Update for 1.21.11

jpenilla · jpenilla · commit e47935a4209b · 2025-12-09T20:07:05.000-07:00
diff --git a/cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricServerCommandManager.java b/cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricServerCommandManager.java
@@ -27,6 +27,7 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.permissions.Permission;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.SenderMapper;
@@ -117,8 +118,10 @@ public boolean hasPermission(final @NonNull C sender, final @NonNull String perm
         }
         final CommandSourceStack source = this.senderMapper().reverse(sender);
         if (HAS_PERMISSIONS_API) {
-            return Permissions.check(source, permission, source.getServer().operatorUserPermissionLevel());
+            return Permissions.check(source, permission, source.getServer().operatorUserPermissions().level());
         }
-        return source.hasPermission(source.getServer().operatorUserPermissionLevel());
+        return source.permissions().hasPermission(
+            new Permission.HasCommandLevel(source.getServer().operatorUserPermissions().level())
+        );
     }
 }
diff --git a/cloud-fabric/src/main/resources/fabric.mod.json b/cloud-fabric/src/main/resources/fabric.mod.json
@@ -25,10 +25,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.15.7",
+    "fabricloader": ">=0.18.2",
     "fabric-command-api-v2": "*",
     "fabric-networking-api-v1": "*",
     "fabric-lifecycle-events-v1": "*",
-    "minecraft": ">=1.21.5"
+    "minecraft": ">=1.21.11"
   }
 }
diff --git a/cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java b/cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java
@@ -136,7 +136,7 @@ public void onInitializeClient() {
 
     private static void disconnectClient(final @NonNull Minecraft client) {
         final PauseScreen pauseScreen = new PauseScreen(true);
-        pauseScreen.init(client, 0, 0);
+        pauseScreen.init(0, 0);
         client.disconnectFromWorld(ClientLevel.DEFAULT_QUIT_MESSAGE);
     }
 }
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/ModdedPredicatePermissions.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/ModdedPredicatePermissions.java
@@ -24,8 +24,9 @@
 package org.incendo.cloud.minecraft.modded;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.commands.PermissionSource;
 import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.SenderMapperHolder;
 import org.incendo.cloud.key.CloudKey;
@@ -47,14 +48,16 @@ private ModdedPredicatePermissions() {
      */
     public static <C> @NonNull PredicatePermission<C> permissionLevel(
         final SenderMapperHolder<? extends SharedSuggestionProvider, C> mapperHolder,
-        final int permissionLevel
+        final PermissionLevel permissionLevel
     ) {
         return new PredicatePermission<>() {
             @Override
             public @NonNull PermissionResult testPermission(final @NonNull C sender) {
                 final SharedSuggestionProvider suggestionProvider = mapperHolder.senderMapper().reverse(sender);
                 return PermissionLevelResult.of(
-                    suggestionProvider instanceof PermissionSource permissionSource && permissionSource.hasPermission(permissionLevel),
+                    suggestionProvider.permissions().hasPermission(
+                        new Permission.HasCommandLevel(permissionLevel)
+                    ),
                     this,
                     permissionLevel
                 );
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedParserMappings.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedParserMappings.java
@@ -37,12 +37,13 @@
 import java.util.Set;
 import java.util.function.Function;
 import net.minecraft.ChatFormatting;
-import net.minecraft.advancements.critereon.MinMaxBounds;
+import net.minecraft.advancements.criterion.MinMaxBounds;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.arguments.AngleArgument;
 import net.minecraft.commands.arguments.ColorArgument;
 import net.minecraft.commands.arguments.CompoundTagArgument;
 import net.minecraft.commands.arguments.EntityAnchorArgument;
+import net.minecraft.commands.arguments.IdentifierArgument;
 import net.minecraft.commands.arguments.MessageArgument;
 import net.minecraft.commands.arguments.NbtPathArgument;
 import net.minecraft.commands.arguments.NbtTagArgument;
@@ -51,7 +52,6 @@
 import net.minecraft.commands.arguments.ParticleArgument;
 import net.minecraft.commands.arguments.RangeArgument;
 import net.minecraft.commands.arguments.ResourceKeyArgument;
-import net.minecraft.commands.arguments.ResourceLocationArgument;
 import net.minecraft.commands.arguments.UuidArgument;
 import net.minecraft.commands.arguments.blocks.BlockPredicateArgument;
 import net.minecraft.commands.arguments.coordinates.SwizzleArgument;
@@ -61,8 +61,8 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
 import org.apiguardian.api.API;
@@ -129,7 +129,7 @@ public static <C, S> void register(
         registerConstantNativeParserSupplier(manager, OperationArgument.Operation.class, OperationArgument.operation());
         registerConstantNativeParserSupplier(manager, AngleArgument.SingleAngle.class, AngleArgument.angle());
         registerConstantNativeParserSupplier(manager, new TypeToken<>() {}, SwizzleArgument.swizzle());
-        registerConstantNativeParserSupplier(manager, ResourceLocation.class, ResourceLocationArgument.id());
+        registerConstantNativeParserSupplier(manager, Identifier.class, IdentifierArgument.id());
         registerConstantNativeParserSupplier(manager, EntityAnchorArgument.Anchor.class, EntityAnchorArgument.anchor());
         registerConstantNativeParserSupplier(manager, MinMaxBounds.Ints.class, RangeArgument.intRange());
         registerConstantNativeParserSupplier(manager, MinMaxBounds.Doubles.class, RangeArgument.floatRange());
@@ -222,7 +222,7 @@ private static <C, S> void registerRegistryEntryMappings(
         final Set<Class<?>> seenClasses = new HashSet<>();
         /* Some registries have types that are too generic... we'll skip those for now.
          * Eventually, these could be resolved by using ParserParameters in some way? */
-        seenClasses.add(ResourceLocation.class);
+        seenClasses.add(Identifier.class);
         seenClasses.add(Codec.class);
         seenClasses.add(String.class); // avoid pottery pattern registry overriding default string parser
         for (final Field field : Registries.class.getDeclaredFields()) {
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/FloatRangeParser.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/FloatRangeParser.java
@@ -23,15 +23,15 @@
 //
 package org.incendo.cloud.minecraft.modded.parser;
 
-import net.minecraft.advancements.critereon.MinMaxBounds;
+import net.minecraft.advancements.criterion.MinMaxBounds;
 import net.minecraft.commands.arguments.RangeArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
 import org.incendo.cloud.component.CommandComponent;
 import org.incendo.cloud.parser.ParserDescriptor;
 
 /**
- * An argument parsing an unbounded {@link net.minecraft.advancements.critereon.MinMaxBounds.Doubles double range}, in the form
+ * An argument parsing an unbounded {@link net.minecraft.advancements.criterion.MinMaxBounds.Doubles double range}, in the form
  * {@code [min]..[max]}, where both lower and upper bounds are optional.
  *
  * @param <C> the sender type
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/IdentifierParser.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/IdentifierParser.java
@@ -23,27 +23,27 @@
 //
 package org.incendo.cloud.minecraft.modded.parser;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
 import org.incendo.cloud.component.CommandComponent;
 import org.incendo.cloud.parser.ParserDescriptor;
 
 /**
- * An argument parsing a {@link ResourceLocation}.
+ * An argument parsing a {@link Identifier}.
  *
  * @param <C> the sender type
  */
-public final class ResourceLocationParser<C> extends WrappedBrigadierParser<C, ResourceLocation> {
+public final class IdentifierParser<C> extends WrappedBrigadierParser<C, Identifier> {
 
     /**
      * Creates a new resource location parser.
      *
      * @param <C> command sender type
      * @return the created parser
      */
-    public static <C> @NonNull ParserDescriptor<C, ResourceLocation> resourceLocationParser() {
-        return ParserDescriptor.of(new ResourceLocationParser<>(), ResourceLocation.class);
+    public static <C> @NonNull ParserDescriptor<C, Identifier> resourceLocationParser() {
+        return ParserDescriptor.of(new IdentifierParser<>(), Identifier.class);
     }
 
     /**
@@ -52,12 +52,12 @@ public final class ResourceLocationParser<C> extends WrappedBrigadierParser<C, R
      * @param <C> the command sender type
      * @return the component builder
      */
-    public static <C> CommandComponent.@NonNull Builder<C, ResourceLocation> resourceLocationComponent() {
-        return CommandComponent.<C, ResourceLocation>builder().parser(resourceLocationParser());
+    public static <C> CommandComponent.@NonNull Builder<C, Identifier> resourceLocationComponent() {
+        return CommandComponent.<C, Identifier>builder().parser(resourceLocationParser());
     }
 
-    ResourceLocationParser() {
-        super(net.minecraft.commands.arguments.ResourceLocationArgument.id());
+    IdentifierParser() {
+        super(net.minecraft.commands.arguments.IdentifierArgument.id());
     }
 
 }
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/IntRangeParser.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/IntRangeParser.java
@@ -23,15 +23,15 @@
 //
 package org.incendo.cloud.minecraft.modded.parser;
 
-import net.minecraft.advancements.critereon.MinMaxBounds;
+import net.minecraft.advancements.criterion.MinMaxBounds;
 import net.minecraft.commands.arguments.RangeArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
 import org.incendo.cloud.component.CommandComponent;
 import org.incendo.cloud.parser.ParserDescriptor;
 
 /**
- * An argument parsing an unbounded {@link net.minecraft.advancements.critereon.MinMaxBounds.Ints integer range}, in the form
+ * An argument parsing an unbounded {@link net.minecraft.advancements.criterion.MinMaxBounds.Ints integer range}, in the form
  * {@code [min]..[max]}, where both lower and upper bounds are optional.
  *
  * @param <C> the sender type
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/RegistryEntryParser.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/RegistryEntryParser.java
@@ -31,8 +31,8 @@
 import java.util.Set;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.core.Registry;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.caption.CaptionVariable;
 import org.incendo.cloud.component.CommandComponent;
@@ -124,9 +124,9 @@ public RegistryEntryParser(
         final @NonNull CommandContext<@NonNull C> commandContext,
         final @NonNull CommandInput commandInput
     ) {
-        final ResourceLocation key;
+        final Identifier key;
         try {
-            key = ResourceLocation.read(new StringReader(commandInput.readString()));
+            key = Identifier.read(new StringReader(commandInput.readString()));
         } catch (final CommandSyntaxException ex) {
             return ArgumentParseResult.failure(ex);
         }
@@ -154,9 +154,9 @@ private Registry<V> resolveRegistry(final CommandContext<C> ctx) {
         final @NonNull CommandContext<C> commandContext,
         final @NonNull CommandInput input
     ) {
-        final Set<ResourceLocation> ids = this.resolveRegistry(commandContext).keySet();
+        final Set<Identifier> ids = this.resolveRegistry(commandContext).keySet();
         final List<String> results = new ArrayList<>(ids.size());
-        for (final ResourceLocation entry : ids) {
+        for (final Identifier entry : ids) {
             if (entry.getNamespace().equals(NAMESPACE_MINECRAFT)) {
                 results.add(entry.getPath());
             }
@@ -183,7 +183,7 @@ private static final class UnknownEntryException extends ParserException {
 
         UnknownEntryException(
             final CommandContext<?> context,
-            final ResourceLocation key,
+            final Identifier key,
             final ResourceKey<? extends Registry<?>> registry
         ) {
             super(
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/permission/PermissionLevelResult.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/permission/PermissionLevelResult.java
@@ -23,6 +23,7 @@
 //
 package org.incendo.cloud.minecraft.modded.permission;
 
+import net.minecraft.server.permissions.PermissionLevel;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.immutables.value.Value;
 import org.incendo.cloud.internal.ImmutableImpl;
@@ -48,7 +49,7 @@ public interface PermissionLevelResult extends PermissionResult {
     static @NonNull PermissionLevelResult of(
         final boolean result,
         final @NonNull Permission permission,
-        final int requiredPermissionLevel
+        final @NonNull PermissionLevel requiredPermissionLevel
     ) {
         return PermissionLevelResultImpl.of(result, permission, requiredPermissionLevel);
     }
@@ -65,5 +66,5 @@ public interface PermissionLevelResult extends PermissionResult {
      * @return the required permission level
      */
     @SuppressWarnings("unused")
-    int requiredPermissionLevel();
+    @NonNull PermissionLevel requiredPermissionLevel();
 }
diff --git a/cloud-neoforge/src/main/java/org/incendo/cloud/neoforge/CloudNeoForgeEntrypoint.java b/cloud-neoforge/src/main/java/org/incendo/cloud/neoforge/CloudNeoForgeEntrypoint.java
@@ -157,7 +157,9 @@ private static Boolean defaultPermissionHandler(
         final UUID uuid,
         final PermissionDynamicContext<?>... contexts
     ) {
-        return player != null && player.hasPermissions(player.level().getServer().operatorUserPermissionLevel());
+        return player != null && player.permissions().hasPermission(
+            new net.minecraft.server.permissions.Permission.HasCommandLevel(player.level().getServer().operatorUserPermissions().level())
+        );
     }
 
     private static void testClientManager() {
diff --git a/cloud-neoforge/src/main/java/org/incendo/cloud/neoforge/NeoForgeServerCommandManager.java b/cloud-neoforge/src/main/java/org/incendo/cloud/neoforge/NeoForgeServerCommandManager.java
@@ -28,6 +28,7 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import java.util.concurrent.ExecutionException;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.permissions.Permission;
 import net.neoforged.neoforge.server.permission.PermissionAPI;
 import net.neoforged.neoforge.server.permission.nodes.PermissionNode;
 import net.neoforged.neoforge.server.permission.nodes.PermissionTypes;
@@ -111,6 +112,8 @@ public boolean hasPermission(final @NonNull C sender, final @NonNull String perm
             }
             return PermissionAPI.getPermission(source.getPlayer(), node);
         }
-        return source.hasPermission(source.getServer().operatorUserPermissionLevel());
+        return source.permissions().hasPermission(
+            new Permission.HasCommandLevel(source.getServer().operatorUserPermissions().level())
+        );
     }
 }
diff --git a/cloud-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/cloud-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -23,7 +23,7 @@ side = "BOTH"
 [[dependencies.cloud]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.9,)"
+versionRange = "[1.21.11,)"
 ordering = "NONE"
 side = "BOTH"
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,12 +11,12 @@ geantyref = "1.3.16"
 
 immutables = "2.12.0"
 
-minecraft = "1.21.9"
+minecraft = "1.21.11"
 fabricLoader = "0.18.2"
-fabricPermissionsApi = "0.5.0"
-neoforge = "21.9.15-beta"
-neoform = "1.21.9-20250930.151910"
-adventureMod = "6.7.0"
+fabricPermissionsApi = "0.6.1"
+neoforge = "21.11.0-beta"
+neoform = "1.21.11-20251209.172050"
+adventureMod = "6.8.0"
 
 [libraries]
 cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "cloud-build-logic" }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;`
`28`	`28`	`import net.fabricmc.loader.api.FabricLoader;`
`29`	`29`	`import net.minecraft.commands.CommandSourceStack;`
	`30`	`+import net.minecraft.server.permissions.Permission;`
`30`	`31`	`import org.apiguardian.api.API;`
`31`	`32`	`import org.checkerframework.checker.nullness.qual.NonNull;`
`32`	`33`	`import org.incendo.cloud.SenderMapper;`
`@@ -117,8 +118,10 @@ public boolean hasPermission(final @NonNull C sender, final @NonNull String perm`
`117`	`118`	`}`
`118`	`119`	`final CommandSourceStack source = this.senderMapper().reverse(sender);`
`119`	`120`	`if (HAS_PERMISSIONS_API) {`
`120`		`- return Permissions.check(source, permission, source.getServer().operatorUserPermissionLevel());`
	`121`	`+ return Permissions.check(source, permission, source.getServer().operatorUserPermissions().level());`
`121`	`122`	`}`
`122`		`- return source.hasPermission(source.getServer().operatorUserPermissionLevel());`
	`123`	`+ return source.permissions().hasPermission(`
	`124`	`+ new Permission.HasCommandLevel(source.getServer().operatorUserPermissions().level())`
	`125`	`+ );`
`123`	`126`	`}`
`124`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@`
`25`	`25`	`],`
`26`	`26`
`27`	`27`	`"depends": {`
`28`		`- "fabricloader": ">=0.15.7",`
	`28`	`+ "fabricloader": ">=0.18.2",`
`29`	`29`	`"fabric-command-api-v2": "*",`
`30`	`30`	`"fabric-networking-api-v1": "*",`
`31`	`31`	`"fabric-lifecycle-events-v1": "*",`
`32`		`- "minecraft": ">=1.21.5"`
	`32`	`+ "minecraft": ">=1.21.11"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public void onInitializeClient() {`
`136`	`136`
`137`	`137`	`private static void disconnectClient(final @NonNull Minecraft client) {`
`138`	`138`	`final PauseScreen pauseScreen = new PauseScreen(true);`
`139`		`- pauseScreen.init(client, 0, 0);`
	`139`	`+ pauseScreen.init(0, 0);`
`140`	`140`	`client.disconnectFromWorld(ClientLevel.DEFAULT_QUIT_MESSAGE);`
`141`	`141`	`}`
`142`	`142`	`}`