Update dependencies

Signed-off-by: Lilly Rose Berner <[email protected]>

Author: LostLuma

build.gradle

@@ -25,10 +25,7 @@ ploceus {
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-	mappings loom.layered {
-		mappings "net.ornithemc:feather:${project.feather_version}:v2"
-		addLayer ploceus.nestedMappings() // Required for nests
-	}
+	mappings "net.ornithemc:feather:${project.feather_version}:v2"
 
 	nests "net.ornithemc:nests:${project.nests_version}"
 	modImplementation libs.quilt.loader

gradle/libs.versions.toml

@@ -2,14 +2,14 @@
 osl = "0.12.1"
 
 gson = "2.10.1"
-quilt_loader = "0.24.0-beta.8"
+quilt_loader = "0.28.1"
 
 [libraries]
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
 
 [plugins]
-ploceus = { id = "ploceus", version = "1.3.19" }
-quilt_loom = { id = "org.quiltmc.loom", version = "1.3.4" }
+ploceus = { id = "ploceus", version = "1.8.10" }
+quilt_loom = { id = "org.quiltmc.loom", version = "1.8.5" }
 
-shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+shadow = { id = "com.gradleup.shadow", version = "9.0.0-beta11" }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,15 +147,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 +204,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

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,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 +59,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
 

gradlew.bat

@@ -31,7 +31,7 @@
             },
             {
                 "id": "quilt_loader",
-                "versions": ">=0.24.0-beta.8"
+                "versions": ">=0.28.1"
             },
             {
                 "id": "server_stats_mixins",

src/main/resources/quilt.mod.json

@@ -25,10 +25,7 @@ ploceus {
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-	mappings loom.layered {
-		mappings "net.ornithemc:feather:${project.feather_version}:v2"
-		addLayer ploceus.nestedMappings() // Required for nests
-	}
+	mappings "net.ornithemc:feather:${project.feather_version}:v2"
 
 	nests "net.ornithemc:nests:${project.nests_version}"
 	modImplementation libs.quilt.loader

versions/1.0.0-beta.1.5.0-to-1.0.0-beta.1.5.2-server/build.gradle

@@ -27,10 +27,7 @@ ploceus {
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-	mappings loom.layered {
-		mappings "net.ornithemc:feather:${project.feather_version}:v2"
-		addLayer ploceus.nestedMappings() // Required for nests
-	}
+	mappings "net.ornithemc:feather:${project.feather_version}:v2"
 
 	nests "net.ornithemc:nests:${project.nests_version}"
 	modImplementation libs.quilt.loader

versions/1.0.0-beta.1.5.0-to-1.0.0-beta.1.7.3-client/build.gradle

@@ -25,10 +25,7 @@ ploceus {
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-	mappings loom.layered {
-		mappings "net.ornithemc:feather:${project.feather_version}:v2"
-		addLayer ploceus.nestedMappings() // Required for nests
-	}
+	mappings "net.ornithemc:feather:${project.feather_version}:v2"
 
 	nests "net.ornithemc:nests:${project.nests_version}"
 	modImplementation libs.quilt.loader