Initial NeoForge support

Test/build.gradle

@@ -1,4 +1,6 @@
 import io.github.groovymc.modsdotgroovy.AbstractConvertTask
+import io.github.groovymc.modsdotgroovy.ConvertToForgeTomlTask
+import io.github.groovymc.modsdotgroovy.ConvertToNeoForgeTomlTask
 
 plugins {
     id 'java'
@@ -9,13 +11,19 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 modsDotGroovy {
     dslVersion = '1.5.0'
-    platforms 'forge', 'quilt', 'fabric'
+    platforms 'forge', 'neoforge', 'quilt', 'fabric'
 }
 
 repositories {
     mavenLocal()
 }
 
 tasks.withType(AbstractConvertTask).configureEach {
-    it.output.set(file("demo/${it.output.get().asFile.name}"))
+    if(it instanceof ConvertToNeoForgeTomlTask) {
+        it.output.set(file("demo/neoforge-${it.output.get().asFile.name}"))
+    } else if(it instanceof ConvertToForgeTomlTask) {
+        it.output.set(file("demo/forge-${it.output.get().asFile.name}"))
+    } else {
+        it.output.set(file("demo/${it.output.get().asFile.name}"))
+    }
 }

Test/demo/fabric.mod.json

@@ -25,7 +25,7 @@
   ],
   "environment": "server",
   "depends": {
-    "minecraft": ">=1.19 <1.20",
+    "minecraft": ">=1.19.4 <1.20",
     "fabricloader": ">=0.14.19",
     "patchouli": ">=1.1"
   },
@@ -39,6 +39,7 @@
     "Thanks to the mods.groovy contributors"
   ],
   "mixins": [
-    "no.mixin.json"
+    "no.mixin.json",
+    "test.mixin.json"
   ]
 }

Test/demo/mods.toml → Test/demo/forge-mods.toml

@@ -13,6 +13,13 @@ license = "MIT"
   description = "A very nice example mod"
   authors = "GroovyMC, Matyrobbrt, Paint_Ninja and lukebemish"
 
+    [[dependencies.examplemod]]
+      mandatory = true
+      versionRange = "[20.2,)"
+      ordering = "NONE"
+      side = "BOTH"
+      modId = "neoforge"
+
     [[dependencies.examplemod]]
       mandatory = true
       versionRange = "[1.1,)"

Test/demo/neoforge-mods.toml

@@ -0,0 +1,44 @@
+modLoader = "gml"
+loaderVersion = "[1,)"
+license = "MIT"
+
+[[mods]]
+  modId = "examplemod"
+  version = "1.0.0"
+  displayName = "Examplemod"
+  displayTest = "IGNORE_SERVER_VERSION"
+  displayURL = "https://curseforge.com/minecraft/mc-mods/spammycombat"
+  updateJSONURL = "https://forge.curseupdate.com/623297/spammycombat"
+  credits = "Thanks to the mods.groovy contributors"
+  description = "A very nice example mod"
+  authors = "GroovyMC, Matyrobbrt, Paint_Ninja and lukebemish"
+
+    [[dependencies.examplemod]]
+      mandatory = true
+      versionRange = "[20.2,)"
+      ordering = "NONE"
+      side = "BOTH"
+      modId = "neoforge"
+
+    [[dependencies.examplemod]]
+      mandatory = true
+      versionRange = "[1.1,)"
+      ordering = "AFTER"
+      side = "BOTH"
+      modId = "patchouli"
+
+    [[dependencies.examplemod]]
+      mandatory = true
+      versionRange = "[1.19.4,1.20)"
+      ordering = "NONE"
+      side = "BOTH"
+      modId = "minecraft"
+
+    [modproperties.examplemod]
+      customProperty = "hello_neoforge"
+
+[[mixins]]
+  config = "no.mixin.json"
+
+[[mixins]]
+  config = "test.mixin.json"

Test/demo/quilt.mod.json

@@ -20,7 +20,7 @@
       {
         "optional": false,
         "id": "minecraft",
-        "versions": ">=1.19"
+        "versions": ">=1.19.4"
       },
       {
         "optional": false,
@@ -69,6 +69,7 @@
     }
   },
   "mixin": [
-    "no.mixin.json"
+    "no.mixin.json",
+    "test.mixin.json"
   ]
 }

Test/src/main/resources/mods.groovy

@@ -26,6 +26,10 @@ ModsDotGroovy.make {
             customProperty = 'hello_forge'
         }
 
+        onNeoForge {
+            customProperty = 'hello_neoforge'
+        }
+
         onFabricAndQuilt {
             customProperty = 'hello_quabric'
         }
