Hotfix: Make patchwork-networking-messages work on the server

Author: TheGlitch76

patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java

@@ -37,36 +37,20 @@
 import net.minecraft.util.PacketByteBuf;
 
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 
 public class PatchworkPlayNetworkingMessages implements ModInitializer, MessageFactory {
-	private static final Logger LOGGER = LogManager.getLogger("patchwork-networking");
-	private static final Identifier IDENTIFIER = new Identifier("fml", "play");
-	private static final NetworkChannelVersion VERSION = new NetworkChannelVersion("FML2", version -> true, version -> true);
-	private static final short SPAWN_ENTITY = 0;
-	private static final short OPEN_CONTAINER = 1;
+	public static final Logger LOGGER = LogManager.getLogger("patchwork-networking");
+	public static final Identifier IDENTIFIER = new Identifier("fml", "play");
+	public static final NetworkChannelVersion VERSION = new NetworkChannelVersion("FML2", version -> true, version -> true);
+	public static final short SPAWN_ENTITY = 0;
+	public static final short OPEN_CONTAINER = 1;
 
 	@Override
 	public void onInitialize() {
 		PatchworkNetworking.getVersionManager().createChannel(IDENTIFIER, VERSION);
 		PatchworkNetworking.setFactory(this);
 
-		// TODO: Move to client initializer
-		ClientSidePacketRegistry.INSTANCE.register(IDENTIFIER, (context, buf) -> {
-			int id = buf.readUnsignedByte();
-
-			if (id == SPAWN_ENTITY) {
-				FMLPlayMessages.SpawnEntity spawn = FMLPlayMessages.SpawnEntity.decode(buf);
-				FMLPlayMessages.SpawnEntity.handle(spawn, context);
-			} else if (id == OPEN_CONTAINER) {
-				FMLPlayMessages.OpenContainer open = FMLPlayMessages.OpenContainer.decode(buf);
-				FMLPlayMessages.OpenContainer.handle(open, context);
-			} else {
-				LOGGER.warn("Received an unknown fml:play message with an id of {} and a payload of {} bytes", id, buf.readableBytes());
-			}
-		});
-
 		ServerSidePacketRegistry.INSTANCE.register(IDENTIFIER, (context, buf) -> {
 			LOGGER.warn("Received an fml:play on the server, this should not happen! Kicking the offending client.");
 

patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessagesClient.java

@@ -0,0 +1,26 @@
+package net.patchworkmc.impl.networking;
+
+import net.minecraftforge.fml.network.FMLPlayMessages;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
+
+public class PatchworkPlayNetworkingMessagesClient implements ClientModInitializer {
+	@Override
+	public void onInitializeClient() {
+		// TODO: Move to client initializer
+		ClientSidePacketRegistry.INSTANCE.register(PatchworkPlayNetworkingMessages.IDENTIFIER, (context, buf) -> {
+			int id = buf.readUnsignedByte();
+
+			if (id == PatchworkPlayNetworkingMessages.SPAWN_ENTITY) {
+				FMLPlayMessages.SpawnEntity spawn = FMLPlayMessages.SpawnEntity.decode(buf);
+				FMLPlayMessages.SpawnEntity.handle(spawn, context);
+			} else if (id == PatchworkPlayNetworkingMessages.OPEN_CONTAINER) {
+				FMLPlayMessages.OpenContainer open = FMLPlayMessages.OpenContainer.decode(buf);
+				FMLPlayMessages.OpenContainer.handle(open, context);
+			} else {
+				PatchworkPlayNetworkingMessages.LOGGER.warn("Received an unknown fml:play message with an id of {} and a payload of {} bytes", id, buf.readableBytes());
+			}
+		});
+	}
+}

patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinServerPlayerEntity.java

@@ -20,29 +20,23 @@
 package net.patchworkmc.mixin.networking;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.server.network.ServerPlayerEntity;
 
 import net.patchworkmc.impl.networking.ContainerSyncAccess;
 
 @Mixin(ServerPlayerEntity.class)
-public class MixinServerPlayerEntity implements ContainerSyncAccess {
-	@Accessor
-	private int getContainerSyncId() {
-		throw new AssertionError("Mixin not applied");
-	}
-
-	@Invoker
-	private void invokeIncrementContainerSyncId() {
-		throw new AssertionError("Mixin not applied");
-	}
+public abstract class MixinServerPlayerEntity implements ContainerSyncAccess {
+	@Shadow
+	private int containerSyncId;
+	@Shadow
+	protected abstract void incrementContainerSyncId();
 
 	@Override
 	public int patchwork$getNewContainerSyncId() {
-		invokeIncrementContainerSyncId();
+		incrementContainerSyncId();
 
-		return getContainerSyncId();
+		return containerSyncId;
 	}
 }

patchwork-networking-messages/src/main/resources/fabric.mod.json

@@ -19,6 +19,9 @@
   "entrypoints": {
     "main": [
       "net.patchworkmc.impl.networking.PatchworkPlayNetworkingMessages"
+    ],
+    "client": [
+      "net.patchworkmc.impl.networking.PatchworkPlayNetworkingMessagesClient"
     ]
   },
   "mixins": [

patchwork-networking-messages/src/main/resources/patchwork-networking-messages.mixins.json

@@ -4,7 +4,8 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinEntityType",
-    "MixinEntityTypeBuilder"
+    "MixinEntityTypeBuilder",
+    "MixinServerPlayerEntity"
   ],
   "injectors": {
     "defaultRequire": 1