Minecraft 26.1

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
           cache: 'gradle'
       - name: Tests
         run: ./gradlew spotlessCheck test --stacktrace
@@ -44,7 +44,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
           cache: 'gradle'
       - name: Build with Gradle
         run: ./gradlew release --stacktrace

buildSrc/src/main/kotlin/bluemap.java.gradle.kts

@@ -5,6 +5,22 @@ plugins {
     id ( "com.diffplug.spotless" )
 }
 
+var libs = project.extensions.getByType(VersionCatalogsExtension::class).named("libs")
+
+dependencies {
+    compileOnly ( libs.findLibrary("jetbrains-annotations").get() )
+    compileOnly ( libs.findLibrary("lombok").get() )
+
+    annotationProcessor ( libs.findLibrary("lombok").get() )
+
+    testImplementation( platform(libs.findLibrary("junit-bom").get()) )
+    testImplementation( libs.findBundle("junit-jupiter").get() )
+    testAnnotationProcessor ( libs.findLibrary("lombok").get() )
+
+    testRuntimeOnly( libs.findBundle("junit-runtime").get() )
+    testRuntimeOnly ( libs.findLibrary("lombok").get() )
+}
+
 tasks.withType(JavaCompile::class).configureEach {
     options.encoding = "utf-8"
 }
@@ -15,7 +31,7 @@ tasks.withType(AbstractArchiveTask::class).configureEach {
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    toolchain.languageVersion = JavaLanguageVersion.of(25)
     withSourcesJar()
     withJavadocJar()
 }

common/build.gradle.kts

