mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 11:49:14 +00:00
Let farm break replaceable blocks (such as Railcraft's residual heat)
This commit is contained in:
1 parent
195c8fc524
commit
b36d10308b
2 files changed
+5
-3
No files matched your search
@@ -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() {
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in new issue
Block a user