fix: Actually read the payloads

Still need to investigate 1.20.5's networking system, should already work but who knows...

gradle.properties

@@ -16,7 +16,7 @@ loader_version_1_18_2=0.14.14
 fabric_version_1_18_2=0.76.0+1.18.2
 
 # Runtime Properties
-recipe_viewer=none
+recipe_viewer=emi
 
 # Dependencies
 jankson_version=1.2.3

src/main/java/io/github/null2264/cobblegen/mixin/network/ServerConfigurationPacketListenerMixin.java

@@ -1,27 +1,18 @@
 //#if MC>=1.20.2
 //$$ package io.github.null2264.cobblegen.mixin.network;
-//$$
-//$$ import io.github.null2264.cobblegen.network.payload.CGPingS2CPayload;
-//$$ import io.netty.buffer.Unpooled;
-//$$ import net.minecraft.network.FriendlyByteBuf;
-//$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+
+//$$ import io.github.null2264.cobblegen.network.CGServerPlayNetworkHandler;
 //$$ import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
 //$$ import org.spongepowered.asm.mixin.Mixin;
 //$$ import org.spongepowered.asm.mixin.injection.At;
 //$$ import org.spongepowered.asm.mixin.injection.Inject;
 //$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-//$$
-//$$ import static io.github.null2264.cobblegen.util.Constants.CG_PING;
-//$$
+
 //$$ @Mixin(ServerConfigurationPacketListenerImpl.class)
 //$$ public abstract class ServerConfigurationPacketListenerMixin {
 //$$     @Inject(method = "startConfiguration", at = @At("HEAD"))
 //$$     private void syncCG(CallbackInfo ci) {
-//$$         FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
-//$$         buf.writeResourceLocation(CG_PING.toMC());
-//$$         ((ServerConfigurationPacketListenerImpl) (Object) this).send(
-//$$             new ClientboundCustomPayloadPacket(new CGPingS2CPayload(false))
-//$$         );
+//$$         CGServerPlayNetworkHandler.trySync((ServerConfigurationPacketListenerImpl) (Object) this);
 //$$     }
 //$$ }
 //#endif

src/main/java/io/github/null2264/cobblegen/mixin/network/packet/ClientboundCustomPayloadPacketMixin.java

@@ -0,0 +1,42 @@
+package io.github.null2264.cobblegen.mixin.network.packet;
+
+//#if MC<1.20.2
+import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
+//#else
+//#if MC<1.20.5
+//$$ import io.github.null2264.cobblegen.data.CGIdentifier;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPayloadReader;
+//$$ import io.netty.buffer.Unpooled;
+//$$ import net.minecraft.network.FriendlyByteBuf;
+//$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+//$$ import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+//$$ import net.minecraft.resources.ResourceLocation;
+//$$ import org.spongepowered.asm.mixin.injection.At;
+//$$ import org.spongepowered.asm.mixin.injection.Inject;
+//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+//$$
+//$$ import static io.github.null2264.cobblegen.util.Constants.KNOWN_CLIENT_PAYLOADS;
+//$$ import static io.github.null2264.cobblegen.CobbleGen.MOD_ID;
+//#endif
+//#endif
+
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = ClientboundCustomPayloadPacket.class, priority = 999)
+public abstract class ClientboundCustomPayloadPacketMixin {
+    //#if MC>=1.20.2
+    //#if MC<1.20.5
+    //$$ @Inject(method = "readPayload", at = @At("HEAD"), cancellable = true)
+    //$$ private static void read(ResourceLocation id, FriendlyByteBuf buf, CallbackInfoReturnable<CustomPacketPayload> cir) {
+    //$$     if (!id.getNamespace().equals(MOD_ID))
+    //$$         return;
+    //$$
+    //$$     CGPayloadReader<? extends CGPacketPayload> reader = KNOWN_CLIENT_PAYLOADS.get(CGIdentifier.fromMC(id));
+    //$$     if (reader == null) return;
+    //$$
+    //$$     cir.setReturnValue(reader.apply(buf));
+    //$$ }
+    //#endif
+    //#endif
+}

src/main/java/io/github/null2264/cobblegen/mixin/network/packet/ServerboundCustomPayloadPacketMixin.java

