From ebbdbdaef74dc389b2df437179d3f3c74bd179cf Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 7 Nov 2015 16:55:22 +0100 Subject: [PATCH] BuildCraft 7.1.13 --- build.gradle | 2 +- buildcraft_resources/changelog/7.1.13 | 23 +++++++++++++++++++ buildcraft_resources/versions.txt | 2 +- .../buildcraft/core/lib/utils/BlockUtils.java | 1 - common/buildcraft/robotics/EntityRobot.java | 1 - .../buildcraft/robotics/ai/AIRobotBreak.java | 5 ++-- .../robotics/ai/AIRobotGotoBlock.java | 5 ++-- 7 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 buildcraft_resources/changelog/7.1.13 diff --git a/build.gradle b/build.gradle index 4225bf0e..a79f70a1 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'checkstyle' -version = "7.1.12" +version = "7.1.13" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] diff --git a/buildcraft_resources/changelog/7.1.13 b/buildcraft_resources/changelog/7.1.13 new file mode 100644 index 00000000..c8be9b3d --- /dev/null +++ b/buildcraft_resources/changelog/7.1.13 @@ -0,0 +1,23 @@ +I recommend that you double-check your gate setups after this update. + +Note for Regrowth/IguanaTweaks users: If you have disabled vanilla tools working in your pack, they won't work anymore with BuildCraft robots since ~7.1.10. They used to, but they won't, as now robots emulate a real player far more accurately. + +Additions: + +* Clear Lens and Filter (asie, requested by Forecaster) +* Special triggers for Fuel and Coolant in Combustion Engines (SandGrainOne) + +Improvements: + +* Default inventory triggers are now side-sensitive. (SandGrainOne) + +Bugs fixed: + +* [#3112] Robot loading stuck in a race condition (asie) +* [#3111] Rare NPE upon placing Pipe Wire (asie) +* [#3102] Defective recipe handling with disabled items (asie) +* [#3100] Strange FacadeRenderHelper crash (asie) +* [#3086] Stripes pipes not consuming energy (asie) +* "/buildcraft" command not working correctly (asie) +* Improvements to robot pathfinding handling (asie) +* Robots not handling tools properly in some cases (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index ba7d1c4d..d41c41ef 100755 --- a/buildcraft_resources/versions.txt +++ b/buildcraft_resources/versions.txt @@ -1,3 +1,3 @@ 1.6.4:BuildCraft:4.2.2 1.7.2:BuildCraft:6.0.16 -1.7.10:BuildCraft:7.1.12 +1.7.10:BuildCraft:7.1.13 diff --git a/common/buildcraft/core/lib/utils/BlockUtils.java b/common/buildcraft/core/lib/utils/BlockUtils.java index 41703494..c780c302 100644 --- a/common/buildcraft/core/lib/utils/BlockUtils.java +++ b/common/buildcraft/core/lib/utils/BlockUtils.java @@ -28,7 +28,6 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; import cpw.mods.fml.common.FMLCommonHandler; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; diff --git a/common/buildcraft/robotics/EntityRobot.java b/common/buildcraft/robotics/EntityRobot.java index e2ca6805..4906961e 100644 --- a/common/buildcraft/robotics/EntityRobot.java +++ b/common/buildcraft/robotics/EntityRobot.java @@ -69,7 +69,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; -import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.events.RobotEvent; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.DockingStation; diff --git a/common/buildcraft/robotics/ai/AIRobotBreak.java b/common/buildcraft/robotics/ai/AIRobotBreak.java index 8e711068..a088fd16 100644 --- a/common/buildcraft/robotics/ai/AIRobotBreak.java +++ b/common/buildcraft/robotics/ai/AIRobotBreak.java @@ -22,7 +22,6 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.utils.BlockUtils; -import buildcraft.core.proxy.CoreProxy; public class AIRobotBreak extends AIRobot { private BlockIndex blockToBreak; @@ -138,9 +137,9 @@ public class AIRobotBreak extends AIRobot { } } - f = ForgeEventFactory.getBreakSpeed(BlockUtils.getFakePlayerWithTool((WorldServer)robot.worldObj, blockToBreak.x, blockToBreak.y, blockToBreak.z, robot.getHeldItem()), + f = ForgeEventFactory.getBreakSpeed(BlockUtils.getFakePlayerWithTool((WorldServer) robot.worldObj, blockToBreak.x, blockToBreak.y, blockToBreak.z, robot.getHeldItem()), block, meta, f, blockToBreak.x, blockToBreak.y, blockToBreak.z); - return (f < 0 ? 0 : f); + return f < 0 ? 0 : f; } @Override diff --git a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java index e6f2347f..b23acc04 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java @@ -20,7 +20,6 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.utils.IterableAlgorithmRunner; import buildcraft.core.lib.utils.PathFinding; -import buildcraft.robotics.RobotUtils; public class AIRobotGotoBlock extends AIRobotGoto { @@ -124,10 +123,12 @@ public class AIRobotGotoBlock extends AIRobotGoto { private void setNextInPath() { if (path.size() > 0) { + boolean isFirst = prevDistance == Double.MAX_VALUE; + BlockIndex next = path.getFirst(); prevDistance = Double.MAX_VALUE; - if (BuildCraftAPI.isSoftBlock(robot.worldObj, next.x, next.y, next.z)) { + if (isFirst || BuildCraftAPI.isSoftBlock(robot.worldObj, next.x, next.y, next.z)) { setDestination(robot, next.x + 0.5F, next.y + 0.5F, next.z + 0.5F); robot.aimItemAt(next.x, next.y, next.z); } else {