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

Revert "Merge pull request #329 from Xhamolk/patch-2"

Browse source 
This reverts commit 83d2b51931, reversing
changes made to 2cd7857d07.

Conflicts:
	common/buildcraft/transport/Pipe.java
	common/buildcraft/transport/PipeTransportItems.java
This commit is contained in:
Christian 2012-10-13 14:53:45 -04:00
parent e89d3525b4
commit 6299c472bb
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/buildcraft/transport/Pipe.java
View file

@ -16,7 +16,6 @@ import java.util.Random;
import buildcraft.BuildCraftTransport;
import buildcraft.api.core.Orientations;
import buildcraft.api.core.Position;
import buildcraft.api.core.SafeTimeTracker;
import buildcraft.api.gates.Action;
import buildcraft.api.gates.ActionManager;
@ -27,7 +26,6 @@ import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.gates.Trigger;
import buildcraft.api.gates.TriggerParameter;
import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.core.IDropControlInventory;
import buildcraft.core.network.TilePacketWrapper;
import buildcraft.core.triggers.ActionRedstoneOutput;
@ -133,11 +131,6 @@ public abstract class Pipe implements IPipe, IDropControlInventory {
}
public boolean isPipeConnected(TileEntity tile) {
if( tile instanceof IPipeConnection && !(tile instanceof TileGenericPipe) ){
Orientations or = Utils.get3dOrientation(new Position(this.container), new Position(tile));
if( !((IPipeConnection) tile).isPipeConnected(or) )
return false;
}
return logic.isPipeConnected(tile) && transport.isPipeConnected(tile);
}

13
common/buildcraft/transport/PipeTransportItems.java
View file

@ -44,7 +44,6 @@ import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.NBTTagList;
import net.minecraft.src.Packet;
import net.minecraft.src.TileEntity;
import net.minecraftforge.common.ISidedInventory;
public class PipeTransportItems extends PipeTransport {
@ -159,15 +158,15 @@ public class PipeTransportItems extends PipeTransport {
if (!Utils.checkPipesConnections(entity, container))
return false;
if (entity instanceof IPipeEntry) {
if (entity instanceof IPipeEntry)
return true;
} else if (entity instanceof TileGenericPipe) {
else if (entity instanceof TileGenericPipe) {
TileGenericPipe pipe = (TileGenericPipe) entity;
return pipe.pipe.transport instanceof PipeTransportItems;
} else if (entity instanceof IInventory) {
} else if (entity instanceof IInventory)
if(Transactor.getTransactorFor(entity).add(item.getItemStack(), o.reverse(), false).stackSize > 0)
return true;
}
return false;
}
@ -429,10 +428,6 @@ public class PipeTransportItems extends PipeTransport {
@Override
public boolean isPipeConnected(TileEntity tile) {
if( tile instanceof ISidedInventory ){
Orientations or = Utils.get3dOrientation(new Position(container), new Position(tile));
return ((ISidedInventory) tile).getSizeInventorySide(or.toDirection()) > 0;
}
return tile instanceof TileGenericPipe
|| tile instanceof IPipeEntry
|| tile instanceof ISpecialInventory