build: Use MDG instead of archloom for NeoForge

Author: jpenilla

cloud-fabric/build.gradle.kts

@@ -3,7 +3,7 @@ import net.fabricmc.loom.task.AbstractRunTask
 plugins {
     id("conventions.base")
     id("conventions.publishing")
-    id("xyz.jpenilla.quiet-architectury-loom")
+    id("quiet-fabric-loom")
 }
 
 configurations {

cloud-fabric/common-repack/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("conventions.base")
     id("conventions.publishing")
-    id("xyz.jpenilla.quiet-architectury-loom")
+    id("quiet-fabric-loom")
     id("conventions.common-dependencies")
 }
 

cloud-minecraft-modded-common/build.gradle.kts

@@ -3,7 +3,7 @@ import net.fabricmc.loom.task.AbstractRemapJarTask
 plugins {
     id("conventions.base")
     id("conventions.publishing")
-    id("xyz.jpenilla.quiet-architectury-loom")
+    id("quiet-fabric-loom")
     id("conventions.common-dependencies")
 }
 
@@ -18,5 +18,8 @@ tasks.withType(AbstractRemapJarTask::class).configureEach {
 }
 
 tasks.jar {
-    manifest.attributes("FMLModType" to "GAMELIBRARY")
+    manifest.attributes(
+        "FMLModType" to "GAMELIBRARY",
+        "Automatic-Module-Name" to "org.incendo.cloud_minecraft_modded_common",
+    )
 }

cloud-neoforge/build.gradle.kts

@@ -1,34 +1,48 @@
 plugins {
     id("conventions.base")
     id("conventions.publishing")
-    id("xyz.jpenilla.quiet-architectury-loom")
+    id("net.neoforged.moddev")
 }
 
-configurations {
-    transitiveInclude {
-        extendsFrom(api.get())
+afterEvaluate {
+    configurations.named("additionalRuntimeClasspath") {
+        extendsFrom(configurations.api.get())
 
-        exclude("org.checkerframework")
-        exclude("org.apiguardian")
         exclude("org.incendo", "cloud-minecraft-modded-common")
     }
-    forgeExtra {
-        extendsFrom(api.get())
+}
+
+neoForge {
+    enable {
+        version = libs.versions.neoforge.get()
+    }
+    mods.register("cloud-neoforge") {
+        sourceSet(sourceSets.main.get())
+    }
+    runs.register("client") {
+        client()
+    }
+    runs.register("server") {
+        server()
+    }
+    runs.configureEach {
+        jvmArgument("-Dcloud.test_commands=true")
     }
 }
 
 dependencies {
-    minecraft(libs.minecraft)
-    mappings(loom.officialMojangMappings())
-    neoForge(libs.neoForge)
-
     api(platform(libs.cloud.bom))
     api(libs.cloud.core)
     api(platform(libs.cloud.minecraft.bom))
     api(libs.cloud.brigadier)
     offlineLinkedJavadoc(project(":cloud-minecraft-modded-common"))
     api(project(":cloud-minecraft-modded-common", configuration = "namedElements"))
-    include(project(":cloud-minecraft-modded-common"))
+
+    jarJar(project(":cloud-minecraft-modded-common"))
+    jarJar(libs.cloud.brigadier)
+    jarJar(libs.cloud.core)
+    jarJar(libs.cloud.services)
+    jarJar(libs.geantyref)
 }
 
 tasks {
@@ -40,9 +54,3 @@ tasks {
         }
     }
 }
-
-loom {
-    runs.configureEach {
-        vmArg("-Dcloud.test_commands=true")
-    }
-}

cloud-neoforge/gradle.properties

@@ -1,2 +1 @@
-loom.platform=neoforge
 description=Cloud Command Framework on NeoForge

gradle/libs.versions.toml

@@ -7,13 +7,15 @@ errorprone = "2.27.1"
 
 cloud = "2.0.0"
 cloudMinecraft = "2.0.0-beta.10"
+geantyref = "1.3.16"
 
 immutables = "2.10.1"
 
 minecraft = "1.21.3"
 fabricLoader = "0.16.9"
 fabricApi = "0.110.0+1.21.3"
 fabricPermissionsApi = "0.3.3"
+neoforge = "21.3.56"
 
 [libraries]
 cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "cloud-build-logic" }
@@ -23,6 +25,8 @@ errorproneCore = { group = "com.google.errorprone", name = "error_prone_core", v
 cloud-bom = { module = "org.incendo:cloud-bom", version.ref = "cloud" }
 cloud-minecraft-bom = { module = "org.incendo:cloud-minecraft-bom", version.ref = "cloudMinecraft" }
 cloud-core = { module = "org.incendo:cloud-core", version.ref = "cloud" }
+cloud-services = { module = "org.incendo:cloud-services", version.ref = "cloud" }
+geantyref = { group = "io.leangen.geantyref", name = "geantyref", version.ref = "geantyref" }
 cloud-brigadier = { module = "org.incendo:cloud-brigadier", version.ref = "cloudMinecraft" }
 cloud-minecraft-signed-arguments = { module = "org.incendo:cloud-minecraft-signed-arguments", version.ref = "cloudMinecraft" }
 adventureApi = { group = "net.kyori", name = "adventure-api", version = "4.15.0" }
@@ -39,7 +43,8 @@ fabricApi-networking-api-v1 = { module = "net.fabricmc.fabric-api:fabric-network
 fabricApi-lifecycle-events-v1 = { module = "net.fabricmc.fabric-api:fabric-lifecycle-events-v1" }
 fabricPermissionsApi = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabricPermissionsApi" }
 
-neoForge = "net.neoforged:neoforge:21.3.56"
+# For renovate
+zNeoForge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
 [plugins]
 cloud-buildLogic-spotless = { id = "org.incendo.cloud-build-logic.spotless", version.ref = "cloud-build-logic" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -15,8 +15,9 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-    id("xyz.jpenilla.quiet-architectury-loom") version "1.7-SNAPSHOT"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("quiet-fabric-loom") version "1.9-SNAPSHOT"
+    id("net.neoforged.moddev.repositories") version "2.0.74"
 }
 
 dependencyResolutionManagement {