@@ -14,17 +14,6 @@ dependencies {
 
     compileOnly ( libs.bluecommands.brigadier )
     compileOnly ( libs.brigadier )
-
-    compileOnly ( libs.jetbrains.annotations )
-    compileOnly ( libs.lombok )
-
-    annotationProcessor ( libs.lombok )
-
-    // tests
-    testImplementation ( libs.junit.core )
-    testRuntimeOnly ( libs.junit.engine )
-    testRuntimeOnly ( libs.lombok )
-    testAnnotationProcessor ( libs.lombok )
 }
 
 node {

core/build.gradle.kts

@@ -12,17 +12,6 @@ dependencies {
     api ( libs.configurate.hocon )
     api ( libs.configurate.gson )
     api ( libs.lz4 )
-
-    compileOnly ( libs.jetbrains.annotations )
-    compileOnly ( libs.lombok )
-
-    annotationProcessor ( libs.lombok )
-
-    // tests
-    testImplementation ( libs.junit.core )
-    testRuntimeOnly ( libs.junit.engine )
-    testRuntimeOnly ( libs.lombok )
-    testAnnotationProcessor ( libs.lombok )
 }
 
 tasks.register("zipResourceExtensions", type = Zip::class) {

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ adventure = "4.23.0"
 bluecommands = "1.3.4"
 bstats = "2.2.1"
 configurate = "4.1.2"
-junit = "5.8.2"
+junit = "6.1.0-M1"
 spongegradle = "2.2.0"
 
 [libraries]
@@ -27,20 +27,28 @@ flow-math = { module = "com.flowpowered:flow-math", version = "1.0.3" }
 gson = { module = "com.google.code.gson:gson", version = "2.8.9" }
 guava = { module = "com.google.guava:guava", version = "33.3.0-jre" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
-junit-core = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
-lombok = { module = "org.projectlombok:lombok", version = "1.18.32" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+lombok = { module = "org.projectlombok:lombok", version = "1.18.42" }
 lz4 = { module = "at.yawk.lz4:lz4-java", version = "1.8.1" }
 
 [plugins]
 cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.4.0" }
 forgegradle = { id = "net.minecraftforge.gradle", version = "[6.0.24,6.2)" }
 hangar = { id = "io.papermc.hangar-publish-plugin", version = "0.1.2" }
-loom = { id = "fabric-loom", version = "1.13-SNAPSHOT" }
+loom = { id = "net.fabricmc.fabric-loom", version = "1.15-SNAPSHOT" }
 minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
 node-gradle = { id = "com.github.node-gradle.node", version = "7.0.2" }
 neoforge-gradle = { id = "net.neoforged.moddev", version = "2.0.107" }
 shadow = { id = "com.gradleup.shadow", version = "9.1.0" }
 sponge-plugin = { id = "org.spongepowered.gradle.plugin", version.ref = "spongegradle" }
 sponge-ore = { id = "org.spongepowered.gradle.ore", version.ref = "spongegradle" }
-spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+
+[bundles]
+junit-runtime = [ "junit-platform-launcher", "junit-vintage-engine", "junit-jupiter-engine" ]
+junit-jupiter = [ "junit-jupiter", "junit-jupiter-api" ]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

implementations/fabric/build.gradle.kts

@@ -1,5 +1,4 @@
 import com.matthewprenger.cursegradle.CurseRelation
-import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     bluemap.implementation
@@ -9,13 +8,13 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.11"
+    "26.1-snapshot-11"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val yarnMappings = "${minecraftVersion}+build.1"
-val fabricLoaderVersion = "0.18.2"
-val fabricApiVersion = "0.139.4+${minecraftVersion}"
+val fabricLoaderVersion = "0.18.4"
+//val fabricApiVersion = "0.143.11+${minecraftVersion}"
+val fabricApiVersion = "0.143.11+26.1"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)
@@ -27,10 +26,9 @@ dependencies {
     }
 
     minecraft ("com.mojang:minecraft:${minecraftVersion}")
-    mappings ("net.fabricmc:yarn:${yarnMappings}")
-    modImplementation ("net.fabricmc:fabric-loader:${fabricLoaderVersion}")
-    modImplementation ("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion}")
-    modImplementation ( libs.fabric.permissions )
+    implementation ("net.fabricmc:fabric-loader:${fabricLoaderVersion}")
+    implementation ("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion}")
+    implementation ( libs.fabric.permissions )
 
     shadowInclude ( libs.bluecommands.brigadier ) {
         exclude ( group = "com.mojang", module = "brigadier" )
@@ -85,7 +83,8 @@ tasks.withType(ProcessResources::class).configureEach {
     val replacements = mapOf(
         "version" to project.version,
         "fabric_loader_version" to fabricLoaderVersion,
-        "minecraft_version" to minecraftVersion,
+        "minecraft_version" to "26.1-alpha.11",
+        //"minecraft_version" to minecraftVersion,
         "java_version" to java.toolchain.languageVersion.get()
     )
     inputs.properties(replacements)
@@ -94,16 +93,25 @@ tasks.withType(ProcessResources::class).configureEach {
     )) { expand(replacements) }
 }
 
-val remappedShadowJar = tasks.register("remappedShadowJar", type = RemapJarTask::class) {
-    dependsOn (tasks.shadowJar)
-    archiveFileName = "${project.name}-${project.version}-shadow-remapped.jar"
-    inputFile = tasks.shadowJar.flatMap { it.archiveFile }
-    addNestedDependencies = true
+val mergeShadowAndJarJar = tasks.register<Jar>("mergeShadowAndJarJar") {
+    dependsOn( tasks.shadowJar, tasks.jar )
+    from (
+        zipTree( tasks.shadowJar.map { it.outputs.files.singleFile } ).matching {
+            exclude("fabric.mod.json")
+        },
+        zipTree( tasks.jar.map { it.outputs.files.singleFile } ).matching {
+            include("META-INF/jars/**")
+            include("fabric.mod.json")
+        }
+    ).exclude(
+        "META-INF/services/net.kyori.adventure*" // not correctly relocated and not needed -> exclude
+    )
+    archiveFileName = "${project.name}-${project.version}-merged.jar"
 }
 
 tasks.getByName<CopyFileTask>("release") {
-    dependsOn(remappedShadowJar)
-    inputFile = remappedShadowJar.flatMap { it.archiveFile }
+    dependsOn(mergeShadowAndJarJar)
+    inputFile = mergeShadowAndJarJar.flatMap { it.archiveFile }
 }
 
 modrinth {

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java

@@ -30,25 +30,19 @@
 import de.bluecolored.bluemap.common.commands.TextFormat;
 import de.bluecolored.bluemap.common.serverinterface.CommandSource;
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
-import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.minecraft.command.DefaultPermissions;
-import net.minecraft.command.permission.Permission;
-import net.minecraft.command.permission.PermissionLevel;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.text.TextCodecs;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.ComponentSerialization;
 
 import java.util.Optional;
 
 public class FabricCommandSource implements CommandSource {
 
     private final FabricMod mod;
-    private final ServerCommandSource delegate;
+    private final CommandSourceStack delegate;
 
-    public FabricCommandSource(FabricMod mod, ServerCommandSource delegate) {
+    public FabricCommandSource(FabricMod mod, CommandSourceStack delegate) {
         this.mod = mod;
         this.delegate = delegate;
     }
@@ -59,33 +53,37 @@ public void sendMessage(Component text) {
             text = Component.newline().append(text).appendNewline();
 
         JsonElement textJson = GsonComponentSerializer.gson().serializeToTree(text.compact());
-        Text minecraftText = TextCodecs.CODEC.parse(JsonOps.INSTANCE, textJson).getOrThrow();
-        delegate.sendMessage(minecraftText);
+        net.minecraft.network.chat.Component minecraftText = ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, textJson).getOrThrow();
+        delegate.sendSystemMessage(minecraftText);
     }
 
     @Override
     public boolean hasPermission(String permission) {
+        /* TODO: re-enable permission-api support once fabric-permission-api is updated
         try {
             Class.forName("me.lucko.fabric.api.permissions.v0.Permissions");
             return Permissions.check(delegate, permission, PermissionLevel.MODERATORS);
         } catch (ClassNotFoundException ex) {
-            return delegate.getPermissions().hasPermission(DefaultPermissions.MODERATORS);
+            return delegate.permissions().hasPermission(net.minecraft.server.permissions.Permissions.COMMANDS_MODERATOR);
         }
+        */
+
+        return delegate.permissions().hasPermission(net.minecraft.server.permissions.Permissions.COMMANDS_MODERATOR);
     }
 
     @Override
     public Optional<Vector3d> getPosition() {
-        if (!delegate.isExecutedByPlayer() && delegate.getName().equals("Server")) return Optional.empty();
+        if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
         return Optional.ofNullable(delegate.getPosition())
                 .map(pos -> new Vector3d(pos.x, pos.y, pos.z));
     }
 
     @Override
     public Optional<ServerWorld> getWorld() {
-        if (!delegate.isExecutedByPlayer() && delegate.getName().equals("Server")) return Optional.empty();
+        if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
-        return Optional.ofNullable(delegate.getWorld())
+        return Optional.ofNullable(delegate.getLevel())
                 .map(mod::getServerWorld);
     }
 

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java

@@ -27,8 +27,7 @@
 import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-
+import net.minecraft.server.level.ServerPlayer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.UUID;
@@ -61,17 +60,17 @@ public synchronized void removeAllListeners() {
         this.eventListeners.clear();
     }
 
-    public synchronized void onPlayerJoin(MinecraftServer server, ServerPlayerEntity player) {
+    public synchronized void onPlayerJoin(MinecraftServer server, ServerPlayer player) {
         if (this.mod.getServer() != server) return;
 
-        UUID uuid = player.getUuid();
+        UUID uuid = player.getUUID();
         for (ServerEventListener listener : eventListeners) listener.onPlayerJoin(uuid);
     }
 
-    public synchronized void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player) {
+    public synchronized void onPlayerLeave(MinecraftServer server, ServerPlayer player) {
         if (this.mod.getServer() != server) return;
 
-        UUID uuid = player.getUuid();
+        UUID uuid = player.getUUID();
         for (ServerEventListener listener : eventListeners) listener.onPlayerLeave(uuid);
     }