diff --git a/src/main/java/mc/duzo/timeless/client/network/ClientNetwork.java b/src/main/java/mc/duzo/timeless/client/network/ClientNetwork.java index 30da980..4b01e48 100644 --- a/src/main/java/mc/duzo/timeless/client/network/ClientNetwork.java +++ b/src/main/java/mc/duzo/timeless/client/network/ClientNetwork.java @@ -2,14 +2,10 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import mc.duzo.timeless.network.s2c.MarkFiveCaseS2CPacket; -import mc.duzo.timeless.network.s2c.MarkFiveMaskS2CPacket; import mc.duzo.timeless.network.s2c.UpdateFlyingStatusS2CPacket; public class ClientNetwork { static { - ClientPlayNetworking.registerGlobalReceiver(MarkFiveCaseS2CPacket.TYPE, MarkFiveCaseS2CPacket::handle); - ClientPlayNetworking.registerGlobalReceiver(MarkFiveMaskS2CPacket.TYPE, MarkFiveMaskS2CPacket::handle); ClientPlayNetworking.registerGlobalReceiver(UpdateFlyingStatusS2CPacket.TYPE, UpdateFlyingStatusS2CPacket::handle); } diff --git a/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveCaseS2CPacket.java b/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveCaseS2CPacket.java deleted file mode 100644 index 7cf6c56..0000000 --- a/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveCaseS2CPacket.java +++ /dev/null @@ -1,45 +0,0 @@ -package mc.duzo.timeless.network.s2c; - -import java.util.UUID; - -import net.fabricmc.fabric.api.networking.v1.FabricPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.PacketType; - -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Identifier; - -import mc.duzo.timeless.Timeless; -import mc.duzo.timeless.client.animation.player.PlayerAnimationTracker; -import mc.duzo.timeless.client.animation.player.holder.PlayerAnimationHolder; -import mc.duzo.timeless.suit.client.animation.SuitAnimationHolder; -import mc.duzo.timeless.suit.client.animation.SuitAnimationTracker; -import mc.duzo.timeless.suit.client.animation.impl.ironman.mk5.MarkFiveAnimations; -import mc.duzo.timeless.suit.client.animation.impl.ironman.mk5.MarkFiveCaseAnimation; - -public record MarkFiveCaseS2CPacket(UUID player, boolean isPuttingOn) implements FabricPacket { - public static final PacketType TYPE = PacketType.create(new Identifier(Timeless.MOD_ID, "mark_five_animation"), MarkFiveCaseS2CPacket::new); - - public MarkFiveCaseS2CPacket(PacketByteBuf buf) { - this(buf.readUuid(), buf.readBoolean()); - } - @Override - public void write(PacketByteBuf buf) { - buf.writeUuid(player); - buf.writeBoolean(isPuttingOn); - } - - @Override - public PacketType getType() { - return TYPE; - } - - public void handle(ClientPlayerEntity client, PacketSender sender) { - SuitAnimationHolder suit = new MarkFiveCaseAnimation(isPuttingOn); - SuitAnimationTracker.addAnimation(player, suit); - - PlayerAnimationHolder anim = (isPuttingOn) ? new PlayerAnimationHolder(MarkFiveAnimations.CASE_OPEN_PLAYER) : new PlayerAnimationHolder(MarkFiveAnimations.CASE_CLOSE_PLAYER); - PlayerAnimationTracker.addAnimation(player, anim); - } -} diff --git a/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveMaskS2CPacket.java b/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveMaskS2CPacket.java deleted file mode 100644 index c4aff93..0000000 --- a/src/main/java/mc/duzo/timeless/network/s2c/MarkFiveMaskS2CPacket.java +++ /dev/null @@ -1,39 +0,0 @@ -package mc.duzo.timeless.network.s2c; - -import java.util.UUID; - -import net.fabricmc.fabric.api.networking.v1.FabricPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.PacketType; - -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Identifier; - -import mc.duzo.timeless.Timeless; -import mc.duzo.timeless.suit.client.animation.SuitAnimationHolder; -import mc.duzo.timeless.suit.client.animation.SuitAnimationTracker; -import mc.duzo.timeless.suit.client.animation.impl.ironman.mk5.MarkFiveMaskAnimation; - -public record MarkFiveMaskS2CPacket(UUID player, boolean isPuttingOn) implements FabricPacket { - public static final PacketType TYPE = PacketType.create(new Identifier(Timeless.MOD_ID, "mark_five_case"), MarkFiveMaskS2CPacket::new); - - public MarkFiveMaskS2CPacket(PacketByteBuf buf) { - this(buf.readUuid(), buf.readBoolean()); - } - @Override - public void write(PacketByteBuf buf) { - buf.writeUuid(player); - buf.writeBoolean(isPuttingOn); - } - - @Override - public PacketType getType() { - return TYPE; - } - - public void handle(ClientPlayerEntity client, PacketSender sender) { - SuitAnimationHolder suit = new MarkFiveMaskAnimation(isPuttingOn); - SuitAnimationTracker.addAnimation(player, suit); - } -}