From f135d09d032cee88ea91dfd509848090c59755b8 Mon Sep 17 00:00:00 2001 From: Kyprus Date: Fri, 29 Jun 2012 17:56:33 -0400 Subject: [PATCH 1/5] Fixed robot not moving. --- common/net/minecraft/src/buildcraft/core/EntityRobot.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/core/EntityRobot.java b/common/net/minecraft/src/buildcraft/core/EntityRobot.java index 85c38532..659e0826 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityRobot.java +++ b/common/net/minecraft/src/buildcraft/core/EntityRobot.java @@ -171,9 +171,9 @@ public class EntityRobot extends Entity implements ISpawnHandler { destY = y; destZ = z; - motionX = (destX - posX) / 75 * laser.getPowerAverage() / 2; - motionY = (destY - posY) / 75 * laser.getPowerAverage() / 2; - motionZ = (destZ - posZ) / 75 * laser.getPowerAverage() / 2; + motionX = (destX - posX) / 75 * (laser.getPowerAverage() / 2 + 1); + motionY = (destY - posY) / 75 * (laser.getPowerAverage() / 2 + 1); + motionZ = (destZ - posZ) / 75 * (laser.getPowerAverage() / 2 + 1); } protected boolean reachedDesination() { From e3c38609edb1316429616f8d380b5436da01c6fa Mon Sep 17 00:00:00 2001 From: Kyprus Date: Fri, 29 Jun 2012 18:20:03 -0400 Subject: [PATCH 2/5] Fixed an NPE the can happen when using a builder with path markers. --- .../net/minecraft/src/buildcraft/core/EntityRobot.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/core/EntityRobot.java b/common/net/minecraft/src/buildcraft/core/EntityRobot.java index 659e0826..f40f13ec 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityRobot.java +++ b/common/net/minecraft/src/buildcraft/core/EntityRobot.java @@ -246,9 +246,12 @@ public class EntityRobot extends Entity implements ISpawnHandler { Action a = targets.getFirst(); BptSlotInfo target = a.slot; - - laser.setPositions(new Position(posX, posY, posZ), new Position(target.x + 0.5, target.y + 0.5, target.z + 0.5)); - laser.show(); + + if (target != null) { + + laser.setPositions(new Position(posX, posY, posZ), new Position(target.x + 0.5, target.y + 0.5, target.z + 0.5)); + laser.show(); + } } else { laser.hide(); From b3b51c99c381ada1a2650777afb71e5ccf977e0a Mon Sep 17 00:00:00 2001 From: SirSengir Date: Sat, 30 Jun 2012 15:53:27 +0200 Subject: [PATCH 3/5] Fixed mcp mapping. --- .../net/minecraft/src/buildcraft/core/CoreProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java b/buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java index 37f32276..edbcdd8a 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java @@ -60,7 +60,7 @@ public class CoreProxy { } public static void setField804(EntityItem item, float value) { - item.field_804_d = value; + item.hoverStart = value; } public static File getPropertyFile() { From 1fc2fb15c3babe1edb6ea98e37b32df61dd5bed4 Mon Sep 17 00:00:00 2001 From: Landrash Date: Sat, 30 Jun 2012 23:00:25 +0200 Subject: [PATCH 4/5] Updated translation. Added Void and Sandstone pipes --- buildcraft_resources/lang/buildcraft/sv_SE.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildcraft_resources/lang/buildcraft/sv_SE.properties b/buildcraft_resources/lang/buildcraft/sv_SE.properties index fad23e52..f59314e6 100644 --- a/buildcraft_resources/lang/buildcraft/sv_SE.properties +++ b/buildcraft_resources/lang/buildcraft/sv_SE.properties @@ -64,6 +64,10 @@ item.PipePowerStone=Konduktivt stenr\u00c3\u00b6r item.PipePowerGold=Konduktivt guldr\u00c3\u00b6r item.PipeItemsStripes=Randigt transportr\u00c3\u00b6r item.PipeStructureCobblestone=Kullerstens strukturr\u00c3\u00b6r +item.PipeItemsVoid=Annulleringstransportr\u00c3\u00b6r +item.PipeLiquidsVoid=Vattent\u00c3\u00a4tt annulleringstransportr\u00c3\u00b6r +item.PipeItemsSandstone=Sandstenstransportr\u00c3\u00b6r +item.PipeLiquidsSandstone=Vattent\u00c3\u00a4tt Sandstensr\u00c3\u00b6r tile.miningWellBlock=Gruvborr tile.plainPipeBlock=Gruvr\u00c3\u00b6r tile.autoWorkbenchBlock=Automatiskt arbetsb\u00c3\u00a4nk @@ -83,4 +87,4 @@ tile.blockHopper=Hopper tile.pumpBlock=Pump tile.engineWood=R\u00c3\u00b6dstenmotor tile.engineStone=\u00c3\u0085ngmotor -tile.engineIron=F\u00c3\u00b6rbr\u00c3\u00a4nningsmotor \ No newline at end of file +tile.engineIron=F\u00c3\u00b6rbr\u00c3\u00a4nningsmotor From 92e7fe2d242ee52ece0f073eefd872cb7d61e095 Mon Sep 17 00:00:00 2001 From: Kyprus Date: Sun, 1 Jul 2012 08:58:14 -0400 Subject: [PATCH 5/5] Fixed quarry not being removed properly. Fixes #71 --- .../net/minecraft/src/buildcraft/factory/TileQuarry.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java index b6c77352..de4a9e73 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java +++ b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java @@ -456,12 +456,15 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I } @Override - public void invalidate () { - destroy (); + public void invalidate() { + + super.invalidate(); + destroy(); } @Override public void destroy() { + if (arm != null) { arm.setDead(); }