From f419c4e6d53ac4b775dc8017e05a44009f9d866c Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 27 Dec 2014 21:26:20 +0000 Subject: [PATCH] Fix anvil and snow pickup --- .../java/mekanism/tools/item/ItemMekanismPaxel.java | 10 ++++++++++ .../java/mekanism/tools/item/ItemMekanismPickaxe.java | 5 +++++ .../java/mekanism/tools/item/ItemMekanismShovel.java | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index 774b9be56..727e40f67 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -51,6 +51,16 @@ public class ItemMekanismPaxel extends ItemMekanismTool return toolMaterial.getHarvestLevel() >= 2; } + if(block == Blocks.anvil) + { + return toolMaterial.getHarvestLevel() >= 0; + } + + if(block == Blocks.snow || block == Blocks.snow_layer) + { + return true; + } + if(block.getMaterial() == Material.rock) { return true; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java index 1e3ed45ad..9c3a96c03 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java @@ -47,6 +47,11 @@ public class ItemMekanismPickaxe extends ItemMekanismTool return toolMaterial.getHarvestLevel() >= 2; } + if(block == Blocks.anvil) + { + return toolMaterial.getHarvestLevel() >= 0; + } + if(block.getMaterial() == Material.rock) { return true; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java index f8c43b91b..4ccd255a3 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java @@ -16,7 +16,7 @@ public class ItemMekanismShovel extends ItemMekanismTool @Override public boolean canHarvestBlock(Block block, ItemStack stack) { - if(block == Blocks.snow) + if(block == Blocks.snow_layer) { return true; } @@ -28,7 +28,7 @@ public class ItemMekanismShovel extends ItemMekanismTool { blocksEffectiveAgainst = (new Block[] { - Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium + Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium }); } }