Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docking stations can provide items/fluids only on wooden/emerald pipes from the input side of the pipe

Browse source
This commit is contained in:
Hea3veN 2015-04-14 22:42:03 -03:00
parent b3ce32f26b
commit f792040415
3 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
common/buildcraft/robotics/DockingStationPipe.java
View file

@ -14,11 +14,12 @@ import buildcraft.api.robots.RobotManager;
import buildcraft.api.statements.StatementSlot;
import buildcraft.api.transport.IInjectable;
import buildcraft.api.transport.IPipeTile;
import buildcraft.core.lib.inventory.InventoryConcatenator;
import buildcraft.transport.Pipe;
import buildcraft.transport.PipeTransportItems;
import buildcraft.transport.TravelingItem;
import buildcraft.transport.gates.ActionIterator;
import buildcraft.transport.pipes.PipeFluidsWood;
import buildcraft.transport.pipes.PipeItemsWood;
public class DockingStationPipe extends DockingStation {
@ -85,30 +86,45 @@ public class DockingStationPipe extends DockingStation {
@Override
public IInventory getItemInput() {
InventoryConcatenator inv = InventoryConcatenator.make();
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
TileEntity nearbyTile = getPipe().getWorld().getTileEntity(x() + dir.offsetX,
y() + dir.offsetY, z() + dir.offsetZ);
if (nearbyTile instanceof IInventory) {
inv = inv.add((IInventory) nearbyTile);
}
}
if (inv.getSizeInventory() > 0) {
return inv;
} else {
if (getPipe().getPipeType() != IPipeTile.PipeType.ITEM) {
return null;
}
if (!(getPipe().getPipe() instanceof PipeItemsWood)) {
return null;
}
int meta = ((TileEntity) getPipe()).getBlockMetadata();
ForgeDirection dir = ForgeDirection.getOrientation(meta);
TileEntity connectedTile = getPipe().getWorld().getTileEntity(x() + dir.offsetX,
y() + dir.offsetY, z() + dir.offsetZ);
if (connectedTile instanceof IInventory) {
return (IInventory) connectedTile;
}
return null;
}
@Override
public IFluidHandler getFluidInput() {
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
TileEntity nearbyTile = getPipe().getWorld().getTileEntity(x() + dir.offsetX,
if (getPipe().getPipeType() != IPipeTile.PipeType.FLUID) {
return null;
}
if (!(getPipe().getPipe() instanceof PipeFluidsWood)) {
return null;
}
int meta = ((TileEntity) getPipe()).getBlockMetadata();
ForgeDirection dir = ForgeDirection.getOrientation(meta);
TileEntity connectedTile = getPipe().getWorld().getTileEntity(x() + dir.offsetX,
y() + dir.offsetY, z() + dir.offsetZ);
if (nearbyTile instanceof IFluidHandler) {
return (IFluidHandler) nearbyTile;
}
if (connectedTile instanceof IFluidHandler) {
return (IFluidHandler) connectedTile;
}
return null;
}
@ -118,7 +134,7 @@ public class DockingStationPipe extends DockingStation {
return null;
}
return (IFluidHandler) getPipe();
return (IFluidHandler) ((Pipe) getPipe().getPipe()).transport;
}
@Override

1
common/buildcraft/robotics/ai/AIRobotUnloadFluids.java
View file

@ -35,7 +35,6 @@ public class AIRobotUnloadFluids extends AIRobot {
if (unload(robot, robot.getDockingStation(), true) == 0) {
terminate();
} else {
waitedCycles = 0;
setSuccess(true);
}
}

4
common/buildcraft/robotics/statements/RobotsActionProvider.java
View file

@ -73,11 +73,11 @@ public class RobotsActionProvider implements IActionProvider {
continue;
}
if (station.getItemOutput() != null) {
if (station.getItemInput() != null) {
result.add(BuildCraftRobotics.actionStationProvideItems);
}
if (station.getFluidOutput() != null) {
if (station.getFluidInput() != null) {
result.add(BuildCraftRobotics.actionStationProvideFluids);
}