From a924e35d39c6d1484ceebcf6ed4312eecb965587 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 10 Jun 2014 14:41:02 +0800 Subject: [PATCH] #740 Farm damages 'unbreakable' items. Breaking leaves no longer uses axe durability. --- .../enderio/machine/farm/TileFarmStation.java | 2 +- .../enderio/machine/farm/TreeFarmer.java | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 67940616..ecde714b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -152,7 +152,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt private void damageTool(Class class1, int damage) { ItemStack tool = getTool(class1); - if(tool != null) { + if(tool != null && tool.getItem().isDamageable()) { tool.damageItem(damage, farmerJoe); if(tool.getItemDamage() >= tool.getMaxDamage()) { destroyTool(class1); diff --git a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java index bb084449..59195b49 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java @@ -87,7 +87,7 @@ public class TreeFarmer implements IFarmerJoe { HarvestResult res = new HarvestResult(); harvestUp(farm, bc, res); Collections.sort(res.harvestedBlocks, comp); - + List actualHarvests = new ArrayList(); for (int i = 0; i < res.harvestedBlocks.size() && farm.hasAxe(); i++) { @@ -100,21 +100,24 @@ public class TreeFarmer implements IFarmerJoe { res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); } } - + boolean isWood = false; if(blk != wood) { //leaves - int leaveMeta = farm.getBlockMeta(coord); - boolean canDropApple = + isWood = true; + int leaveMeta = farm.getBlockMeta(coord); + boolean canDropApple = (blk instanceof BlockOldLeaf && (leaveMeta == 0 || leaveMeta == 8)) || //oak - (blk instanceof BlockNewLeaf && (leaveMeta == 1 || leaveMeta == 9)); //giant oak + (blk instanceof BlockNewLeaf && (leaveMeta == 1 || leaveMeta == 9)); //giant oak - if(canDropApple) { - if(farm.getWorldObj().rand.nextInt(200) == 0) { + if(canDropApple) { + if(farm.getWorldObj().rand.nextInt(200) == 0) { res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); } - } + } } farm.actionPerformed(); - farm.damageAxe(); + if(isWood) { + farm.damageAxe(); + } farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); actualHarvests.add(coord); }