diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 274213ff6..68279d053 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -173,22 +173,13 @@ public class ForgeHooks if (stack.isEmpty() || tool == null) return player.func_234569_d_(state); - int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state); + int toolLevel = stack.getHarvestLevel(tool, player, state); if (toolLevel < 0) return player.func_234569_d_(state); return ForgeEventFactory.doPlayerHarvestCheck(player, state, toolLevel >= state.getHarvestLevel()); } - public static boolean canToolHarvestBlock(IWorldReader world, BlockPos pos, @Nonnull ItemStack stack) - { - BlockState state = world.getBlockState(pos); - //state = state.getActualState(world, pos); - ToolType tool = state.getHarvestTool(); - if (stack.isEmpty() || tool == null) return false; - return stack.getHarvestLevel(tool, null, null) >= state.getHarvestLevel(); - } - public static boolean isToolEffective(IWorldReader world, BlockPos pos, @Nonnull ItemStack stack) { BlockState state = world.getBlockState(pos); diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java index f90951152..119343e0b 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java @@ -94,10 +94,9 @@ public interface IForgeItemStack extends ICapabilitySerializable * Queries the harvest level of this item stack for the specified tool class, * Returns -1 if this tool is not of the specified type * - * @param stack This item stack instance - * @param toolClass Tool Class - * @param player The player trying to harvest the given blockstate - * @param state The block to harvest + * @param tool the tool type of the item + * @param player The player trying to harvest the given blockstate + * @param state The block to harvest * @return Harvest level, or -1 if not the specified tool type. */ default int getHarvestLevel(ToolType tool, @Nullable PlayerEntity player, @Nullable BlockState state)