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
--- common\net\minecraft\src\buildcraft\transport\TilePipe.java Wed Jul 20 00:03:29 2011 | |
+++ ..\src\minecraft\net\minecraft\src\buildcraft\transport\TilePipe.java Tue Jul 26 10:36:02 2011 | |
@@ -138,6 +138,7 @@ | |
entitiesToLoad.clear(); | |
LinkedList <EntityData> toRemove = new LinkedList <EntityData> (); | |
+ LinkedList <EntityData> toReinsert = new LinkedList <EntityData> (); | |
for (EntityData data : travelingEntities.values()) { | |
Position motion = new Position (0, 0, 0, data.orientation); |
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\minecraft\net\minecraft\src\buildcraft\factory\TileQuarry.java Wed Jul 20 00:03:29 2011 | |
+++ src\minecraft\net\minecraft\src\buildcraft\factory\TileQuarry.java Tue Jul 26 22:46:55 2011 | |
@@ -153,11 +153,30 @@ | |
powerProvider.timeTracker.markTime(worldObj); | |
BlockContents contents = bluePrintBuilder.findNextBlock(worldObj); | |
- int blockId = worldObj.getBlockId(contents.x, contents.y, contents.z); | |
- | |
if (contents != null) { | |
+ int blockId = worldObj.getBlockId(contents.x, contents.y, contents.z); |
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 -ur src\minecraft\net\minecraft\src\buildcraft\api\FillerPattern.java src\minecraft\net\minecraft\src\buildcraft\api\FillerPattern.java | |
--- src\minecraft\net\minecraft\src\buildcraft\api\FillerPattern.java Wed Jun 29 14:03:09 2011 | |
+++ src\minecraft\net\minecraft\src\buildcraft\api\FillerPattern.java Tue Jul 26 23:17:20 2011 | |
@@ -1,8 +1,11 @@ | |
package net.minecraft.src.buildcraft.api; | |
+import net.minecraft.src.BuildCraftBlockUtil; | |
import net.minecraft.src.ItemStack; | |
import net.minecraft.src.TileEntity; | |
import net.minecraft.src.World; |
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/energy/EngineWood.java b/buildcraft/common/net/minecraft/src/buildcraft/energy/EngineWood.java | |
index 0c03dd7..2473075 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/energy/EngineWood.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/energy/EngineWood.java | |
@@ -40,7 +40,7 @@ public class EngineWood extends Engine { | |
if (tile.worldObj.isBlockIndirectlyGettingPowered(tile.xCoord, tile.yCoord, tile.zCoord)) { | |
if ((tile.worldObj.getWorldTime() % 20) == 0) { | |
- energy++; | |
+ addEnergy(1); |
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/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | |
index 647f195..99fb281 100644 | |
--- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | |
+++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | |
@@ -65,13 +65,13 @@ public class ForgeHooks { | |
public static float blockStrength(Block bl, | |
EntityPlayer player, int md) { | |
- float bh=bl.getHardness(md); | |
+ float bh=bl.getHardness(); |
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
a0229a7c60447875f749c50a97b3f0823c6f1d23 | |
.../buildcraft/transport/PipeTransportLiquids.java | 16 +++++++++++++++- | |
.../transport/pipes/PipeLiquidsGold.java | 5 +---- | |
2 files changed, 16 insertions(+), 5 deletions(-) | |
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
index 35c0ae0..dbed5d5 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java | |
@@ -269,6 +269,13 @@ public class PipeTransportLiquids extends PipeTransport implements ILiquidContai |
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 949426e..cd05778 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
@@ -241,8 +246,8 @@ public class BlockGenericPipe extends BlockContainer implements | |
Pipe pipe2 = getPipe(blockAccess, x2, y2, z2); | |
if (pipe2 != null | |
- && !pipe1.transport.getClass().equals( | |
- pipe2.transport.getClass())) { |
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); | |
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
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; | |
} | |
- | |
+ |
OlderNewer