1.0.8-beta.2 fixed some fabric issues

mysticdrew · Apr 26, 2024 · d23128f · d23128f
1 parent e0047db
commit d23128f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/doc/changelog.html b/doc/changelog.html
@@ -10,5 +10,5 @@ <h1>Common Networking ${version} for Minecraft ${mcversion}</h1>
 
 <p>New in ${version}</p>
 <ul>
-    <li>Fixed some fabric sided issues</li>
+    <li>Fixed some fabric sided issues for 1.20.5</li>
 </ul>
diff --git a/fabric/src/main/java/commonnetwork/networking/FabricNetworkHandler.java b/fabric/src/main/java/commonnetwork/networking/FabricNetworkHandler.java
@@ -22,29 +22,32 @@ public FabricNetworkHandler(Side side)
     @SuppressWarnings("unchecked")
     protected <T> void registerPacket(PacketContainer<T> container)
     {
-        if (PACKET_MAP.get(container.classType()) == null)
+        try
         {
-            if (Side.CLIENT.equals(this.side))
-            {
-                Constants.LOG.debug("Registering packet {} : {} on the: {}", container.type().id(), container.classType(), Side.CLIENT);
+            PayloadTypeRegistry.playC2S().register(container.getType(), container.getCodec());
+            PayloadTypeRegistry.playS2C().register(container.getType(), container.getCodec());
+        }
+        catch (IllegalArgumentException e)
+        {
+            // do nothing
+        }
 
-                PayloadTypeRegistry.playS2C().register(container.getType(), container.getCodec());
-                ClientPlayNetworking.registerGlobalReceiver(container.getType(),
-                        (ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
-                                container.handler().accept(
-                                        new PacketContext<>(payload.packet(), side))));
-            }
-            else
-            {
-                Constants.LOG.debug("Registering packet {} : {} on the: {}", container.type().id(), container.classType(), Side.SERVER);
+        if (Side.CLIENT.equals(this.side))
+        {
+            Constants.LOG.debug("Registering packet {} : {} on the: {}", container.type().id(), container.classType(), Side.CLIENT);
 
-                PayloadTypeRegistry.playC2S().register(container.getType(), container.getCodec());
-                ServerPlayNetworking.registerGlobalReceiver(container.getType(),
-                        (ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() ->
-                                container.handler().accept(
-                                        new PacketContext<>(context.player(), payload.packet(), side))));
-            }
+            ClientPlayNetworking.registerGlobalReceiver(container.getType(),
+                    (ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
+                            container.handler().accept(
+                                    new PacketContext<>(payload.packet(), side))));
         }
+
+        Constants.LOG.debug("Registering packet {} : {} on the: {}", container.type().id(), container.classType(), Side.SERVER);
+        ServerPlayNetworking.registerGlobalReceiver(container.getType(),
+                (ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() ->
+                        container.handler().accept(
+                                new PacketContext<>(context.player(), payload.packet(), side))));
+
     }
 
     public <T> void sendToServer(T packet)

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version=1.0.8-beta.1
+version=1.0.8-beta.2
 group_id=mysticdrew
 
 curseforge_project_id=806044