build(gradle): update dependencies and build scripts to minecraft 1.20.1

gradle.properties

@@ -2,14 +2,35 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-# MDK
-mc_version=1.19.2
-forge_version=43.2.13
-parchment_version=2022.11.27
-# Dependencies
-## "Create" Mod
-create_version=0.5.1.b-30
-flywheel_version=0.6.8.a-14
-registrate_version=MC1.19-1.1.5
-## Just Enough Items (JEI) Mod
-jei_version=11.5.0.297
+## Environment Properties
+minecraft_version=1.20.1
+minecraft_version_range=[1.20.1,1.20.2)
+forge_version=47.2.19
+forge_version_range=[47,)
+loader_version_range=[47,)
+mapping_channel=parchment
+mapping_version=2023.09.03-1.20.1
+mixin_version=0.8.5
+## Mod Properties
+mod_id=biomancy
+mod_name=Biomancy 2
+mod_license=MIT & CC-BY-NC-4.0
+mod_group_id=com.github.elenterius.biomancy
+mod_vendor=Elenterius
+mod_authors=\u00A72Elenterius\u00A7r, \u00A76RhinoW\u00A7r
+mod_credits=\u00A77RhinoW, The Shroome, Shorepion, Kitteh6660, ZeoMaddox, ItsLumine, RuskieThe3rd, M4rc3ll0
+mod_description=\u00A77Biopunk and Flesh Magic inspired tech-magic mod that has a fleshy art theme.
+## Dependencies
+### Geckolib Mod
+geckolib_version=4.4
+geckolib_version_range=[4.4,)
+### Modonomicon
+modonomicon_version=1.54.4
+### "Create" Mod
+create_version=0.5.1.e-22
+create_version_range=[0.5.1.e,)
+flywheel_version=0.6.10-7
+registrate_version=MC1.20-1.3.3
+### Just Enough Items (JEI) Mod
+jei_version=15.2.0.27
+jei_version_range=[15.2.0,)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
 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,10 @@ 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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 +194,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 +210,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.

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,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

mod_version.json

@@ -1,4 +1,4 @@
 {
   "major": "2",
-  "semantic": "3.1.0"
+	"semantic": "2.1.0"
 }

settings.gradle

@@ -5,4 +5,8 @@ pluginManagement {
 		maven { url = 'https://maven.parchmentmc.org' }
 		maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
 	}
+}
+
+plugins {
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }

src/generated/resources/assets/biomancy/lang/en_us.json

@@ -142,8 +142,6 @@
 	"block.biomancy.bio_forge.tooltip": "Crafting Station",
 	"block.biomancy.bio_lab": "Bio-Lab",
 	"block.biomancy.bio_lab.tooltip": "Bio-alchemical Brewer",
-	"block.biomancy.voice_box": "[PH] Modular Larynx",
-	"block.biomancy.voice_box.tooltip": "",
 	"block.biomancy.tongue": "Tongue",
 	"block.biomancy.tongue.tooltip": "Extracts up to 3 items of the same type every 24 ticks from containers it's attached to, and drops them on the ground.",
 	"block.biomancy.maw_hopper": "Maw Hopper",

src/main/resources/META-INF/mods.toml

@@ -1,52 +1,66 @@
 modLoader = "javafml"
-loaderVersion = "[43,)" #This is typically bumped every Minecraft version by Forge
-license = "MIT & CC-BY-NC-4.0"
-issueTrackerURL = "https://github.com/Elenterius/Biomancy/issues" #optional
+loaderVersion = "${loader_version_range}"
+license = "${mod_license}"
+issueTrackerURL = "https://github.com/Elenterius/Biomancy/issues"
 showAsResourcePack = false
 
 [[mods]]
-modId = "biomancy"
-version = "${file.jarVersion}"
-displayName = "Biomancy 2"
+modId = "${mod_id}"
+version = "${mod_version}"
+displayName = "${mod_name}"
 updateJSONURL = "https://api.modrinth.com/updates/uAAuyU4M/forge_updates.json"
-displayURL = "https://modrinth.com/mod/biomancy" #optional
-logoFile = "text_logo_small.png" #optional
+displayURL = "https://modrinth.com/mod/biomancy"
+logoFile = "text_logo_small.png"
 logoBlur = false
-credits = "\u00A77RhinoW, The Shroome, Shorepion, Kitteh6660, ZeoMaddox, ItsLumine, RuskieThe3rd, M4rc3ll0"
-authors = "\u00A72Elenterius\u00A7r, \u00A76RhinoW\u00A7r"
-description = '''§7Biopunk and Flesh Magic inspired tech-magic mod that has a fleshy art theme.'''
+credits = "${mod_credits}"
+authors = "${mod_authors}"
+description = '''${mod_description}'''
 
-[[dependencies.biomancy]]
-modId = "geckolib3"
+# Display Test controls the display for your mod in the server connection screen
+# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
+# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
+# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
+# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
+# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
+#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+
+[[dependencies.${ mod_id }]]
+modId = "forge"
+mandatory = true
+versionRange = "${forge_version_range}"
+ordering = "NONE"
+side = "BOTH" # BOTH, CLIENT or SERVER
+
+[[dependencies.${ mod_id }]]
+modId = "minecraft"
+mandatory = true
+versionRange = "${minecraft_version_range}"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.${ mod_id }]]
+modId = "geckolib"
 mandatory = true
-versionRange = "[3.1.39,4.0)"
+versionRange = "${geckolib_version_range}"
 ordering = "BEFORE"
 side = "BOTH"
 
-[[dependencies.biomancy]]
+[[dependencies.${ mod_id }]]
 modId = "jei"
 mandatory = false
-versionRange = "[11.5.0,)"
+versionRange = "${jei_version_range}"
 ordering = "BEFORE"
 side = "BOTH"
 
-[[dependencies.biomancy]]
+[[dependencies.${ mod_id }]]
 modId = "create"
 mandatory = false
-versionRange = "[0.5.0,)"
+versionRange = "${create_version_range}"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.biomancy]]
-modId = "forge"
-mandatory = true
-versionRange = "[43.2.0,)"
-ordering = "NONE"
-side = "BOTH" # BOTH, CLIENT or SERVER
-
-[[dependencies.biomancy]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.19.2,1.19.3)"
-ordering = "NONE"
-side = "BOTH"
+# Features are specific properties of the game environment, that you may want to declare you require. This example declares
+# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
+# stop your mod loading on the server for example.
+#[features.${mod_id}]
+#openGLVersion="[3.2,)"

src/main/resources/mixins.biomancy.json

@@ -2,7 +2,7 @@
   "required": true,
   "package": "com.github.elenterius.biomancy.mixin",
   "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.8.4",
+	"minVersion": "0.8.5",
   "refmap": "mixins.biomancy.refmap.json",
   "injectors": {
     "defaultRequire": 1

src/main/resources/pack.mcmeta

@@ -1,6 +1,8 @@
 {
-    "pack": {
-      "description": "biomancy resources",
-      "pack_format": 9
-    }
-}
+	"pack": {
+		"description": {
+			"text": "${mod_id} resources"
+		},
+		"pack_format": 15
+	}
+}