From b36d10308bc887f93dd6f0fb5c459ecb4bc7e0b5 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 18 Jan 2015 10:56:51 -0800 Subject: [PATCH] Let farm break replaceable blocks (such as Railcraft's residual heat) --- src/main/java/forestry/farming/logic/FarmLogic.java | 6 ++++-- .../java/forestry/farming/logic/FarmLogicHomogeneous.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 03736ef98..7716be291 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -28,6 +28,7 @@ import forestry.core.config.ForestryBlock; import forestry.core.render.SpriteSheet; import forestry.core.vect.IVect; import forestry.core.vect.Vect; +import forestry.core.vect.VectUtil; public abstract class FarmLogic implements IFarmLogic { @@ -46,7 +47,8 @@ public abstract class FarmLogic implements IFarmLogic { return this; } - public boolean canBreakGround(Block block) { + public boolean canBreakGround(World world, Vect position) { + Block block = VectUtil.getBlock(world, position); if (breakable.isEmpty()) { breakable.add(Blocks.air); breakable.add(Blocks.dirt); @@ -59,7 +61,7 @@ public abstract class FarmLogic implements IFarmLogic { breakable.add(Blocks.flowing_water); breakable.add(ForestryBlock.soil.block()); } - return breakable.contains(block); + return breakable.contains(block) || block.isReplaceable(world, position.getX(), position.getY(), position.getZ()); } protected World getWorld() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index 93fd3b0fb..6237a5009 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -84,7 +84,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { Vect position = translateWithOffset(x, yGround, z, direction, i); ItemStack stack = VectUtil.getAsItemStack(world, position); - if (isAcceptedGround(stack) || !canBreakGround(VectUtil.getBlock(world, position))) + if (isAcceptedGround(stack) || !canBreakGround(world, position)) continue; produce.addAll(BlockUtil.getBlockDrops(world, position));