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

Wooden Pipes shouldn't orient to pipes

Browse source 
Closes #1218
This commit is contained in:
CovertJaguar 2013-09-24 10:17:21 -07:00
parent 93290e0ad9
commit 3c84c34bd9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/transport/pipes/PipeFluidsWood.java
View file

@ -13,8 +13,8 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type; import buildcraft.api.power.PowerHandler.Type;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.PipeManager;
import buildcraft.core.TileBuffer;
import buildcraft.core.network.TileNetworkData; import buildcraft.core.network.TileNetworkData;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeIconProvider;
@ -41,6 +41,8 @@ public class PipeFluidsWood extends Pipe<PipeTransportFluids> implements IPowerR
private PipeLogicWood logic = new PipeLogicWood(this) { private PipeLogicWood logic = new PipeLogicWood(this) {
@Override @Override
protected boolean isValidConnectingTile(TileEntity tile) { protected boolean isValidConnectingTile(TileEntity tile) {
if(tile instanceof IPipeTile)
return false;
if (!(tile instanceof IFluidHandler)) if (!(tile instanceof IFluidHandler))
return false; return false;
if (!PipeManager.canExtractFluids(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord)) if (!PipeManager.canExtractFluids(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord))

4
common/buildcraft/transport/pipes/PipeItemsWood.java
View file

@ -15,8 +15,8 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type; import buildcraft.api.power.PowerHandler.Type;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.PipeManager;
import buildcraft.core.TileBuffer;
import buildcraft.transport.TravelingItem; import buildcraft.transport.TravelingItem;
import buildcraft.core.inventory.InventoryWrapper; import buildcraft.core.inventory.InventoryWrapper;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
@ -40,6 +40,8 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> implements IPowerRec
private PipeLogicWood logic = new PipeLogicWood(this) { private PipeLogicWood logic = new PipeLogicWood(this) {
@Override @Override
protected boolean isValidConnectingTile(TileEntity tile) { protected boolean isValidConnectingTile(TileEntity tile) {
if (tile instanceof IPipeTile)
return false;
if (!(tile instanceof IInventory)) if (!(tile instanceof IInventory))
return false; return false;
if (!PipeManager.canExtractItems(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord)) if (!PipeManager.canExtractItems(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord))