Netty improvements and small fixes

build.gradle.kts

@@ -74,7 +74,8 @@ subprojects {
             rootProject.libs.taterlib.lite.base,
             rootProject.libs.taterlib.lite.core,
             rootProject.libs.taterlib.lite.metadata,
-            rootProject.libs.taterlib.lite.muxins
+            rootProject.libs.taterlib.lite.muxins,
+            rootProject.libs.taterlib.lite.network
         ).forEach {
             mainCompileOnly(it)
         }

common/build.gradle.kts

@@ -28,13 +28,15 @@ dependencies {
     compileOnly(libs.mixin)
     compileOnly(libs.netty.buffer)
     compileOnly(libs.netty.codec)
+    compileOnly(libs.netty.unix.common)
     compileOnly(libs.asm.tree)
 
     compileOnly(libs.entrypoint.spoof)
     implementation(libs.taterlib.lite.base)
     implementation(libs.taterlib.lite.core)
     implementation(libs.taterlib.lite.metadata)
     implementation(libs.taterlib.lite.muxins)
+    implementation(libs.taterlib.lite.network)
 }
 
 tasks.withType<ProcessResources> {

common/src/main/java/org/adde0109/pcf/PCF.java

@@ -1,5 +1,7 @@
 package org.adde0109.pcf;
 
+import static dev.neuralnexus.taterapi.network.Protocol.map;
+
 import dev.neuralnexus.taterapi.loader.EntrypointLoader;
 import dev.neuralnexus.taterapi.meta.Constraint;
 import dev.neuralnexus.taterapi.meta.Constraints;
@@ -10,8 +12,7 @@
 import dev.neuralnexus.taterapi.meta.ModResource;
 import dev.neuralnexus.taterapi.meta.Platform;
 import dev.neuralnexus.taterapi.meta.Platforms;
-import dev.neuralnexus.taterapi.network.NetworkRegistry;
-import dev.neuralnexus.taterapi.registries.AdapterRegistry;
+import dev.neuralnexus.taterapi.network.PayloadRegistry;
 
 import org.adde0109.pcf.forwarding.Mode;
 import org.adde0109.pcf.forwarding.compatibility.prelogin.ArclightPreLogin;
@@ -79,8 +80,9 @@ void onInit() {
 
         // Modern forwarding init
         if (this.forwarding().enabled() && this.forwarding().mode().equals(Mode.MODERN)) {
-            NetworkRegistry.registerQueryPayload(
-                    PlayerInfoQueryPayload.IDENTIFIER, PlayerInfoQueryPayload.STREAM_CODEC);
+            PayloadRegistry.register(
+                    PlayerInfoQueryPayload.TYPE,
+                    map(PlayerInfoQueryPayload.IDENTIFIER, MinecraftVersions.V7_2));
 
             if (Constraint.builder().platform(Platforms.ARCLIGHT).result()) {
                 logger.debug("Arclight detected, applying pre-login post processor");
@@ -198,12 +200,12 @@ public static void forceLoadConfig() {
                             .getMethod("reload")
                             .invoke(null);
                 } else {
-                    Class.forName("org.adde0109.pcf.v16_5.forge.Config")
+                    Class.forName("org.adde0109.pcf.v26_1.forge.Config")
                             .getMethod("reload")
                             .invoke(null);
                 }
             } else if (Constraint.builder().platform(Platforms.NEOFORGE).result()) {
-                Class.forName("org.adde0109.pcf.v20_2.neoforge.Config")
+                Class.forName("org.adde0109.pcf.v26_1.neoforge.Config")
                         .getMethod("reload")
                         .invoke(null);
             }
@@ -215,13 +217,6 @@ public static void forceLoadConfig() {
         }
     }
 
-    private static final AdapterRegistry ADAPTER_REGISTRY = new AdapterRegistry();
-
-    @ApiStatus.Internal
-    public AdapterRegistry adapters() {
-        return ADAPTER_REGISTRY;
-    }
-
     private Forwarding forwarding;
 
     public Forwarding forwarding() {

common/src/main/java/org/adde0109/pcf/PCFForge.java

@@ -6,6 +6,7 @@
         value = PCF.MOD_ID,
         modid = PCF.MOD_ID,
         name = PCF.MOD_NAME,
+        version = PCF.VERSION,
         useMetadata = true,
         serverSideOnly = true,
         acceptableRemoteVersions = "*")

common/src/main/java/org/adde0109/pcf/PCFForgeLegacy.java

@@ -2,7 +2,12 @@
 
 import cpw.mods.fml.common.Mod;
 
-@Mod(modid = PCF.MOD_ID, name = PCF.MOD_NAME, acceptableRemoteVersions = "*", useMetadata = true)
+@Mod(
+        modid = PCF.MOD_ID,
+        name = PCF.MOD_NAME,
+        version = PCF.VERSION,
+        acceptableRemoteVersions = "*",
+        useMetadata = true)
 public final class PCFForgeLegacy {
     public PCFForgeLegacy() {
         PCF.instance().onInit();

common/src/main/java/org/adde0109/pcf/crossstitch/CrossStitch.java

@@ -71,15 +71,15 @@ public static boolean shouldNotWrapArgument(final @NonNull String identifier) {
         if (entry == null) {
             PCF.logger.debug(
                     "Wrapping entryless argument type: " + argumentType.getClass().getName());
-            buf.writeResourceLocation(MOD_ARGUMENT_INDICATOR);
-            buf.writeResourceLocation(EMPTY_IDENTIFIER);
+            buf.writeIdentifier(MOD_ARGUMENT_INDICATOR);
+            buf.writeIdentifier(EMPTY_IDENTIFIER);
             buf.writeVarInt(ZERO_LENGTH);
             return;
         }
 
         final String identifier = entry.bridge$identifier();
         if (shouldNotWrapArgument(identifier)) {
-            buf.writeResourceLocation(identifier);
+            buf.writeIdentifier(identifier);
             serializer.bridge$serializeToNetwork(argumentType, buf);
             PCF.logger.debug("Not wrapping argument with identifier: " + identifier);
             return;
@@ -93,8 +93,8 @@ public static boolean shouldNotWrapArgument(final @NonNull String identifier) {
                         + entry.getClass().getName());
 
         // Serialize wrapped argument type
-        buf.writeResourceLocation(MOD_ARGUMENT_INDICATOR);
-        buf.writeResourceLocation(entry.bridge$identifier());
+        buf.writeIdentifier(MOD_ARGUMENT_INDICATOR);
+        buf.writeIdentifier(entry.bridge$identifier());
 
         final ByteBuf extraData = Unpooled.buffer();
         serializer.bridge$serializeToNetwork(argumentType, extraData);

common/src/main/java/org/adde0109/pcf/forwarding/modern/ConnectionBridge.java

@@ -1,11 +1,22 @@
 package org.adde0109.pcf.forwarding.modern;
 
+import io.netty.channel.Channel;
+
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import java.net.InetSocketAddress;
 
 public interface ConnectionBridge {
-    InetSocketAddress bridge$address();
+    @NonNull InetSocketAddress bridge$address();
+
+    void bridge$address(final @NonNull InetSocketAddress address);
+
+    @NonNull Channel bridge$channel();
 
-    void bridge$address(InetSocketAddress address);
+    @Nullable Object bridge$getPacketListener();
 
-    void bridge$send(Object packet);
+    default void bridge$send(final @NonNull Object packet) {
+        this.bridge$channel().writeAndFlush(packet).addListener(ModernForwarding::errorListener);
+    }
 }