diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 702ffdc4f..7693a9bd6 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -60,7 +60,6 @@ public class ModItems public static Item advancedJackhammer; public static Item nanosaber; - public static Item hammer; public static Item wrench; public static Item lapotronCrystal; public static Item energyCrystal; @@ -266,9 +265,6 @@ public class ModItems registerItem(peridotLeggings, "peridotLeggings"); peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET); registerItem(peridotBoots, "peridotBoots"); - - hammer = new ItemHammer(100); - registerItem(hammer, "hammer"); wrench = new ItemWrench(); registerItem(wrench, "wrench"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 6c9da54dc..3d7207c83 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -41,12 +41,10 @@ import java.util.List; public class ModRecipes { public static ConfigTechReborn config; - public static ItemStack hammerStack = new ItemStack(ModItems.hammer, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack batteryStack = new ItemStack(ModItems.reBattery, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack crystalStack = new ItemStack(ModItems.energyCrystal, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack lapcrystalStack = new ItemStack(ModItems.lapotronCrystal, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack dyes = new ItemStack(Items.DYE, 1, OreDictionary.WILDCARD_VALUE); - public static Item hammer = ModItems.hammer; public static Item ironDrill = TechRebornAPI.recipeCompact.getItem("miningDrill").getItem(); public static ItemStack ironDrillStack = new ItemStack(ironDrill, 1, OreDictionary.WILDCARD_VALUE); diff --git a/src/main/java/techreborn/items/tools/ItemHammer.java b/src/main/java/techreborn/items/tools/ItemHammer.java deleted file mode 100644 index 4d3e9ec9c..000000000 --- a/src/main/java/techreborn/items/tools/ItemHammer.java +++ /dev/null @@ -1,80 +0,0 @@ -package techreborn.items.tools; - -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.ModSounds; -import techreborn.items.ItemTR; -import techreborn.lib.ModInfo; - -public class ItemHammer extends ItemTR implements ITexturedItem -{ - private String iconName; - - public ItemHammer(int MaxDamage) - { - setUnlocalizedName("techreborn.hammer"); - setMaxDamage(MaxDamage); - } - - @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - world.playSound(player, player.posX, player.posY, - player.posZ, ModSounds.dismantle, - SoundCategory.BLOCKS, 0.6F, 1F); - return EnumActionResult.SUCCESS; - } - - @Override - public Item setUnlocalizedName(String par1Str) - { - iconName = par1Str; - return super.setUnlocalizedName(par1Str); - } - - @Override - public boolean getShareTag() - { - return true; - } - - @Override - public ItemStack getContainerItem(ItemStack itemStack) - { - ItemStack copiedStack = itemStack.copy(); - - copiedStack.setItemDamage(copiedStack.getItemDamage() + 1); - copiedStack.stackSize = 1; - - return copiedStack; - } - - @Override - public String getTextureName(int damage) - { - return "techreborn:items/tool/hammer"; - } - - @Override - public int getMaxMeta() - { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) - { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } -} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 52bbf7076..6badd23ca 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -632,7 +632,6 @@ item.techreborn.diamondChainsaw.name=Diamond Chainsaw item.techreborn.advancedChainsaw.name=Advanced Chainsaw item.techreborn.lapotronicorb.name=Lapotronic Energy Orb item.techreborn.cloakingdevice.name=Cloaking Device -item.techreborn.hammer.name=Iron Hammer item.techreborn.steelJackhammer.name=Steel Jackhammer item.techreborn.diamondJackhammer.name=Diamond Jackhammer item.techreborn.advancedJackhammer.name=Advanced Jackhammer