port to 1.20.5

Jenkinsfile

@@ -3,7 +3,7 @@
 pipeline {
     agent any
     tools {
-        jdk "jdk-17.0.1"
+        jdk "jdk-21"
     }
     environment {
         modrinth_token = credentials('modrinth_token')

build.gradle.kts

@@ -16,7 +16,7 @@ version = GMUtils.updatingVersion(Versions.MOD)
 
 tasks.create("postDiscord") {
     val taskName = "publishCurseForge"
-    dependsOn(":fabric:${taskName}", ":forge:${taskName}", ":neoforge:${taskName}")
+    dependsOn(":fabric:${taskName}",/* ":forge:${taskName}",*/ ":neoforge:${taskName}")
     doLast {
         try {
 
@@ -32,13 +32,13 @@ tasks.create("postDiscord") {
             val embed = Embed()
             val downloadSources = StringJoiner("\n")
 
-            mapOf(Pair("fabric", "<:fabric:932163720568782878>"), Pair("forge", "<:forge:932163698003443804>"), Pair("neoforge", "<:neoforged:1184738260371644446>"))
+            mapOf(Pair("fabric", "<:fabric:932163720568782878>"), /*Pair("forge", "<:forge:932163698003443804>"),*/ Pair("neoforge", "<:neoforged:1184738260371644446>"))
                     .filter {
                         project(":${it.key}").ext.has("curse_file_url")
                     }.map { "${it.value} [${it.key.capitalize(Locale.ENGLISH)}](${project(":${it.key}").ext.get("curse_file_url")})" }
                     .forEach { downloadSources.add(it) }
 
-            listOf("common", "fabric", "forge", "neoforge")
+            listOf("common", "fabric", /*"forge",*/ "neoforge")
                     .map { project(":${it}") }
                     .map { "<:maven:932165250738970634> `\"${it.group}:${it.base.archivesName.get()}:${it.version}\"`" }
                     .forEach { downloadSources.add(it) }

buildSrc/src/main/kotlin/com/blamejared/clumps/gradle/DefaultPlugin.kt

@@ -46,10 +46,6 @@ class DefaultPlugin : Plugin<Project> {
         project.version = GMUtils.updatingVersion(Versions.MOD)
         project.group = Properties.GROUP
 
-        project.tasks.withType<GenerateModuleMetadata>().all {
-            enabled = false
-        }
-
         project.repositories {
             this.add(this.maven("https://repo.spongepowered.org/repository/maven-public/") {
                 name = "Sponge"
@@ -68,7 +64,7 @@ class DefaultPlugin : Plugin<Project> {
         project.plugins.apply(JavaLibraryPlugin::class.java)
 
         with(project.extensions.getByType(JavaPluginExtension::class.java)) {
-            toolchain.languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion))
+            toolchain.languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_21.majorVersion))
             withSourcesJar()
             withJavadocJar()
             sourceSets {
@@ -127,7 +123,7 @@ class DefaultPlugin : Plugin<Project> {
                         "ITEM_ICON" to Properties.ITEM_ICON,
                 )
                 inputs.properties(properties)
-                filesMatching(setOf("fabric.mod.json", "META-INF/mods.toml", "pack.mcmeta")) {
+                filesMatching(setOf("fabric.mod.json", "META-INF/mods.toml", "META-INF/neoforge.mods.toml", "pack.mcmeta")) {
                     expand(properties)
                 }
             }

buildSrc/src/main/kotlin/com/blamejared/clumps/gradle/Versions.kt

@@ -1,13 +1,13 @@
 package com.blamejared.clumps.gradle
 
 object Versions {
-    const val MOD = "15.0.0"
-    const val JAVA = "17"
-    const val MINECRAFT = "1.20.4"
-    const val FABRIC_LOADER = "0.15.3"
-    const val FABRIC = "0.93.1+1.20.4"
-    const val FORGE = "49.0.19"
-    const val FORGE_LOADER = "[49,)"
-    const val NEO_FORGE = "20.4.89-beta"
+    const val MOD = "16.0.0"
+    const val JAVA = "21"
+    const val MINECRAFT = "1.20.5"
+    const val FABRIC_LOADER = "0.15.10"
+    const val FABRIC = "0.97.6+1.20.5"
+    const val FORGE = "49.0.19" // 1.20.4
+    const val FORGE_LOADER = "[49,)" // 1.20.4
+    const val NEO_FORGE = "20.5.0-beta"
     const val NEO_FORGE_LOADER= "[2,)"
 }

common/src/main/resources/clumps.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.blamejared.clumps.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "ExperienceOrbAccess",
     "MixinExperienceOrb"

fabric/build.gradle.kts

@@ -5,7 +5,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
-    id("fabric-loom") version "1.4-SNAPSHOT"
+    id("fabric-loom") version "1.6-SNAPSHOT"
     id("com.blamejared.clumps.default")
     id("com.blamejared.clumps.loader")
     id("com.modrinth.minotaur")

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

neoforge/build.gradle.kts

@@ -7,7 +7,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 plugins {
     id("com.blamejared.clumps.default")
     id("com.blamejared.clumps.loader")
-    id("net.neoforged.gradle.userdev") version ("7.0.81")
+    id("net.neoforged.gradle.userdev") version ("7.0.107")
     id("com.modrinth.minotaur")
 }
 

settings.gradle.kts

@@ -12,10 +12,10 @@ pluginManagement {
     }
 }
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 rootProject.name = "Clumps"
 include("common")
 include("fabric")
-include("forge")
+//include("forge")
 include("neoforge")