Add back forge and update to 1.21.11

Author: TBlueF

implementations/forge/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 forgeVersion = "56.0.7"
+val forgeVersion = "61.0.0"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

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

@@ -34,6 +34,7 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.server.permissions.Permissions;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -60,7 +61,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/forge/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;
@@ -177,8 +177,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/forge/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());
     }
 

implementations/paper/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 val supportedMinecraftVersions = listOf(
     "1.20.6",
-    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()

implementations/spigot/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 val supportedMinecraftVersions = listOf(
     "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
-    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
 )
 
 val apiVersion = "1.16"

implementations/sponge/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 val supportedMinecraftVersions = listOf(
     "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
-    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
 )
 
 dependencies {

settings.gradle.kts

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