From 54b4089afd40c8fbb8acede6be2d7eb373dc4672 Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Tue, 4 Aug 2020 08:06:36 +0800 Subject: [PATCH] Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 6d77239d80..17027ff34f 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -74,6 +74,7 @@ import net.minecraft.item.Item; import net.minecraft.item.AxeItem; import net.minecraft.item.BucketItem; import net.minecraft.item.EnchantedBookItem; +import net.minecraft.item.HoeItem; import net.minecraft.item.PickaxeItem; import net.minecraft.item.PotionItem; import net.minecraft.item.ShovelItem; @@ -219,9 +220,12 @@ public class ForgeHooks //TODO Axes check Material and Blocks now. blocks = getPrivateValue(AxeItem.class, null, 1); blocks.forEach(block -> blockToolSetter.accept(block, ToolType.AXE, 0)); + blocks = getPrivateValue(HoeItem.class, null, 0); + blocks.forEach(block -> blockToolSetter.accept(block, ToolType.HOE, 0)); - //This is taken from ItemAxe, if that changes update here. - blockToolSetter.accept(Blocks.OBSIDIAN, ToolType.PICKAXE, 3); + //This is taken from PickaxeItem, if that changes update here. + for (Block block : new Block[]{Blocks.OBSIDIAN, Blocks.field_235399_ni_, Blocks.field_235397_ng_, Blocks.field_235400_nj_, Blocks.field_235398_nh_}) + blockToolSetter.accept(block, ToolType.PICKAXE, 3); for (Block block : new Block[]{Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.EMERALD_BLOCK, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.REDSTONE_ORE}) blockToolSetter.accept(block, ToolType.PICKAXE, 2); for (Block block : new Block[]{Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE})