Implement ServerUtil#registerCodecs for C2S & S2C

StavWasPlayZ · Sep 9, 2024 · 04c9478 · 04c9478
1 parent 222353e
commit 04c9478
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/cstav/genshinstrument/networking/GIPacketHandler.java b/src/main/java/com/cstav/genshinstrument/networking/GIPacketHandler.java
@@ -11,7 +11,6 @@
 import com.cstav.genshinstrument.networking.packet.instrument.util.ClientDistExec;
 import com.cstav.genshinstrument.util.ServerUtil;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
@@ -36,8 +35,7 @@ public class GIPacketHandler {
 
 
     public static void registerCodecs() {
-        ServerUtil.registerCodecs(PayloadTypeRegistry.playC2S(), C2S_PACKETS);
-        ServerUtil.registerCodecs(PayloadTypeRegistry.playS2C(), S2C_PACKETS);
+        ServerUtil.registerCodecs(C2S_PACKETS, S2C_PACKETS);
     }
 
     public static void registerClientPackets() {

diff --git a/src/main/java/com/cstav/genshinstrument/util/ServerUtil.java b/src/main/java/com/cstav/genshinstrument/util/ServerUtil.java
@@ -14,6 +14,14 @@
 
 public class ServerUtil {
 
+    public static void registerCodecs(
+        List<Class<IModPacket>> c2sPacketTypes,
+        List<Class<IModPacket>> s2cPacketTypes
+    ) {
+        ServerUtil.registerCodecs(PayloadTypeRegistry.playC2S(), c2sPacketTypes);
+        ServerUtil.registerCodecs(PayloadTypeRegistry.playS2C(), s2cPacketTypes);
+    }
+
     public static void registerCodecs(PayloadTypeRegistry<RegistryFriendlyByteBuf> registry, List<Class<IModPacket>> packetTypes) {
         for (final Class<IModPacket> packetClass : packetTypes) {
             registry.register(
@@ -23,6 +31,7 @@ public static void registerCodecs(PayloadTypeRegistry<RegistryFriendlyByteBuf> r
         }
     }
 
+
     public static void registerServerPackets(final List<Class<IModPacket>> packetTypes) {
         for (final Class<IModPacket> packetClass : packetTypes) {
             ServerPlayNetworking.registerGlobalReceiver(