Update fabric and neoforge to 1.21.11 and remove forge implementation until they updated

Author: TBlueF

gradle/libs.versions.toml

@@ -30,13 +30,13 @@ jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.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" }
-lz4 = { module = "org.lz4:lz4-java", version = "1.8.0" }
+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.11-SNAPSHOT" }
+loom = { id = "fabric-loom", version = "1.13-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" }

implementations/fabric/build.gradle.kts

@@ -8,13 +8,13 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.9", "1.21.10"
+    "1.21.11"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
 val yarnMappings = "${minecraftVersion}+build.1"
-val fabricLoaderVersion = "0.17.2"
-val fabricApiVersion = "0.133.14+${minecraftVersion}"
+val fabricLoaderVersion = "0.18.2"
+val fabricApiVersion = "0.139.4+${minecraftVersion}"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

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

@@ -33,6 +33,9 @@
 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;
@@ -66,7 +69,7 @@ public boolean hasPermission(String permission) {
             Class.forName("me.lucko.fabric.api.permissions.v0.Permissions");
             return Permissions.check(delegate, permission, 1);
         } catch (ClassNotFoundException ex) {
-            return delegate.hasPermissionLevel(1);
+            return delegate.getPermissions().hasPermission(DefaultPermissions.MODERATORS);
         }
     }
 

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

@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.nio.file.Path;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
@@ -46,9 +47,8 @@ public class FabricWorld implements ServerWorld {
     public FabricWorld(net.minecraft.server.world.ServerWorld delegate) {
         this.delegate = new WeakReference<>(delegate);
 
-        MinecraftServer server = delegate.getServer();
-        this.worldFolder = delegate.getServer().getRunDirectory()
-                .resolve(server.getSavePath(WorldSavePath.ROOT));
+        MinecraftServer server = Objects.requireNonNull(delegate.getServer());
+        this.worldFolder = server.getRunDirectory().resolve(server.getSavePath(WorldSavePath.ROOT));
 
         Identifier id = delegate.getRegistryKey().getValue();
         this.dimension = new Key(id.getNamespace(), id.getPath());

implementations/neoforge/build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21.11"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val neoVersion = "21.6.11-beta"
+val neoVersion = "21.11.0-beta"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java

@@ -34,6 +34,8 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.server.permissions.LevelBasedPermissionSet;
+import net.minecraft.server.permissions.Permissions;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -60,7 +62,7 @@ public void sendMessage(Component text) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return delegate.hasPermission(1);
+        return delegate.permissions().hasPermission(Permissions.COMMANDS_MODERATOR);
     }
 
     @Override

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java

@@ -38,8 +38,8 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -165,8 +165,8 @@ public Collection<ServerWorld> getLoadedServerWorlds() {
     public Optional<ServerWorld> getServerWorld(Object world) {
 
         if (world instanceof String) {
-            ResourceLocation resourceLocation = ResourceLocation.tryParse((String) world);
-            if (resourceLocation != null) world = serverInstance.getLevel(ResourceKey.create(Registries.DIMENSION, resourceLocation));
+            Identifier identifier = Identifier.tryParse((String) world);
+            if (identifier != null) world = serverInstance.getLevel(ResourceKey.create(Registries.DIMENSION, identifier));
         }
 
         if (world instanceof ResourceKey) {

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeWorld.java

@@ -26,14 +26,15 @@
 
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import de.bluecolored.bluemap.core.util.Key;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.LevelResource;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.nio.file.Path;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
@@ -47,11 +48,11 @@ public class ForgeWorld implements ServerWorld {
     public ForgeWorld(ServerLevel delegate) {
         this.delegate = new WeakReference<>(delegate);
 
-        MinecraftServer server = delegate.getServer();
-        this.worldFolder = delegate.getServer().getServerDirectory()
+        MinecraftServer server = Objects.requireNonNull(delegate.getServer());
+        this.worldFolder = server.getServerDirectory()
                 .resolve(server.getWorldPath(LevelResource.ROOT));
 
-        ResourceLocation id = delegate.dimension().location();
+        Identifier id = delegate.dimension().identifier();
         this.dimension = new Key(id.getNamespace(), id.getPath());
     }
 

settings.gradle.kts

@@ -24,7 +24,7 @@ include(":common")
 
 implementation("cli")
 implementation("fabric")
-implementation("forge")
+//implementation("forge")
 implementation("neoforge")
 implementation("paper")
 implementation("spigot")