use moddev gradle for neoforge

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
     id 'fabric-loom' version '1.10-SNAPSHOT' apply false
-    // see https://projects.neoforged.net/neoforged/neogradle for new versions
-    id 'net.neoforged.gradle.userdev' version '7.0.153' apply false
+    // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
+    id 'net.neoforged.moddev' version '2.0.80' apply false
     // see https://files.minecraftforge.net/net/minecraftforge/gradle/ForgeGradle/ for new versions
     id 'net.minecraftforge.gradle' version '6.0.35' apply false
     id 'org.parchmentmc.librarian.forgegradle' version '1.+' apply false

buildSrc/src/main/groovy/multiloader-publish.gradle

@@ -5,6 +5,8 @@ plugins {
 publishMods {
     if (project.name == 'fabric')
         file = remapJar.archiveFile
+    else if (project.name == 'neoforge')
+        file = jar.archiveFile
     else
         file = tasks.named('jarJar').get().archiveFile
 

forge/build.gradle

@@ -40,7 +40,7 @@ minecraft {
 
     runs {
         client {
-            workingDirectory file('../run/client')
+            workingDirectory rootProject.file('run/client')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
             mods {
@@ -51,7 +51,7 @@ minecraft {
         }
 
         server {
-            workingDirectory file('../run/server')
+            workingDirectory rootProject.file('run/server')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
             mods {

neoforge/build.gradle

@@ -3,56 +3,58 @@ plugins {
     id 'idea'
     id 'eclipse'
 
-    id 'net.neoforged.gradle.userdev'
+    id 'net.neoforged.moddev'
 
     id 'multiloader-publish'
 }
 
+neoForge {
+    version = neoforge_version
+    
     // Automatically enable neoforge AccessTransformers if the file exists
     def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {
         minecraft.accessTransformers.file(at)
     }
 
-jarJar.enable()
-
-tasks.named('jar') {
-    archiveClassifier = 'thin'
-}
-
-tasks.named('jarJar') {
-    archiveClassifier = ''
-}
-
-jar.finalizedBy('jarJar')
-
-dependencies {
-    implementation "net.neoforged:neoforge:${neoforge_version}"
-
-    implementation(jarJar(group: 'org.mineskin', name: 'java-client', version: mineskin_client_version)) {
-        jarJar.ranged(it, "[${mineskin_client_version},)")
-    }
-}
-
-subsystems {
     parchment {
         minecraftVersion = parchment_minecraft
         mappingsVersion = parchment_version
     }
-}
 
     runs {
         configureEach {
-        modSource project.sourceSets.main
-        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+            ideName = "NeoForge ${it.name.capitalize()} (${project.path})" // Unify the run config names with fabric
         }
 
         client {
-        workingDirectory = file('../run/client')
+            client()
+            gameDirectory = rootProject.file('run/client')
         }
 
         server {
+            server()
             programArgument '--nogui'
-        workingDirectory = file('../run/server')
+            gameDirectory = rootProject.file('run/server')
         }
     }
+
+    mods {
+        "${mod_id}" {
+            sourceSet sourceSets.main
+        }
+    }
+}
+
+dependencies {
+    implementation "net.neoforged:neoforge:${neoforge_version}"
+
+    jarJar(implementation('org.mineskin:java-client')) {
+        version {
+            strictly "[${mineskin_client_version},)"
+            prefer mineskin_client_version
+        }
+    }
+
+    additionalRuntimeClasspath "org.mineskin:java-client:${mineskin_client_version}"
+}