diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 1f7f081c..8b31fee5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,6 +11,7 @@ Bugs - #1226 Redstone color not showing on MFR machines / BR ports - #1210 ME Conduits enabling without AE2 - #1230 ME Conduits overlap with Gas Conduits +- #1228 Spoon upgrade still not working properly ------------------------------------------------------ Version 2.2.0 diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 1de6c051..401fe040 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -40,8 +40,6 @@ import crazypants.util.Lang; public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { - private static final Set SHOVEL_MATS = Sets.newHashSet(new Material[] { Material.clay, Material.craftedSnow, Material.grass, Material.ground, Material.sand, Material.snow }); - public static boolean isEquipped(EntityPlayer player) { if(player == null) { return false; @@ -192,12 +190,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return efficiencyOnProperMaterial; } - if(energy > 0 && hasSpoonUpgrade(item)) { - if(SHOVEL_MATS.contains(block.getMaterial())) { - return efficiencyOnProperMaterial; - } - } - return super.func_150893_a(item, block); } @@ -224,6 +216,16 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } return super.getDigSpeed(stack, block, meta); } + + + @Override + public Set getToolClasses(ItemStack stack) { + Set set = Sets.newHashSet("pickaxe"); + if (hasSpoonUpgrade(stack)) { + set.add("shovel"); + } + return set; + } protected void init() { GameRegistry.registerItem(this, getUnlocalizedName());