From e664a7dfad32e681f39c86f78eb17651f16ac895 Mon Sep 17 00:00:00 2001 From: Virtuoel Date: Wed, 3 Jun 2015 16:45:45 +0300 Subject: [PATCH 1/3] Fix dupe bug #835 Alchemical bag that is held can no longer be moved. Number keys no longer move items around. --- .../gui/inventory/GuiAlchemicalBag.java | 7 +++ .../ee3/inventory/ContainerAlchemicalBag.java | 45 +++++++++++++++++-- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java index d37a86bc..38429a6c 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java @@ -96,4 +96,11 @@ public class GuiAlchemicalBag extends GuiContainer } } } + + @Override + protected boolean checkHotbarKeys(int key) + { + return false; + } + } diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java index b15083d3..ae729502 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java @@ -95,15 +95,54 @@ public class ContainerAlchemicalBag extends ContainerEE { if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 0) { - this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162)); + if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack)) + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162)); + } + else + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162) + { + public boolean canTakeStack(EntityPlayer p_82869_1_) + { + return false; + } + }); + } } else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 1) { - this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216)); + if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack)) + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216)); + } + else + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216) + { + public boolean canTakeStack(EntityPlayer p_82869_1_) + { + return false; + } + }); + } } else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 2) { - this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232)); + if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack)) + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232)); + } + else + { + this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232) + { + public boolean canTakeStack(EntityPlayer p_82869_1_) + { + return false; + } + }); + } } } } From 7d799a41c801c2b6c1477d340770d19f1d0159dc Mon Sep 17 00:00:00 2001 From: Virtuoel Date: Wed, 3 Jun 2015 16:47:42 +0300 Subject: [PATCH 2/3] Fix dupe bug #866 Number keys no longer move items around. --- .../ee3/client/gui/inventory/GuiTransmutationTablet.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiTransmutationTablet.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiTransmutationTablet.java index 359c30d2..3f1d990c 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiTransmutationTablet.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiTransmutationTablet.java @@ -169,6 +169,12 @@ public class GuiTransmutationTablet extends GuiBase tickCount++; } + @Override + protected boolean checkHotbarKeys(int key) + { + return false; + } + @Override public void handleElementButtonClick(String buttonName, int mouseButton) { From 13c9f8d8c2fdbeb652a32fb800d41d4fd17d1a64 Mon Sep 17 00:00:00 2001 From: Virtuoel Date: Wed, 3 Jun 2015 16:49:36 +0300 Subject: [PATCH 3/3] Fix Transmutation Tablet inventory name --- .../com/pahimar/ee3/inventory/InventoryTransmutationTablet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/pahimar/ee3/inventory/InventoryTransmutationTablet.java b/src/main/java/com/pahimar/ee3/inventory/InventoryTransmutationTablet.java index 88c0bdba..f8ea4897 100644 --- a/src/main/java/com/pahimar/ee3/inventory/InventoryTransmutationTablet.java +++ b/src/main/java/com/pahimar/ee3/inventory/InventoryTransmutationTablet.java @@ -130,7 +130,7 @@ public class InventoryTransmutationTablet implements IInventory @Override public String getInventoryName() { - return Names.Containers.ALCHEMICAL_TOME; + return Names.Containers.TRANSMUTATION_TABLET; } @Override