From 0cabe335dd42c65d2dbd2ecc509e5f7a52ca3c58 Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:41:25 +0200 Subject: [PATCH] fix aiob when opening chisel in some slots (#51) --- src/main/java/team/chisel/inventory/ContainerChisel.java | 4 ++-- src/main/java/team/chisel/inventory/SlotChiselSelection.java | 2 +- src/main/java/team/chisel/item/chisel/ChiselMode.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/team/chisel/inventory/ContainerChisel.java b/src/main/java/team/chisel/inventory/ContainerChisel.java index 47562700..0c6570a6 100644 --- a/src/main/java/team/chisel/inventory/ContainerChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerChisel.java @@ -152,13 +152,13 @@ public class ContainerChisel extends Container { } public void onChiselSlotChanged() { - ItemStack stack = playerInventory.mainInventory[chiselSlot]; + ItemStack stack = playerInventory.getStackInSlot(chiselSlot); if (stack == null || !stack.isItemEqual(chisel)) finished = true; if (finished) return; General.setChiselTarget(chisel, inventory.getStackInSpecialSlot()); - playerInventory.mainInventory[chiselSlot] = chisel; + playerInventory.setInventorySlotContents(chiselSlot, chisel); } } diff --git a/src/main/java/team/chisel/inventory/SlotChiselSelection.java b/src/main/java/team/chisel/inventory/SlotChiselSelection.java index 1d0d673e..de7764d8 100644 --- a/src/main/java/team/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/team/chisel/inventory/SlotChiselSelection.java @@ -66,7 +66,7 @@ public class SlotChiselSelection extends Slot { .onChisel(player.worldObj, container.chisel, General.getVariation(crafted))) { container.chisel.damageItem(1, player); if (container.chisel.stackSize <= 0) { - player.inventory.mainInventory[player.inventory.currentItem] = null; + player.setCurrentItemOrArmor(0, null); } } diff --git a/src/main/java/team/chisel/item/chisel/ChiselMode.java b/src/main/java/team/chisel/item/chisel/ChiselMode.java index aee41ba5..35cf6252 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselMode.java +++ b/src/main/java/team/chisel/item/chisel/ChiselMode.java @@ -121,7 +121,7 @@ public enum ChiselMode implements IChiselMode { player.getCurrentEquippedItem() .damageItem(1, player); if (player.getCurrentEquippedItem().stackSize <= 0) { - player.inventory.mainInventory[player.inventory.currentItem] = null; + player.setCurrentItemOrArmor(0, null); breakChisel = true; } }