Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,4 +30,4 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: Artifacts
path: build/libs/
path: build/libs/
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
31 changes: 16 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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")
}
Expand All @@ -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 {
Expand All @@ -73,7 +75,7 @@ processResources {
}

checkstyle {
toolVersion = '12.0.1'
toolVersion = '13.4.2'
maxWarnings = 0
}

Expand Down Expand Up @@ -103,7 +105,6 @@ shadowJar {
archiveBaseName.set(rootProject.name)
archiveVersion.set(archiveVersionLabel)
archiveClassifier.set('')
relocate 'io.papermc.lib', 'shadow.io.papermc.paperlib'
minimize()
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/fr/sukikui/biomemap/BiomeMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,7 +22,6 @@ public final class BiomeMap extends JavaPlugin {

@Override
public void onEnable() {
PaperLib.suggestPaper(this);
ensureDataFolder();
saveDefaultConfig();
loadPerformanceSettings();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -87,7 +86,7 @@ public void releaseChunkPermit() {
private CompletableFuture<ChunkSnapshot> loadSnapshot(int chunkX, int chunkZ) {
chunkRequests.incrementAndGet();
CompletableFuture<ChunkSnapshot> result = new CompletableFuture<>();
PaperLib.getChunkAtAsync(world, chunkX, chunkZ, true)
world.getChunkAtAsync(chunkX, chunkZ, true)
.whenComplete((chunk, throwable) -> {
if (throwable != null) {
result.completeExceptionally(throwable);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading