Update to 1.21.6

Patbox · Patbox · commit 22999febeeba · 2025-06-19T19:31:26.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
           21    # Minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
diff --git a/.profileconfig.json b/.profileconfig.json
@@ -0,0 +1,64 @@
+{
+    "jfrConfig": {
+        "settings": "profile"
+    },
+    "asyncProfilerConfig": {
+        "jfrsync": true,
+        "alloc": true,
+        "event": "wall",
+        "misc": ""
+    },
+    "file": "$PROJECT_DIR/profile.jfr",
+    "conversionConfig": {
+        "nonProjectPackagePrefixes": [
+            "java.",
+            "javax.",
+            "kotlin.",
+            "jdk.",
+            "com.google.",
+            "org.apache.",
+            "org.spring.",
+            "sun.",
+            "scala."
+        ],
+        "enableMarkers": true,
+        "initialVisibleThreads": 10,
+        "initialSelectedThreads": 10,
+        "includeGCThreads": false,
+        "includeInitialSystemProperty": false,
+        "includeInitialEnvironmentVariables": false,
+        "includeSystemProcesses": false,
+        "ignoredEvents": [
+            "jdk.ActiveSetting",
+            "jdk.ActiveRecording",
+            "jdk.BooleanFlag",
+            "jdk.IntFlag",
+            "jdk.DoubleFlag",
+            "jdk.LongFlag",
+            "jdk.NativeLibrary",
+            "jdk.StringFlag",
+            "jdk.UnsignedIntFlag",
+            "jdk.UnsignedLongFlag",
+            "jdk.InitialSystemProperty",
+            "jdk.InitialEnvironmentVariable",
+            "jdk.SystemProcess",
+            "jdk.ModuleExport",
+            "jdk.ModuleRequire"
+        ],
+        "minRequiredItemsPerThread": 3
+    },
+    "additionalGradleTargets": [
+        {
+            "targetPrefix": "quarkus",
+            "optionForVmArgs": "-Djvm.args",
+            "description": "Example quarkus config, adding profiling arguments via -Djvm.args option to the Gradle task run"
+        }
+    ],
+    "additionalMavenTargets": [
+        {
+            "targetPrefix": "quarkus:",
+            "optionForVmArgs": "-Djvm.args",
+            "description": "Example quarkus config, adding profiling arguments via -Djvm.args option to the Maven goal run"
+        }
+    ]
+}
diff --git a/build.gradle b/build.gradle
@@ -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.3.3")
+	modImplementation include("me.lucko:fabric-permissions-api:0.4.0")
 	implementation include("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,16 +3,19 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.21.5
-	yarn_mappings=1.21.5+build.1
-	loader_version=0.16.10
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14
+loom_version=1.10-SNAPSHOT
+
+# Fabric API
+fabric_version=0.127.0+1.21.6
 
 # Mod Properties
-	mod_version = 0.9.1+1.21.5
+	mod_version = 0.10.0+1.21.6
 	maven_group = space.essem
 	archives_base_name = image2map
 
 # Dependencies
-	fabric_version=0.119.1+1.21.5
 	mapcanvas_version=0.5.1+1.21.5
-	sgui_version=1.9.0+1.21.5
+	sgui_version=1.10.0+1.21.6
diff --git a/src/main/java/space/essem/image2map/gui/MapGui.java b/src/main/java/space/essem/image2map/gui/MapGui.java
@@ -3,6 +3,7 @@
 import com.google.common.base.Predicates;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.tree.ArgumentCommandNode;
+import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 import eu.pb4.mapcanvas.api.core.*;
 import eu.pb4.mapcanvas.api.utils.VirtualDisplay;
@@ -25,6 +26,7 @@
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.network.packet.s2c.play.*;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.PlayerInput;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -62,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.getServerWorld());
+        this.entity = new HorseEntity(EntityType.HORSE, player.getWorld());
         this.entity.setYaw(0);
         this.entity.setHeadYaw(0);
         this.entity.setNoGravity(true);
@@ -147,7 +149,7 @@ public void onTick() {
     public void onClose() {
         //this.cursor.remove();
         this.destroy();
-        this.player.server.getCommandManager().sendCommandTree(this.player);
+        this.player.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()) {
@@ -236,7 +238,23 @@ public void onPlayerCommand(int id, ClientCommandC2SPacket.Mode command, int dat
             )
         );
 
-        COMMAND_PACKET = new CommandTreeS2CPacket(commandNode);
+        COMMAND_PACKET = new CommandTreeS2CPacket(commandNode, new CommandTreeS2CPacket.CommandNodeInspector<CommandSource>() {
+            @Nullable
+            @Override
+            public Identifier getSuggestionProviderId(ArgumentCommandNode<CommandSource, ?> node) {
+                return null;
+            }
+
+            @Override
+            public boolean isExecutable(CommandNode<CommandSource> node) {
+                return true;
+            }
+
+            @Override
+            public boolean hasRequiredLevel(CommandNode<CommandSource> node) {
+                return false;
+            }
+        });
     }
 
 
