diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2c75055..234950f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -23,12 +23,12 @@ body: attributes: label: Console Error description: | - If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**. + If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**. If the error is small/less than 10 lines, you may put it directly into this field. There may be some additional information in ``logs/debug.log`` value: | ``` - Put the paste.gg link or text here. + Put the mclo.gs link or text here. ``` placeholder: Please do not remove the grave accents; simply replace the line of text in the middle. validations: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 36ddeb2..117f719 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -5,14 +5,15 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 + check-latest: true - name: Cache Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.gradle/ key: ${{ runner.os }}-build-aspirin-${{ hashFiles('**/build.gradle.kts') }} @@ -21,7 +22,7 @@ jobs: - name: Build with Gradle run: ./gradlew build - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifact path: build/libs/ diff --git a/build.gradle.kts b/build.gradle.kts index 58ccbfe..69e06ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,15 +9,15 @@ import java.nio.file.Files as JFiles buildscript { repositories { mavenCentral() } - dependencies { classpath("com.github.hazendaz:htmlcompressor:1.9.1") } + dependencies { classpath("com.github.hazendaz:htmlcompressor:2.0.0") } } plugins { `java-library` application - kotlin("jvm") version "1.9.10" + kotlin("jvm") version "1.9.22" id("maven-publish") - id("com.github.ben-manes.versions") version "0.47.0" + id("com.github.ben-manes.versions") version "0.50.0" id("com.github.johnrengelman.shadow") version "8.1.1" id("com.palantir.git-version") version "3.0.0" id("org.gradlewebtools.minify") version "1.3.2" apply false @@ -62,7 +62,7 @@ dependencies { val vvVer = "4.9.3-SNAPSHOT" val vbVer = "4.9.2-SNAPSHOT" - val vrVer = "3.0.5" + val vrVer = "3.0.6-SNAPSHOT" implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false } implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false } implementation("com.viaversion:viarewind-universal:$vrVer") { isTransitive = false } @@ -85,18 +85,18 @@ dependencies { implementation("org.powernukkit.fastutil:fastutil-lite:8.1.1") implementation("org.yaml:snakeyaml:2.2") - val log4jVer = "2.20.0" - val slf4jVer = "2.0.9" - implementation("com.lmax:disruptor:3.4.4") + val log4jVer = "2.22.1" + val slf4jVer = "2.0.11" + implementation("com.lmax:disruptor:4.0.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("org.apache.logging.log4j:log4j-core:$log4jVer") implementation("org.apache.logging.log4j:log4j-iostreams:$log4jVer") implementation("org.apache.logging.log4j:log4j-jul:$log4jVer") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVer") - implementation("org.jline:jline-terminal-jansi:3.23.0") + implementation("org.jline:jline-terminal-jansi:3.25.0") implementation("org.slf4j:slf4j-api:$slf4jVer") - val ktorVersion = "2.3.5" + val ktorVersion = "2.3.7" implementation("io.ktor:ktor-network-tls-certificates-jvm:$ktorVersion") implementation("io.ktor:ktor-server-websockets:$ktorVersion") implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 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 3fa8f86..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..4957490 100755 --- a/gradlew +++ b/gradlew @@ -200,7 +200,7 @@ 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"' +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, @@ -246,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 6689b85..89509c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -34,7 +34,7 @@ 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 @@ -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 @@ -89,4 +89,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file diff --git a/jitpack.yml b/jitpack.yml index 7cb4f9b..15db425 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,7 +1,4 @@ -jdk: - - temurinjdk17 before_install: - - curl -s "https://get.sdkman.io" | bash - - source "$HOME/.sdkman/bin/sdkman-init.sh" - - sdk install java 17.0.8+7-tem - - sdk use java 17.0.8+7-tem + - curl -s "https://get.sdkman.io" | bash + - source ~/.sdkman/bin/sdkman-init.sh + - sdk install java 17.0.10-tem \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index e0f5d24..ce1f5ab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } \ No newline at end of file