From 8b0a5eb7995de7548ef06ddd6d392df85d4bc490 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 17 Jul 2016 13:34:38 +0200 Subject: [PATCH] Override getToolClasses() in tools so that they work with basically every mod that needs it to work. Duh. --- .../de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java | 6 ++++++ .../ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java | 6 ++++++ .../ellpeck/actuallyadditions/mod/items/ItemShovelAA.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java index 0c31cf28a..c728e1d76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java @@ -20,6 +20,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.Collections; import java.util.Set; public class ItemAxeAA extends ItemToolAA{ @@ -39,4 +40,9 @@ public class ItemAxeAA extends ItemToolAA{ Material material = state.getMaterial(); return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } + + @Override + public Set getToolClasses(ItemStack stack){ + return Collections.singleton("axe"); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java index 79019a955..7f7e7d85d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java @@ -20,6 +20,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.Collections; import java.util.Set; public class ItemPickaxeAA extends ItemToolAA{ @@ -80,4 +81,9 @@ public class ItemPickaxeAA extends ItemToolAA{ Material material = state.getMaterial(); return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } + + @Override + public Set getToolClasses(ItemStack stack){ + return Collections.singleton("pickaxe"); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java index cfaa63932..4fca08cb9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java @@ -26,6 +26,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.Collections; import java.util.Set; public class ItemShovelAA extends ItemToolAA{ @@ -51,4 +52,9 @@ public class ItemShovelAA extends ItemToolAA{ public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ return Items.IRON_SHOVEL.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); } + + @Override + public Set getToolClasses(ItemStack stack){ + return Collections.singleton("shovel"); + } }