diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index aa1461b2..f43d4f5c 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -97,8 +97,6 @@ public class Crafting { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot})); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1, 1), new Object[]{" y", "x ", 'x', "stickWood", 'y', "ingotIron"})); } - // Getting the proper diamond chisel from the deprecated one - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.chisel, 1, 1), new ItemStack(ModItems.diamondChisel)); if (Configurations.featureEnabled("ballOfMoss")) GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick}); diff --git a/src/main/java/com/cricketcraft/chisel/init/ModItems.java b/src/main/java/com/cricketcraft/chisel/init/ModItems.java index c4b49fb6..3280f72e 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModItems.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModItems.java @@ -11,7 +11,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { public static ItemChisel chisel; - public static ItemDiamondChisel diamondChisel; public static ItemCloudInABottle itemCloudInABottle; public static ItemBallOMoss itemBallOMoss; public static ItemSmashingRock smashingRock; @@ -43,11 +42,5 @@ public class ModItems { upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel); GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName()); } - - // TODO deprecated - if(Configurations.featureEnabled("diamondChisel")){ - diamondChisel = (ItemDiamondChisel) new ItemDiamondChisel().setTextureName(Chisel.MOD_ID + ":diamondChisel"); - GameRegistry.registerItem(diamondChisel, diamondChisel.getUnlocalizedName()); - } } } diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java b/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java deleted file mode 100644 index afd2c1ef..00000000 --- a/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cricketcraft.chisel.item; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import com.cricketcraft.chisel.api.ChiselMode; -import com.cricketcraft.chisel.api.IChiselMode; -import com.cricketcraft.chisel.carving.Carving; - -public class ItemDiamondChisel extends Item implements IChiselMode{ - public static Carving carving = Carving.chisel; - - public ItemDiamondChisel() { - super(); - setMaxStackSize(1); - setUnlocalizedName("diamondChisel"); - } - - @Override - public ChiselMode getChiselMode(ItemStack itemStack){ - return ChiselMode.SINGLE; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4){ - list.add("Deprecated. Craft to get new version."); - } -} diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 96393862..003178f5 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -56,7 +56,5 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ModItems.smashingRock)); MinecraftForgeClient.registerItemRenderer(ModItems.chisel, renderer); - // TODO deprecated - MinecraftForgeClient.registerItemRenderer(ModItems.diamondChisel, renderer); } }