diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1087875..f740543 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,18 +51,3 @@ jobs: prerelease: true name: Dev-build ${{ steps.git-version.outputs.id }} tag: dev-build - - name: Upload to Modrinth - if: ${{ github.event_name == 'push' }} - uses: RubixDev/modrinth-upload@v1.0.0 - with: - token: ${{ secrets.MODRINTH_TOKEN }} - file_path: build/libs/${{ steps.find-jar.outputs.jarname }} - name: Dev-build ${{ steps.git-version.outputs.id }} - version: ${{ steps.git-version.outputs.id }} - changelog: ${{ join(github.event.commits.*.message, '\n') }} - relations: TZOteSf2:required - game_versions: 1.7.2 - release_type: beta - loaders: velocity - featured: false - project_id: 8lKLCxRW \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7a58283..d501247 100644 --- a/build.gradle +++ b/build.gradle @@ -2,20 +2,21 @@ plugins { id("java") id("checkstyle") id("com.github.spotbugs").version("6.0.12") - id("org.cadixdev.licenser").version("0.6.1") - id("com.gradleup.shadow").version("8.3.6") +// id("org.cadixdev.licenser").version("0.6.1") + id("com.gradleup.shadow").version("9.4.1") + id("xyz.jpenilla.run-velocity") version "2.3.1" } setGroup("net.elytrium") -setVersion("1.1.7") +setVersion("1.1.8") compileJava { getOptions().setEncoding("UTF-8") } java { - setSourceCompatibility(JavaVersion.VERSION_17) - setTargetCompatibility(JavaVersion.VERSION_17) + setSourceCompatibility(JavaVersion.VERSION_21) + setTargetCompatibility(JavaVersion.VERSION_21) } repositories { @@ -47,10 +48,21 @@ shadowJar { relocate("net.elytrium.commons.kyori", "net.elytrium.limboapi.thirdparty.commons.kyori") } -license { - setHeader(file("HEADER.txt")) +tasks { + runVelocity { + velocityVersion("3.4.0-SNAPSHOT") + + downloadPlugins { + github("Elytrium", "LimboAPI", "dev-build", "limboapi-1.1.27-SNAPSHOT.jar") + + } + } } +//license { +// setHeader(file("HEADER.txt")) +//} + checkstyle { setToolVersion("10.1") setConfigFile(file("${this.getRootDir()}/config/checkstyle/checkstyle.xml")) @@ -67,7 +79,7 @@ spotbugsMain { reports { html { getRequired().set(true) - getOutputLocation().set(file("${this.getBuildDir()}/reports/spotbugs/main/spotbugs.html")) + getOutputLocation().set(file("${this.getRootDir()}/${this.DEFAULT_BUILD_DIR_NAME}/reports/spotbugs/main/spotbugs.html")) setStylesheet("fancy-hist.xsl") } } @@ -88,17 +100,23 @@ sourceSets.main.getJava().srcDir( assemble.dependsOn(shadowJar) -String getCurrentShortRevision() { - OutputStream outputStream = new ByteArrayOutputStream() - exec { - if (System.getProperty("os.name").toLowerCase().contains("win")) { - commandLine("cmd", "/c", "git rev-parse --short HEAD") - } else { - commandLine("bash", "-c", "git rev-parse --short HEAD") - } +static String getCurrentShortRevision() { + def command = System.getProperty("os.name").toLowerCase().contains("win") + ? ["cmd", "/c", "git rev-parse --short HEAD"] + : ["bash", "-c", "git rev-parse --short HEAD"] + + def process = new ProcessBuilder(command) + .redirectErrorStream(true) + .start() + + def output = process.inputStream.withStream { + it.readLines().join("\n").trim() + } - setStandardOutput(outputStream) + process.waitFor() + if (process.exitValue() != 0) { + throw new GradleException("Failed to get git revision: ${output}") } - return outputStream.toString().trim() + return output } diff --git a/gradle.properties b/gradle.properties index 1ca6632..b9153d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -limboapiVersion=1.1.26 -velocityVersion=3.4.0-SNAPSHOT -nettyVersion=4.1.114.Final -serializerVersion=1.1.1 \ No newline at end of file +limboapiVersion=1.1.27 +velocityVersion=3.5.0-SNAPSHOT +nettyVersion=4.2.12.Final +serializerVersion=1.1.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..9bbc975 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 2733ed5..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-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 1b6c787..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -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/master/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/. @@ -80,13 +82,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 -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 @@ -133,22 +133,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,11 +200,15 @@ 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, 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" \ @@ -205,6 +216,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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @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 +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,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 +43,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 +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 @@ -75,13 +78,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 diff --git a/src/main/java/net/elytrium/limboreconnect/LimboReconnect.java b/src/main/java/net/elytrium/limboreconnect/LimboReconnect.java index 6844267..6873189 100644 --- a/src/main/java/net/elytrium/limboreconnect/LimboReconnect.java +++ b/src/main/java/net/elytrium/limboreconnect/LimboReconnect.java @@ -169,6 +169,9 @@ public void reload() { new PacketMapping(0x68, ProtocolVersion.MINECRAFT_1_20_5, true), new PacketMapping(0x6f, ProtocolVersion.MINECRAFT_1_21_2, true), new PacketMapping(0x6e, ProtocolVersion.MINECRAFT_1_21_5, true), + new PacketMapping(0x6e, ProtocolVersion.MINECRAFT_1_21_7, true), + new PacketMapping(0x6f, ProtocolVersion.MINECRAFT_1_21_9, true), + new PacketMapping(0x6f, ProtocolVersion.MINECRAFT_1_21_11, true) }); this.offlineTitles.clear();