Require Java 25, initial fabric 26.1 support

Author: TBlueF

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

@@ -15,7 +15,7 @@ tasks.withType(AbstractArchiveTask::class).configureEach {
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    toolchain.languageVersion = JavaLanguageVersion.of(25)
     withSourcesJar()
     withJavadocJar()
 }

gradle/libs.versions.toml

@@ -29,14 +29,14 @@ 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" }
+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" }

gradle/wrapper/gradle-wrapper.jar

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -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 {

gradlew

@@ -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);
     }
 

gradlew.bat

@@ -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);
     }
 

implementations/fabric/build.gradle.kts

@@ -41,13 +41,13 @@
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.SharedConstants;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.Identifier;
-import net.minecraft.world.World;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
@@ -62,7 +62,7 @@ public class FabricMod implements ModInitializer, Server {
 
     private final FabricEventForwarder eventForwarder;
 
-    private final LoadingCache<net.minecraft.server.world.ServerWorld, ServerWorld> worlds;
+    private final LoadingCache<net.minecraft.server.level.ServerLevel, ServerWorld> worlds;
 
     private int playerUpdateIndex = 0;
     private final Map<UUID, Player> onlinePlayerMap;
@@ -92,7 +92,7 @@ public void onInitialize() {
                 BrigadierBridge.createCommandNodes(
                         Commands.create(pluginInstance),
                         new BrigadierExecutionHandler(pluginInstance),
-                        (ServerCommandSource fabricSource) -> new FabricCommandSource(this, fabricSource)
+                        (CommandSourceStack fabricSource) -> new FabricCommandSource(this, fabricSource)
                 ).forEach(dispatcher.getRoot()::addChild)
         );
 
@@ -139,7 +139,7 @@ public void onInitialize() {
 
     @Override
     public String getMinecraftVersion() {
-        return SharedConstants.getGameVersion().comp_4024();
+        return SharedConstants.getCurrentVersion().id();
     }
 
     @Override
@@ -155,7 +155,7 @@ public void unregisterAllListeners() {
     @Override
     public Collection<ServerWorld> getLoadedServerWorlds() {
         Collection<ServerWorld> loadedWorlds = new ArrayList<>(3);
-        for (net.minecraft.server.world.ServerWorld serverWorld : serverInstance.getWorlds()) {
+        for (net.minecraft.server.level.ServerLevel serverWorld : serverInstance.getAllLevels()) {
             loadedWorlds.add(worlds.get(serverWorld));
         }
         return loadedWorlds;
@@ -167,22 +167,22 @@ public Optional<ServerWorld> getServerWorld(Object world) {
 
         if (world instanceof String) {
             Identifier identifier = Identifier.tryParse((String) world);
-            if (identifier != null) world = serverInstance.getWorld(RegistryKey.of(RegistryKeys.WORLD, identifier));
+            if (identifier != null) world = serverInstance.getLevel(ResourceKey.create(Registries.DIMENSION, identifier));
         }
 
-        if (world instanceof RegistryKey) {
+        if (world instanceof ResourceKey) {
             try {
-                world = serverInstance.getWorld((RegistryKey<World>) world);
+                world = serverInstance.getLevel((ResourceKey<Level>) world);
             } catch (ClassCastException ignored) {}
         }
 
-        if (world instanceof net.minecraft.server.world.ServerWorld)
-            return Optional.of(getServerWorld((net.minecraft.server.world.ServerWorld) world));
+        if (world instanceof net.minecraft.server.level.ServerLevel)
+            return Optional.of(getServerWorld((net.minecraft.server.level.ServerLevel) world));
 
         return Optional.empty();
     }
 
-    public ServerWorld getServerWorld(net.minecraft.server.world.ServerWorld serverWorld) {
+    public ServerWorld getServerWorld(net.minecraft.server.level.ServerLevel serverWorld) {
         return worlds.get(Objects.requireNonNull(serverWorld));
     }
 
@@ -196,18 +196,18 @@ public Optional<Path> getModsFolder() {
         return Optional.of(Path.of("mods"));
     }
 
-    public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
+    public void onPlayerJoin(MinecraftServer server, ServerPlayer playerInstance) {
         if (this.serverInstance != server) return;
 
         FabricPlayer player = new FabricPlayer(playerInstance, this);
         onlinePlayerMap.put(player.getUuid(), player);
         onlinePlayerList.add(player);
     }
 
-    public void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player) {
+    public void onPlayerLeave(MinecraftServer server, ServerPlayer player) {
         if (this.serverInstance != server) return;
 
-        UUID playerUUID = player.getUuid();
+        UUID playerUUID = player.getUUID();
         onlinePlayerMap.remove(playerUUID);
         synchronized (onlinePlayerList) {
             onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID));