From 3e84c6498cb8a9c95a55b644ceeebcddb31adce9 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 21 Feb 2015 02:54:59 -0500 Subject: [PATCH] Make sure to call canChisel from autochisel --- .../chisel/block/tileentity/TileEntityAutoChisel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 64507435..fa00f93f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -141,8 +141,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory // if we have the stack upgrade, boost the stack size to the max possible, otherwise just one chiseled.stackSize = hasUpgrade(Upgrade.STACK) ? canBeMade : 1; - // if we can place the result in the output - if (canMerge(chiseled)) { + if (canChisel(chiseled)) { // if our output is empty, just use the current result if (output == null) { setInventorySlotContents(OUTPUT, chiseled); @@ -187,7 +186,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory return false; } - private boolean canMerge(ItemStack toMerge) { + private boolean canChisel(ItemStack toMerge) { // if the output slot is empty we can merge without checking if (inventory[OUTPUT] == null) { return true; @@ -198,7 +197,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory return !toMerge.getHasSubtypes() || toMerge.getItemDamage() == inventory[OUTPUT].getItemDamage(); } - return false; + return ((IChiselItem)inventory[CHISEL].getItem()).canChisel(worldObj, inventory[CHISEL], General.getVariation(inventory[TARGET])); } private boolean hasChisel() {