diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f640c9605..dae1e0bc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,17 +15,16 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: 21 + java-version: 25 distribution: 'temurin' - name: Gradle build @@ -38,7 +37,8 @@ jobs: - name: Upload JAR if: ${{ github.event_name != 'pull_request'}} - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: vane-${{ matrix.project }}-${{ env.git_hash }}.jar path: target/vane-${{ matrix.project }}-*.jar + archive: false diff --git a/.github/workflows/lint-commit.yml b/.github/workflows/lint-commit.yml index bc7e6c884..0b9949eea 100644 --- a/.github/workflows/lint-commit.yml +++ b/.github/workflows/lint-commit.yml @@ -12,13 +12,13 @@ jobs: if: always() && github.repository == 'oddlama/vane' steps: - - uses: actions/checkout@v6.0.1 + - uses: actions/checkout@v6 with: fetch-depth: 0 persist-credentials: false ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-node@v6.1.0 + - uses: actions/setup-node@v6 with: node-version: 24 - run: | diff --git a/build.gradle.kts b/build.gradle.kts index 2ce47f6a4..0436be978 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) + toolchain.languageVersion.set(JavaLanguageVersion.of(25)) } // We don't need to generate an empty `vane.jar` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1115505c..f87b46b62 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,30 @@ [versions] -paper = "1.21.11-R0.1-SNAPSHOT" -bstats = "3.1.0" +paper = "26.1.2.build.+" +bstats = "3.2.1" [libraries] -annotations = {group = "org.jetbrains", name = "annotations", version = "26.0.2-1"} +annotations = {group = "org.jetbrains", name = "annotations", version = "26.1.0"} reflections = {group = "org.reflections", name = "reflections", version = "0.10.2"} commonsLang = {group = "org.apache.commons", name = "commons-lang3", version = "3.20.0"} commonsText = {group = "org.apache.commons", name = "commons-text", version = "1.15.0"} -json = {group = "org.json", name = "json", version = "20250517"} -slf4j = {group = "org.slf4j", name = "slf4j-api", version = "2.0.17"} -nightConfig = {group = "com.electronwill.night-config", name = "toml", version = "3.8.3"} +json = {group = "org.json", name = "json", version = "20251224"} +slf4j = {group = "org.slf4j", name = "slf4j-api", version = "2.0.18"} +nightConfig = {group = "com.electronwill.night-config", name = "toml", version = "3.8.4"} # Minecraft bstatsBase = {group = "org.bstats", name = "bstats-base", version.ref = "bstats"} bstatsBukkit = {group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats"} bstatsVelocity = {group = "org.bstats", name = "bstats-velocity", version.ref = "bstats"} vault = {group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7.1"} -velocity = {group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT"} -packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.11.1"} +velocity = {group = "com.velocitypowered", name = "velocity-api", version = "3.5.0-SNAPSHOT"} +packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.12.1"} # maps -dynmap = {group = "us.dynmap", name = "DynmapCoreAPI", version = "3.7-beta-6"} -bluemap = {group = "de.bluecolored", name = "bluemap-api", version = "2.7.7"} +dynmap = {group = "us.dynmap", name = "DynmapCoreAPI", version = "3.8"} +bluemap = {group = "de.bluecolored", name = "bluemap-api", version = "2.7.8"} [plugins] -paperweightUserdev = {id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.19"} +paperweightUserdev = {id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.+"} runPaper = {id = "xyz.jpenilla.run-paper", version = "3.0.2"} shadow = {id = "com.gradleup.shadow", version = "9.3.0"} blossom = {id = "net.kyori.blossom", version = "2.2.0"} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee312..b1b8ef56b 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 23449a2b5..df6a6ad76 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index adff685a0..b9bb139f7 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. diff --git a/gradlew.bat b/gradlew.bat index e509b2dd8..aa5f10b06 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @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" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -: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 +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/vane-core/src/main/resources/resource_pack/pack.mcmeta b/vane-core/src/main/resources/resource_pack/pack.mcmeta index 1617cf71b..6bb216b4a 100644 --- a/vane-core/src/main/resources/resource_pack/pack.mcmeta +++ b/vane-core/src/main/resources/resource_pack/pack.mcmeta @@ -2,6 +2,6 @@ "pack": { "description": "Vane plugin resource pack", "min_format": 69, - "max_format": 75 + "max_format": 84 } } diff --git a/vane-proxy-core/build.gradle.kts b/vane-proxy-core/build.gradle.kts index 007c0337c..df1a0326e 100644 --- a/vane-proxy-core/build.gradle.kts +++ b/vane-proxy-core/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } diff --git a/vane-velocity/build.gradle.kts b/vane-velocity/build.gradle.kts index 245f46a6f..bcbc91518 100644 --- a/vane-velocity/build.gradle.kts +++ b/vane-velocity/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } }