From 020f30b418974047eaf6ee72053e5eb42f13d7ca Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 15 Aug 2015 23:37:27 -0700 Subject: [PATCH] Fix #793 frames should not be automated or stack in Apiaries --- .../java/forestry/apiculture/gadgets/TileApiary.java | 11 ++++++++++- .../core/inventory/InventoryAdapterRestricted.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 3258dbfa7..cd336ddde 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -139,12 +139,21 @@ public class TileApiary extends TileBeeHousing { @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { if (Utils.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { - return itemStack.getItem() instanceof IHiveFrame; + return (itemStack.getItem() instanceof IHiveFrame) && (getStackInSlot(slotIndex) == null); } return super.canSlotAccept(slotIndex, itemStack); } + // override for pipe automation + @Override + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + if (Utils.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { + return false; + } + return super.isItemValidForSlot(slotIndex, itemStack); + } + public IInventory getFrameInventory() { return new InventoryMapper(this, SLOT_FRAMES_1, SLOT_FRAMES_COUNT); } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java index 4bbca1512..e7061b515 100644 --- a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java @@ -35,7 +35,7 @@ public class InventoryAdapterRestricted extends InventoryAdapter { } @Override - public final boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { if (itemStack == null || !accessHandler.allowsPipeConnections()) { return false; }