Merge remote-tracking branch 'refs/remotes/origin/master' into multi-…

…platform

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
#	README.md
#	build.gradle
#	common/src/main/java/dev/xpple/betterconfig/impl/BetterConfigInternals.java
#	fabric/src/main/resources/fabric.mod.json
#	fabric/src/testmod/java/dev/xpple/betterconfig/BlockAdapter.java
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	settings.gradle

.github/workflows/build.yml

@@ -20,13 +20,13 @@ jobs:
           21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
+        os: [ubuntu-24.04, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
           java-version: '21'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
       - name: Publish package
         run: gradle publish
         env:

README.md

@@ -101,8 +101,8 @@ Import it:
 ```groovy
 dependencies {
     // Fabric
-    include modImplementation('dev.xpple:betterconfig:${version}')
+    include modImplementation('dev.xpple:betterconfig-fabric:${betterconfig-version}')
     // Paper (also include the JAR in the plugins folder)
-    compileOnly 'dev.xpple:betterconfig:${version}'
+    compileOnly 'dev.xpple:betterconfig-paper:${betterconfig_version}'
 }
 ```

fabric/src/main/resources/fabric.mod.json

@@ -31,7 +31,7 @@
   ],
   "depends": {
     "fabricloader": ">=${fabric_loader_version}",
-    "minecraft": "1.20.x",
+    "minecraft": "1.21.x",
     "java": ">=21",
     "fabric-api": "*"
   },

fabric/src/testmod/java/dev/xpple/betterconfig/BlockAdapter.java

@@ -17,6 +17,6 @@ public void write(JsonWriter writer, Block block) throws IOException {
 
     @Override
     public Block read(JsonReader reader) throws IOException {
-        return BuiltInRegistries.BLOCK.get(new ResourceLocation(reader.nextString()));
+        return BuiltInRegistries.BLOCK.get(ResourceLocation.parse(reader.nextString()));
     }
 }

fabric/src/testmod/java/dev/xpple/betterconfig/StructureAdapter.java

@@ -17,6 +17,6 @@ public void write(JsonWriter writer, StructureType structure) throws IOException
 
     @Override
     public StructureType<?> read(JsonReader reader) throws IOException {
-        return BuiltInRegistries.STRUCTURE_TYPE.get(new ResourceLocation(reader.nextString()));
+        return BuiltInRegistries.STRUCTURE_TYPE.get(ResourceLocation.parse(reader.nextString()));
     }
 }

gradle.properties

@@ -8,13 +8,13 @@ maven_group=dev.xpple
 archives_base_name=betterconfig
 
 # Minecraft properties
-minecraft_version=1.20.6
+minecraft_version=1.21
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 # https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/
-fabric_api_version=0.98.0+1.20.6
-parchment_mappings=parchment-1.20.6:2024.05.01@zip
+fabric_api_version=0.100.1+1.21
+parchment_mappings=parchment-1.20.6:2024.06.02@zip
 fabric_loader_version=0.15.11
 
 # Paper Properties

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/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/.
@@ -145,15 +145,15 @@ 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
@@ -202,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