From 76a13f3df3ea7bf79c5e1c3829a11dc1d1fcec3f Mon Sep 17 00:00:00 2001 From: hilburn Date: Sat, 3 Jan 2015 11:32:02 +0000 Subject: [PATCH] Farm Station respects Tinker's Tools Also fixed an edge case where crops could be inserted into the tool slot on the tick that the tool broke --- .../enderio/machine/farm/TileFarmStation.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index c57fb571..1e887f4d 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -56,9 +56,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if (item == null) { return false; } - return match(item); + return match(item) && !isBrokenTinkerTool(item); } - + + private boolean isBrokenTinkerTool(ItemStack item) + { + return item.hasTagCompound() && item.getTagCompound().hasKey("InfiTool") && item.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"); + } + abstract boolean match(ItemStack item); public static boolean isTool(ItemStack stack) { @@ -187,7 +192,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { private ItemStack getTool(ToolType type) { for (int i = minToolSlot; i <= maxToolSlot; i++) { - if(type.itemMatches(inventory[i])) { + if(type.itemMatches(inventory[i]) && inventory[i].stackSize>0) { return inventory[i]; } } @@ -218,7 +223,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { tool.damageItem(1, farmerJoe); } - if(canDamage && tool.getItemDamage() >= tool.getMaxDamage()) { + if(tool.stackSize == 0 || (canDamage && tool.getItemDamage() >= tool.getMaxDamage())) { destroyTool(type); } } @@ -229,7 +234,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { private void destroyTool(ToolType type) { for (int i = minToolSlot; i <= maxToolSlot; i++) { - if(type.itemMatches(inventory[i])) { + if(type.itemMatches(inventory[i]) && inventory[i].stackSize==0) { inventory[i] = null; markDirty(); return; @@ -306,6 +311,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return true; } } + return false; } return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); } @@ -485,7 +491,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if(entity instanceof EntityItem && !entity.isDead) { EntityItem item = (EntityItem) entity; ItemStack stack = item.getEntityItem().copy(); - int numInserted = insertResult(stack); stack.stackSize -= numInserted; item.setEntityItemStack(stack); @@ -494,9 +499,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } } } - } + private int insertResult(ItemStack stack) { int origSize = stack.stackSize;