diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39fc83d..c671179 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,27 +3,21 @@ on: [pull_request, push, workflow_dispatch] jobs: build: - strategy: - matrix: - java: ["8"] - os: ["ubuntu-22.04"] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-22.04 steps: - - name: Checkout the repository - uses: actions/checkout@v3 - - name: Validate Gradle wrapper + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Setup JDK ${{ matrix.java }} + - name: Set up JDK 8 uses: actions/setup-java@v3 with: - java-version: ${{ matrix.java }} + java-version: 8 distribution: 'temurin' - - name: Make Gradle wrapper runnable on Unix - run: chmod +x ./gradlew - - name: Build + check-latest: true + - name: Build with Gradle run: ./gradlew shadowJar - name: Upload Build Artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '8' }} uses: actions/upload-artifact@v3 with: name: ViaForge All-in-One diff --git a/.gitignore b/.gitignore index 12f8644..7e03583 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -# eclipse +# Eclipse + bin *.launch .settings @@ -6,18 +7,18 @@ bin .classpath .project -# idea +# Idea out *.ipr *.iws *.iml .idea -# gradle +# Gradle build .gradle -# other +# Others eclipse run diff --git a/README.md b/README.md index dc2bcb0..fff85f7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Client-side Implementation of ViaVersion, ViaBackwards and ViaRewind for Legacy ## Contact If you encounter any issues, please report them on the -[issue tracker](https://github.com/FlorianMichael/ViaForge/issues). +[issue tracker](https://github.com/ViaVersion/ViaForge/issues). If you just want to talk or need help with ViaForge feel free to join the ViaVersion [Discord](https://discord.gg/viaversion). diff --git a/build.gradle b/build.gradle index d46d67c..6a73cd3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "com.github.johnrengelman.shadow" version "7.0.0" + id "com.github.johnrengelman.shadow" version "7.1.2" } subprojects { diff --git a/gradle.properties b/gradle.properties index d009319..c9b72eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ # Gradle Properties -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx3G -XX:+UseG1GC org.gradle.daemon=false # Project Details maven_name=viaforge -maven_version=3.4.3 +maven_version=3.4.4 maven_group=de.florianmichael # ViaVersion -vialoader_version=2.2.9 -viaversion_version=4.8.0 -viabackwards_version=4.8.0 -viarewind_version=3.0.0 -snake_yml_version=2.0 +vialoader_version=2.2.11-SNAPSHOT +viaversion_version=4.9.0-23w42a-SNAPSHOT +viabackwards_version=4.9.0-23w42a-SNAPSHOT +viarewind_version=3.0.3-SNAPSHOT +snake_yml_version=2.2 # Misc Libraries -slf4j_version=2.0.7 -mixin_version=0.8.3 +slf4j_version=2.0.9 +mixin_version=0.8.5 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..62d4c05 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 a0f7639..f598e91 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index c53aefa..4957490 100755 --- a/gradlew +++ b/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,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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,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 +198,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='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' + +# 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" \ @@ -205,6 +214,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. @@ -231,4 +246,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 107acd3..d449684 100755 --- a/gradlew.bat +++ b/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% @@ -33,14 +34,14 @@ set APP_HOME=%DIRNAME% 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" +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-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%" == "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,15 +76,17 @@ 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 -:omega +:omega \ No newline at end of file diff --git a/viaforge-mc112/build.gradle b/viaforge-mc112/build.gradle index 7aff85a..5dad8a0 100644 --- a/viaforge-mc112/build.gradle +++ b/viaforge-mc112/build.gradle @@ -1,5 +1,5 @@ plugins { - id "net.minecraftforge.gradle" version "5.1.+" + id "net.minecraftforge.gradle" version "5.+" id "org.spongepowered.mixin" version "0.7-SNAPSHOT" } @@ -36,7 +36,7 @@ sourceSets.main.resources { } dependencies { - minecraft "net.minecraftforge:forge:1.12.2-14.23.5.2859" + minecraft "net.minecraftforge:forge:1.12.2-14.23.5.2860" include "org.spongepowered:mixin:${mixin_version}" include "org.slf4j:slf4j-api:${project.slf4j_version}" diff --git a/viaforge-mc116/build.gradle b/viaforge-mc116/build.gradle index be5065b..375e1e5 100644 --- a/viaforge-mc116/build.gradle +++ b/viaforge-mc116/build.gradle @@ -1,5 +1,5 @@ plugins { - id "net.minecraftforge.gradle" version "5.1.+" + id "net.minecraftforge.gradle" version "5.+" id "org.spongepowered.mixin" version "0.7-SNAPSHOT" } @@ -36,7 +36,7 @@ sourceSets.main.resources { } dependencies { - minecraft "net.minecraftforge:forge:1.16.5-36.2.34" + minecraft "net.minecraftforge:forge:1.16.5-36.2.39" include "org.spongepowered:mixin:${mixin_version}" include "org.slf4j:slf4j-api:${project.slf4j_version}" diff --git a/viaforge-mc116/src/main/resources/pack.mcmeta b/viaforge-mc116/src/main/resources/pack.mcmeta index efafd46..646ce57 100644 --- a/viaforge-mc116/src/main/resources/pack.mcmeta +++ b/viaforge-mc116/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "ViaForge", - "pack_format": 3 + "pack_format": 6 } }