Fix network api on all targets

Author: isXander

src/main/java/dev/isxander/controlify/compatibility/ControlifyCompat.java

@@ -38,7 +38,7 @@ public static void init() {
         } catch (NoClassDefFoundError e) {
             disabledMods.add(FANCY_MENU);
         }
-        //? }
+        //?}
     }
 
     public static void ifBeginHudBatching() {

src/main/java/dev/isxander/controlify/platform/network/C2SNetworkApi.java

@@ -1,13 +1,12 @@
 package dev.isxander.controlify.platform.network;
 
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 
 public interface C2SNetworkApi extends SidedNetworkApi {
     <T> void sendPacket(ResourceLocation channel, T packet);
 
-    <T> CustomPacketPayload createPayload(ResourceLocation channel, T packet);
+    <T> PacketPayload createPayload(ResourceLocation channel, T packet);
 
     <T> void listenForPacket(ResourceLocation channel, PacketListener<T> listener);
 

src/main/java/dev/isxander/controlify/platform/network/PacketPayload.java

@@ -0,0 +1,10 @@
+package dev.isxander.controlify.platform.network;
+
+public interface PacketPayload
+        //? if >1.20.4 {
+        extends net.minecraft.network.protocol.common.custom.CustomPacketPayload
+        //?} elif fabric {
+        /*extends net.fabricmc.fabric.api.networking.v1.FabricPacket
+        *///?}
+{
+}

src/main/java/dev/isxander/controlify/platform/network/fabric/C2SNetworkApiFabric.java

@@ -3,9 +3,9 @@
 
 import dev.isxander.controlify.platform.network.C2SNetworkApi;
 import dev.isxander.controlify.platform.network.ControlifyPacketCodec;
+import dev.isxander.controlify.platform.network.PacketPayload;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.HashMap;
@@ -30,7 +30,7 @@ public <T> void sendPacket(ResourceLocation channel, T packet) {
     }
 
     @Override
-    public <T> CustomPacketPayload createPayload(ResourceLocation channel, T packet) {
+    public <T> PacketPayload createPayload(ResourceLocation channel, T packet) {
         FabricPacketWrapper<T> packetWrapper = getWrapper(channel);
         return packetWrapper.new FabricPacketPayloadWrapper(packet);
     }
@@ -45,7 +45,7 @@ public <T> void listenForPacket(ResourceLocation channel, PacketListener<T> list
         });
         /*?} else {*/
         /*ServerPlayNetworking.registerGlobalReceiver(packetWrapper.type, (packet, player, responseSender) -> {
-            listener.listen(packet.payload, player, responseSender);
+            listener.listen(packet.payload, player);
         });
         *//*?}*/
     }

src/main/java/dev/isxander/controlify/platform/network/fabric/FabricPacketWrapper.java

@@ -2,6 +2,7 @@
 package dev.isxander.controlify.platform.network.fabric;
 
 import dev.isxander.controlify.platform.network.ControlifyPacketCodec;
+import dev.isxander.controlify.platform.network.PacketPayload;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
@@ -47,7 +48,7 @@ public FabricPacketWrapper(
         *//*?}*/
     }
 
-    public class FabricPacketPayloadWrapper implements /*? if >1.20.4 {*/ CustomPacketPayload /*?} else {*/ /*FabricPacket *//*?}*/ {
+    public class FabricPacketPayloadWrapper implements PacketPayload {
         public final T payload;
 
         public FabricPacketPayloadWrapper(T payload) {

src/main/java/dev/isxander/controlify/platform/network/neoforge/C2SNetworkApiNeoforge.java

@@ -3,7 +3,7 @@
 
 import dev.isxander.controlify.platform.network.C2SNetworkApi;
 import dev.isxander.controlify.platform.network.ControlifyPacketCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import dev.isxander.controlify.platform.network.PacketPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
@@ -17,7 +17,7 @@ public <T> void sendPacket(ResourceLocation channel, T packet) {
     }
 
     @Override
-    public <T> CustomPacketPayload createPayload(ResourceLocation channel, T packet) {
+    public <T> PacketPayload createPayload(ResourceLocation channel, T packet) {
         return null;
     }