This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
index 966b2bb..5e5c1fe 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
@@ -226,7 +226,7 @@ public class BlockGenericPipe extends BlockContainer implements | |
{ | |
continue; | |
} | |
- int k1 = getPipe(world, i, j, k).itemID; | |
+ int k1 = getPipe(world, i, j, k, true).itemID; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
index 966b2bb..1101ecc 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
@@ -367,17 +367,10 @@ public class BlockGenericPipe extends BlockContainer implements | |
public static Pipe getPipe (IBlockAccess blockAccess, int i, int j, int k) { | |
TileEntity tile = blockAccess.getBlockTileEntity(i, j, k); | |
- Pipe pipe = null; | |
+ if (tile instanceof TileGenericPipe) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
index df63dbc..0da206b 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
@@ -240,11 +245,11 @@ public class BlockGenericPipe extends BlockContainer implements | |
Pipe pipe1 = getPipe(blockAccess, x1, y1, z1); | |
Pipe pipe2 = getPipe(blockAccess, x2, y2, z2); | |
- if (!isValid(pipe1) || !isValid(pipe2)) { | |
+ if (!isValid(pipe1)) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/BuildCraftEnergy.java b/buildcraft/common/net/minecraft/src/BuildCraftEnergy.java | |
index ba3440a..f515754 100755 | |
--- a/buildcraft/common/net/minecraft/src/BuildCraftEnergy.java | |
+++ b/buildcraft/common/net/minecraft/src/BuildCraftEnergy.java | |
@@ -34,6 +34,7 @@ import net.minecraft.src.forge.MinecraftForge; | |
import net.minecraft.src.forge.Property; | |
public class BuildCraftEnergy { | |
+ private static boolean initialized = false; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/buildcraft_client/src/net/minecraft/src/buildcraft/factory/RenderTank.java b/buildcraft/buildcraft_client/src/net/minecraft/src/buildcraft/factory/RenderTank.java | |
index bcfa6c2..bbf27e4 100755 | |
--- a/buildcraft/buildcraft_client/src/net/minecraft/src/buildcraft/factory/RenderTank.java | |
+++ b/buildcraft/buildcraft_client/src/net/minecraft/src/buildcraft/factory/RenderTank.java | |
@@ -10,8 +10,6 @@ package net.minecraft.src.buildcraft.factory; | |
import java.util.HashMap; | |
-import org.lwjgl.opengl.GL11; | |
- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
index 0164797..7d6250b 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
@@ -501,8 +501,8 @@ public class PipeTransportLiquids extends PipeTransport implements ILiquidContai | |
pos.moveForwards(1); | |
- if (!canReceiveLiquid(pos)) { | |
+ if (!Utils.checkPipesConnections(worldObj, (int) pos.x, (int) pos.y, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
index cd91009..0164797 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
@@ -501,8 +501,9 @@ public class PipeTransportLiquids extends PipeTransport implements ILiquidContai | |
pos.moveForwards(1); | |
- if (!canReceiveLiquid(pos)) { | |
- side[i].reset (); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/factory/TileRefinery.java b/buildcraft/common/net/minecraft/src/buildcraft/factory/TileRefinery.java | |
index f4c2d75..ea585b6 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/factory/TileRefinery.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/factory/TileRefinery.java | |
@@ -223,7 +223,12 @@ public class TileRefinery extends TileMachine implements ILiquidContainer, | |
decreaseAnimation(); | |
return; | |
} | |
- | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
index d654489..dcd5345 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
@@ -112,8 +112,13 @@ public class PipeLogicIron extends PipeLogic { | |
@Override | |
public boolean outputOpen(Orientations to) { | |
- return to.ordinal() == worldObj | |
- .getBlockMetadata(xCoord, yCoord, zCoord); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.../src/buildcraft/transport/PipeLogicIron.java | 4 +++- | |
1 files changed, 3 insertions(+), 1 deletions(-) | |
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
index 6a2d8da..d654489 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java | |
@@ -26,7 +26,9 @@ public class PipeLogicIron extends PipeLogic { | |
yCoord, zCoord); | |