tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Sorters can now directly eject into inventories

Browse source
This commit is contained in:
Aidan Brady 2013-12-04 22:17:56 -05:00
parent b84445c9ea
commit 73c41f7863
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
View file

@ -79,10 +79,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
TileEntity back = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj); TileEntity back = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj);
TileEntity front = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); TileEntity front = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj);
if(back instanceof IInventory && front instanceof TileEntityLogisticalTransporter) if(back instanceof IInventory && (front instanceof TileEntityLogisticalTransporter || front instanceof IInventory))
{ {
IInventory inventory = (IInventory)back; IInventory inventory = (IInventory)back;
TileEntityLogisticalTransporter transporter = (TileEntityLogisticalTransporter)front;
InvStack inInventory = null; InvStack inInventory = null;
boolean hasFilter = false; boolean hasFilter = false;
@ -125,17 +124,31 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
{ {
ItemStack used = null; ItemStack used = null;
if(!roundRobin) if(front instanceof TileEntityLogisticalTransporter)
{ {
ItemStack rejects = TransporterUtils.insert(this, transporter, inInventory.getStack(), filterColor, true, min); TileEntityLogisticalTransporter transporter = (TileEntityLogisticalTransporter)front;
if(TransporterManager.didEmit(inInventory.getStack(), rejects)) if(!roundRobin)
{ {
used = TransporterManager.getToUse(inInventory.getStack(), rejects); ItemStack rejects = TransporterUtils.insert(this, transporter, inInventory.getStack(), filterColor, true, min);
if(TransporterManager.didEmit(inInventory.getStack(), rejects))
{
used = TransporterManager.getToUse(inInventory.getStack(), rejects);
}
}
else {
ItemStack rejects = TransporterUtils.insertRR(this, transporter, inInventory.getStack(), filterColor, true, min);
if(TransporterManager.didEmit(inInventory.getStack(), rejects))
{
used = TransporterManager.getToUse(inInventory.getStack(), rejects);
}
} }
} }
else { else if(front instanceof IInventory)
ItemStack rejects = TransporterUtils.insertRR(this, transporter, inInventory.getStack(), filterColor, true, min); {
ItemStack rejects = InventoryUtils.putStackInInventory((IInventory)front, inInventory.getStack(), facing, false);
if(TransporterManager.didEmit(inInventory.getStack(), rejects)) if(TransporterManager.didEmit(inInventory.getStack(), rejects))
{ {