add(temporary animation solution)

nvb-uy · Aug 27, 2023 · fe6b5b9 · fe6b5b9
1 parent 0c785b6
commit fe6b5b9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/elocindev/shield_overhaul/ShieldOverhaulClient.java b/src/main/java/elocindev/shield_overhaul/ShieldOverhaulClient.java
@@ -2,12 +2,14 @@
 
 import elocindev.shield_overhaul.event.ShieldInteraction;
 import elocindev.shield_overhaul.registry.EntityRegistry;
+import elocindev.shield_overhaul.registry.PacketRegistry;
 import net.fabricmc.api.ClientModInitializer;
 
 public class ShieldOverhaulClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         EntityRegistry.registerRenderers();
+        PacketRegistry.registerS2CPackets();
         ShieldInteraction.bashingPacketRegistry();
     }
 }
diff --git a/src/main/java/elocindev/shield_overhaul/networking/ShieldBashAnimationS2CPacket.java b/src/main/java/elocindev/shield_overhaul/networking/ShieldBashAnimationS2CPacket.java
@@ -0,0 +1,14 @@
+package elocindev.shield_overhaul.networking;
+
+import elocindev.shield_overhaul.util.ShieldAnimationUtils;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.network.PacketByteBuf;
+
+public class ShieldBashAnimationS2CPacket {
+    public static void receive(MinecraftClient client, ClientPlayNetworkHandler handler,
+                               PacketByteBuf buf, PacketSender responseSender) {
+        ShieldAnimationUtils.playShieldBashAnimation(client.player);
+    }
+}
diff --git a/src/main/java/elocindev/shield_overhaul/networking/ShieldBashC2SPacket.java b/src/main/java/elocindev/shield_overhaul/networking/ShieldBashC2SPacket.java
@@ -2,9 +2,12 @@
 
 import elocindev.shield_overhaul.ShieldOverhaul;
 import elocindev.shield_overhaul.entity.ShieldBashEntity;
+import elocindev.shield_overhaul.registry.PacketRegistry;
 import elocindev.shield_overhaul.util.MathUtils;
 import elocindev.shield_overhaul.util.ShieldAnimationUtils;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
@@ -23,7 +26,7 @@ public static void receive(MinecraftServer server, ServerPlayerEntity player, Se
                 entity.setVelocity(player, player.getPitch(), player.getYaw(), 0.0F, 2.0F, 0F);
                 player.world.spawnEntity(entity);
 
-                ShieldAnimationUtils.playShieldBashAnimation(player);
+                ServerPlayNetworking.send(player, PacketRegistry.SHIELD_BASH_ANIMATION_PACKET, PacketByteBufs.create());
 
                 Vec3d velocityVector = MathUtils.getLookingVec(player, 1.5f);
                 player.addVelocity(velocityVector.x, velocityVector.y, velocityVector.z);

diff --git a/src/main/java/elocindev/shield_overhaul/registry/PacketRegistry.java b/src/main/java/elocindev/shield_overhaul/registry/PacketRegistry.java
@@ -1,14 +1,21 @@
 package elocindev.shield_overhaul.registry;
 
 import elocindev.shield_overhaul.ShieldOverhaul;
+import elocindev.shield_overhaul.networking.ShieldBashAnimationS2CPacket;
 import elocindev.shield_overhaul.networking.ShieldBashC2SPacket;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.util.Identifier;
 
 public class PacketRegistry {
-    public static final Identifier SHIELD_BASH_PACKET = new Identifier(ShieldOverhaul.MODID, "");
+    public static final Identifier SHIELD_BASH_PACKET = new Identifier(ShieldOverhaul.MODID, "shield_bash_packet");
+    public static final Identifier SHIELD_BASH_ANIMATION_PACKET = new Identifier(ShieldOverhaul.MODID, "shield_bash_animation_packet");
 
     public static void registerC2SPackets() {
         ServerPlayNetworking.registerGlobalReceiver(SHIELD_BASH_PACKET, ShieldBashC2SPacket::receive);
     }
+
+    public static void registerS2CPackets() {
+        ClientPlayNetworking.registerGlobalReceiver(SHIELD_BASH_ANIMATION_PACKET, ShieldBashAnimationS2CPacket::receive);
+    }
 }