some fabric and forge fixes

mysticdrew · Jun 10, 2024 · bf751ca · bf751ca
1 parent bc1e8f5
commit bf751ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/doc/changelog.html b/doc/changelog.html
@@ -10,6 +10,6 @@ <h1>Common Networking ${version} for Minecraft ${mcversion}</h1>
 
 <p>New in ${version}</p>
 <ul>
-    <li>Added Forge back</li>
-    <li>Bump loader versions</li>
+    <li>Fixed: Some issues with forge networking throwing exceptions.</li>
+    <li>Fixed; Some Fabric issues.</li>
 </ul>
diff --git a/fabric/src/main/java/commonnetwork/networking/FabricNetworkHandler.java b/fabric/src/main/java/commonnetwork/networking/FabricNetworkHandler.java
@@ -39,7 +39,7 @@ protected <T> void registerPacket(PacketContainer<T> container)
             ClientPlayNetworking.registerGlobalReceiver(container.getType(),
                     (ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
                             container.handler().accept(
-                                    new PacketContext<>(payload.packet(), side))));
+                                    new PacketContext<>(payload.packet(), Side.CLIENT))));
         }
 
         Constants.LOG.debug("Registering packet {} : {} on the: {}", container.type().id(), container.classType(), Side.SERVER);

diff --git a/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java b/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java
@@ -93,17 +93,19 @@ public <T> void sendToClient(T packet, ServerPlayer player)
 
     private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<PacketContext<T>> handler)
     {
-        return (message, ctx) -> ctx.enqueueWork(() -> {
+        return (message, ctx) -> {
             try
             {
                 Side side = ctx.isServerSide() ? Side.SERVER : Side.CLIENT;
                 ServerPlayer player = ctx.getSender();
                 handler.accept(new PacketContext<>(player, message, side));
                 ctx.setPacketHandled(true);
-            } catch (Throwable t) {
+            }
+            catch (Throwable t)
+            {
                 Constants.LOG.error("{} error handling packet", message.getClass(), t);
             }
-        });
+        };
     }
 
     public record Message<T>(EventNetworkChannel channel, BiConsumer<T, FriendlyByteBuf> encoder)

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -17,7 +17,7 @@ plugins {
     id 'java-library'
     id 'eclipse'
     id 'idea'
-//    id 'java'
+    id 'java'
     id 'maven-publish'
     id 'net.neoforged.gradle.userdev' version '[7.0.105,)'
     id 'net.darkhax.curseforgegradle' version '1.+'