Update to Minecraft 1.21.11

Author: lucko

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">
 	<img
 		alt="spark"
-		src="https://i.imgur.com/ykHn9vx.png">
+		src="https://spark.lucko.me/assets/banner.png">
 </h1>
 
 <h3 align="center">

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'org.cadixdev.licenser' version '0.6.1' apply false
     id 'com.gradleup.shadow' version '8.3.8' apply false
-    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
 }
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat

spark-fabric/build.gradle

@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.21.10'
+    minecraft 'com.mojang:minecraft:1.21.11'
     mappings loom.officialMojangMappings()
-    modImplementation 'net.fabricmc:fabric-loader:0.17.3'
+    modImplementation 'net.fabricmc:fabric-loader:0.18.2'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,12 +40,12 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.135.0+1.21.10'))
+        modImplementation(fabricApi.module(it, '0.139.4+1.21.11'))
     }
 
-    include(modImplementation('me.lucko:fabric-permissions-api:0.5.0'))
+    include(modImplementation('me.lucko:fabric-permissions-api:0.6.1'))
 
-    modImplementation('eu.pb4:placeholder-api:2.8.0+1.21.9')
+    modImplementation('eu.pb4:placeholder-api:2.8.1+1.21.10')
 
     shade project(':spark-common')
     shade project(':spark-minecraft')

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerCommandSender.java

@@ -25,8 +25,12 @@
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 
 public class FabricServerCommandSender extends MinecraftServerCommandSender {
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
+
     public FabricServerCommandSender(CommandSourceStack commandSource) {
         super(commandSource);
     }
@@ -40,7 +44,7 @@ public boolean hasPermission(String permission) {
                 if (server != null && server.isSingleplayerOwner(player.nameAndId())) {
                     return true;
                 }
-                return player.hasPermissions(4);
+                return player.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
             }
             return true;
         });

spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java

@@ -32,7 +32,7 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 public enum SparkFabricPlaceholderApi {
@@ -41,7 +41,7 @@ public enum SparkFabricPlaceholderApi {
     public static void register(SparkPlatform platform) {
         for (SparkPlaceholder placeholder : SparkPlaceholder.values()) {
             Placeholders.register(
-                    ResourceLocation.fromNamespaceAndPath("spark", placeholder.getName()),
+                    Identifier.fromNamespaceAndPath("spark", placeholder.getName()),
                     new Handler(platform, placeholder)
             );
         }

spark-forge/build.gradle

@@ -9,7 +9,7 @@ tasks.withType(JavaCompile) {
 }
 
 minecraft {
-    mappings channel: 'official', version: '1.21.10'
+    mappings channel: 'official', version: '1.21.11'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     reobf = false
 }
@@ -20,7 +20,7 @@ configurations {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.21.10-60.0.3'
+    minecraft 'net.minecraftforge:forge:1.21.11-61.0.0'
     annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.12'
     shade project(':spark-common')
     shade project(':spark-minecraft')

spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java

@@ -38,6 +38,8 @@
 import me.lucko.spark.minecraft.sender.MinecraftServerCommandSender;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.server.ServerAboutToStartEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
@@ -65,7 +67,7 @@ public static void init(ForgeSparkMod mod, ServerAboutToStartEvent event) {
         ForgeServerSparkPlugin plugin = new ForgeServerSparkPlugin(mod, event.getServer());
         plugin.enable();
     }
-
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
     private static final PermissionResolver<Boolean> DEFAULT_PERMISSION_VALUE = (player, playerUUID, context) -> {
         if (player == null) {
             return false;
@@ -76,7 +78,7 @@ public static void init(ForgeSparkMod mod, ServerAboutToStartEvent event) {
             return true;
         }
 
-        return player.hasPermissions(4);
+        return player.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
     };
 
     private Map<String, PermissionNode<Boolean>> registeredPermissions = Collections.emptyMap();

spark-minecraft/build.gradle

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    minecraft 'com.mojang:minecraft:1.21.10'
+    minecraft 'com.mojang:minecraft:1.21.11'
     mappings loom.officialMojangMappings()
 
     implementation project(':spark-common')

spark-minecraft/src/main/java/me/lucko/spark/minecraft/MinecraftWorldInfoProvider.java

@@ -33,7 +33,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.gamerules.GameRule;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -104,7 +104,7 @@ public ChunksResult<MinecraftChunkInfo> pollChunks() {
                     info.entityCounts.increment(entity.getType());
                 }
 
-                data.put(level.dimension().location().getPath(), List.copyOf(worldInfos.values()));
+                data.put(level.dimension().identifier().getPath(), List.copyOf(worldInfos.values()));
             }
 
             return data;
@@ -116,22 +116,23 @@ public GameRulesResult pollGameRules() {
             Iterable<ServerLevel> worlds = this.server.getAllLevels();
 
             for (ServerLevel level : worlds) {
-                String levelName = level.dimension().location().getPath();
+                String levelName = level.dimension().identifier().getPath();
 
-                level.getGameRules().visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() {
-                    @Override
-                    public <T extends GameRules.Value<T>> void visit(GameRules.Key<T> key, GameRules.Type<T> type) {
-                        String defaultValue = type.createRule().serialize();
-                        data.putDefault(key.getId(), defaultValue);
+                level.getGameRules().availableRules().forEach(rule -> {
+                    String defaultValue = gameRuleDefaultValue(rule);
+                    data.putDefault(rule.id(), defaultValue);
 
-                        String value = level.getGameRules().getRule(key).serialize();
-                        data.put(key.getId(), levelName, value);
-                    }
+                    String value = level.getGameRules().getAsString(rule);
+                    data.put(rule.id(), levelName, value);
                 });
             }
             return data;
         }
 
+        private static <T> String gameRuleDefaultValue(GameRule<T> rule) {
+            return rule.serialize(rule.defaultValue());
+        }
+
         @Override
         protected PackRepository getPackRepository() {
             return this.server.getPackRepository();
@@ -177,7 +178,7 @@ public ChunksResult<MinecraftChunkInfo> pollChunks() {
                 info.entityCounts.increment(entity.getType());
             }
 
-            data.put(level.dimension().location().getPath(), List.copyOf(worldInfos.values()));
+            data.put(level.dimension().identifier().getPath(), List.copyOf(worldInfos.values()));
             return data;
         }
 

spark-neoforge/build.gradle

@@ -15,7 +15,7 @@ java {
 }
 
 neoForge {
-    version = "21.10.10-beta"
+    version = "21.11.0-beta"
     validateAccessTransformers = true
 
     runs {