From 05cc5f9718b51df24f2eba147ca60cfadf206762 Mon Sep 17 00:00:00 2001 From: Sukikui Date: Sun, 24 May 2026 16:02:10 +0200 Subject: [PATCH] build: update Paper target to 26.1.2 and Java 25 --- .github/workflows/build.yml | 4 +-- .github/workflows/release.yml | 2 +- README.md | 2 +- build.gradle | 31 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/fr/sukikui/biomemap/BiomeMap.java | 2 -- .../biomemap/export/BiomeColorPalette.java | 2 +- .../export/ChunkSnapshotProvider.java | 3 +- src/main/resources/plugin.yml | 4 +-- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 282d177..796e97e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: ๐Ÿ˜ Setup Gradle uses: gradle/actions/setup-gradle@v6 @@ -30,4 +30,4 @@ jobs: uses: actions/upload-artifact@v7 with: name: Artifacts - path: build/libs/ \ No newline at end of file + path: build/libs/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89c7ce2..61441bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: ๐Ÿ˜ Setup Gradle uses: gradle/actions/setup-gradle@v6 diff --git a/README.md b/README.md index 27cb4db..25322b1 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Then it samples biomes and writes: ## ๐Ÿš€ Installation -1. Install [PaperMC server](https://papermc.io/downloads/paper) with Java 21+ +1. Install [PaperMC server](https://papermc.io/downloads/paper) with Java 25+ 2. Download the latest `biomemap-x.x.x+mcx.x.x.jar` from the [releases page](https://github.com/Sukikui/BiomeMap/releases) 3. Drop the jar into your serverโ€™s `plugins/` folder 4. Restart the server or run `/reload confirm` diff --git a/build.gradle b/build.gradle index f05b177..fc1adb9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,22 +2,26 @@ import com.github.spotbugs.snom.SpotBugsTask plugins { id 'checkstyle' - id "com.github.spotbugs" version "6.5.1" + id "com.github.spotbugs" version "6.5.5" id 'com.gradleup.shadow' version '9.4.1' id 'java' } group = "fr.sukikui.biomemap" -version = "0.1.4" +version = "0.1.5" -def paperApiVersion = '1.21.11-R0.1-SNAPSHOT' -def hyphenIndex = paperApiVersion.indexOf('-') -def minecraftVersion = hyphenIndex > 0 ? paperApiVersion.substring(0, hyphenIndex) : paperApiVersion +def minecraftVersion = '26.1.2' +def paperApiVersion = "${minecraftVersion}.build.65-stable" +def spotbugsAnnotationsVersion = '4.9.8' +def junitVersion = '6.1.0' def archiveVersionLabel = "${version}+mc${minecraftVersion}" java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } repositories { @@ -26,7 +30,6 @@ repositories { url = 'https://repo.papermc.io/repository/maven-public/' content { includeModule("io.papermc.paper", "paper-api") - includeModule("io.papermc", "paperlib") includeModule("net.md-5", "bungeecord-chat") includeGroup("io.papermc.adventure") } @@ -45,14 +48,13 @@ repositories { dependencies { compileOnly "io.papermc.paper:paper-api:${paperApiVersion}" - compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.6' - implementation 'io.papermc:paperlib:1.0.8' + compileOnly "com.github.spotbugs:spotbugs-annotations:${spotbugsAnnotationsVersion}" implementation 'com.google.code.gson:gson:2.14.0' spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0' - testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.6' + testCompileOnly "com.github.spotbugs:spotbugs-annotations:${spotbugsAnnotationsVersion}" testImplementation "io.papermc.paper:paper-api:${paperApiVersion}" - testImplementation 'org.junit.jupiter:junit-jupiter:6.0.3' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher:6.0.3' + testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitVersion}" } test { @@ -73,7 +75,7 @@ processResources { } checkstyle { - toolVersion = '12.0.1' + toolVersion = '13.4.2' maxWarnings = 0 } @@ -103,7 +105,6 @@ shadowJar { archiveBaseName.set(rootProject.name) archiveVersion.set(archiveVersionLabel) archiveClassifier.set('') - relocate 'io.papermc.lib', 'shadow.io.papermc.paperlib' minimize() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b52fb7e..df6a6ad 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-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/src/main/java/fr/sukikui/biomemap/BiomeMap.java b/src/main/java/fr/sukikui/biomemap/BiomeMap.java index d44ec4d..5262f7e 100644 --- a/src/main/java/fr/sukikui/biomemap/BiomeMap.java +++ b/src/main/java/fr/sukikui/biomemap/BiomeMap.java @@ -2,7 +2,6 @@ import fr.sukikui.biomemap.command.BiomeMapCommand; import fr.sukikui.biomemap.export.BiomeExporter; -import io.papermc.lib.PaperLib; import java.io.File; import java.util.Objects; import java.util.logging.Logger; @@ -23,7 +22,6 @@ public final class BiomeMap extends JavaPlugin { @Override public void onEnable() { - PaperLib.suggestPaper(this); ensureDataFolder(); saveDefaultConfig(); loadPerformanceSettings(); diff --git a/src/main/java/fr/sukikui/biomemap/export/BiomeColorPalette.java b/src/main/java/fr/sukikui/biomemap/export/BiomeColorPalette.java index 37c8171..5086df8 100644 --- a/src/main/java/fr/sukikui/biomemap/export/BiomeColorPalette.java +++ b/src/main/java/fr/sukikui/biomemap/export/BiomeColorPalette.java @@ -6,7 +6,7 @@ import java.util.Map; /** - * Color palette for vanilla biome ids (Minecraft 1.21.11) used by preview rendering. + * Color palette for vanilla biome ids (Minecraft 26.1.2) used by preview rendering. */ public final class BiomeColorPalette { diff --git a/src/main/java/fr/sukikui/biomemap/export/ChunkSnapshotProvider.java b/src/main/java/fr/sukikui/biomemap/export/ChunkSnapshotProvider.java index 915f874..e25e3a0 100644 --- a/src/main/java/fr/sukikui/biomemap/export/ChunkSnapshotProvider.java +++ b/src/main/java/fr/sukikui/biomemap/export/ChunkSnapshotProvider.java @@ -1,7 +1,6 @@ package fr.sukikui.biomemap.export; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.papermc.lib.PaperLib; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -87,7 +86,7 @@ public void releaseChunkPermit() { private CompletableFuture loadSnapshot(int chunkX, int chunkZ) { chunkRequests.incrementAndGet(); CompletableFuture result = new CompletableFuture<>(); - PaperLib.getChunkAtAsync(world, chunkX, chunkZ, true) + world.getChunkAtAsync(chunkX, chunkZ, true) .whenComplete((chunk, throwable) -> { if (throwable != null) { result.completeExceptionally(throwable); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ff34b07..7769485 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,8 +2,8 @@ main: ${PACKAGE}.${NAME} name: ${NAME} version: "${VERSION}" api-version: "${API_VERSION}" -author: AUTHOR -description: DESCRIPTION +author: ${AUTHOR} +description: "${DESCRIPTION}" commands: biomemap: description: Export dominant biomes to JSON/PNG, check status, and stop the current export.