@@ -34,6 +38,7 @@ ModsDotGroovy.make {
             //minecraft = 1.19..1.20 // equivalent to `minecraft = '[1.19,1.20)'`
             minecraft = 19.4..20.0 // equivalent to `minecraft = '[1.19.4,1.20)'`
             forge = '[43.0.0,)' // equivalent to `forge { versionRange = '[43.0.0,)' }`
+            neoforge = '[20.2,)' // equivalent to `neoforge { versionRange = '[20.2,)' }`
             quiltLoader = '>=0.17.3'
             fabricLoader = '[0.14.19,)'
 
@@ -90,7 +95,6 @@ ModsDotGroovy.make {
         }
     }
 
-    onFabricAndQuilt {
-        mixin = 'no.mixin.json'
-    }
+    mixin = 'no.mixin.json'
+    mixin = 'test.mixin.json'
 }

src/lib/groovy/ModsDotGroovy.groovy

@@ -38,6 +38,7 @@ class ModsDotGroovy {
                 this.data = ['schemaVersion': 1]
                 break
             case Platform.FORGE:
+            case Platform.NEOFORGE:
                 this.data = [:]
         }
     }
@@ -70,6 +71,26 @@ class ModsDotGroovy {
         }
     }
 
+    /**
+     * Run a given block only if the plugin is configuring the mods.toml file for NeoForge.
+     */
+    void onNeoForge(Closure closure) {
+        if (platform === Platform.NEOFORGE) {
+            closure.resolveStrategy = DELEGATE_FIRST
+            closure.call()
+        }
+    }
+
+    /**
+     * Run a given block only if the plugin is configuring the mods.toml file for Forge or NeoForge.
+     */
+    void onForgeAndNeo(Closure closure) {
+        if (platform === Platform.NEOFORGE || platform === Platform.FORGE) {
+            closure.resolveStrategy = DELEGATE_FIRST
+            closure.call()
+        }
+    }
+
     /**
      * Run a given block only if the plugin is configuring the quilt.mod.json file for quilt.
      */
@@ -109,6 +130,7 @@ class ModsDotGroovy {
         switch (platform) {
             case Platform.FABRIC:
             case Platform.FORGE:
+            case Platform.NEOFORGE:
                 put 'license', license
                 break
             case Platform.QUILT:
@@ -122,6 +144,7 @@ class ModsDotGroovy {
     void setIssueTrackerUrl(String issueTrackerUrl) {
         switch (platform) {
             case Platform.FORGE:
+            case Platform.NEOFORGE:
                 put 'issueTrackerURL', issueTrackerUrl
                 break
             case Platform.QUILT:
@@ -150,23 +173,23 @@ class ModsDotGroovy {
      * For GroovyModLoader @GMod mods it should be {@code gml}.
      */
     void setModLoader(String modLoader) {
-       if (platform === Platform.FORGE)
+       if (platform === Platform.NEOFORGE || platform === Platform.FORGE)
             put 'modLoader', modLoader
     }
 
     /**
      * A version range to match for the {@link #setModLoader(java.lang.String)}.
      */
     void setLoaderVersion(String loaderVersion) {
-        if (platform === Platform.FORGE)
+        if (platform === Platform.NEOFORGE || platform === Platform.FORGE)
             put 'loaderVersion', VersionRange.of(loaderVersion).toForge()
     }
 
     /**
      * A version range to match for the {@link #setModLoader(java.lang.String)}.
      */
     void setLoaderVersion(List<String> loaderVersion) {
-        if (platform === Platform.FORGE) {
+        if (platform === Platform.NEOFORGE || platform === Platform.FORGE) {
             final VersionRange range = new VersionRange()
             range.versions = loaderVersion.collectMany {VersionRange.of(it).versions}
             put 'loaderVersion', range.toForge()
@@ -194,6 +217,7 @@ class ModsDotGroovy {
 
     protected void pushMod(ImmutableModInfo modInfo) {
         switch (platform) {
+            case Platform.NEOFORGE:
             case Platform.FORGE:
                 final mods = (data.computeIfAbsent('mods', {[]}) as List)
                 modInfo.dependencies?.each {
@@ -347,14 +371,22 @@ class ModsDotGroovy {
     }
 
     /**
-     * Declare a mixin config. Only works on Fabric or Quilt.
+     * Declare a mixin config. Only works on Fabric, Quilt or NeoForge.
      * @param mixins the mixin configs to declare
      */
     void setMixin(List<String> mixins) {
         if (platform === Platform.FABRIC) {
             this.data = merge(this.data, ['mixins': mixins.toList()])
         } else if (platform === Platform.QUILT) {
             this.data = merge(this.data, ['mixin': mixins.toList()])
+        } else if (platform === Platform.NEOFORGE) {
+            // NeoForge supports setting mixin configs directly in the mods.toml file
+            // https://github.com/neoforged/FancyModLoader/pull/31
+            final mixinsCfg = data.computeIfAbsent('mixins', {[]}) as List
+
+            mixins.each {
+                mixinsCfg.add([config: it])
+            }
         }
     }
 
@@ -447,7 +479,7 @@ class ModsDotGroovy {
      */
     @Nullable
     String inferUpdateJsonUrl(final ImmutableModInfo modInfo) {
-        if (platform !== Platform.FORGE) return null
+        if (!(platform === Platform.NEOFORGE || platform === Platform.FORGE)) return null
 
         final String displayOrIssueTrackerUrl = modInfo.displayUrl ?: ((String) data.issueTrackerURL) ?: ''
         if (displayOrIssueTrackerUrl === null || displayOrIssueTrackerUrl.isEmpty() || displayOrIssueTrackerUrl.isAllWhitespace())

src/lib/groovy/Platform.groovy

@@ -7,7 +7,7 @@ import groovy.transform.CompileStatic
 
 @CompileStatic
 enum Platform {
-    FORGE, QUILT, FABRIC
+    FORGE, NEOFORGE, QUILT, FABRIC
 
     Platform() {}
 }

src/lib/groovy/modsdotgroovy/DependenciesBuilder.groovy

@@ -99,6 +99,25 @@ class DependenciesBuilder extends HashMap {
         }
     }
 
+    void neoforge(@DelegatesTo(value = NeoForgeDependency, strategy = DELEGATE_FIRST)
+               @ClosureParams(value = SimpleType, options = 'modsdotgroovy.NeoForgeDependency') final Closure closure) {
+        if (platform === Platform.NEOFORGE) {
+            final neoDependency = new NeoForgeDependency()
+            closure.delegate = neoDependency
+            closure.resolveStrategy = DELEGATE_FIRST
+            closure.call(neoDependency)
+            dependencies << neoDependency.copy()
+        }
+    }
+
+    void setNeoForge(final String versionRange) {
+        if (platform === Platform.NEOFORGE) {
+            final neoDependency = new NeoForgeDependency()
+            neoDependency.versionRange = versionRange
+            dependencies << neoDependency.copy()
+        }
+    }
+
     void quiltLoader(@DelegatesTo(value = QuiltLoaderDependency, strategy = DELEGATE_FIRST)
                      @ClosureParams(value = SimpleType, options = 'modsdotgroovy.QuiltLoaderDependency') final Closure closure) {
         if (platform === Platform.QUILT) {

src/lib/groovy/modsdotgroovy/NeoForgeDependency.groovy

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2022 GroovyMC
+ * SPDX-License-Identifier: MIT
+ */
+
+package modsdotgroovy
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+class NeoForgeDependency extends Dependency {
+    {
+        modId = 'neoforge'
+        mandatory = true
+        ordering = DependencyOrdering.NONE
+    }
+}

src/main/groovy/io/github/groovymc/modsdotgroovy/ConvertToTomlTask.groovy → src/main/groovy/io/github/groovymc/modsdotgroovy/ConvertToForgeTomlTask.groovy

@@ -9,7 +9,7 @@ import com.moandjiezana.toml.TomlWriter
 import groovy.transform.CompileStatic
 
 @CompileStatic
-abstract class ConvertToTomlTask extends AbstractConvertTask {
+abstract class ConvertToForgeTomlTask extends AbstractConvertTask {
     @Override
     protected String getOutputName() {
         return 'mods.toml'

src/main/groovy/io/github/groovymc/modsdotgroovy/ConvertToNeoForgeTomlTask.groovy

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 GroovyMC
+ * SPDX-License-Identifier: MIT
+ */
+
+package io.github.groovymc.modsdotgroovy
+
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+abstract class ConvertToNeoForgeTomlTask extends ConvertToForgeTomlTask {
+    @Override
+    protected void setupPlatformSpecificArguments() {
+        final mcDependency = project.configurations.findByName('minecraft')
+                ?.getDependencies()?.find()
+        if (mcDependency !== null) {
+            final version = mcDependency.version.split('-')
+            arg('minecraftVersion', version[0])
+
+            // TODO: Extract out neoforge version
+            /*if (version.length > 1) {
+                arg('forgeVersion', version[1].split('_mapped_')[0])
+            }*/
+
+            final mcSplit = version[0].split('\\.')
+            if (mcSplit.length > 1) {
+                try {
+                    final currentVersion = Integer.parseInt(mcSplit[1])
+                    arg('minecraftVersionRange', "[${version[0]},1.${currentVersion + 1})")
+                } catch (Exception ignored) {}
+            }
+        }
+    }
+
+    @Override
+    protected String getPlatform() {
+        return 'neoforge'
+    }
+}