Refactor for 1.20.6

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.93'
+    id 'net.neoforged.gradle.userdev' version '7.0.138'
 }
 
 version = "2.0.3"
@@ -17,16 +17,16 @@ base {
     archivesName = minecraftVersion { "ToolBelt-${it}" }
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 sourceSets {
     main.resources.srcDirs += 'src/main/generated_resources'
 }
 
 subsystems {
     parchment {
-        minecraftVersion="1.20.3"
-        mappingsVersion="2023.12.31"
+        minecraftVersion="1.20.6"
+        mappingsVersion="2024.05.01"
     }
 }
 
@@ -94,18 +94,18 @@ repositories {
 }
 
 dependencies {
-    implementation 'net.neoforged:neoforge:20.4.160-beta'
+    implementation 'net.neoforged:neoforge:20.6.100-beta'
 
-    compileOnly "dev.gigaherz.sewingkit:SewingKit-1.20.4:1.8.6"
-    runtimeOnly "dev.gigaherz.sewingkit:SewingKit-1.20.4:1.8.6"
+    compileOnly "dev.gigaherz.sewingkit:SewingKit-1.20.6:2.0.0"
+    runtimeOnly "dev.gigaherz.sewingkit:SewingKit-1.20.6:2.0.0"
 
     //compileOnly "mezz.jei:jei-1.20-common-api:14.0.0.4"
     //runtimeOnly "mezz.jei:jei-1.20-common:14.0.0.4"
     //compileOnly "mezz.jei:jei-1.20-forge-api:14.0.0.4"
     //runtimeOnly "mezz.jei:jei-1.20-forge:14.0.0.4"
 
-    compileOnly "top.theillusivec4.curios:curios-neoforge:7.3.0+1.20.4"
-    runtimeOnly "top.theillusivec4.curios:curios-neoforge:7.3.0+1.20.4"
+    compileOnly "top.theillusivec4.curios:curios-neoforge:8.0.0-beta.4+1.20.6"
+    runtimeOnly "top.theillusivec4.curios:curios-neoforge:8.0.0-beta.4+1.20.6"
 
     //runtimeOnly fg.deobf("curse.maven:corail-tombstone-243707:3836552")
 }

gradle.properties

@@ -1,4 +1,5 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+neogradle.subsystems.conventions.runs.create-default-run-per-type=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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/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=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.

gradlew.bat

@@ -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,13 +41,13 @@ 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.
-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
 
@@ -56,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
 
@@ -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

src/main/generated_resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,23 +1,23 @@
-// 1.20.4	2023-12-29T00:36:08.5188735	Recipes
-503ee2d169acbf57a278baa50e8fbe46c0e3e924 data/toolbelt/advancements/recipes/misc/belt_upgrade_1_via_sewing.json
-fd5253f71b537520f2621e217b368690d85ef7d1 data/toolbelt/advancements/recipes/misc/belt_upgrade_2_via_sewing.json
-61434d4c233e672fee540d5bddd3c9ff137c000d data/toolbelt/advancements/recipes/misc/belt_upgrade_3_via_sewing.json
-490691ad089abf25c188a549fb9a9facdf50acd8 data/toolbelt/advancements/recipes/misc/belt_upgrade_4_via_sewing.json
-d0e17694f461d8b335d3111f17772363583c23d1 data/toolbelt/advancements/recipes/misc/belt_upgrade_5_via_sewing.json
-0b960e5d93cb23d062020fe46eb84e77f4fabcfb data/toolbelt/advancements/recipes/misc/belt_upgrade_6_via_sewing.json
-d0571f26ce4660786eafbbc9ca2a1e6a21941ddb data/toolbelt/advancements/recipes/misc/belt_upgrade_7_via_sewing.json
-ebdb49f04df3539f32c265b0b12647a6fb6ebdd7 data/toolbelt/advancements/recipes/tools/belt.json
-7c1806fbf68b20d506c24fa1a8b9c0c4783f2b18 data/toolbelt/advancements/recipes/tools/belt_via_sewing.json
-8fe1a4e584d3e39341792ec6d99f4a39e01af8b9 data/toolbelt/advancements/recipes/tools/pouch.json
-138121968f45239956c77359717d1828c08b6579 data/toolbelt/advancements/recipes/tools/pouch_via_sewing.json
-58de7baf5ecf439f7a50bd02ef5c5c0f4ca87958 data/toolbelt/recipes/belt.json
-3144543eb2676ec3bcdd7499326990db19e76932 data/toolbelt/recipes/belt_upgrade_1_via_sewing.json
-cc1118ceee72110d31b5c895c8e4be2c385d9a88 data/toolbelt/recipes/belt_upgrade_2_via_sewing.json
-9d77ebd4438e9b01d98fcc9a07a73dce09070068 data/toolbelt/recipes/belt_upgrade_3_via_sewing.json
-931945d965f90727471cf766260a11d7d0d178f1 data/toolbelt/recipes/belt_upgrade_4_via_sewing.json
-540a6f34cd5f4ddbecfe549be8d650c393211e0e data/toolbelt/recipes/belt_upgrade_5_via_sewing.json
-f168265aa302137ce1fad46a90c2ee7920502be8 data/toolbelt/recipes/belt_upgrade_6_via_sewing.json
-d2c7cf2ae81e90badd3724108e74134bd53f0969 data/toolbelt/recipes/belt_upgrade_7_via_sewing.json
-0108b32cd07dbd9185de2cc3993ec8d7749ad258 data/toolbelt/recipes/belt_via_sewing.json
-f2a5d1af302fc5ff36582e702274530a7c04adba data/toolbelt/recipes/pouch.json
-8244a819e856c5219bc0259dd2d9cad3e2c21990 data/toolbelt/recipes/pouch_via_sewing.json
+// 1.20.6	2024-06-02T18:26:19.1023755	Recipes
+cde6a43c310f3e28602f09613846c0f00c99c264 data/toolbelt/advancements/recipes/misc/belt_upgrade_1_via_sewing.json
+e10371b84abca907fd90763660732582003c53c9 data/toolbelt/advancements/recipes/misc/belt_upgrade_2_via_sewing.json
+b8b7a63d61a469a06d0083b52e9e780311b4384f data/toolbelt/advancements/recipes/misc/belt_upgrade_3_via_sewing.json
+8dbba6d84ecee0bbd43a5592f321f522271415c3 data/toolbelt/advancements/recipes/misc/belt_upgrade_4_via_sewing.json
+11ef9a83b595598bc9ff904e8f10c3b61d67f469 data/toolbelt/advancements/recipes/misc/belt_upgrade_5_via_sewing.json
+92367ce89023747ddcb26dc05cbda5ec9cf7fca4 data/toolbelt/advancements/recipes/misc/belt_upgrade_6_via_sewing.json
+d873d783c32d9c52afe5345a61364bccc9697d7d data/toolbelt/advancements/recipes/misc/belt_upgrade_7_via_sewing.json
+e95a64ad8848fca94e0788021461ee9e275bcb16 data/toolbelt/advancements/recipes/tools/belt.json
+7cb3c8d72c7191dddcd1d8a3470a03e2647e3f66 data/toolbelt/advancements/recipes/tools/belt_via_sewing.json
+1872a3dc74e1d6497e2511df2590719dd05e09c9 data/toolbelt/advancements/recipes/tools/pouch.json
+5779bf8a140ccc3aecf6913b68acf42cab3e35c8 data/toolbelt/advancements/recipes/tools/pouch_via_sewing.json
+137532d31f8ecad75f47e456c193e37f4f1c7a1d data/toolbelt/recipes/belt.json
+c853b279bd87828c1bcfb51ccdca224b9ba2cc27 data/toolbelt/recipes/belt_upgrade_1_via_sewing.json
+20cb3a9a2cac76f93f24052f37959517136e5591 data/toolbelt/recipes/belt_upgrade_2_via_sewing.json
+5aaf1b3a651c7524ddd4465ad51397ca0aea571f data/toolbelt/recipes/belt_upgrade_3_via_sewing.json
+9332f18563d839ca15b9869f7cc347bfaa509dba data/toolbelt/recipes/belt_upgrade_4_via_sewing.json
+cc8f5b9dec0e28b0f489376642a4baed4954dfb3 data/toolbelt/recipes/belt_upgrade_5_via_sewing.json
+c261750be8caf34dc676a9e82a6904bd342d67db data/toolbelt/recipes/belt_upgrade_6_via_sewing.json
+59cf085f2b8cb1882ca93352ccf09e536f2b61a6 data/toolbelt/recipes/belt_upgrade_7_via_sewing.json
+4a0d9290fd5e1661cd9dc2e67429b1d3290adcdd data/toolbelt/recipes/belt_via_sewing.json
+b268f2629fcc92a60dd0ef648e29ff7477e81023 data/toolbelt/recipes/pouch.json
+a85937b3888b3036332510a2cd17cd04d0e234a9 data/toolbelt/recipes/pouch_via_sewing.json

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_1_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_2_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_3_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_4_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_5_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_6_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/misc/belt_upgrade_7_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/tools/belt.json

@@ -10,7 +10,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/tools/belt_via_sewing.json

@@ -13,7 +13,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },

src/main/generated_resources/data/toolbelt/advancements/recipes/tools/pouch.json

@@ -10,7 +10,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:leather"
+            "items": "#forge:leather"
           }
         ]
       },