Update Gradle wrapper to 8.12, loom to 1.9, switch to ModDevGradle fo…

…r NeoForge

gradle/libs.versions.toml

@@ -28,6 +28,7 @@ minecraft = "1.21.4"
 spongeApi7 = "7.2.0"
 velocityApi = "3.4.0-SNAPSHOT"
 jupiterEngine = "5.11.4"
+neoforge = "21.4.47-beta"
 
 [libraries]
 adventureBom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
@@ -64,7 +65,8 @@ fabricApi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.re
 fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" }
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
 
-neoforge = { module = "net.neoforged:neoforge", version = "21.4.47-beta" }
+# for renovate
+zNeoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
 spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "spongeApi7" }
 

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

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

platform/fabric/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom")
+  id("quiet-fabric-loom")
   id("minimotd.platform-conventions")
   id("com.gradleup.shadow")
 }

platform/neoforge/build.gradle.kts

@@ -1,27 +1,25 @@
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom")
+  id("net.neoforged.moddev")
   id("minimotd.platform-conventions")
   id("com.gradleup.shadow")
 }
 
+neoForge {
+  enable {
+    version = libs.versions.neoforge.get()
+  }
+}
+
 val shade: Configuration by configurations.creating
 
 dependencies {
-  minecraft(libs.minecraft)
-  mappings(loom.officialMojangMappings())
-  neoForge(libs.neoforge)
-
   shade(implementation(projects.minimotdCommon) {
     exclude("net.kyori")
     exclude("com.google.errorprone")
   })
 
-  modImplementation(libs.adventurePlatformNeoforge)
-  include(libs.adventurePlatformNeoforge)
-}
-
-miniMOTDPlatform {
-  jarTask.set(tasks.remapJar)
+  implementation(libs.adventurePlatformNeoforge)
+  jarJar(libs.adventurePlatformNeoforge)
 }
 
 indra {
@@ -36,9 +34,6 @@ tasks {
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
   }
-  remapJar {
-    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
-  }
   processResources {
     val replacements = mapOf(
       "version" to project.version.toString(),
@@ -52,6 +47,17 @@ tasks {
   }
 }
 
+val productionJar = tasks.register<Zip>("productionJar") {
+  archiveFileName = "${project.name}-mc$minecraftVersion-${project.version}.jar"
+  destinationDirectory = layout.buildDirectory.dir("libs")
+  from(zipTree(tasks.shadowJar.flatMap { it.archiveFile }))
+  from(tasks.jarJar.flatMap { it.outputDirectory })
+}
+
+miniMOTDPlatform {
+  jarTask.set(productionJar)
+}
+
 publishMods.modrinth {
   modLoaders.add("neoforge")
   minecraftVersions.addAll(minecraftVersion)

renovate.json

@@ -4,7 +4,7 @@
     "config:base"
   ],
   "ignoreDeps": [
-    "xyz.jpenilla.quiet-architectury-loom",
+    "quiet-fabric-loom",
     "com.mojang:minecraft",
     "com.google.code.gson:gson"
   ],

settings.gradle.kts

@@ -12,8 +12,9 @@ pluginManagement {
 }
 
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom") version "1.7-SNAPSHOT" apply false
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+  id("net.neoforged.moddev.repositories") version "2.0.71" apply false
+  id("quiet-fabric-loom") version "1.9-SNAPSHOT" apply false
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 
 rootProject.name = "MiniMOTD"