@@ -0,0 +1,41 @@
+package io.github.null2264.cobblegen.mixin.network.packet;
+
+import org.spongepowered.asm.mixin.Mixin;
+//#if MC<1.20.2
+import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
+//#else
+//#if MC<1.20.5
+//$$ import io.github.null2264.cobblegen.data.CGIdentifier;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPayloadReader;
+//$$ import io.netty.buffer.Unpooled;
+//$$ import net.minecraft.network.FriendlyByteBuf;
+//$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+//$$ import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+//$$ import net.minecraft.resources.ResourceLocation;
+//$$ import org.spongepowered.asm.mixin.injection.At;
+//$$ import org.spongepowered.asm.mixin.injection.Inject;
+//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+//$$
+//$$ import static io.github.null2264.cobblegen.util.Constants.KNOWN_SERVER_PAYLOADS;
+//$$ import static io.github.null2264.cobblegen.CobbleGen.MOD_ID;
+//#endif
+//#endif
+
+@Mixin(value = ServerboundCustomPayloadPacket.class, priority = 999)
+public abstract class ServerboundCustomPayloadPacketMixin {
+    //#if MC>=1.20.2
+    //#if MC<1.20.5
+    //$$ @Inject(method = "readPayload", at = @At("HEAD"), cancellable = true)
+    //$$ private static void read(ResourceLocation id, FriendlyByteBuf buf, CallbackInfoReturnable<CustomPacketPayload> cir) {
+    //$$     if (!id.getNamespace().equals(MOD_ID))
+    //$$         return;
+    //$$
+    //$$     CGPayloadReader<? extends CGPacketPayload> reader = KNOWN_SERVER_PAYLOADS.get(CGIdentifier.fromMC(id));
+    //$$     if (reader == null) return;
+    //$$
+    //$$     cir.setReturnValue(reader.apply(buf));
+    //$$ }
+    //#endif
+    //#endif
+}

src/main/java/io/github/null2264/cobblegen/network/CGClientPlayNetworkHandler.java

@@ -14,7 +14,6 @@
 import io.github.null2264.cobblegen.network.payload.*;
 import io.github.null2264.cobblegen.util.CGLog;
 import io.github.null2264.cobblegen.util.Util;
-import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -75,7 +74,7 @@ public static void onDisconnect() {
     @ApiStatus.Internal
     private static ServerboundCustomPayloadPacket createC2SPacket(CGPacketPayload payload) {
         //#if MC<=1.20.1
-        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
+        FriendlyByteBuf buf = FriendlyByteBuf.unpooled();
         payload.write(buf);
         return new ServerboundCustomPayloadPacket(payload.id(), buf);
         //#else

src/main/java/io/github/null2264/cobblegen/network/CGServerPlayNetworkHandler.java

@@ -13,7 +13,6 @@
 import io.github.null2264.cobblegen.data.CGIdentifier;
 import io.github.null2264.cobblegen.network.payload.*;
 import io.github.null2264.cobblegen.util.CGLog;
-import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -102,7 +101,7 @@ public static void sync(ServerGamePacketListenerImpl handler, boolean isReload)
     @ApiStatus.Internal
     public static ClientboundCustomPayloadPacket createS2CPacket(CGPacketPayload payload) {
         //#if MC<=1.20.1
-        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
+        FriendlyByteBuf buf = FriendlyByteBuf.unpooled();
         payload.write(buf);
         return new ClientboundCustomPayloadPacket(payload.id(), buf);
         //#else

src/main/resources/cobblegen.mixins.json

@@ -14,11 +14,12 @@
         "fluid.CreateFluidReactionsMixin",
         //#endif
         "fluid.FluidEventMixin",
-        "fluid.LavaEventMixin",
+        "fluid.LavaEventMixin"
     ],
     "client": [
         "network.ClientCommonPacketListenerMixin",
-        "network.ConnectionMixin"
+        "network.ConnectionMixin",
+        "network.packet.ClientboundCustomPayloadPacketMixin"
     ],
     "server": [
         "network.PlayerManagerMixin",
@@ -27,8 +28,9 @@
         //#endif
         "network.ServerCommonPacketListenerMixin",
         //#if MC>=1.20.2
-        //$$ "network.ServerConfigurationPacketListenerMixin"
+        //$$ "network.ServerConfigurationPacketListenerMixin",
         //#endif
+        "network.packet.ServerboundCustomPayloadPacketMixin"
     ],
     "injectors": {
         "defaultRequire": 1