From fbd917b0052f96c1a8415e933efee12ebe553bf2 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 3 Feb 2020 12:06:40 -0400 Subject: [PATCH] 1.15.2-11 --- gradle.properties | 4 ++-- .../java/carpet/commands/CameraModeCommand.java | 8 ++++---- .../carpet/helpers/EntityPlayerActionPack.java | 2 +- src/main/java/carpet/helpers/XPcombine.java | 2 +- src/main/java/carpet/logging/HUDLogger.java | 2 +- ...tworkHandler_smoothClientAnimationsMixin.java | 2 +- .../mixins/EntityTrackerEntry_leashFixMixin.java | 2 +- .../mixins/PlayerActionC2SPacketMixin.java | 2 +- .../mixins/PlayerListHeaderS2CPacketMixin.java | 2 +- .../ServerPlayNetworkHandler_coreMixin.java | 2 +- ...ayNetworkHandler_interactionUpdatesMixin.java | 10 +++++----- ...verPlayNetworkHandler_scarpetEventsMixin.java | 16 ++++++++-------- .../ServerPlayNetworkHandler_tickMixin.java | 4 ++-- .../java/carpet/patches/EntityPlayerMPFake.java | 6 +++--- .../java/carpet/script/CarpetExpression.java | 4 ++-- .../java/carpet/script/value/EntityValue.java | 6 +++--- src/main/java/carpet/utils/HUDController.java | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6264f900..38e3642a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.15.2 - yarn_mappings=1.15.2+build.7 - loader_version=0.7.6+build.180 + yarn_mappings=1.15.2+build.11 + loader_version=0.7.6+build.181 # Mod Properties mod_version = 1.3.7+v200127 diff --git a/src/main/java/carpet/commands/CameraModeCommand.java b/src/main/java/carpet/commands/CameraModeCommand.java index 91e28fa3..05acce3b 100644 --- a/src/main/java/carpet/commands/CameraModeCommand.java +++ b/src/main/java/carpet/commands/CameraModeCommand.java @@ -5,8 +5,8 @@ import carpet.settings.SettingsManager; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.minecraft.client.network.packet.EntityVelocityUpdateS2CPacket; -import net.minecraft.client.network.packet.RemoveEntityEffectS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.RemoveEntityStatusEffectS2CPacket; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.command.arguments.EntityArgumentType; import net.minecraft.entity.effect.StatusEffects; @@ -63,9 +63,9 @@ public class CameraModeCommand { if (!(iCanHasPermissions(source, player))) return 0; player.setGameMode(GameMode.SURVIVAL); - player.networkHandler.sendPacket(new RemoveEntityEffectS2CPacket(player.getEntityId(), StatusEffects.NIGHT_VISION)); + player.networkHandler.sendPacket(new RemoveEntityStatusEffectS2CPacket(player.getEntityId(), StatusEffects.NIGHT_VISION)); player.removeStatusEffect(StatusEffects.NIGHT_VISION); - player.networkHandler.sendPacket(new RemoveEntityEffectS2CPacket(player.getEntityId(), StatusEffects.CONDUIT_POWER)); + player.networkHandler.sendPacket(new RemoveEntityStatusEffectS2CPacket(player.getEntityId(), StatusEffects.CONDUIT_POWER)); player.removeStatusEffect(StatusEffects.CONDUIT_POWER); return 1; } diff --git a/src/main/java/carpet/helpers/EntityPlayerActionPack.java b/src/main/java/carpet/helpers/EntityPlayerActionPack.java index 2b9c7e63..0b0d2d1f 100644 --- a/src/main/java/carpet/helpers/EntityPlayerActionPack.java +++ b/src/main/java/carpet/helpers/EntityPlayerActionPack.java @@ -8,7 +8,7 @@ import net.minecraft.entity.vehicle.BoatEntity; import net.minecraft.entity.vehicle.MinecartEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; diff --git a/src/main/java/carpet/helpers/XPcombine.java b/src/main/java/carpet/helpers/XPcombine.java index a570e3cb..0f27e5c6 100644 --- a/src/main/java/carpet/helpers/XPcombine.java +++ b/src/main/java/carpet/helpers/XPcombine.java @@ -1,7 +1,7 @@ package carpet.helpers; import carpet.fakes.ExperienceOrbInterface; -import net.minecraft.client.network.packet.PlaySoundIdS2CPacket; +import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket; import net.minecraft.entity.EntityType; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/carpet/logging/HUDLogger.java b/src/main/java/carpet/logging/HUDLogger.java index 044fafa1..27554110 100644 --- a/src/main/java/carpet/logging/HUDLogger.java +++ b/src/main/java/carpet/logging/HUDLogger.java @@ -1,7 +1,7 @@ package carpet.logging; import carpet.utils.HUDController; -import net.minecraft.client.network.packet.TitleS2CPacket; +import net.minecraft.network.packet.s2c.play.TitleS2CPacket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.BaseText; diff --git a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java b/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java index 43b44256..1ab5c95a 100644 --- a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java +++ b/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.PistonBlockEntity; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.client.network.packet.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; import net.minecraft.client.world.ClientWorld; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java b/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java index f52a1741..620b65ea 100644 --- a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java +++ b/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java @@ -1,7 +1,7 @@ package carpet.mixins; import carpet.CarpetSettings; -import net.minecraft.client.network.packet.EntityAttachS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityAttachS2CPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.network.Packet; diff --git a/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java b/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java index 444d13df..b68ab767 100644 --- a/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java +++ b/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -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 org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java b/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java index 6e2b3be0..16b5d07c 100644 --- a/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java +++ b/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerListHeaderS2CPacket; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java index 3ca3c1a2..577b7e1b 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java @@ -5,7 +5,7 @@ import net.minecraft.network.ClientConnection; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.network.packet.CustomPayloadC2SPacket; +import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java index c4c63ce8..061ca518 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java @@ -2,9 +2,9 @@ package carpet.mixins; import carpet.CarpetSettings; import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractBlockC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractItemC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -58,7 +58,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin } @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/network/packet/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", + target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/network/packet/c2s/play/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", shift = At.Shift.BEFORE )) private void beforeBlockBroken(PlayerActionC2SPacket packet, CallbackInfo ci) @@ -69,7 +69,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/network/packet/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", + target ="Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/network/packet/c2s/play/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", shift = At.Shift.AFTER )) private void afterBlockBroken(PlayerActionC2SPacket packet, CallbackInfo ci) diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java index 1e7da345..6128944c 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java @@ -3,13 +3,13 @@ package carpet.mixins; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.network.packet.ClientCommandC2SPacket; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.server.network.packet.PlayerInputC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractBlockC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractEntityC2SPacket; -import net.minecraft.server.network.packet.PlayerInteractItemC2SPacket; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import org.spongepowered.asm.mixin.Mixin; @@ -85,7 +85,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/network/packet/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", + target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/network/packet/c2s/play/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V", shift = At.Shift.BEFORE )) private void onClicked(PlayerActionC2SPacket packet, CallbackInfo ci) diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java index 903735c1..7b6ec9f2 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java @@ -3,8 +3,8 @@ package carpet.mixins; import carpet.helpers.TickSpeed; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.network.packet.PlayerInputC2SPacket; -import net.minecraft.server.network.packet.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index e77dbaf6..bd12b0ca 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -2,9 +2,9 @@ package carpet.patches; import com.mojang.authlib.GameProfile; import net.minecraft.block.entity.SkullBlockEntity; -import net.minecraft.client.network.packet.EntityPositionS2CPacket; -import net.minecraft.client.network.packet.EntitySetHeadYawS2CPacket; -import net.minecraft.client.network.packet.PlayerListS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; +import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.HungerManager; import net.minecraft.network.NetworkSide; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 068e1e27..2bb24ce0 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -43,8 +43,8 @@ import net.minecraft.block.CommandBlock; import net.minecraft.block.JigsawBlock; import net.minecraft.block.StructureBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.client.network.packet.ContainerSlotUpdateS2CPacket; -import net.minecraft.client.network.packet.PlaySoundIdS2CPacket; +import net.minecraft.network.packet.s2c.play.ContainerSlotUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket; import net.minecraft.command.arguments.ItemStackArgument; import net.minecraft.command.arguments.ParticleArgumentType; import net.minecraft.enchantment.Enchantments; diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index bb30c389..4760a84e 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -9,9 +9,9 @@ import carpet.script.EntityEventsGroup; import carpet.script.exception.InternalExpressionException; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.minecraft.client.network.packet.EntityPassengersSetS2CPacket; -import net.minecraft.client.network.packet.EntityPositionS2CPacket; -import net.minecraft.client.network.packet.PlayerPositionLookS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.command.EntitySelector; import net.minecraft.command.EntitySelectorReader; import net.minecraft.entity.Entity; diff --git a/src/main/java/carpet/utils/HUDController.java b/src/main/java/carpet/utils/HUDController.java index e04c718c..74d09caf 100644 --- a/src/main/java/carpet/utils/HUDController.java +++ b/src/main/java/carpet/utils/HUDController.java @@ -7,7 +7,7 @@ import carpet.logging.logHelpers.PacketCounter; import carpet.mixins.PlayerListHeaderS2CPacketMixin; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerListHeaderS2CPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.MathHelper; import net.minecraft.text.BaseText;