Sync with template mod

Author: NebelNidas

.github/dependabot.yaml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
@@ -26,7 +26,7 @@ jobs:
         run: ./gradlew :build --stacktrace
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: |

.github/workflows/build.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
@@ -25,11 +25,11 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Build mod
+      - name: Build the mod
         run: ./gradlew :build --stacktrace
 
       - name: Publish mod
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: 45F9B0j8
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -39,8 +39,7 @@ jobs:
 
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-          files-primary: build/libs/!(*-@(dev|sources)).jar
-          files-secondary: null
+          files: build/libs/!(*-@(dev|sources)).jar
 
           name: 0.2.1 for MC 1.15 to 1.19
           version: 0.2.1+1.15-1.16
@@ -68,6 +67,14 @@ jobs:
             1.19.1
             1.19.2
             1.19.3
+            1.19.4
+            1.20
+            1.20.1
+            1.20.2
+            1.20.3
+            1.20.4
+            1.20.5
+            1.20.6
 
           dependencies: |
             modmenu       | recommends

.github/workflows/release.yaml

@@ -1,20 +1,29 @@
 plugins {
 	id 'fabric-loom' apply false
-	id 'io.github.juuxel.loom-quiltflower' apply false
 	id 'checkstyle'
+	id 'com.diffplug.spotless'
 }
 
 
 allprojects {
 	apply plugin: 'fabric-loom'
-	apply plugin: 'io.github.juuxel.loom-quiltflower'
 	apply plugin: 'checkstyle'
+	apply plugin: 'com.diffplug.spotless'
 
 	checkstyle {
 		configFile = file("${rootDir}/checkstyle.xml")
 		toolVersion = project.checkstyle_version
 	}
 
+	spotless {
+		java {
+			removeUnusedImports()
+			importOrder('java', 'javax', '', 'net.minecraft', 'com.github.reviversmc')
+			indentWithTabs()
+			trimTrailingWhitespace()
+		}
+	}
+
 
 	version = rootProject.mod_version
 	group = rootProject.maven_group
@@ -51,14 +60,6 @@ allprojects {
 		maven {
 			url = 'https://maven.shedaniel.me/'
 		}
-		maven {
-			name = 'JitPack'
-			url = 'https://jitpack.io'
-		}
-		maven {
-			name = 'NucleoidMC'
-			url = 'https://maven.nucleoid.xyz/'
-		}
 		mavenCentral()
 	}
 
@@ -107,6 +108,6 @@ dependencies {
 
 processResources {
 	from("${rootDir}/assets/icon.png") {
-		into "assets/unsaddle/"
+		into 'assets/unsaddle/'
 	}
 }

build.gradle

@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
-<!-- ReviversMC checkstyle v1.1 -->
+<!-- ReviversMC checkstyle v2.0 -->
 
 <module name="Checker">
 	<property name="charset" value="UTF-8"/>
 	<property name="fileExtensions" value="java"/>
 	<property name="localeLanguage" value="en"/>
 	<property name="localeCountry" value="US"/>
+	<property name="tabWidth" value="4"/>
 
 	<!-- Excludes all 'module-info.java' files              -->
 	<!-- See https://checkstyle.org/config_filefilters.html -->
@@ -68,16 +69,29 @@
 		<property name="message" value="missing blank line after block at same indentation level"/>
 	</module>
 
+	<!-- Allow `@SuppressWarnings("checkstyle:...")` to suppress certain checkstyle errors -->
+	<module name="SuppressWarningsFilter"/>
+
 	<module name="TreeWalker">
+		<!-- Required counterpart to `SuppressWarningsFilter` -->
+		<module name="SuppressWarningsHolder"/>
+
+		<!-- Allow "//CHECKSTYLE.OFF: <InspectionName>" and "//CHECKSTYLE.ON: <InspectionName>" pairs to toggle some inspections -->
+		<module name="SuppressionCommentFilter">
+			<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+			<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+			<property name="checkFormat" value="$1"/>
+		</module>
+
 		<!-- Ensure all imports are ship shape -->
 		<module name="AvoidStarImport"/>
 		<module name="IllegalImport"/>
 		<module name="RedundantImport"/>
 		<module name="UnusedImports"/>
 
 		<module name="ImportOrder">
-			<property name="groups" value="java,javax,*,com.github.reviversmc"/>
-			<property name="ordered" value="false"/><!-- the plugin orders alphabetically without considering separators.. -->
+			<property name="groups" value="java,javax,*,net.minecraft,com.github.reviversmc"/>
+			<property name="ordered" value="true"/>
 			<property name="separated" value="true"/>
 			<property name="option" value="top"/>
 			<property name="sortStaticImportsAlphabetically" value="true"/>
@@ -115,11 +129,11 @@
 		</module>
 
 		<module name="Indentation">
-			<property name="basicOffset" value="8"/>
-			<property name="caseIndent" value="8"/>
-			<property name="throwsIndent" value="8"/>
-			<property name="arrayInitIndent" value="8"/>
-			<property name="lineWrappingIndentation" value="16"/>
+			<property name="basicOffset" value="4"/>
+			<property name="caseIndent" value="4"/>
+			<property name="throwsIndent" value="4"/>
+			<property name="arrayInitIndent" value="4"/>
+			<property name="lineWrappingIndentation" value="8"/>
 		</module>
 
 		<module name="ParenPad"/>

checkstyle.xml

@@ -1,20 +1,20 @@
 # Gradle Properties
-org.gradle.jvmargs = -Xmx3G
+org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.workers.max = 3
 
 # Gradle Plugins
-fabric_loom_version = 1.1-SNAPSHOT
-loom_quiltflower_version = 1.8.0
-checkstyle_version = 10.5.0
+fabric_loom_version = 1.6-SNAPSHOT
+checkstyle_version = 10.16.+
+spotless_version = 6.25.+
 
 # Mod Properties
 mod_version = 0.2.1
 maven_group = com.github.reviversmc
 archives_base_name = unsaddle
 
 # Global Dependencies
-fabric_loader_version = 0.14.14
+fabric_loader_version = 0.15.11
 
 # Module Dependencies
 # 1.15
@@ -31,8 +31,7 @@ fabric_api_version_1_16 = 0.42.0+1.16
 modmenu_version_1_16 = 1.16.23
 cloth_config_version_1_16 = 4.15.82
 
-
-# If true, third-party mods will be loaded during runtime in the developer run configurations
+# Dev-Env Mods
 use_third_party_mods = true
 # 1.15
 lazydfu_version_1_15 = 0.1.2
@@ -43,6 +42,6 @@ lazydfu_version_1_16 = 0.1.2
 sodium_version_1_16 = mc1.16.5-0.2.0
 lithium_version_1_16 = mc1.16.5-0.6.6
 phosphor_version_1_16 = mc1.16.2-0.8.0
-ferrite_core_version_1_16 = 2.1.1-fabric
+ferritecore_version_1_16 = 2.1.1-fabric
 smoothboot_version_1_16 = 1.16.5-1.6.0
 no_fade_version_1_16 = 3228523

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -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/subprojects/plugins/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=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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 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
@@ -205,6 +214,12 @@ set -- \
         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.

gradle/wrapper/gradle-wrapper.properties

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew

@@ -9,7 +9,7 @@ pluginManagement {
 	}
 	plugins {
 		id 'fabric-loom' version "${fabric_loom_version}"
-		id 'io.github.juuxel.loom-quiltflower' version "${loom_quiltflower_version}"
+		id 'com.diffplug.spotless' version "${spotless_version}"
 	}
 }