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

Transporters can now auto-pull items from adjacent sides, fixed recalculation logic with differing side types

Browse source
This commit is contained in:
Aidan Brady 2013-12-21 19:54:12 -05:00
parent f25bc6f941
commit 6cf6ba2b09
1 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
common/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -16,6 +16,7 @@ import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityLogisticalSorter;
import mekanism.common.transporter.InvStack;
import mekanism.common.transporter.TransporterManager;
import mekanism.common.transporter.TransporterStack;
import mekanism.common.transporter.TransporterStack.Path;
@ -53,6 +54,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
public EnumColor color;
public int pullDelay = 0;
public HashList<TransporterStack> transit = new HashList<TransporterStack>();
public Set<TransporterStack> needsSync = new HashSet<TransporterStack>();
@ -187,6 +190,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
else {
Set<TransporterStack> remove = new HashSet<TransporterStack>();
pullItems();
for(TransporterStack stack : transit)
{
if(!stack.initiatedPath)
@ -273,7 +278,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
{
if(stack.isFinal(this))
{
if(stack.pathType == Path.DEST && !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), false))
if(stack.pathType == Path.DEST && (!checkSideForInsert(stack) || !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), false)))
{
if(!recalculate(stack, null))
{
@ -281,7 +286,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
continue;
}
}
else if(stack.pathType == Path.HOME && !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), true))
else if(stack.pathType == Path.HOME && (!checkSideForInsert(stack) || !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), true)))
{
if(!recalculate(stack, null))
{
@ -338,6 +343,51 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
}
}
private boolean checkSideForInsert(TransporterStack stack)
{
ForgeDirection side = ForgeDirection.getOrientation(stack.getSide(this));
return getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PUSH;
}
private void pullItems()
{
if(pullDelay == 0)
{
boolean did = false;
for(ForgeDirection side : getConnections(ConnectionType.PULL))
{
TileEntity tile = Coord4D.get(tile()).getFromSide(side).getTileEntity(world());
if(tile instanceof IInventory)
{
IInventory inv = (IInventory)tile;
InvStack stack = InventoryUtils.takeTopStack(inv, side.ordinal());
if(stack != null && stack.getStack() != null)
{
ItemStack rejects = TransporterUtils.insert(tile, this, stack.getStack(), color, true, 0);
if(TransporterManager.didEmit(stack.getStack(), rejects))
{
did = true;
stack.use(TransporterManager.getToUse(stack.getStack(), rejects).stackSize);
}
}
}
}
if(did)
{
pullDelay = 10;
}
}
else {
pullDelay--;
}
}
private boolean recalculate(TransporterStack stack, Coord4D from)
{
needsSync.add(stack);