fix neoforge versioning on major release

unimined · Jun 13, 2024 · edb3f41 · edb3f41
1 parent 558b4ea
commit edb3f41
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 12 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/PatchProviders.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/PatchProviders.kt
@@ -249,13 +249,16 @@ interface PatchProviders {
      * enables the NeoForged patcher.
      * @since 1.1.0
      */
-    fun neoForged(action: NeoForgedPatcher<*>.() -> Unit)
+    @Deprecated(message = "neoForged -> neoForge", replaceWith = ReplaceWith("neoForge(action)"))
+    fun neoForged(action: NeoForgedPatcher<*>.() -> Unit) {
+        neoForge(action)
+    }
 
     /**
      * enables the NeoForged patcher.
      * @since 1.1.0
      */
-
+    @Deprecated(message = "neoForged -> neoForge", replaceWith = ReplaceWith("neoForge(action)"))
     fun neoForged(
         @DelegatesTo(
             value = NeoForgedPatcher::class,
@@ -273,10 +276,30 @@ interface PatchProviders {
      * enables the NeoForged patcher.
      * @since 1.1.0
      */
+    @Deprecated(message = "neoForged -> neoForge", replaceWith = ReplaceWith("neoForge()"))
     fun neoForged() {
         neoForged {}
     }
 
+    fun neoForge(action: NeoForgedPatcher<*>.() -> Unit)
+
+    fun neoForge(
+        @DelegatesTo(
+            value = NeoForgedPatcher::class,
+            strategy = Closure.DELEGATE_FIRST
+        ) action: Closure<*>
+    ) {
+        neoForge {
+            action.delegate = this
+            action.resolveStrategy = Closure.DELEGATE_FIRST
+            action.call()
+        }
+    }
+
+    fun neoForge() {
+        neoForge {}
+    }
+
     /**
      * enables the jar mod patcher.
      * @param action the action to configure the patcher.

diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -281,7 +281,7 @@ class MinecraftProvider(project: Project, sourceSet: SourceSet) : MinecraftConfi
         }
     }
 
-    override fun neoForged(action: NeoForgedPatcher<*>.() -> Unit) {
+    override fun neoForge(action: NeoForgedPatcher<*>.() -> Unit) {
         mcPatcher = NeoForgedMinecraftTransformer(project, this).also {
             patcherActions.addFirst {
                 action(it)

diff --git a/.../xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt b/.../xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt
@@ -28,7 +28,11 @@ open class NeoForgedMinecraftTransformer(project: Project, provider: MinecraftPr
             if (provider.version == "1.20.1") {
                 project.dependencies.create("net.neoforged:forge:${provider.version}-$dep:universal")
             } else {
-                project.dependencies.create("net.neoforged:neoforge:${provider.version.removePrefix("1.")}.$dep:universal")
+                var version = provider.version.removePrefix("1.")
+                if (!version.contains(".")) {
+                    version = "$version.0"
+                }
+                project.dependencies.create("net.neoforged:neoforge:$version.$dep:universal")
             }
         } else {
             project.dependencies.create(dep)

diff --git a/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt b/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt
@@ -70,7 +70,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
         }
 
     override val prodNamespace by lazy {
-        if (userdevCfg["mcp"].asString.contains("neoform")) {
+        if (userdevCfg["mcp"].asString.contains("neoform") || provider.minecraftData.mcVersionCompare(provider.version, "1.20.5") <= 0) {
             provider.mappings.getNamespace("mojmap")
         } else {
             provider.mappings.getNamespace("searge")

diff --git a/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/merged/MergedMinecraftTransformer.kt b/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/merged/MergedMinecraftTransformer.kt
@@ -159,7 +159,7 @@ class MergedMinecraftTransformer(project: Project, provider: MinecraftProvider):
         patchers.add(forge)
     }
 
-    override fun neoForged(action: NeoForgedPatcher<*>.() -> Unit) {
+    override fun neoForge(action: NeoForgedPatcher<*>.() -> Unit) {
         val forge = NeoForgedMinecraftTransformer(project, provider)
         forge.action()
         patchers.add(forge)

diff --git a/testing/1.21-NeoForged-Fabric/build.gradle b/testing/1.21-NeoForged-Fabric/build.gradle
@@ -30,9 +30,6 @@ repositories {
     maven {
         url = "https://maven.wagyourtail.xyz/releases"
     }
-    maven {
-        url = "https://maven.firstdarkdev.xyz/snapshots"
-    }
 }
 
 unimined.minecraft {
@@ -61,7 +58,7 @@ unimined.minecraft(sourceSets.neoforge) {
     combineWith(sourceSets.main)
 
     neoForged {
-        loader "net.neoforged:neoforge:${project.neoforge_version}:universal"
+        loader project.neoforge_version
         mixinConfig "modid.mixins.json"
     }
 

diff --git a/testing/1.21-NeoForged-Fabric/gradle.properties b/testing/1.21-NeoForged-Fabric/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs = -Xmx2G
 
-minecraft_version = 1.21-pre4
+minecraft_version = 1.21
 
-neoforge_version = 21.0.0-alpha.1.21-pre4.20240608.221725
+neoforge_version = 0-beta
 fabric_version = 0.15.11