Update to 1.21.6

Author: Patbox

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.5-rc1
-yarn_mappings=1.21.5-rc1+build.1
-loader_version=0.16.10
+minecraft_version=1.21.6-pre3
+yarn_mappings=1.21.6-pre3+build.1
+loader_version=0.16.14
 
 #Fabric api
-fabric_version=0.119.1+1.21.5
+fabric_version=0.126.0+1.21.6
 
 # Mod Properties
-mod_version = 1.9.1+1.21.5
+mod_version = 1.10.0+1.21.6
 maven_group = eu.pb4
 archives_base_name = sgui
 

src/main/java/eu/pb4/sgui/api/gui/SignGui.java

@@ -166,7 +166,7 @@ public void close(boolean alreadyClosed) {
             this.open = false;
             this.reOpen = false;
 
-            this.player.networkHandler.sendPacket(new BlockUpdateS2CPacket(player.getServerWorld(), signEntity.getPos()));
+            this.player.networkHandler.sendPacket(new BlockUpdateS2CPacket(player.getWorld(), signEntity.getPos()));
 
             if (alreadyClosed && this.player.currentScreenHandler == this.screenHandler) {
                 this.player.onHandledScreenClosed();

src/main/java/eu/pb4/sgui/mixin/ServerPlayNetworkHandlerMixin.java

@@ -292,9 +292,9 @@ public ServerPlayNetworkHandlerMixin(MinecraftServer server, ClientConnection co
                 var pos = packet.getBlockHitResult().getBlockPos();
                 handler.syncSelectedSlot();
 
-                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getServerWorld().getBlockState(pos)));
+                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getWorld().getBlockState(pos)));
                 pos = pos.offset(packet.getBlockHitResult().getSide());
-                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getServerWorld().getBlockState(pos)));
+                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getWorld().getBlockState(pos)));
                 this.sendPacket(new PlayerActionResponseS2CPacket(packet.getSequence()));
 
                 ci.cancel();
@@ -314,9 +314,9 @@ public ServerPlayNetworkHandlerMixin(MinecraftServer server, ClientConnection co
                     handler.syncOffhandSlot();
                 }
 
-                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getServerWorld().getBlockState(pos)));
+                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getWorld().getBlockState(pos)));
                 pos = pos.offset(packet.getDirection());
-                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getServerWorld().getBlockState(pos)));
+                this.sendPacket(new BlockUpdateS2CPacket(pos, this.player.getWorld().getBlockState(pos)));
                 this.sendPacket(new PlayerActionResponseS2CPacket(packet.getSequence()));
                 ci.cancel();
             }

src/main/java/eu/pb4/sgui/mixin/ServerPlayerEntityMixin.java

@@ -28,8 +28,8 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Pl
     @Unique
     private boolean sgui$ignoreNext = false;
 
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
-        super(world, pos, yaw, gameProfile);
+    public ServerPlayerEntityMixin(World world, GameProfile gameProfile) {
+        super(world, gameProfile);
     }
 
     @Inject(method = "openHandledScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;closeHandledScreen()V", shift = At.Shift.BEFORE))

src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java

@@ -58,7 +58,7 @@ public boolean onClick(int index, ClickType type, SlotActionType action, GuiElem
 
                 @Override
                 public void onTick() {
-                    this.setSlot(0, new GuiElementBuilder(Items.ARROW).setCount((int) (player.getServerWorld().getTime() % 99999)).setMaxCount(99999));
+                    this.setSlot(0, new GuiElementBuilder(Items.ARROW).setCount((int) (player.getWorld().getTime() % 99999)).setMaxCount(99999));
                     super.onTick();
                 }
 
@@ -106,7 +106,7 @@ public boolean canPlayerClose() {
             );
 
             gui.setSlot(6, new GuiElementBuilder(Items.PLAYER_HEAD)
-                    .setSkullOwner(new GameProfile(UUID.fromString("f5a216d9-d660-4996-8d0f-d49053677676"), "patbox"), player.server)
+                    .setSkullOwner(new GameProfile(UUID.fromString("f5a216d9-d660-4996-8d0f-d49053677676"), "patbox"), player.getServer())
                     .setName(Text.literal("# Patbox's Head #"))
                     .glow()
             );
@@ -555,7 +555,7 @@ public boolean onSelectedSlotChange(int slot) {
             );
 
             gui.setSlot(6, new GuiElementBuilder(Items.PLAYER_HEAD)
-                    .setSkullOwner(new GameProfile(UUID.fromString("f5a216d9-d660-4996-8d0f-d49053677676"), "patbox"), player.server)
+                    .setSkullOwner(new GameProfile(UUID.fromString("f5a216d9-d660-4996-8d0f-d49053677676"), "patbox"), player.getServer())
                     .setName(Text.literal("Patbox's Head"))
                     .glow()
             );