Do some things I TODOed earlier
This commit is contained in:
parent
d70595ad84
commit
f4a6fb8274
3 changed files with 12 additions and 11 deletions
|
@ -10,6 +10,7 @@ import mekanism.common.Mekanism;
|
||||||
import mekanism.common.PacketHandler;
|
import mekanism.common.PacketHandler;
|
||||||
import mekanism.common.base.IActiveState;
|
import mekanism.common.base.IActiveState;
|
||||||
import mekanism.common.base.ILogisticalTransporter;
|
import mekanism.common.base.ILogisticalTransporter;
|
||||||
|
import mekanism.common.base.ITransporterTile;
|
||||||
import mekanism.common.content.transporter.TransporterManager;
|
import mekanism.common.content.transporter.TransporterManager;
|
||||||
import mekanism.common.item.ItemBlockBasic;
|
import mekanism.common.item.ItemBlockBasic;
|
||||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||||
|
@ -193,11 +194,10 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento
|
||||||
if(bottomStack != null && isActive)
|
if(bottomStack != null && isActive)
|
||||||
{
|
{
|
||||||
TileEntity tile = Coord4D.get(this).getFromSide(ForgeDirection.getOrientation(0)).getTileEntity(worldObj);
|
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);
|
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));
|
setInventorySlotContents(0, InventoryUtils.putStackInInventory((IInventory)tile, bottomStack, 0, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
|
||||||
delayTicks = 10;
|
delayTicks = 10;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@ import mekanism.common.base.IAdvancedBoundingBlock;
|
||||||
import mekanism.common.base.ILogisticalTransporter;
|
import mekanism.common.base.ILogisticalTransporter;
|
||||||
import mekanism.common.base.IRedstoneControl;
|
import mekanism.common.base.IRedstoneControl;
|
||||||
import mekanism.common.base.ISustainedData;
|
import mekanism.common.base.ISustainedData;
|
||||||
|
import mekanism.common.base.ITransporterTile;
|
||||||
import mekanism.common.base.IUpgradeTile;
|
import mekanism.common.base.IUpgradeTile;
|
||||||
import mekanism.common.block.BlockMachine.MachineType;
|
import mekanism.common.block.BlockMachine.MachineType;
|
||||||
import mekanism.common.content.miner.MItemStackFilter;
|
import mekanism.common.content.miner.MItemStackFilter;
|
||||||
|
@ -296,14 +297,14 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||||
|
|
||||||
getTopEject(true, remains);
|
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))
|
if(TransporterManager.didEmit(getTopEject(false, null), rejected))
|
||||||
{
|
{
|
||||||
getTopEject(true, rejected);
|
getTopEject(true, rejected);
|
||||||
}*/
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
delayTicks = 10;
|
delayTicks = 10;
|
||||||
|
|
|
@ -19,6 +19,7 @@ import mekanism.common.base.ILogisticalTransporter;
|
||||||
import mekanism.common.base.ISideConfiguration;
|
import mekanism.common.base.ISideConfiguration;
|
||||||
import mekanism.common.base.ITankManager;
|
import mekanism.common.base.ITankManager;
|
||||||
import mekanism.common.base.ITileComponent;
|
import mekanism.common.base.ITileComponent;
|
||||||
|
import mekanism.common.base.ITransporterTile;
|
||||||
import mekanism.common.content.transporter.TransporterManager;
|
import mekanism.common.content.transporter.TransporterManager;
|
||||||
import mekanism.common.tile.TileEntityContainerBlock;
|
import mekanism.common.tile.TileEntityContainerBlock;
|
||||||
import mekanism.common.util.InventoryUtils;
|
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());
|
TileEntity tile = Coord4D.get(tileEntity).getFromSide(side).getTileEntity(tileEntity.getWorldObj());
|
||||||
ItemStack prev = stack.copy();
|
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);
|
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))
|
if(TransporterManager.didEmit(stack, rejects))
|
||||||
{
|
{
|
||||||
stack = rejects;
|
stack = rejects;
|
||||||
}*/
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(stack == null || prev.stackSize != stack.stackSize)
|
if(stack == null || prev.stackSize != stack.stackSize)
|
||||||
|
|
Loading…
Reference in a new issue