Update to FG6, Gradle 8.8, clean up some buildscript jank

Author: robotgryphon

build.gradle

@@ -1,14 +1,5 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        maven { url = 'https://maven.parchmentmc.org' }
-        maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
-        mavenCentral()
-        mavenLocal()
-    }
-
+buildscript{
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:5.1.+"
         classpath 'org.parchmentmc:librarian:1.+'
     }
 }
@@ -17,26 +8,27 @@ plugins {
     id "idea"
     id "eclipse"
     id "maven-publish"
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
-apply plugin: "net.minecraftforge.gradle"
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-
 var envVersion = System.getenv("VERSION") ?: "9.9.9"
 if (envVersion.startsWith("v"))
     envVersion = envVersion.trimStart('v')
 
+var RUNNING_IN_CI = true // System.getenv().containsKey("CI") ?: false
+
 archivesBaseName = mod_id
 group = "dev.compactmods.compactmachines"
 version = envVersion
 
-tasks.create("mcVersion") {
+tasks.register("mcVersion") {
     doFirst {
         println("version=$minecraft_version")
     }
 }
 
-tasks.create("forgeVersion") {
+tasks.register("forgeVersion") {
     doFirst {
         println("version=$forge_version")
     }
@@ -88,7 +80,6 @@ sourceSets {
     }
 }
 
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
     mappings channel: 'parchment', version: parchment_version
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
@@ -98,8 +89,8 @@ minecraft {
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
     runs {
-        client {
-            workingDirectory project.file('run/client')
+        data {
+            workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
             property 'forge.logging.markers', '' // 'SCAN,REGISTRIES,REGISTRYDUMP'
@@ -110,35 +101,41 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
+            args '--mod', mod_id
+            args '--existing', file('src/main/resources')
+            args '--all'
+            args '--output', file('src/generated/resources/')
+
             if(!System.getenv().containsKey("CI")) {
                 // JetBrains Runtime Hotswap
                 jvmArg '-XX:+AllowEnhancedClassRedefinition'
                 jvmArg '-XX:HotswapAgent=fatjar'
             }
 
-            args '--username', 'Nano'
-            args '--width', 1920
-            args '--height', 1080
-
             mods {
                 compactmachines {
                     source sourceSets.tunnels
                     source sourceSets.main
                     source sourceSets.api
+                    source sourceSets.datagen
                 }
             }
         }
 
-        server {
-            workingDirectory project.file('run/server')
+        gameTestServer {
+            workingDirectory project.file('run/gametest')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', '' // 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be added/remove as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', ''
 
             // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', mod_id
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'info'
 
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
@@ -148,19 +145,23 @@ minecraft {
                 jvmArg '-XX:+AllowEnhancedClassRedefinition'
                 jvmArg '-XX:HotswapAgent=fatjar'
             }
-
+            
             mods {
                 compactmachines {
                     source sourceSets.tunnels
-                    source sourceSets.main
                     source sourceSets.api
+                    source sourceSets.main
                     source sourceSets.test
                 }
             }
         }
+    }
+}
 
-        data {
-            workingDirectory project.file('run')
+if(!RUNNING_IN_CI) {
+    minecraft.runs {
+        client {
+            workingDirectory project.file('run/client')
 
             // Recommended logging data for a userdev environment
             property 'forge.logging.markers', '' // 'SCAN,REGISTRIES,REGISTRYDUMP'
@@ -171,62 +172,50 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
-            args '--mod', mod_id
-            args '--existing', file('src/main/resources')
-            args '--all'
-            args '--output', file('src/generated/resources/')
-
-            if(!System.getenv().containsKey("CI")) {
+            if(!RUNNING_IN_CI) {
                 // JetBrains Runtime Hotswap
                 jvmArg '-XX:+AllowEnhancedClassRedefinition'
                 jvmArg '-XX:HotswapAgent=fatjar'
-            } else {
-                forceExit false
             }
 
-            forceExit false
+            args '--username', 'Nano'
+            args '--width', 1920
+            args '--height', 1080
 
             mods {
                 compactmachines {
                     source sourceSets.tunnels
                     source sourceSets.main
                     source sourceSets.api
-                    source sourceSets.datagen
                 }
             }
         }
 
-        gameTestServer {
-            workingDirectory project.file('run/gametest')
+        server {
+            workingDirectory project.file('run/server')
 
             // Recommended logging data for a userdev environment
-            // The markers can be added/remove as needed separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', ''
+            property 'forge.logging.markers', '' // 'SCAN,REGISTRIES,REGISTRYDUMP'
 
             // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'info'
+            property 'forge.logging.console.level', 'debug'
+
+            property 'forge.enabledGameTestNamespaces', mod_id
 
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
-            forceExit false
-
-            if(!System.getenv().containsKey("CI")) {
+            if(!RUNNING_IN_CI) {
                 // JetBrains Runtime Hotswap
                 jvmArg '-XX:+AllowEnhancedClassRedefinition'
                 jvmArg '-XX:HotswapAgent=fatjar'
             }
-            
+
             mods {
                 compactmachines {
                     source sourceSets.tunnels
-                    source sourceSets.api
                     source sourceSets.main
+                    source sourceSets.api
                     source sourceSets.test
                 }
             }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# 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
@@ -133,22 +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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.