diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ee4549b3..0de10c9ea 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ - Fixed rendering crash with Disk Drive - Fixed crash when quickly toggling sorting direction in Grid - Fixed not being able to clear exporter row in interface -- Fixed interface having weird extraction / insertion rules. It can now take items from any side, or extract items from any side depending on the block that is inserting or extracting the item (like conduits). **Features** - Added config option to set the base energy usage of the Controller (default is 0) diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerInterface.java b/src/main/java/refinedstorage/inventory/ItemHandlerInterface.java deleted file mode 100755 index 8fff53eb5..000000000 --- a/src/main/java/refinedstorage/inventory/ItemHandlerInterface.java +++ /dev/null @@ -1,24 +0,0 @@ -package refinedstorage.inventory; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.ItemStackHandler; - -public class ItemHandlerInterface extends ItemStackHandler { - private ItemHandlerBasic importItems; - private ItemHandlerBasic exportItems; - - public ItemHandlerInterface(ItemHandlerBasic importItems, ItemHandlerBasic exportItems) { - this.importItems = importItems; - this.exportItems = exportItems; - } - - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - return importItems.insertItem(slot, stack, simulate); - } - - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - return exportItems.extractItem(slot, amount, simulate); - } -} diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 228044364..13703ad11 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,7 +12,6 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper; import refinedstorage.RefinedStorage; import refinedstorage.container.ContainerInterface; import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerInterface; import refinedstorage.inventory.ItemHandlerUpgrade; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; @@ -23,7 +22,6 @@ public class TileInterface extends TileNode implements ICompareConfig { private ItemHandlerBasic importItems = new ItemHandlerBasic(9, this); private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this); private ItemHandlerBasic exportItems = new ItemHandlerBasic(9, this); - private ItemHandlerInterface itemHandler = new ItemHandlerInterface(importItems, exportItems); private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK); private int compare = 0; @@ -175,7 +173,11 @@ public class TileInterface extends TileNode implements ICompareConfig { @Override public T getCapability(Capability capability, EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return (T) itemHandler; + if (facing == EnumFacing.DOWN) { + return (T) exportItems; + } else { + return (T) importItems; + } } return super.getCapability(capability, facing);