Update to 1.21.11

Author: xpple

build.gradle

@@ -50,12 +50,12 @@ dependencies {
 	include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
 	include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
 
-	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-		exclude group: 'net.fabricmc', module: 'fabric-loader'
-	}
-	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-		exclude group: 'net.fabricmc', module: 'fabric-loader'
-	}
+//	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+//		exclude group: 'net.fabricmc', module: 'fabric-loader'
+//	}
+//	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+//		exclude group: 'net.fabricmc', module: 'fabric-loader'
+//	}
 
 	testImplementation platform("org.junit:junit-bom:${project.junit_version}")
 	testImplementation 'org.junit.jupiter:junit-jupiter'

gradle.properties

@@ -8,21 +8,21 @@ maven_group=dev.xpple
 archives_base_name=seedmapper
 
 # Minecraft properties
-minecraft_version=1.21.10
-minecraft_version_dependency=>=1.21.10 <1.22
+minecraft_version=1.21.11-rc3
+minecraft_version_dependency=>=1.21.11-rc.3 <1.22
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 # https://maven.parchmentmc.org/org/parchmentmc/data/
-fabric_api_version=0.138.3+1.21.10
+fabric_api_version=0.139.4+1.21.11
 parchment_mappings=parchment-1.21.9:2025.10.05@zip
-fabric_loader_version=0.17.3
-fabric_loom_version=1.13-SNAPSHOT
+fabric_loader_version=0.18.1
+fabric_loom_version=1.14-SNAPSHOT
 
 # Library dependencies
 betterconfig_version=2.5.0
-clientarguments_version=1.11.5
-simplewaypoints_version=1.1.0
+clientarguments_version=1.11.6
+simplewaypoints_version=1.2.0
 
 devauth_version=1.2.1
 

includes.txt

@@ -122,6 +122,7 @@
 --include-constant MC_1_21_5
 --include-constant MC_1_21_6
 --include-constant MC_1_21_9
+--include-constant MC_1_21_11
 --include-constant MC_1_21_WD
 --include-constant MC_1_2_5
 --include-constant MC_1_3
@@ -705,6 +706,7 @@
 --include-constant ITEM_COOKED_PORKCHOP
 --include-constant ITEM_COOKED_SALMON
 --include-constant ITEM_COPPER_HORSE_ARMOR
+--include-constant ITEM_COPPER_NAUTILUS_ARMOR
 --include-constant ITEM_CROSSBOW
 --include-constant ITEM_CRYING_OBSIDIAN
 --include-constant ITEM_DARK_OAK_LOG
@@ -714,8 +716,10 @@
 --include-constant ITEM_DIAMOND_HELMET
 --include-constant ITEM_DIAMOND_HORSE_ARMOR
 --include-constant ITEM_DIAMOND_LEGGINGS
+--include-constant ITEM_DIAMOND_NAUTILUS_ARMOR
 --include-constant ITEM_DIAMOND_PICKAXE
 --include-constant ITEM_DIAMOND_SHOVEL
+--include-constant ITEM_DIAMOND_SPEAR
 --include-constant ITEM_DIAMOND_SWORD
 --include-constant ITEM_DUNE_ARMOR_TRIM_SMITHING_TEMPLATE
 --include-constant ITEM_EMERALD
@@ -737,6 +741,7 @@
 --include-constant ITEM_GOLDEN_HOE
 --include-constant ITEM_GOLDEN_HORSE_ARMOR
 --include-constant ITEM_GOLDEN_LEGGINGS
+--include-constant ITEM_GOLDEN_NAUTILUS_ARMOR
 --include-constant ITEM_GOLDEN_PICKAXE
 --include-constant ITEM_GOLDEN_SHOVEL
 --include-constant ITEM_GOLDEN_SWORD
@@ -753,9 +758,11 @@
 --include-constant ITEM_IRON_HORSE_ARMOR
 --include-constant ITEM_IRON_INGOT
 --include-constant ITEM_IRON_LEGGINGS
+--include-constant ITEM_IRON_NAUTILUS_ARMOR
 --include-constant ITEM_IRON_NUGGET
 --include-constant ITEM_IRON_PICKAXE
 --include-constant ITEM_IRON_SHOVEL
+--include-constant ITEM_IRON_SPEAR
 --include-constant ITEM_IRON_SWORD
 --include-constant ITEM_LAPIS_LAZULI
 --include-constant ITEM_LEATHER
@@ -797,6 +804,7 @@
 --include-constant ITEM_UNKNOWN
 --include-constant ITEM_WHEAT
 --include-constant ITEM_WILD_ARMOR_TRIM_SMITHING_TEMPLATE
+--include-constant NUM_ITEMS
 
 --include-struct EnchantInstance
 --include-struct ItemStack

src/main/c/cubiomes

@@ -16,9 +16,11 @@
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,8 +36,8 @@ public class CustomClientCommandSource extends ClientSuggestionProvider implemen
     private final ClientLevel world;
     private final Map<String, Object> meta;
 
-    public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel world, Map<String, Object> meta) {
-        super(listener, minecraft, true);
+    public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel world, PermissionSet permissionSet, Map<String, Object> meta) {
+        super(listener, minecraft, permissionSet);
 
         this.client = minecraft;
         this.entity = entity;
@@ -49,7 +51,7 @@ public static CustomClientCommandSource of(FabricClientCommandSource source) {
         if (source instanceof CustomClientCommandSource custom) {
             return custom;
         }
-        return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getWorld(), new HashMap<>());
+        return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getWorld(), source.permissions(), new HashMap<>());
     }
 
     @Override
@@ -94,24 +96,24 @@ public ClientLevel getWorld() {
     }
 
     @Override
-    public Object getMeta(String key) {
+    public @Nullable Object getMeta(String key) {
         return this.meta.get(key);
     }
 
     public CustomClientCommandSource withEntity(Entity entity) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.world, this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.world, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withPosition(Vec3 position) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.world, this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.world, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withRotation(Vec2 rotation) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.world, this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.world, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withWorld(ClientLevel world) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, world, this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, world, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withMeta(String key, Object value) {
@@ -146,7 +148,7 @@ public int getDimension() throws CommandSyntaxException {
         if (dimensionMeta != null) {
             return (int) dimensionMeta;
         }
-        return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().location().getPath()));
+        return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().identifier().getPath()));
     }
 
     public int getVersion() throws CommandSyntaxException {