diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8820780..9c706de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,27 +21,25 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6.0.2 with: fetch-depth: 0 - - uses: gradle/actions/wrapper-validation@v3 - - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.2.0 with: distribution: 'microsoft' - java-version: '21' + java-version: '25' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v6.0.1 with: cache-read-only: ${{ github.ref != 'refs/heads/main' }} - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7.0.0 with: name: dist path: build/libs/ @@ -58,7 +56,7 @@ jobs: # Auto-Release when pushed to main - name: Release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v2.6.1 if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' with: tag_name: v${{ steps.get_version.outputs.version }} diff --git a/build.gradle b/build.gradle index 363ff42..c27d7dd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,8 @@ - plugins { id 'maven-publish' id 'net.neoforged.gradleutils' id 'net.neoforged.moddev' - id 'io.github.goooler.shadow' + id 'com.gradleup.shadow' } gradleutils { @@ -19,7 +18,6 @@ gradleutils { } version = gradleutils.version.toString() - group = 'net.forgecraft.serverpacklocator' sourceSets { @@ -29,6 +27,7 @@ sourceSets { neoForge { version = project.neoforgeVersion accessTransformers.from("src/utilmod/resources/META-INF/accesstransformer.cfg") + validateAccessTransformers = true mods { spl { @@ -80,7 +79,7 @@ def copyUtilMod = tasks.register("copyUtilMod", Copy) { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } withSourcesJar() } @@ -105,12 +104,15 @@ shadowJar { } dependencies { - shadow("io.netty:netty-codec-http:4.1.118.Final") { + shadow("io.netty:netty-codec-http:4.2.7.Final") { transitive = false } shadow("com.electronwill.night-config:json:3.8.3") { transitive = false } + implementation("com.electronwill.night-config:json:3.8.3") { + transitive = false + } utilmodCompileOnly sourceSets.main.output runtimeOnly sourceSets.utilmod.output diff --git a/gradle.properties b/gradle.properties index 02fde53..b441ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,7 @@ +org.gradle.jvmargs=-Xmx4G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=false -neoforgeVersion=21.8.47 - -neoForge.parchment.minecraftVersion=1.21.8 -neoForge.parchment.mappingsVersion=2025.07.18 +neoforgeVersion=26.1.0.18-beta \ No newline at end of file diff --git a/gradle/daemon-jvm.properties b/gradle/daemon-jvm.properties deleted file mode 100644 index ebc8101..0000000 --- a/gradle/daemon-jvm.properties +++ /dev/null @@ -1,3 +0,0 @@ - -#This file is generated by updateDaemonJvm -toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..d997cfc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2617362..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..739907d 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# 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». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/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/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$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"' +# This is normally unused +# 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 -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" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the 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. + JAVACMD=java + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - 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=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 fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,93 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -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. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/settings.gradle b/settings.gradle index 16cd92a..98ff81b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,19 +1,18 @@ - pluginManagement { plugins { id 'com.diffplug.spotless' version '6.25.0' - id 'io.github.goooler.shadow' version '8.1.8' + id 'com.gradleup.shadow' version '9.4.1' id 'de.undercouch.download' version '5.6.0' // https://projects.neoforged.net/neoforged/ModDevGradle - id 'net.neoforged.moddev' version '2.0.103' - id 'net.neoforged.moddev.repositories' version '2.0.103' + id 'net.neoforged.moddev' version '2.0.141' + id 'net.neoforged.moddev.repositories' version '2.0.141' id 'net.neoforged.gradleutils' version '3.0.0' } } plugins { id 'net.neoforged.moddev.repositories' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } dependencyResolutionManagement { @@ -23,17 +22,6 @@ dependencyResolutionManagement { repositories { mavenCentral() } - - repositories { - maven { - name 'Maven for PR #2039' // https://github.com/neoforged/NeoForge/pull/2039 - url 'https://prmaven.neoforged.net/NeoForge/pr2039' - content { - includeModule('net.neoforged', 'neoforge') - includeModule('net.neoforged', 'testframework') - } - } - } } rootProject.name = 'serverpacklocator' diff --git a/src/main/java/net/forgecraft/serverpacklocator/LaunchEnvironmentHandler.java b/src/main/java/net/forgecraft/serverpacklocator/LaunchEnvironmentHandler.java deleted file mode 100644 index 2260ef4..0000000 --- a/src/main/java/net/forgecraft/serverpacklocator/LaunchEnvironmentHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.forgecraft.serverpacklocator; - -import cpw.mods.modlauncher.Environment; -import cpw.mods.modlauncher.Launcher; -import cpw.mods.modlauncher.api.IEnvironment; -import cpw.mods.modlauncher.api.TypesafeMap; -import net.neoforged.api.distmarker.Dist; - -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Optional; -import java.util.function.Supplier; - -@SuppressWarnings("OptionalUsedAsFieldOrParameterType") -public class LaunchEnvironmentHandler { - public static final LaunchEnvironmentHandler INSTANCE = new LaunchEnvironmentHandler(); - private final Optional environment; - - private LaunchEnvironmentHandler() { - environment = Optional.ofNullable(Launcher.INSTANCE).map(Launcher::environment); - } - - private Optional getValue(final Supplier> key) { - return environment.flatMap(e -> e.getProperty(key.get())); - } - - Path getGameDir() { - return getValue(IEnvironment.Keys.GAMEDIR).orElseGet(()-> Paths.get(".")); - } - - public String getUUID() { - return getValue(IEnvironment.Keys.UUID).orElse(""); - } - - public Dist getDist() { - return getValue(net.neoforged.neoforgespi.Environment.Keys.DIST).orElse(Dist.CLIENT); - } - - public void addProgressMessage(String message) { - getValue(net.neoforged.neoforgespi.Environment.Keys.PROGRESSMESSAGE).ifPresent(pm->pm.accept(message)); - } -} diff --git a/src/main/java/net/forgecraft/serverpacklocator/PackLocator.java b/src/main/java/net/forgecraft/serverpacklocator/PackLocator.java index 7892163..d825781 100644 --- a/src/main/java/net/forgecraft/serverpacklocator/PackLocator.java +++ b/src/main/java/net/forgecraft/serverpacklocator/PackLocator.java @@ -1,10 +1,17 @@ package net.forgecraft.serverpacklocator; +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.ConnectException; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; +import java.util.List; import net.forgecraft.serverpacklocator.client.ClientSidedPackHandler; import net.forgecraft.serverpacklocator.server.ServerSidedPackHandler; import net.neoforged.fml.ModLoadingIssue; +import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.fml.loading.FMLPaths; -import net.neoforged.neoforgespi.Environment; import net.neoforged.neoforgespi.ILaunchContext; import net.neoforged.neoforgespi.locating.IDiscoveryPipeline; import net.neoforged.neoforgespi.locating.IModFileCandidateLocator; @@ -13,14 +20,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.File; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.net.ConnectException; -import java.nio.file.Files; -import java.nio.file.StandardCopyOption; -import java.util.List; - public class PackLocator implements IModFileCandidateLocator { private static final Logger LOGGER = LogManager.getLogger(); @@ -28,7 +27,7 @@ public class PackLocator implements IModFileCandidateLocator { public void findCandidates(ILaunchContext launchContext, IDiscoveryPipeline pipeline) { LOGGER.info("Loading server pack locator"); - var dist = Environment.get().getDist(); + var dist = FMLEnvironment.getDist(); var gameDir = FMLPaths.GAMEDIR.get(); var splDirectory = gameDir.resolve("spl"); var configFile = splDirectory.resolve("config.toml"); diff --git a/src/main/java/net/forgecraft/serverpacklocator/secure/ProfileKeyPairBasedSecurityManager.java b/src/main/java/net/forgecraft/serverpacklocator/secure/ProfileKeyPairBasedSecurityManager.java index d6e13eb..fd4407c 100644 --- a/src/main/java/net/forgecraft/serverpacklocator/secure/ProfileKeyPairBasedSecurityManager.java +++ b/src/main/java/net/forgecraft/serverpacklocator/secure/ProfileKeyPairBasedSecurityManager.java @@ -8,19 +8,10 @@ import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.authlib.yggdrasil.response.KeyPairResponse; import com.mojang.logging.LogUtils; -import cpw.mods.modlauncher.ArgumentHandler; -import cpw.mods.modlauncher.Launcher; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponse; -import net.forgecraft.serverpacklocator.LaunchEnvironmentHandler; -import net.forgecraft.serverpacklocator.utils.NonceUtils; -import net.neoforged.api.distmarker.Dist; -import org.slf4j.Logger; - -import javax.annotation.Nullable; -import java.lang.reflect.Field; import java.net.Proxy; import java.net.http.HttpRequest; import java.nio.ByteBuffer; @@ -36,6 +27,13 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nullable; +import net.forgecraft.serverpacklocator.utils.NonceUtils; +import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLLoader; +import net.neoforged.fml.loading.ProgramArgs; +import net.neoforged.fml.loading.progress.StartupNotificationManager; +import org.slf4j.Logger; public final class ProfileKeyPairBasedSecurityManager implements IConnectionSecurityManager { @@ -57,55 +55,22 @@ public ProfileKeyPairBasedSecurityManager() { validator = getSignatureValidator(); } - private static ArgumentHandler getArgumentHandler() { - try { - final Field argumentHandlerField = Launcher.class.getDeclaredField("argumentHandler"); - argumentHandlerField.setAccessible(true); - return (ArgumentHandler) argumentHandlerField.get(Launcher.INSTANCE); - } - catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) - { - throw new RuntimeException("Failed to get the argument handler used to start the system", e); - } - } - - private static String[] getLaunchArguments() { - final ArgumentHandler argumentHandler = getArgumentHandler(); - try { - final Field argsArrayField = ArgumentHandler.class.getDeclaredField("args"); - argsArrayField.setAccessible(true); - return (String[]) argsArrayField.get(argumentHandler); - } - catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) - { - throw new RuntimeException("Failed to get the launch arguments used to start the system", e); - } + private static ProgramArgs getLaunchArguments() { + return FMLLoader.getCurrent().getProgramArgs(); } - private static String getAccessToken() { - final String[] arguments = getLaunchArguments(); - for (int i = 0; i < arguments.length; i++) - { - final String arg = arguments[i]; - if (Objects.equals(arg, "--accessToken")) { - return arguments[i+1]; - } - } - - return ""; + private static @Nullable String getAccessToken() { + return getLaunchArguments().get("accessToken"); } private static UUID getSessionId() { - final String[] arguments = getLaunchArguments(); - for (int i = 0; i < arguments.length; i++) - { - final String arg = arguments[i]; - if (Objects.equals(arg, "--uuid")) { - return UUID.fromString(arguments[i+1].replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5")); - } + final String uuid = getLaunchArguments().get("uuid"); + + if(uuid == null || uuid.isBlank()) { + return DEFAULT_NILL_UUID; } - return DEFAULT_NILL_UUID; + return UUID.fromString(uuid.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5")); } private static YggdrasilAuthenticationService getAuthenticationService() { @@ -115,7 +80,7 @@ private static YggdrasilAuthenticationService getAuthenticationService() { private static UserApiService getApiService() { final String accessToken = getAccessToken(); final YggdrasilAuthenticationService authenticationService = getAuthenticationService(); - if (accessToken.isBlank()) + if (accessToken == null || accessToken.isBlank()) return UserApiService.OFFLINE; return authenticationService.createUserApiService(accessToken); @@ -459,11 +424,10 @@ private SigningHandler(ProfileKeyPair keyPair) @Nullable @Override public String getUnavailabilityReason() { - if (LaunchEnvironmentHandler.INSTANCE.getDist() == Dist.CLIENT) { - final String uuid = LaunchEnvironmentHandler.INSTANCE.getUUID(); - if (uuid == null || uuid.isEmpty()) { + if (FMLEnvironment.getDist().isClient()) { + if (sessionId.equals(DEFAULT_NILL_UUID)) { // invalid UUID - probably offline mode. not supported - LaunchEnvironmentHandler.INSTANCE.addProgressMessage("NO UUID found. Offline mode does not work. No server mods will be downloaded"); + StartupNotificationManager.locatorConsumer().ifPresent(pm -> pm.accept("NO UUID found. Offline mode does not work. No server mods will be downloaded")); return "There was not a valid UUID present in this client launch. You are probably playing offline mode. Trivially, there is nothing for us to do."; } } diff --git a/src/utilmod/java/net/forgecraft/serverpackutility/UtilityMod.java b/src/utilmod/java/net/forgecraft/serverpackutility/UtilityMod.java index 3133cd0..9851364 100644 --- a/src/utilmod/java/net/forgecraft/serverpackutility/UtilityMod.java +++ b/src/utilmod/java/net/forgecraft/serverpackutility/UtilityMod.java @@ -5,8 +5,8 @@ package net.forgecraft.serverpackutility; -import com.mojang.authlib.GameProfile; import net.forgecraft.serverpacklocator.ModAccessor; +import net.minecraft.server.players.NameAndId; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.server.ServerStartedEvent; @@ -29,7 +29,7 @@ private void onServerStart(ServerStartedEvent startedEvent) { var server = startedEvent.getServer(); ModAccessor.setAllowListStrategy(uuid -> server.submit(() -> { if (server.getPlayerList().isUsingWhitelist()) { - return server.getPlayerList().getWhiteList().isWhiteListed(new GameProfile(uuid, "")); //Name does not matter + return server.getPlayerList().getWhiteList().isWhiteListed(new NameAndId(uuid, "")); //Name does not matter } else { return true; } diff --git a/src/utilmod/resources/META-INF/accesstransformer.cfg b/src/utilmod/resources/META-INF/accesstransformer.cfg index 02c2862..623c0ef 100644 --- a/src/utilmod/resources/META-INF/accesstransformer.cfg +++ b/src/utilmod/resources/META-INF/accesstransformer.cfg @@ -1 +1,2 @@ -public net.minecraft.client.Minecraft$GameLoadCookie \ No newline at end of file +public net.minecraft.client.Minecraft$GameLoadCookie +public net.minecraft.client.Minecraft$GameLoadCookie (Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V \ No newline at end of file