mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
#740 Farm damages 'unbreakable' items. Breaking leaves no longer uses axe durability.
This commit is contained in:
1 parent
aa6914daca
commit
a924e35d39
2 files changed
+13
-10
No files matched your search
@@ -152,7 +152,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt
|
||||
|
||||
private void damageTool(Class<? extends Item> 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);
|
||||
|
||||
@@ -87,7 +87,7 @@ public class TreeFarmer implements IFarmerJoe {
|
||||
HarvestResult res = new HarvestResult();
|
||||
harvestUp(farm, bc, res);
|
||||
Collections.sort(res.harvestedBlocks, comp);
|
||||
|
||||
|
||||
List<BlockCoord> actualHarvests = new ArrayList<BlockCoord>();
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user