This commit is contained in:
Raoul Van den Berge
2016-07-31 17:37:37 +02:00
parent 370dfc88cb
commit 74a62f5035
3 changed files with 5 additions and 28 deletions

View File

@@ -5,7 +5,6 @@
- Fixed rendering crash with Disk Drive - Fixed rendering crash with Disk Drive
- Fixed crash when quickly toggling sorting direction in Grid - Fixed crash when quickly toggling sorting direction in Grid
- Fixed not being able to clear exporter row in interface - 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** **Features**
- Added config option to set the base energy usage of the Controller (default is 0) - Added config option to set the base energy usage of the Controller (default is 0)

View File

@@ -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);
}
}

View File

@@ -12,7 +12,6 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.container.ContainerInterface; import refinedstorage.container.ContainerInterface;
import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemHandlerInterface;
import refinedstorage.inventory.ItemHandlerUpgrade; import refinedstorage.inventory.ItemHandlerUpgrade;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.ICompareConfig; 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 importItems = new ItemHandlerBasic(9, this);
private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this); private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this);
private ItemHandlerBasic exportItems = 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 ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
private int compare = 0; private int compare = 0;
@@ -175,7 +173,11 @@ public class TileInterface extends TileNode implements ICompareConfig {
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { 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); return super.getCapability(capability, facing);