Merge pull request #31 from LukynkaCZE/update/1.21.5

Update to minecraft version 1.21.5

Author: LukynkaCZE

gradle.properties

@@ -5,14 +5,14 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Fabric API
-fabric_version=0.115.1+1.21.4
+fabric_version=0.119.5+1.21.5
 
 # Mod Properties
-mod_version=1.3.4
+mod_version=1.3.5
 maven_group=cz.lukynka
 archives_base_name=better-saved-hotbars

src/main/java/cz/lukynka/bettersavedhotbars/mixin/CreativeModeInventoryScreen.java

@@ -78,9 +78,10 @@ private void slotClicked(@Nullable Slot slot, int i, int j, ClickType clickType,
     private Inventory fakeInventoryWithModifiedHotbar(List<ItemStack> existingItems, Integer slot, ItemStack itemStack) {
         assert Minecraft.getInstance().player != null;
         var player = Minecraft.getInstance().player;
-        var fakeInventory = new Inventory(player);
+        var fakeInventory = new Inventory(player, ((InventoryAccessor) player.getInventory()).getEquipment());
         var i = 0;
-        fakeInventory.items.clear();
+        var fakeInventoryAccessor = ((InventoryAccessor) fakeInventory);
+        fakeInventoryAccessor.getItems().clear();
         for(ItemStack item : existingItems) {
             fakeInventory.setItem(i, existingItems.get(i));
             i++;

src/main/java/cz/lukynka/bettersavedhotbars/mixin/InventoryAccessor.java

@@ -0,0 +1,18 @@
+package cz.lukynka.bettersavedhotbars.mixin;
+
+import net.minecraft.core.NonNullList;
+import net.minecraft.world.entity.EntityEquipment;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Inventory.class)
+public interface InventoryAccessor {
+
+    @Accessor("equipment")
+    public EntityEquipment getEquipment();
+
+    @Accessor("items")
+    public NonNullList<ItemStack> getItems();
+}

src/main/resources/bettersavedhotbars.mixins.json

@@ -4,6 +4,7 @@
   "package": "cz.lukynka.bettersavedhotbars.mixin",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
+    "InventoryAccessor"
   ],
   "client": [
     "CreativeModeInventoryScreen",