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

Make BlockGenericPipe use the IPipeTile to access Pipe and TileGenericPipe.

Browse source 
Allow non TGP implementation of IPipeTile to pass an internal version of Pipe.
This commit is contained in:
davboecki 2015-01-22 19:52:55 +01:00
parent ada7c2cf32
commit 63d05326f0
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -57,6 +57,8 @@ import buildcraft.api.gates.GateExpansions;
import buildcraft.api.gates.IGateExpansion;
import buildcraft.api.robots.EntityRobotBase;
import buildcraft.api.tools.IToolWrench;
import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeWire;
import buildcraft.api.transport.pluggable.IPipePluggableItem;
import buildcraft.api.transport.pluggable.PipePluggable;
@ -296,20 +298,15 @@ public class BlockGenericPipe extends BlockBuildCraft {
}
private RaytraceResult doRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) {
TileEntity pipeTileEntity = world.getTileEntity(x, y, z);
Pipe<?> pipe = getPipe(world, x, y, z);
TileGenericPipe tileG = null;
if (pipeTileEntity instanceof TileGenericPipe) {
tileG = (TileGenericPipe) pipeTileEntity;
}
if (tileG == null) {
if (!isValid(pipe)) {
return null;
}
Pipe<?> pipe = tileG.pipe;
TileGenericPipe tileG = pipe.container;
if (!isValid(pipe)) {
if(tileG == null) {
return null;
}
@ -946,11 +943,13 @@ public class BlockGenericPipe extends BlockBuildCraft {
public static Pipe<?> getPipe(IBlockAccess blockAccess, int i, int j, int k) {
TileEntity tile = blockAccess.getTileEntity(i, j, k);
if (!(tile instanceof TileGenericPipe) || tile.isInvalid()) {
return null;
} else {
return ((TileGenericPipe) tile).pipe;
if (tile instanceof IPipeTile && !tile.isInvalid()) {
IPipe pipe = ((IPipeTile) tile).getPipe();
if(pipe instanceof Pipe<?>) {
return (Pipe<?>) pipe;
}
}
return null;
}
public static boolean isFullyDefined(Pipe<?> pipe) {
@ -1119,10 +1118,10 @@ public class BlockGenericPipe extends BlockBuildCraft {
if (neighbours != null) {
for (int i = 0; i < 6; i++) {
if (neighbours[i] != null && neighbours[i].getTile() instanceof TileGenericPipe &&
if (neighbours[i] != null && neighbours[i].getTile() instanceof IPipeTile &&
!neighbours[i].getTile().isInvalid() &&
((TileGenericPipe) neighbours[i].getTile()).pipe != null) {
((TileGenericPipe) neighbours[i].getTile()).pipe.updateSignalState();
((IPipeTile) neighbours[i].getTile()).getPipe() instanceof Pipe<?>) {
((Pipe<?>)((IPipeTile) neighbours[i].getTile()).getPipe()).updateSignalState();
}
}
}