Crystals!!!

3 files changed, 2 insertions, 119 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index dcf7804..41a44e1 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -11,13 +11,13 @@ import java.util.List;
 import java.util.Map;
 import javax.imageio.ImageIO;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
@@ -89,7 +89,7 @@ public abstract class ItemBaseJewelry extends Item
             int color = getMostCommonColour(m);
             if (JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1) != 16777215) JewelryNBT.addIngotColor(stack, JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1));
             else JewelryNBT.addIngotColor(stack, color);
-        }else if (pass == 1 && stack != null && JewelryNBT.gem(stack) != null && JewelryNBT.gem(stack).getIconIndex() != null && JewelryNBT.gem(stack) != null){
+        }else if (pass == 1 && stack != null && stack.getItem() != null && JewelryNBT.gem(stack) != null && !(Block.getBlockFromItem(JewelryNBT.gem(stack).getItem()) instanceof BlockAir) && JewelryNBT.gem(stack).getIconIndex() != null){
             ItemStack gem = JewelryNBT.gem(stack);
             icon = ImageIO.read(rm.getResource(getLocation(gem, stack, true)).getInputStream());
             int height = icon.getHeight();
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemCrystal.java b/src/main/java/darkknight/jewelrycraft/item/ItemCrystal.java
deleted file mode 100644
index 43e6b5b..0000000
--- a/src/main/java/darkknight/jewelrycraft/item/ItemCrystal.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package darkknight.jewelrycraft.item;
-
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import darkknight.jewelrycraft.util.Variables;
-
-public class ItemCrystal extends Item
-{
-    public IIcon overlay;
-    public static final int[] dyeColors = new int[]{1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 11250603, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320};
-    
-    /**
-     * 
-     */
-    public ItemCrystal()
-    {
-        super();
-        setHasSubtypes(true);
-        setMaxDamage(0);
-    }
-    
-    /**
-     * @param iconRegister
-     */
-    @Override
-    public void registerIcons(IIconRegister iconRegister)
-    {
-        itemIcon = iconRegister.registerIcon(Variables.MODID + ":crystal");
-        overlay = iconRegister.registerIcon(Variables.MODID + ":crystalOverlay");
-    }
-    
-    /**
-     * @return
-     */
-    @Override
-    public boolean requiresMultipleRenderPasses()
-    {
-        return true;
-    }
-    
-    /**
-     * @param stack
-     * @param pass
-     * @return
-     */
-    @Override
-    @SideOnly (Side.CLIENT)
-    public int getColorFromItemStack(ItemStack stack, int pass)
-    {
-        if (pass == 1 && getDamage(stack) != 16) return dyeColors[getDamage(stack)];
-        return 16777215;
-    }
-    
-    /**
-     * @param stack
-     * @param pass
-     * @return
-     */
-    @Override
-    public IIcon getIcon(ItemStack stack, int pass)
-    {
-        return pass == 0 ? itemIcon : overlay;
-    }
-    
-    /**
-     * @param stack
-     * @param player
-     * @param world
-     * @param i
-     * @param j
-     * @param k
-     * @param side
-     * @param par8
-     * @param par9
-     * @param par10
-     * @return
-     */
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int i, int j, int k, int side, float par8, float par9, float par10)
-    {
-        return true;
-    }
-    
-    /**
-     * @param stack
-     * @return
-     */
-    @Override
-    public String getUnlocalizedName(ItemStack stack)
-    {
-        return super.getUnlocalizedName() + "." + stack.getItemDamage();
-    }
-    
-    /**
-     * @param par1
-     * @param par2CreativeTabs
-     * @param par3List
-     */
-    @Override
-    @SuppressWarnings ({"unchecked", "rawtypes"})
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List)
-    {
-        for(int j = 0; j < 16; ++j)
-            par3List.add(new ItemStack(par1, 1, j));
-    }
-}
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 1ec3fc3..0d8c61c 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -14,7 +14,6 @@ public class ItemList
     public static Item shadowIngot;
     public static Item molds;
     public static Item clayMolds;
-    public static Item crystal;
     public static ItemRing ring;
     public static ItemNecklace necklace;
     public static ItemBracelet bracelet;
@@ -39,7 +38,6 @@ public class ItemList
         necklace = (ItemNecklace)new ItemNecklace().setUnlocalizedName(Variables.MODID + ".necklace").setTextureName(Variables.MODID + ":necklace").setCreativeTab(JewelrycraftMod.jewelrycraft);
         bracelet = (ItemBracelet)new ItemBracelet().setUnlocalizedName(Variables.MODID + ".bracelet").setTextureName(Variables.MODID + ":bracelet").setCreativeTab(JewelrycraftMod.jewelrycraft);
         earrings = (ItemEarrings)new ItemEarrings().setUnlocalizedName(Variables.MODID + ".earrings").setTextureName(Variables.MODID + ":earrings").setCreativeTab(JewelrycraftMod.jewelrycraft);
-        crystal = new ItemCrystal().setUnlocalizedName(Variables.MODID + ".crystal").setTextureName(Variables.MODID + ":crystal").setCreativeTab(JewelrycraftMod.jewelrycraft);
         guide = new ItemGuide().setUnlocalizedName(Variables.MODID + ".guide").setTextureName(Variables.MODID + ":guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
         bucket = (ItemMoltenMetalBucket)new ItemMoltenMetalBucket().setUnlocalizedName(Variables.MODID + ".bucket");
         metal = (ItemMoltenMetal)new ItemMoltenMetal().setUnlocalizedName(Variables.MODID + ".bucket");
@@ -54,7 +52,6 @@ public class ItemList
         GameRegistry.registerItem(necklace, "necklace");
         GameRegistry.registerItem(bracelet, "bracelet");
         GameRegistry.registerItem(earrings, "earrings");
-        GameRegistry.registerItem(crystal, "crystal");
         GameRegistry.registerItem(guide, "guide");
         GameRegistry.registerItem(bucket, "moltenMetalBucket");
         GameRegistry.registerItem(metal, "moltenMetal");