diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 18d8899ec..7d50037c6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -10,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.ITransporterTile; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -193,11 +194,10 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento if(bottomStack != null && isActive) { TileEntity tile = Coord4D.get(this).getFromSide(ForgeDirection.getOrientation(0)).getTileEntity(worldObj); -/*TODO - if(tile instanceof ILogisticalTransporter) + if(tile instanceof ITransporterTile) { - ILogisticalTransporter transporter = (ILogisticalTransporter)tile; + ILogisticalTransporter transporter = ((ITransporterTile)tile).getTransmitter(); ItemStack rejects = TransporterUtils.insert(this, transporter, bottomStack, null, true, 0); @@ -211,7 +211,6 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento setInventorySlotContents(0, InventoryUtils.putStackInInventory((IInventory)tile, bottomStack, 0, false)); } -*/ delayTicks = 10; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 431087c8e..3ea23186b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -21,6 +21,7 @@ import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITransporterTile; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.miner.MItemStackFilter; @@ -296,14 +297,14 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I getTopEject(true, remains); } - else if(getEjectInv() instanceof ILogisticalTransporter) + else if(getEjectInv() instanceof ITransporterTile) { - /*TODO ItemStack rejected = TransporterUtils.insert(getEjectTile(), (ILogisticalTransporter)getEjectInv(), getTopEject(false, null), null, true, 0); + ItemStack rejected = TransporterUtils.insert(getEjectTile(), ((ITransporterTile)getEjectInv()).getTransmitter(), getTopEject(false, null), null, true, 0); if(TransporterManager.didEmit(getTopEject(false, null), rejected)) { getTopEject(true, rejected); - }*/ + } } delayTicks = 10; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 479511099..67f43e809 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -19,6 +19,7 @@ import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; +import mekanism.common.base.ITransporterTile; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; @@ -187,18 +188,18 @@ public class TileComponentEjector implements ITileComponent, IEjector TileEntity tile = Coord4D.get(tileEntity).getFromSide(side).getTileEntity(tileEntity.getWorldObj()); ItemStack prev = stack.copy(); - if(tile instanceof IInventory && !(tile instanceof ILogisticalTransporter)) + if(tile instanceof IInventory && !(tile instanceof ITransporterTile)) { stack = InventoryUtils.putStackInInventory((IInventory)tile, stack, side.ordinal(), false); } - else if(tile instanceof ILogisticalTransporter) + else if(tile instanceof ITransporterTile) { - /*TODO ItemStack rejects = TransporterUtils.insert(tileEntity, (ILogisticalTransporter)tile, stack, outputColor, true, 0); + ItemStack rejects = TransporterUtils.insert(tileEntity, ((ITransporterTile)tile).getTransmitter(), stack, outputColor, true, 0); if(TransporterManager.didEmit(stack, rejects)) { stack = rejects; - }*/ + } } if(stack == null || prev.stackSize != stack.stackSize)