diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index ab7b738c..28d60f4d 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -1,5 +1,6 @@ package tconstruct.library; +import net.minecraft.block.Block; import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,11 +21,17 @@ public class ActiveToolMod return false; } + @Deprecated public boolean afterBlockBreak () // Unfinished, not called { return false; } + public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) + { + + } + /* Attacking */ public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 371893d0..97fb419d 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -581,6 +581,9 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { + if(!stack.hasTagCompound()) + return false; + boolean cancelHarvest = false; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { @@ -594,6 +597,13 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo @Override public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + if(!itemstack.hasTagCompound()) + return false; + + // callbacks! + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + mod.afterBlockBreak(this, itemstack, block, x, y, z, player); + if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D) { return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);