From df84f0df9c6bfbf94fbb54ba67a34101f025e3dd Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 6 Feb 2020 20:51:16 +0100 Subject: [PATCH] Update Fabric stuff --- gradle.properties | 4 ++-- src/main/java/net/wurstclient/commands/CopyItemCmd.java | 2 +- src/main/java/net/wurstclient/commands/DamageCmd.java | 2 +- src/main/java/net/wurstclient/commands/GiveCmd.java | 2 +- src/main/java/net/wurstclient/commands/ModifyCmd.java | 2 +- src/main/java/net/wurstclient/commands/RepairCmd.java | 2 +- src/main/java/net/wurstclient/commands/SayCmd.java | 2 +- src/main/java/net/wurstclient/hacks/AutoArmorHack.java | 2 +- src/main/java/net/wurstclient/hacks/AutoBuildHack.java | 2 +- src/main/java/net/wurstclient/hacks/AutoFarmHack.java | 2 +- src/main/java/net/wurstclient/hacks/AutoFishHack.java | 2 +- src/main/java/net/wurstclient/hacks/AutoLeaveHack.java | 6 +++--- src/main/java/net/wurstclient/hacks/AutoPotionHack.java | 2 +- src/main/java/net/wurstclient/hacks/BlinkHack.java | 2 +- src/main/java/net/wurstclient/hacks/BuildRandomHack.java | 2 +- src/main/java/net/wurstclient/hacks/CaveFinderHack.java | 6 +++--- src/main/java/net/wurstclient/hacks/ClickAuraHack.java | 2 +- src/main/java/net/wurstclient/hacks/CriticalsHack.java | 2 +- src/main/java/net/wurstclient/hacks/DerpHack.java | 2 +- src/main/java/net/wurstclient/hacks/ExtraElytraHack.java | 2 +- src/main/java/net/wurstclient/hacks/FastBreakHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/FreecamHack.java | 2 +- src/main/java/net/wurstclient/hacks/HeadRollHack.java | 2 +- src/main/java/net/wurstclient/hacks/InstantBunkerHack.java | 2 +- src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java | 2 +- src/main/java/net/wurstclient/hacks/JesusHack.java | 2 +- src/main/java/net/wurstclient/hacks/KillPotionHack.java | 2 +- src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java | 6 +++--- src/main/java/net/wurstclient/hacks/MultiAuraHack.java | 2 +- src/main/java/net/wurstclient/hacks/NoFallHack.java | 2 +- src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java | 2 +- src/main/java/net/wurstclient/hacks/SearchHack.java | 6 +++--- src/main/java/net/wurstclient/hacks/ServerCrasherHack.java | 2 +- src/main/java/net/wurstclient/hacks/SneakHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/TiredHack.java | 2 +- src/main/java/net/wurstclient/hacks/TpAuraHack.java | 2 +- src/main/java/net/wurstclient/hacks/TrollPotionHack.java | 2 +- src/main/java/net/wurstclient/hacks/TunnellerHack.java | 2 +- .../wurstclient/mixin/ClientPlayNetworkHandlerMixin.java | 6 +++--- .../java/net/wurstclient/mixin/ClientPlayerEntityMixin.java | 2 +- .../mixin/ClientPlayerInteractionManagerMixin.java | 4 ++-- .../net/wurstclient/mixin/LivingEntityRendererMixin.java | 2 +- .../mixinterface/IClientPlayerInteractionManager.java | 2 +- src/main/java/net/wurstclient/util/BlockBreaker.java | 6 +++--- 44 files changed, 60 insertions(+), 60 deletions(-) diff --git a/gradle.properties b/gradle.properties index ee84b005..90adf164 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.15.2 -yarn_mappings=1.15.2+build.8 -loader_version=0.7.6+build.180 +yarn_mappings=1.15.2+build.12 +loader_version=0.7.8+build.184 #Fabric api fabric_version=0.4.29+build.290-1.15 diff --git a/src/main/java/net/wurstclient/commands/CopyItemCmd.java b/src/main/java/net/wurstclient/commands/CopyItemCmd.java index d249d867..19b8d141 100644 --- a/src/main/java/net/wurstclient/commands/CopyItemCmd.java +++ b/src/main/java/net/wurstclient/commands/CopyItemCmd.java @@ -9,7 +9,7 @@ package net.wurstclient.commands; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.wurstclient.command.CmdError; import net.wurstclient.command.CmdException; import net.wurstclient.command.CmdSyntaxError; diff --git a/src/main/java/net/wurstclient/commands/DamageCmd.java b/src/main/java/net/wurstclient/commands/DamageCmd.java index 58ae288f..9ecfb39d 100644 --- a/src/main/java/net/wurstclient/commands/DamageCmd.java +++ b/src/main/java/net/wurstclient/commands/DamageCmd.java @@ -7,7 +7,7 @@ */ package net.wurstclient.commands; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.math.Vec3d; import net.wurstclient.command.CmdError; import net.wurstclient.command.CmdException; diff --git a/src/main/java/net/wurstclient/commands/GiveCmd.java b/src/main/java/net/wurstclient/commands/GiveCmd.java index 1d4363ad..6cab2d5f 100644 --- a/src/main/java/net/wurstclient/commands/GiveCmd.java +++ b/src/main/java/net/wurstclient/commands/GiveCmd.java @@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.StringNbtReader; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.minecraft.util.Identifier; import net.minecraft.util.InvalidIdentifierException; import net.minecraft.util.registry.Registry; diff --git a/src/main/java/net/wurstclient/commands/ModifyCmd.java b/src/main/java/net/wurstclient/commands/ModifyCmd.java index ec34bc48..14c17d47 100644 --- a/src/main/java/net/wurstclient/commands/ModifyCmd.java +++ b/src/main/java/net/wurstclient/commands/ModifyCmd.java @@ -15,7 +15,7 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.StringNbtReader; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.wurstclient.command.CmdError; import net.wurstclient.command.CmdException; import net.wurstclient.command.CmdSyntaxError; diff --git a/src/main/java/net/wurstclient/commands/RepairCmd.java b/src/main/java/net/wurstclient/commands/RepairCmd.java index cd0ab15a..b6567517 100644 --- a/src/main/java/net/wurstclient/commands/RepairCmd.java +++ b/src/main/java/net/wurstclient/commands/RepairCmd.java @@ -9,7 +9,7 @@ package net.wurstclient.commands; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.wurstclient.command.CmdError; import net.wurstclient.command.CmdException; import net.wurstclient.command.CmdSyntaxError; diff --git a/src/main/java/net/wurstclient/commands/SayCmd.java b/src/main/java/net/wurstclient/commands/SayCmd.java index f63b5615..e97f444d 100644 --- a/src/main/java/net/wurstclient/commands/SayCmd.java +++ b/src/main/java/net/wurstclient/commands/SayCmd.java @@ -7,7 +7,7 @@ */ package net.wurstclient.commands; -import net.minecraft.server.network.packet.ChatMessageC2SPacket; +import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import net.wurstclient.SearchTags; import net.wurstclient.command.CmdException; import net.wurstclient.command.CmdSyntaxError; diff --git a/src/main/java/net/wurstclient/hacks/AutoArmorHack.java b/src/main/java/net/wurstclient/hacks/AutoArmorHack.java index 5cfdb613..bb3dfc7e 100644 --- a/src/main/java/net/wurstclient/hacks/AutoArmorHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoArmorHack.java @@ -22,7 +22,7 @@ import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.ClickWindowC2SPacket; +import net.minecraft.network.packet.c2s.play.ClickWindowC2SPacket; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.PacketOutputListener; diff --git a/src/main/java/net/wurstclient/hacks/AutoBuildHack.java b/src/main/java/net/wurstclient/hacks/AutoBuildHack.java index b14bcdc7..8e2e4d81 100644 --- a/src/main/java/net/wurstclient/hacks/AutoBuildHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoBuildHack.java @@ -15,7 +15,7 @@ import java.util.LinkedHashSet; import org.lwjgl.opengl.GL11; import net.minecraft.block.BlockState; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index 464d9820..db167673 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -24,7 +24,7 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.server.network.packet.HandSwingC2SPacket; +import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; diff --git a/src/main/java/net/wurstclient/hacks/AutoFishHack.java b/src/main/java/net/wurstclient/hacks/AutoFishHack.java index 219b908b..6c7a30f4 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFishHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFishHack.java @@ -10,13 +10,13 @@ package net.wurstclient.hacks; import org.lwjgl.opengl.GL11; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.network.packet.PlaySoundS2CPacket; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.projectile.FishingBobberEntity; import net.minecraft.item.FishingRodItem; import net.minecraft.item.ItemStack; +import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/net/wurstclient/hacks/AutoLeaveHack.java b/src/main/java/net/wurstclient/hacks/AutoLeaveHack.java index 6d1c3b82..2978eeca 100644 --- a/src/main/java/net/wurstclient/hacks/AutoLeaveHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoLeaveHack.java @@ -7,9 +7,9 @@ */ package net.wurstclient.hacks; -import net.minecraft.server.network.packet.ChatMessageC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractEntityC2SPacket; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.UpdateListener; diff --git a/src/main/java/net/wurstclient/hacks/AutoPotionHack.java b/src/main/java/net/wurstclient/hacks/AutoPotionHack.java index 3665c148..8ef26587 100644 --- a/src/main/java/net/wurstclient/hacks/AutoPotionHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoPotionHack.java @@ -12,8 +12,8 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.potion.PotionUtil; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.UpdateListener; diff --git a/src/main/java/net/wurstclient/hacks/BlinkHack.java b/src/main/java/net/wurstclient/hacks/BlinkHack.java index 7a1a678e..5a4cbe74 100644 --- a/src/main/java/net/wurstclient/hacks/BlinkHack.java +++ b/src/main/java/net/wurstclient/hacks/BlinkHack.java @@ -9,7 +9,7 @@ package net.wurstclient.hacks; import java.util.ArrayDeque; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.events.PacketOutputListener; import net.wurstclient.events.UpdateListener; diff --git a/src/main/java/net/wurstclient/hacks/BuildRandomHack.java b/src/main/java/net/wurstclient/hacks/BuildRandomHack.java index 6e174af8..5417e8eb 100644 --- a/src/main/java/net/wurstclient/hacks/BuildRandomHack.java +++ b/src/main/java/net/wurstclient/hacks/BuildRandomHack.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java index 629a1004..68aef813 100644 --- a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java @@ -27,11 +27,11 @@ import org.lwjgl.opengl.GL11; import net.minecraft.block.Block; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.network.packet.BlockUpdateS2CPacket; -import net.minecraft.client.network.packet.ChunkDataS2CPacket; -import net.minecraft.client.network.packet.ChunkDeltaUpdateS2CPacket; import net.minecraft.client.world.ClientWorld; import net.minecraft.network.Packet; +import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/net/wurstclient/hacks/ClickAuraHack.java b/src/main/java/net/wurstclient/hacks/ClickAuraHack.java index 573fb5af..f73f476c 100644 --- a/src/main/java/net/wurstclient/hacks/ClickAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/ClickAuraHack.java @@ -27,7 +27,7 @@ import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.Box; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/CriticalsHack.java b/src/main/java/net/wurstclient/hacks/CriticalsHack.java index cf360d70..62b81ff6 100644 --- a/src/main/java/net/wurstclient/hacks/CriticalsHack.java +++ b/src/main/java/net/wurstclient/hacks/CriticalsHack.java @@ -8,7 +8,7 @@ package net.wurstclient.hacks; import net.minecraft.entity.LivingEntity; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/DerpHack.java b/src/main/java/net/wurstclient/hacks/DerpHack.java index 532333cd..119d07ad 100644 --- a/src/main/java/net/wurstclient/hacks/DerpHack.java +++ b/src/main/java/net/wurstclient/hacks/DerpHack.java @@ -9,7 +9,7 @@ package net.wurstclient.hacks; import java.util.Random; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.UpdateListener; diff --git a/src/main/java/net/wurstclient/hacks/ExtraElytraHack.java b/src/main/java/net/wurstclient/hacks/ExtraElytraHack.java index 446c5792..fbff49d3 100644 --- a/src/main/java/net/wurstclient/hacks/ExtraElytraHack.java +++ b/src/main/java/net/wurstclient/hacks/ExtraElytraHack.java @@ -11,7 +11,7 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ElytraItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.server.network.packet.ClientCommandC2SPacket; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/FastBreakHack.java b/src/main/java/net/wurstclient/hacks/FastBreakHack.java index 17c269bd..509f4b05 100644 --- a/src/main/java/net/wurstclient/hacks/FastBreakHack.java +++ b/src/main/java/net/wurstclient/hacks/FastBreakHack.java @@ -7,8 +7,8 @@ */ package net.wurstclient.hacks; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.server.network.packet.PlayerActionC2SPacket.Action; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/FreecamHack.java b/src/main/java/net/wurstclient/hacks/FreecamHack.java index bebf5f64..5b071b9d 100644 --- a/src/main/java/net/wurstclient/hacks/FreecamHack.java +++ b/src/main/java/net/wurstclient/hacks/FreecamHack.java @@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.options.GameOptions; import net.minecraft.client.options.KeyBinding; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/HeadRollHack.java b/src/main/java/net/wurstclient/hacks/HeadRollHack.java index 68f8a8ca..65757c9e 100644 --- a/src/main/java/net/wurstclient/hacks/HeadRollHack.java +++ b/src/main/java/net/wurstclient/hacks/HeadRollHack.java @@ -7,7 +7,7 @@ */ package net.wurstclient.hacks; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.math.MathHelper; import net.wurstclient.Category; import net.wurstclient.SearchTags; diff --git a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java index 1658f139..ee201552 100644 --- a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java +++ b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java @@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.HandSwingC2SPacket; +import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; diff --git a/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java b/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java index a2ed72bb..fd4db5cf 100644 --- a/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java +++ b/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java @@ -11,7 +11,7 @@ import java.util.Random; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.minecraft.util.registry.Registry; import net.wurstclient.Category; import net.wurstclient.SearchTags; diff --git a/src/main/java/net/wurstclient/hacks/JesusHack.java b/src/main/java/net/wurstclient/hacks/JesusHack.java index 9c94f9cd..e29cedf4 100644 --- a/src/main/java/net/wurstclient/hacks/JesusHack.java +++ b/src/main/java/net/wurstclient/hacks/JesusHack.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import net.minecraft.block.Material; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.Packet; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/net/wurstclient/hacks/KillPotionHack.java b/src/main/java/net/wurstclient/hacks/KillPotionHack.java index 8e4f1ba2..8ad3acd1 100644 --- a/src/main/java/net/wurstclient/hacks/KillPotionHack.java +++ b/src/main/java/net/wurstclient/hacks/KillPotionHack.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.minecraft.text.LiteralText; import net.wurstclient.Category; import net.wurstclient.SearchTags; diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index 88a8168c..1d9e3d79 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -22,11 +22,11 @@ import org.lwjgl.opengl.GL11; import net.minecraft.block.BlockState; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.network.packet.BlockUpdateS2CPacket; -import net.minecraft.client.network.packet.ChunkDataS2CPacket; -import net.minecraft.client.network.packet.ChunkDeltaUpdateS2CPacket; import net.minecraft.client.world.ClientWorld; import net.minecraft.network.Packet; +import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.world.LightType; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/wurstclient/hacks/MultiAuraHack.java b/src/main/java/net/wurstclient/hacks/MultiAuraHack.java index 66bc065a..721ea320 100644 --- a/src/main/java/net/wurstclient/hacks/MultiAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/MultiAuraHack.java @@ -28,7 +28,7 @@ import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.Box; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/NoFallHack.java b/src/main/java/net/wurstclient/hacks/NoFallHack.java index c4d1709a..9e8a9c44 100644 --- a/src/main/java/net/wurstclient/hacks/NoFallHack.java +++ b/src/main/java/net/wurstclient/hacks/NoFallHack.java @@ -8,7 +8,7 @@ package net.wurstclient.hacks; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.UpdateListener; diff --git a/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java b/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java index 5fdabc40..a6efe3bf 100644 --- a/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java +++ b/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java @@ -12,7 +12,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; diff --git a/src/main/java/net/wurstclient/hacks/SearchHack.java b/src/main/java/net/wurstclient/hacks/SearchHack.java index d33fa8f1..e8d7db2e 100644 --- a/src/main/java/net/wurstclient/hacks/SearchHack.java +++ b/src/main/java/net/wurstclient/hacks/SearchHack.java @@ -27,11 +27,11 @@ import org.lwjgl.opengl.GL11; import net.minecraft.block.Block; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.network.packet.BlockUpdateS2CPacket; -import net.minecraft.client.network.packet.ChunkDataS2CPacket; -import net.minecraft.client.network.packet.ChunkDeltaUpdateS2CPacket; import net.minecraft.client.world.ClientWorld; import net.minecraft.network.Packet; +import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java b/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java index 53422e91..8924e87d 100644 --- a/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java +++ b/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java @@ -13,7 +13,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.StringNbtReader; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/SneakHack.java b/src/main/java/net/wurstclient/hacks/SneakHack.java index 4f9a9a16..7d7a8944 100644 --- a/src/main/java/net/wurstclient/hacks/SneakHack.java +++ b/src/main/java/net/wurstclient/hacks/SneakHack.java @@ -9,8 +9,8 @@ package net.wurstclient.hacks; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.options.KeyBinding; -import net.minecraft.server.network.packet.ClientCommandC2SPacket; -import net.minecraft.server.network.packet.ClientCommandC2SPacket.Mode; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket.Mode; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.PostMotionListener; diff --git a/src/main/java/net/wurstclient/hacks/TiredHack.java b/src/main/java/net/wurstclient/hacks/TiredHack.java index 09676705..6b4b480d 100644 --- a/src/main/java/net/wurstclient/hacks/TiredHack.java +++ b/src/main/java/net/wurstclient/hacks/TiredHack.java @@ -7,7 +7,7 @@ */ package net.wurstclient.hacks; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.wurstclient.Category; import net.wurstclient.events.UpdateListener; import net.wurstclient.hack.Hack; diff --git a/src/main/java/net/wurstclient/hacks/TpAuraHack.java b/src/main/java/net/wurstclient/hacks/TpAuraHack.java index 79f302a5..f7977269 100644 --- a/src/main/java/net/wurstclient/hacks/TpAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/TpAuraHack.java @@ -28,7 +28,7 @@ import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.Box; import net.wurstclient.Category; diff --git a/src/main/java/net/wurstclient/hacks/TrollPotionHack.java b/src/main/java/net/wurstclient/hacks/TrollPotionHack.java index 926e1ce3..3ac0328c 100644 --- a/src/main/java/net/wurstclient/hacks/TrollPotionHack.java +++ b/src/main/java/net/wurstclient/hacks/TrollPotionHack.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.server.network.packet.CreativeInventoryActionC2SPacket; +import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import net.minecraft.text.LiteralText; import net.wurstclient.Category; import net.wurstclient.SearchTags; diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java index 3003f3b6..09238143 100644 --- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java +++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java @@ -24,7 +24,7 @@ import net.minecraft.client.options.GameOptions; import net.minecraft.client.options.KeyBinding; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.HandSwingC2SPacket; +import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java index 2c95c1be..54eb9622 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -14,10 +14,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.client.network.packet.*; import net.minecraft.network.ClientConnection; import net.minecraft.network.Packet; import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.s2c.play.*; import net.minecraft.text.Text; import net.wurstclient.WurstClient; import net.wurstclient.events.PacketOutputListener.PacketOutputEvent; @@ -348,7 +348,7 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener @Shadow @Override - public void onRemoveEntityEffect(RemoveEntityEffectS2CPacket var1) + public void onRemoveEntityEffect(RemoveEntityStatusEffectS2CPacket var1) { } @@ -488,7 +488,7 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener @Shadow @Override - public void onEntityPotionEffect(EntityPotionEffectS2CPacket var1) + public void onEntityPotionEffect(EntityStatusEffectS2CPacket var1) { } diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java index 76bca2ce..8bc1022b 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java @@ -20,7 +20,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.MovementType; -import net.minecraft.server.network.packet.ChatMessageC2SPacket; +import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import net.minecraft.util.math.Vec3d; import net.wurstclient.WurstClient; import net.wurstclient.events.ChatOutputListener.ChatOutputEvent; diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java index 0eb11812..243a565c 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java @@ -20,8 +20,8 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.container.SlotActionType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.server.network.packet.PlayerActionC2SPacket.Action; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; diff --git a/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java b/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java index 42a89210..055ea0ff 100644 --- a/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java @@ -29,6 +29,6 @@ public abstract class LivingEntityRendererMixin if(WurstClient.INSTANCE.getHax().trueSightHack.isEnabled()) return false; - return e.canSeePlayer(player); + return e.isInvisibleTo(player); } } diff --git a/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java b/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java index 09c97a7b..ba3eaad5 100644 --- a/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java +++ b/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java @@ -8,7 +8,7 @@ package net.wurstclient.mixinterface; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/net/wurstclient/util/BlockBreaker.java b/src/main/java/net/wurstclient/util/BlockBreaker.java index 25557291..9b16ded4 100644 --- a/src/main/java/net/wurstclient/util/BlockBreaker.java +++ b/src/main/java/net/wurstclient/util/BlockBreaker.java @@ -10,9 +10,9 @@ package net.wurstclient.util; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.server.network.packet.HandSwingC2SPacket; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.server.network.packet.PlayerActionC2SPacket.Action; +import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction;