Update to 1.21.9

Patbox · Patbox · commit 83de00bc94b9 · 2025-09-30T09:17:43.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10.+'
+	id 'fabric-loom' version '1.11.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 }
@@ -29,7 +29,7 @@ dependencies {
 
 	modImplementation include("eu.pb4:map-canvas-api:${project.mapcanvas_version}")
 	modImplementation include("eu.pb4:sgui:${project.sgui_version}")
-	modImplementation include("me.lucko:fabric-permissions-api:0.4.0")
+	modImplementation include("me.lucko:fabric-permissions-api:0.4.2-patbox.1")
 	//implementation include("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,19 +3,19 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.16.14
-loom_version=1.10-SNAPSHOT
+minecraft_version=1.21.9-rc1
+yarn_mappings=1.21.9-rc1+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.127.0+1.21.6
+fabric_version=0.133.14+1.21.9
 
 # Mod Properties
-	mod_version = 0.10.1+1.21.6
+	mod_version = 0.11.0+1.21.9
 	maven_group = space.essem
 	archives_base_name = image2map
 
 # Dependencies
-	mapcanvas_version=0.5.1+1.21.5
-	sgui_version=1.10.0+1.21.6
+	mapcanvas_version=0.6.0+1.21.9
+	sgui_version=1.11.0+1.21.9
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/space/essem/image2map/Image2Map.java b/src/main/java/space/essem/image2map/Image2Map.java
@@ -378,8 +378,8 @@ public static ItemStack toSingleStack(List<ItemStack> items, String input, int w
         } else {
             var bundle = new ItemStack(Items.BUNDLE);
             bundle.set(DataComponentTypes.BUNDLE_CONTENTS, new BundleContentsComponent(items));
-            bundle.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT.with(NbtOps.INSTANCE, ImageData.CODEC,
-                    ImageData.ofBundle(MathHelper.ceil(width / 128d), MathHelper.ceil(height / 128d))).getOrThrow());
+            bundle.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(ImageData.CODEC.codec().encodeStart(NbtOps.INSTANCE,
+                    ImageData.ofBundle(MathHelper.ceil(width / 128d), MathHelper.ceil(height / 128d))).result().orElseThrow().asCompound().orElseThrow()));
 
             bundle.set(DataComponentTypes.LORE, new LoreComponent(List.of(Text.literal(input))));
             bundle.set(DataComponentTypes.ITEM_NAME, Text.literal("Maps").formatted(Formatting.GOLD));
@@ -390,13 +390,13 @@ public static ItemStack toSingleStack(List<ItemStack> items, String input, int w
 
     public static boolean clickItemFrame(PlayerEntity player, Hand hand, ItemFrameEntity itemFrameEntity) {
         var stack = player.getStackInHand(hand);
-        var bundleData = stack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).get(ImageData.CODEC);
+        var bundleData = stack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt().decode(ImageData.CODEC);
 
-        if (stack.isOf(Items.BUNDLE) && bundleData.isSuccess() && bundleData.getOrThrow().quickPlace()) {
-            var world = itemFrameEntity.getWorld();
+        if (stack.isOf(Items.BUNDLE) && bundleData.isPresent() && bundleData.orElseThrow().quickPlace()) {
+            var world = itemFrameEntity.getEntityWorld();
             var start = itemFrameEntity.getBlockPos();
-            var width = bundleData.getOrThrow().width();
-            var height = bundleData.getOrThrow().height();
+            var width = bundleData.orElseThrow().width();
+            var height = bundleData.orElseThrow().height();
 
             var frames = new ItemFrameEntity[width * height];
 
@@ -436,14 +436,14 @@ public static boolean clickItemFrame(PlayerEntity player, Hand hand, ItemFrameEn
             }
 
             for (var map : stack.getOrDefault(DataComponentTypes.BUNDLE_CONTENTS, BundleContentsComponent.DEFAULT).iterate()) {
-                var mapData = map.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).get(ImageData.CODEC);
+                var mapData = map.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt().decode(ImageData.CODEC);
 
-                if (mapData.isSuccess() && mapData.getOrThrow().isReal()) {
+                if (mapData.isPresent() && mapData.orElseThrow().isReal()) {
                     map = map.copy();
-                    var newData = mapData.getOrThrow().withDirection(right, down, facing);
-                    map.apply(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT, x -> x.with(NbtOps.INSTANCE, ImageData.CODEC, newData).getOrThrow());
+                    var newData = mapData.orElseThrow().withDirection(right, down, facing);
+                    map.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(ImageData.CODEC.codec().encodeStart(NbtOps.INSTANCE, newData).result().orElseThrow().asCompound().orElseThrow()));
 
-                    var frame = frames[mapData.getOrThrow().x() + mapData.getOrThrow().y() * width];
+                    var frame = frames[mapData.orElseThrow().x() + mapData.orElseThrow().y() * width];
 
                     if (frame != null && frame.getHeldItemStack().isEmpty()) {
                         frame.setHeldItemStack(map);
@@ -463,21 +463,21 @@ public static boolean clickItemFrame(PlayerEntity player, Hand hand, ItemFrameEn
 
     public static boolean destroyItemFrame(Entity player, ItemFrameEntity itemFrameEntity) {
         var stack = itemFrameEntity.getHeldItemStack();
-        var tag = stack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).get(ImageData.CODEC);
+        var tag = stack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt().decode(ImageData.CODEC);
 
 
-        if (stack.getItem() == Items.FILLED_MAP && tag.isSuccess() && tag.getOrThrow().right().isPresent()
-                && tag.getOrThrow().down().isPresent() && tag.getOrThrow().facing().isPresent()) {
-            var xo = tag.getOrThrow().x();
-            var yo = tag.getOrThrow().y();
-            var width = tag.getOrThrow().width();
-            var height = tag.getOrThrow().height();
+        if (stack.getItem() == Items.FILLED_MAP && tag.isPresent() && tag.orElseThrow().right().isPresent()
+                && tag.orElseThrow().down().isPresent() && tag.orElseThrow().facing().isPresent()) {
+            var xo = tag.orElseThrow().x();
+            var yo = tag.orElseThrow().y();
+            var width = tag.orElseThrow().width();
+            var height = tag.orElseThrow().height();
 
-            Direction right = tag.getOrThrow().right().get();
-            Direction down = tag.getOrThrow().down().get();
-            Direction facing = tag.getOrThrow().facing().get();
+            Direction right = tag.orElseThrow().right().get();
+            Direction down = tag.orElseThrow().down().get();
+            Direction facing = tag.orElseThrow().facing().get();
 
-            var world = itemFrameEntity.getWorld();
+            var world = itemFrameEntity.getEntityWorld();
             var start = itemFrameEntity.getBlockPos();
 
             var mut = start.mutableCopy();
@@ -499,10 +499,10 @@ public static boolean destroyItemFrame(Entity player, ItemFrameEntity itemFrameE
 
                         // Only apply to frames that contain an image2map map
                         var frameStack = frame.getHeldItemStack();
-                        tag = frameStack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).get(ImageData.CODEC);
+                        tag = frameStack.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt().decode(ImageData.CODEC);
 
-                        if (frameStack.getItem() == Items.FILLED_MAP && tag.isSuccess() && tag.getOrThrow().right().isPresent()
-                                && tag.getOrThrow().down().isPresent() && tag.getOrThrow().facing().isPresent()) {
+                        if (frameStack.getItem() == Items.FILLED_MAP && tag.isPresent() && tag.orElseThrow().right().isPresent()
+                                && tag.orElseThrow().down().isPresent() && tag.orElseThrow().facing().isPresent()) {
                             frame.setHeldItemStack(ItemStack.EMPTY, true);
                             frame.setInvisible(false);
                         }
diff --git a/src/main/java/space/essem/image2map/gui/MapGui.java b/src/main/java/space/essem/image2map/gui/MapGui.java
@@ -17,7 +17,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.passive.HorseEntity;
-import net.minecraft.entity.player.PlayerPosition;
+import net.minecraft.entity.EntityPosition;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.network.PacketByteBuf;
@@ -64,7 +64,7 @@ public MapGui(ServerPlayerEntity player, int width, int height) {
         var pos = player.getBlockPos().withY(2048);
         this.pos = pos;
 
-        this.entity = new HorseEntity(EntityType.HORSE, player.getWorld());
+        this.entity = new HorseEntity(EntityType.HORSE, player.getEntityWorld());
         this.entity.setYaw(0);
         this.entity.setHeadYaw(0);
         this.entity.setNoGravity(true);
@@ -102,12 +102,12 @@ public MapGui(ServerPlayerEntity player, int width, int height) {
     protected void resizeCanvas(int width, int height) {
         this.destroy();
         this.initialize(width, height);
-        this.player.networkHandler.sendPacket(new EntityPositionS2CPacket(this.entity.getId(), new PlayerPosition(this.entity.getPos(), Vec3d.ZERO, this.entity.getYaw(), this.entity.getPitch()), Set.of(), false));
+        this.player.networkHandler.sendPacket(new EntityPositionS2CPacket(this.entity.getId(), new EntityPosition(this.entity.getEntityPos(), Vec3d.ZERO, this.entity.getYaw(), this.entity.getPitch()), Set.of(), false));
     }
 
     protected void initialize(int width, int height) {
         this.canvas = DrawableCanvas.create(width, height);
-        this.virtualDisplay = VirtualDisplay.of(this.canvas, pos, Direction.NORTH, 0, true);
+        this.virtualDisplay = VirtualDisplay.builder(this.canvas, pos, Direction.NORTH).glowing().build();
         //this.renderer = CanvasRenderer.of(new CanvasImage(this.canvas.getWidth(), this.canvas.getHeight()));
 
         this.canvas.addPlayer(player);
@@ -149,14 +149,14 @@ public void onTick() {
     public void onClose() {
         //this.cursor.remove();
         this.destroy();
-        this.player.getServer().getCommandManager().sendCommandTree(this.player);
+        this.player.getEntityWorld().getServer().getCommandManager().sendCommandTree(this.player);
         this.player.networkHandler.sendPacket(new SetCameraEntityS2CPacket(this.player));
         this.player.networkHandler.sendPacket(new EntitiesDestroyS2CPacket(this.entity.getId()));
         if (!this.additionalEntities.isEmpty()) {
             this.player.networkHandler.sendPacket(new EntitiesDestroyS2CPacket(this.additionalEntities));
         }
         this.player.networkHandler.sendPacket(new GameStateChangeS2CPacket(GameStateChangeS2CPacket.GAME_MODE_CHANGED, this.player.interactionManager.getGameMode().getIndex()));
-        this.player.networkHandler.sendPacket(new PlayerPositionLookS2CPacket(this.player.getId(), new PlayerPosition(this.player.getPos(), Vec3d.ZERO, this.player.getYaw(), this.player.getPitch()), Set.of()));
+        this.player.networkHandler.sendPacket(new PlayerPositionLookS2CPacket(this.player.getId(), new EntityPosition(this.player.getEntityPos(), Vec3d.ZERO, this.player.getYaw(), this.player.getPitch()), Set.of()));
         if (this.player.hasVehicle()) {
             this.player.networkHandler.sendPacket(new EntityPassengersSetS2CPacket(Objects.requireNonNull(this.player.getVehicle())));
         }
@@ -204,7 +204,7 @@ public boolean onClickEntity(int entityId, EntityInteraction type, boolean isSne
 
     public void setDistance(double i) {
         this.entity.setPos(this.entity.getX(), this.entity.getY(), this.pos.getZ() - i);
-        this.player.networkHandler.sendPacket(new EntityPositionS2CPacket(this.entity.getId(), new PlayerPosition(this.entity.getPos(), Vec3d.ZERO, this.entity.getYaw(), this.entity.getPitch()), Set.of(), false));
+        this.player.networkHandler.sendPacket(new EntityPositionS2CPacket(this.entity.getId(), new EntityPosition(this.entity.getEntityPos(), Vec3d.ZERO, this.entity.getYaw(), this.entity.getPitch()), Set.of(), false));
     }
 
     @Override
diff --git a/src/main/java/space/essem/image2map/gui/PreviewGui.java b/src/main/java/space/essem/image2map/gui/PreviewGui.java
@@ -210,7 +210,7 @@ private static <T> RequiredArgumentBuilder<PreviewGui, T> argument(String name,
             if (x.getSource().imageProcessing == null) {
                 x.getSource().drawLoading();
                 Image2Map.giveToPlayer(x.getSource().player,
-                        MapRenderer.toVanillaItems(x.getSource().image, x.getSource().player.getWorld(), x.getSource().source),
+                        MapRenderer.toVanillaItems(x.getSource().image, x.getSource().player.getEntityWorld(), x.getSource().source),
                         x.getSource().source, x.getSource().width, x.getSource().height);
 
                 x.getSource().close();
diff --git a/src/main/java/space/essem/image2map/mixin/BundleItemMixin.java b/src/main/java/space/essem/image2map/mixin/BundleItemMixin.java
@@ -25,7 +25,7 @@ public class BundleItemMixin {
     ItemStack itemStack = user.getStackInHand(hand);
     var tag = itemStack.get(DataComponentTypes.CUSTOM_DATA);
 
-    if (tag != null && tag.contains("image2map:quick_place") && !user.isCreative()) {
+    if (tag != null && tag.copyNbt().contains("image2map:quick_place") && !user.isCreative()) {
       cir.setReturnValue(ActionResult.FAIL);
       cir.cancel();
     }
@@ -36,7 +36,7 @@ public class BundleItemMixin {
       CallbackInfoReturnable<Boolean> cir) {
     var tag = bundle.get(DataComponentTypes.CUSTOM_DATA);
 
-    if (tag != null && tag.contains("image2map:quick_place") && !player.isCreative()) {
+    if (tag != null && tag.copyNbt().contains("image2map:quick_place") && !player.isCreative()) {
       cir.setReturnValue(false);
       cir.cancel();
     }
@@ -48,7 +48,7 @@ public class BundleItemMixin {
       CallbackInfoReturnable<Boolean> cir) {
     var tag = bundle.get(DataComponentTypes.CUSTOM_DATA);
 
-    if (tag != null && tag.contains("image2map:quick_place") && !player.isCreative()) {
+    if (tag != null && tag.copyNbt().contains("image2map:quick_place") && !player.isCreative()) {
       cir.setReturnValue(false);
       cir.cancel();
     }
diff --git a/src/main/java/space/essem/image2map/mixin/PlayerEntityMixin.java b/src/main/java/space/essem/image2map/mixin/PlayerEntityMixin.java
@@ -18,7 +18,7 @@ public class PlayerEntityMixin {
 
     @Shadow public ScreenHandler currentScreenHandler;
 
-    @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;damage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z", shift = At.Shift.BEFORE))
+    @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/PlayerLikeEntity;damage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z", shift = At.Shift.BEFORE))
     private void image2map$closeOnDamage(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         if (amount > 0 && this.currentScreenHandler instanceof VirtualScreenHandlerInterface handler && handler.getGui() instanceof MapGui computerGui) {
             computerGui.close();
diff --git a/src/main/java/space/essem/image2map/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/space/essem/image2map/mixin/ServerPlayNetworkHandlerMixin.java
@@ -38,13 +38,13 @@ public ServerPlayNetworkHandlerMixin(MinecraftServer server, ClientConnection co
         super(server, connection, clientData);
     }
 
-    @WrapWithCondition(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updatePositionAndAngles(DDDFF)V"))
+    @WrapWithCondition(method = "method_73086", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updatePositionAndAngles(DDDFF)V"))
     private boolean image2map$allowMovement(ServerPlayerEntity instance, double x, double y, double z, float p, float yaw) {
         if (this.player.currentScreenHandler instanceof VirtualScreenHandlerInterface handler && handler.getGui() instanceof MapGui computerGui) {
             double l = instance.getX() - this.lastTickX;
             double m = instance.getY() - this.lastTickY;
             double n = instance.getZ() - this.lastTickZ;
-            this.player.getWorld().getChunkManager().updatePosition(this.player);
+            this.player.getEntityWorld().getChunkManager().updatePosition(this.player);
             this.player.handleFall(l, m , n, player.isOnGround());
             this.player.setOnGround(player.isOnGround());
             this.syncWithPlayerPosition();
diff --git a/src/main/java/space/essem/image2map/renderer/MapRenderer.java b/src/main/java/space/essem/image2map/renderer/MapRenderer.java
@@ -95,7 +95,7 @@ public static List<ItemStack> toVanillaItems(CanvasImage image, ServerWorld worl
                 var stack = new ItemStack(Items.FILLED_MAP);
                 stack.set(DataComponentTypes.MAP_ID, id);
                 var data = ImageData.ofSimple(xs, ys, xSections, ySections);
-                stack.apply(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT, x -> x.with(NbtOps.INSTANCE, ImageData.CODEC, data).getOrThrow());
+                stack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(ImageData.CODEC.codec().encodeStart(NbtOps.INSTANCE, data).result().orElseThrow().asCompound().orElseThrow()));
                 stack.set(DataComponentTypes.LORE, new LoreComponent(List.of(
                         Text.literal(xs + " / " + ys).formatted(Formatting.GRAY),
                         Text.literal(url)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.10.+'`
	`2`	`+ id 'fabric-loom' version '1.11.+'`
`3`	`3`	`id 'maven-publish'`
`4`	`4`	`id "com.modrinth.minotaur" version "2.+"`
`5`	`5`	`}`
`@@ -29,7 +29,7 @@ dependencies {`
`29`	`29`
`30`	`30`	`modImplementation include("eu.pb4:map-canvas-api:${project.mapcanvas_version}")`
`31`	`31`	`modImplementation include("eu.pb4:sgui:${project.sgui_version}")`
`32`		`- modImplementation include("me.lucko:fabric-permissions-api:0.4.0")`
	`32`	`+ modImplementation include("me.lucko:fabric-permissions-api:0.4.2-patbox.1")`
`33`	`33`	`//implementation include("com.twelvemonkeys.imageio:imageio-webp:3.12.0")`
`34`	`34`	`}`
`35`	`35`