Merge pull request #173 from hypherionmc/lts/1.4

Fix modern versions of NeoForge failing to complete setup

Author: wagyourtail

build.gradle.kts

@@ -126,6 +126,10 @@ dependencies {
     implementation(libs.binarypatcher) {
         exclude(mapOf("group" to "commons-io"))
     }
+
+    implementation(libs.neo.binarypatcher) {
+        exclude(mapOf("group" to "commons-io"))
+    }
     implementation(libs.jbsdiff)
 
     implementation(libs.classtweaker)

gradle/libs.versions.toml

@@ -14,6 +14,7 @@ tiny-remapper = "0.11.1"
 unimined-mapping-library = "1.2.1"
 
 binarypatcher = "1.1.1"
+neo_binarypatcher = "4.0.7"
 jbsdiff = "1.0"
 
 commons-io = "2.20.0"
@@ -45,6 +46,7 @@ tiny-remapper = { module = "net.fabricmc:tiny-remapper", version.ref = "tiny-rem
 unimined-mapping-library-jvm = { module = "xyz.wagyourtail.unimined.mapping:unimined-mapping-library-jvm", version.ref = "unimined-mapping-library" }
 
 binarypatcher = { module = "net.minecraftforge:binarypatcher", version.ref = "binarypatcher" }
+neo_binarypatcher = { module = "net.neoforged.installertools:binarypatcher", version.ref = "neo_binarypatcher" }
 jbsdiff = { module = "io.sigpipe:jbsdiff", version.ref = "jbsdiff" }
 
 classtweaker = { module = "net.fabricmc:class-tweaker", version.ref = "classtweaker" }

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt

@@ -531,22 +531,29 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
 
         if (!patchedMC.path.exists() || project.unimined.forceReload) {
             patchedMC.path.deleteIfExists()
+            val additionalArgs = listOf("--data", "--unpatched")
+            val isModernNeo = (provider.minecraftData.mcVersionCompare("1.21.9", provider.version) == -1 && parent.providerName.equals("NeoForged", true))
+
             val args = (userdevCfg["binpatcher"].asJsonObject["args"].asJsonArray.map {
                 when (it.asString) {
                     "{clean}" -> inputMC.path.toString()
                     "{patch}" -> binPatchFile.toString()
                     "{output}" -> patchedMC.path.toString()
                     else -> it.asString
                 }
-            } + listOf("--data", "--unpatched")).toTypedArray()
+            } + if (isModernNeo) listOf() else additionalArgs).toTypedArray()
             val stoutLevel = project.gradle.startParameter.logLevel
             val stdout = System.out
             if (stoutLevel > LogLevel.INFO) {
                 System.setOut(PrintStream(NullOutputStream.INSTANCE))
             }
             project.logger.info("Running binpatcher with args: ${args.joinToString(" ")}")
             try {
-                ConsoleTool.main(args)
+                if (isModernNeo) {
+                    net.neoforged.binarypatcher.ConsoleTool.main(args)
+                } else {
+                    ConsoleTool.main(args)
+                }
             } catch (e: Throwable) {
                 e.printStackTrace()
                 patchedMC.path.deleteIfExists()