diff --git a/src/main/java/space/essem/image2map/gui/PreviewGui.java b/src/main/java/space/essem/image2map/gui/PreviewGui.java
@@ -6,15 +6,22 @@
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+import com.mojang.brigadier.tree.ArgumentCommandNode;
+import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 import eu.pb4.mapcanvas.api.core.CanvasColor;
 import eu.pb4.mapcanvas.api.core.CanvasImage;
 import eu.pb4.mapcanvas.api.font.DefaultFonts;
 import eu.pb4.mapcanvas.api.utils.CanvasUtils;
+import net.minecraft.command.suggestion.SuggestionProviders;
 import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
+import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
+import org.jetbrains.annotations.Nullable;
 import space.essem.image2map.Image2Map;
 import space.essem.image2map.renderer.MapRenderer;
 
@@ -44,7 +51,24 @@ public PreviewGui(ServerPlayerEntity player, BufferedImage image, String source,
         this.source = source;
         this.sourceImage = image;
 
-        player.networkHandler.sendPacket(new CommandTreeS2CPacket((RootCommandNode) COMMANDS.getRoot()));
+        player.networkHandler.sendPacket(new CommandTreeS2CPacket(COMMANDS.getRoot(), new CommandTreeS2CPacket.CommandNodeInspector<>() {
+            @Nullable
+            @Override
+            public Identifier getSuggestionProviderId(ArgumentCommandNode<PreviewGui, ?> node) {
+                var suggestionProvider = node.getCustomSuggestions();
+                return suggestionProvider != null ? SuggestionProviders.computeId(suggestionProvider) : null;
+            }
+
+            @Override
+            public boolean isExecutable(CommandNode<PreviewGui> node) {
+                return node.getCommand() != null;
+            }
+
+            @Override
+            public boolean hasRequiredLevel(CommandNode<PreviewGui> node) {
+                return false;
+            }
+        }));
 
         this.updateImage();
 
@@ -186,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.getServerWorld(), x.getSource().source),
+                        MapRenderer.toVanillaItems(x.getSource().image, x.getSource().player.getWorld(), x.getSource().source),
                         x.getSource().source, x.getSource().width, x.getSource().height);
 
                 x.getSource().close();
@@ -198,6 +222,11 @@ private static <T> RequiredArgumentBuilder<PreviewGui, T> argument(String name,
 
         COMMANDS.register(literal("size")
                 .then(argument("width", IntegerArgumentType.integer(1))
+                        .executes(x -> {
+                            var w = IntegerArgumentType.getInteger(x, "width");
+                            x.getSource().setSize(w, x.getSource().sourceImage.getHeight() * w / x.getSource().sourceImage.getWidth());
+                            return 0;
+                        })
                         .then(argument("height", IntegerArgumentType.integer(1)).executes(x -> {
                             x.getSource().setSize(IntegerArgumentType.getInteger(x, "width"), IntegerArgumentType.getInteger(x, "height"));
                             return 0;
diff --git a/src/main/java/space/essem/image2map/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/space/essem/image2map/mixin/ServerPlayNetworkHandlerMixin.java
@@ -44,7 +44,7 @@ public ServerPlayNetworkHandlerMixin(MinecraftServer server, ClientConnection co
             double l = instance.getX() - this.lastTickX;
             double m = instance.getY() - this.lastTickY;
             double n = instance.getZ() - this.lastTickZ;
-            this.player.getServerWorld().getChunkManager().updatePosition(this.player);
+            this.player.getWorld().getChunkManager().updatePosition(this.player);
             this.player.handleFall(l, m , n, player.isOnGround());
             this.player.setOnGround(player.isOnGround());
             this.syncWithPlayerPosition();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ jobs:`
`15`	`15`	`21 # Minimum supported by Minecraft`
`16`	`16`	`]`
`17`	`17`	`# and run on both Linux and Windows`
`18`		`- os: [ubuntu-20.04]`
	`18`	`+ os: [ubuntu-latest]`
`19`	`19`	`runs-on: ${{ matrix.os }}`
`20`	`20`	`steps:`
`21`	`21`	`- name: checkout repository`
Original file line number	Diff line number	Diff line change
`@@ -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.3.3")`
	`32`	`+ modImplementation include("me.lucko:fabric-permissions-api:0.4.0")`
`33`	`33`	`implementation include("com.twelvemonkeys.imageio:imageio-webp:3.12.0")`
`34`	`34`	`}`
`35`	`35`