fix(neo): Network refactor nightmare

null2264 · Oct 30, 2024 · cf81618 · cf81618
1 parent be63a83
commit cf81618
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,3 +11,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed REI integration due to API breaking changes in MC 1.21.2 or newer
 - Adjust JEI integration due to deprecations in JEI 19 or newer
+- Fixed issues with sending packet on NeoForge caused by Network Refactor
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,8 @@ val supportedVersionRange: List<String?> = mapOf(
         11802 to listOf(null, "1.18.2"),
         11902 to listOf("1.19-", "1.19.2"),
         12001 to listOf("1.20-", "1.20.1"),
-        12002 to listOf("1.20.2-", "1.20.4"),
+        12002 to listOf("1.20.2-", if (!isNeo) "1.20.4" else "1.20.3"),
+        12004 to listOf(null, "1.20.4"),  // for Neo
         12006 to listOf("1.20.5-", "1.20.6"),
         12101 to listOf("1.21-", "1.21.1"),
         12103 to listOf("1.21.2-", null),
@@ -152,6 +153,7 @@ dependencies {
             // "20.5.0-alpha.${mc[mcVersion]}.+"
             "neoForge"("net.neoforged:neoforge:" + mapOf(
                 12002 to "20.2.86",
+                12004 to "20.4.237",
                 12006 to "20.6.121",
                 12101 to "21.1.72",
                 12103 to "21.3.1-beta",
@@ -191,6 +193,7 @@ dependencies {
                 11904 to "1.19.4",
                 12001 to "1.20.1",
                 12002 to "1.20.2",
+                12004 to "1.20.2",  // For Neo, the same 1.20.2
                 12006 to "1.20.6",
                 12101 to "1.21.1",
                 12103 to "1.21.1", // FIXME: .
@@ -212,6 +215,7 @@ dependencies {
             11904 to "11.0.621",
             12001 to "12.0.625",
             12002 to "13.0.685",
+            12004 to "13.0.685",  // for Neo
             12006 to "15.0.787",
             12101 to "16.0.788",
             12103 to "17.0.789",
@@ -238,6 +242,7 @@ dependencies {
             11904 to "13.1.0.13",
             12001 to "15.0.0.12",
             12002 to "16.0.0.28",
+            12004 to "16.0.0.28",  // for Neo
             12006 to "18.0.0.62",
             12101 to "19.21.0.246",
             12103 to null,
@@ -248,6 +253,7 @@ dependencies {
         val fallbackJeiMcVer = "1.21.1"
         // fallback ->
         val jeiMc = mapOf(
+            12004 to "1.20.2",  // for Neo
             12103 to fallbackJeiMcVer,
         )
         modCompileOnly("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-common-api:${jeiVersion ?: fallbackJeiVer}")
@@ -381,7 +387,13 @@ val mcReleaseVersions = mapOf<Int, List<String>>(
     11802 to listOf("1.18.2"),
     11902 to listOf("1.19", "1.19.1", "1.19.2"),
     12001 to listOf("1.20", "1.20.1"),
-    12002 to listOf("1.20.2", "1.20.3", "1.20.4"),
+    12002 to listOf("1.20.2", "1.20.3").let {
+        val rt = it.toMutableList()
+        if (!isNeo) rt.add("1.20.4")
+
+        rt
+    },
+    12004 to listOf("1.20.4"),  // for Neo
     12006 to listOf("1.20.5", "1.20.6"),
     12101 to listOf("1.21", "1.21.1"),
     12103 to listOf("1.21.2", "1.21.3")

diff --git a/root.gradle.kts b/root.gradle.kts
@@ -9,6 +9,7 @@ preprocess {
     val fabric12101 = createNode("1.21.1-fabric", 12100, "mojang")
     val neo12006 = createNode("1.20.6-neoforge", 12005, "mojang")
     val fabric12006 = createNode("1.20.6-fabric", 12005, "mojang")
+    val neo12004 = createNode("1.20.4-neoforge", 12004, "mojang")
     val neo12002 = createNode("1.20.2-neoforge", 12002, "mojang")
     val fabric12002 = createNode("1.20.2-fabric", 12002, "mojang")
     val forge12001 = createNode("1.20.1-forge", 12001, "mojang")
@@ -23,6 +24,7 @@ preprocess {
     neo12103.link(fabric12103)
     neo12101.link(fabric12101)
     neo12006.link(fabric12006)
+    neo12004.link(neo12002)
     neo12002.link(fabric12002)
 
     forge12001.link(fabric12001)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -30,6 +30,7 @@ listOf(
     "1.20.1-forge",
     "1.20.2-fabric",
     "1.20.2-neoforge",
+    "1.20.4-neoforge",
     "1.20.6-fabric",
     "1.20.6-neoforge",
     "1.21.1-fabric",

diff --git a/...main/java/io/github/null2264/cobblegen/mixin/network/ClientCommonPacketListenerMixin.java b/...main/java/io/github/null2264/cobblegen/mixin/network/ClientCommonPacketListenerMixin.java
@@ -5,7 +5,13 @@
 //#if MC<1.20.2
 import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
 //#else
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
+//$$ import net.minecraft.network.protocol.Packet;
+//$$ import net.minecraft.network.protocol.common.ClientCommonPacketListener;
 //$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+//$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 //#endif
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -56,4 +62,24 @@ private void handleDisconnect(Component reason, CallbackInfo ci) {
         CGClientPlayNetworkHandler.onDisconnect();
     }
     //#endif
-}
+
+    //#if MC>=1.20.4 && FORGE>=1
+    //$$ @WrapOperation(
+    //$$     method = "send",
+    //$$     at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ClientCommonPacketListener;)V")
+    //$$ )
+    //$$ private void validateCobbleGen(Packet<?> packet, ClientCommonPacketListener listener, Operation<Void> original) {
+    //$$     try {
+    //$$         original.call(packet, listener);
+    //$$     } catch (UnsupportedOperationException e) {
+    //$$         if (!(packet instanceof ServerboundCustomPayloadPacket customPayloadPacket)) {
+    //$$             throw e;
+    //$$         }
+
+    //$$         if (!(customPayloadPacket.payload() instanceof CGPacketPayload)) {
+    //$$             throw e;
+    //$$         }
+    //$$     }
+    //$$ }
+    //#endif
+}
diff --git a/...main/java/io/github/null2264/cobblegen/mixin/network/ServerCommonPacketListenerMixin.java b/...main/java/io/github/null2264/cobblegen/mixin/network/ServerCommonPacketListenerMixin.java
@@ -3,6 +3,12 @@
 //#if MC<1.20.2
 import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
 //#else
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
+//$$ import net.minecraft.network.protocol.Packet;
+//$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+//$$ import net.minecraft.network.protocol.common.ServerCommonPacketListener;
 //$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 //#endif
 import io.github.null2264.cobblegen.network.CGServerPlayNetworkHandler;
@@ -58,4 +64,24 @@ private void handleCustomPayload(ServerboundCustomPayloadPacket packet, Callback
             ci.cancel();
         }
     }
-}
+
+    //#if MC>=1.20.4 && FORGE>=1
+    //$$ @WrapOperation(
+    //$$     method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V",
+    //$$     at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ServerCommonPacketListener;)V")
+    //$$ )
+    //$$ private void validateCobbleGen(Packet<?> packet, ServerCommonPacketListener listener, Operation<Void> original) {
+    //$$     try {
+    //$$         original.call(packet, listener);
+    //$$     } catch (UnsupportedOperationException e) {
+    //$$         if (!(packet instanceof ClientboundCustomPayloadPacket customPayloadPacket)) {
+    //$$             throw e;
+    //$$         }
+
+    //$$         if (!(customPayloadPacket.payload() instanceof CGPacketPayload)) {
+    //$$             throw e;
+    //$$         }
+    //$$     }
+    //$$ }
+    //#endif
+}
diff --git a/versions/1.20.4-neoforge/gradle.properties b/versions/1.20.4-neoforge/gradle.properties
@@ -0,0 +1 @@
+loom.platform=neoforge
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

		- Fixed REI integration due to API breaking changes in MC 1.21.2 or newer
		- Adjust JEI integration due to deprecations in JEI 19 or newer
		- Fixed issues with sending packet on NeoForge caused by Network Refactor