Fixed stuff

9 files changed, 61 insertions, 58 deletions

diff --git a/common/darkknight/jewelrycraft/JewelrycraftMod.java b/common/darkknight/jewelrycraft/JewelrycraftMod.java
index 0b794d7..6f405ad 100644
--- a/common/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/common/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -6,6 +6,8 @@
 
 package darkknight.jewelrycraft;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Logger;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -102,6 +104,16 @@ public class JewelrycraftMod implements IConnectionHandler
         MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
         
         proxy.registerRenderers();
+
+        ModMetadata metadata = e.getModMetadata();
+
+        List<String> authorList = new ArrayList<String>();
+        authorList.add("DarkKnight (or sor1n)");
+        authorList.add("bspkrs");
+
+        metadata.autogenerated = false;
+        metadata.authorList = authorList;
+        metadata.url = "https://github.com/sor1n/Modjam-Mod";
     }
 
     @EventHandler
diff --git a/common/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java b/common/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
index e755b14..6a64046 100644
--- a/common/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
+++ b/common/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
@@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import darkknight.jewelrycraft.client.GuiGuide;
+import net.minecraft.util.EnumChatFormatting;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
 public class GuiTabJewelsAndModifiers extends GuiTab
@@ -26,21 +27,21 @@ public class GuiTabJewelsAndModifiers extends GuiTab
         switch(page)
         {
             case 1:
-                gui.getFont().drawString("§1§n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
                 for(int i = 0; i <= 8; i++){
                     gui.renderItem(JewelrycraftUtil.jewel.get(i), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16*i, 30f);
                     gui.getFont().drawString(JewelrycraftUtil.jewel.get(i).getDisplayName(), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16*i, 0);
                 }
                 break;
             case 2:
-                gui.getFont().drawString("§1§n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
                 for(int i = 0; i <= 8; i++){
                     gui.renderItem(JewelrycraftUtil.jewel.get(i+9), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16*i, 30f);
                     gui.getFont().drawString(JewelrycraftUtil.jewel.get(i+9).getDisplayName(), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16*i, 0);
                 }
                 break;
             case 3:
-                gui.getFont().drawString("§1§n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
                 for(int i = 0; i <= 8; i++)
                     if(i+18 < JewelrycraftUtil.jewel.size()){
                         gui.renderItem(JewelrycraftUtil.jewel.get(i+18), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16*i, 30f);
@@ -49,7 +50,7 @@ public class GuiTabJewelsAndModifiers extends GuiTab
                     }
                 break;
             case 4:
-                gui.getFont().drawString("§1§n" + "Modifiers", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Modifiers", gui.getLeft() + xPos + 40, gui.getTop(), 0);
                 for(int i = 0; i <= 8; i++){
                     if(i < JewelrycraftUtil.modifiers.size())
                     {
@@ -59,7 +60,7 @@ public class GuiTabJewelsAndModifiers extends GuiTab
                 }
                 break;
             case 5:
-                gui.getFont().drawString("§1§n" + "Modifiers", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Modifiers", gui.getLeft() + xPos + 40, gui.getTop(), 0);
                 for(int i = 0; i <= 8; i++){
                     if(i+9 < JewelrycraftUtil.modifiers.size()){
                         gui.renderItem(JewelrycraftUtil.modifiers.get(i + 9), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16*i, 30f);
diff --git a/common/darkknight/jewelrycraft/item/ItemRing.java b/common/darkknight/jewelrycraft/item/ItemRing.java
index 3824edb..b27e8ac 100644
--- a/common/darkknight/jewelrycraft/item/ItemRing.java
+++ b/common/darkknight/jewelrycraft/item/ItemRing.java
@@ -84,7 +84,7 @@ public class ItemRing extends Item
         ResourceManager rm = Minecraft.getMinecraft().getResourceManager();
         BufferedImage icon;
         int x=0, y=0, ok = 0, red, green, blue;
-        if (pass == 0 && JewelryNBT.ingot(stack) != null && JewelryNBT.ingotColor(stack) == 16777215)
+        if (pass == 0 && JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack).getIconIndex() != null && JewelryNBT.ingotColor(stack) == 16777215)
         {
             String ingotIconName = JewelryNBT.ingot(stack).getIconIndex().getIconName(); 
 
@@ -117,7 +117,7 @@ public class ItemRing extends Item
             }
             JewelryNBT.addIngotColor(stack, icon.getRGB(x, y));
         }
-        else if (pass == 1 && JewelryNBT.jewel(stack) != null && JewelryNBT.jewelColor(stack) == 16777215)
+        else if (pass == 1 && JewelryNBT.jewel(stack) != null && JewelryNBT.jewel(stack).getIconIndex() != null && JewelryNBT.jewelColor(stack) == 16777215)
         {
             x = 0; y = 0; ok=0;
             String jewelIconName = JewelryNBT.jewel(stack).getIconIndex().getIconName(); 
diff --git a/common/darkknight/jewelrycraft/lib/Reference.java b/common/darkknight/jewelrycraft/lib/Reference.java
index 84914af..a01a77a 100644
--- a/common/darkknight/jewelrycraft/lib/Reference.java
+++ b/common/darkknight/jewelrycraft/lib/Reference.java
@@ -4,6 +4,6 @@ public class Reference
 {
     public static final String MODID          = "Jewelrycraft";
     public static final String MODNAME        = "Jewelrycraft";
-    public static final String VERSION        = "1.3.0";
+    public static final String VERSION        = "1.3.2";
     public static final String PACKET_CHANNEL = "Jewelrycraft";
 }
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
index daa3147..075b978 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
@@ -134,7 +134,7 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
         GL11.glPushMatrix();
         GL11.glEnable(GL11.GL_TEXTURE_2D);     
         GL11.glScalef(var17*70F, 1F, 0F);
-        fontrenderer.drawString(par2Str.replaceFirst("§0", "§r").replaceFirst("§1", "§r").replaceFirst("§2", "§r").replaceFirst("§3", "§r").replaceFirst("§4", "§r").replaceFirst("§5", "§r").replaceFirst("§6", "§r").replaceFirst("§7", "§r").replaceFirst("§8", "§r").replaceFirst("§9", "§r").replaceFirst("§a", "§r").replaceFirst("§b", "§r").replaceFirst("§c", "§r").replaceFirst("§d", "§r").replaceFirst("§e", "§r").replaceFirst("§f", "§r"), -j, 0, 65536 * (red/2) + 256 * (green/2) + blue/2);
+        fontrenderer.drawString(par2Str.replaceFirst("§0", "§r").replaceFirst("§1", "§r").replaceFirst("§2", "§r").replaceFirst("§3", "§r").replaceFirst("§4", "§r").replaceFirst("§5", "§r").replaceFirst("§6", "§r").replaceFirst("§7", "§r").replaceFirst("§8", "§r").replaceFirst("§9", "§r").replaceFirst("§a", "§r").replaceFirst("§b", "§r").replaceFirst("§c", "§r").replaceFirst("§d", "§r").replaceFirst("§e", "§r").replaceFirst("§f", "§r"), -j, 0, 65536 * (red/2) + 256 * (green/2) + blue/2);
         GL11.glPopMatrix();
         GL11.glTranslatef((float)x - 1f, (float)y - 1f, (float)z - 1F);   
         GL11.glScalef(var17*70F, 1F, 0F);
@@ -146,85 +146,85 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
     
     public void replaceEnumEnchValues(String str, int color)
     {
-        if(str.contains("§0"))
+        if(str.contains("§0"))
         {
             color = Color.BLACK.getRGB();
-            str.replace("§0", "");
+            str.replace("§0", "");
         }
-        if(str.contains("§1"))
+        if(str.contains("§1"))
         {
             color = 85;
-            str.replace("§1", "");
+            str.replace("§1", "");
         }
-        if(str.contains("§2"))
+        if(str.contains("§2"))
         {
             color = 17920;
-            str.replace("§2", "");
+            str.replace("§2", "");
         }
-        if(str.contains("§3"))
+        if(str.contains("§3"))
         {
             color = 1336183;
-            str.replace("§3", "");
+            str.replace("§3", "");
         }
-        if(str.contains("§4"))
+        if(str.contains("§4"))
         {
             color = 4587520;
-            str.replace("§4", "");
+            str.replace("§4", "");
         }
-        if(str.contains("§5"))
+        if(str.contains("§5"))
         {
             color = 5701759;
-            str.replace("§5", "");
+            str.replace("§5", "");
         }
-        if(str.contains("§6"))
+        if(str.contains("§6"))
         {
             color = 16762880;
-            str.replace("§6", "");
+            str.replace("§6", "");
         }
-        if(str.contains("§7"))
+        if(str.contains("§7"))
         {
             color = Color.GRAY.getRGB();
-            str.replace("§7", "");
+            str.replace("§7", "");
         }
-        if(str.contains("§8"))
+        if(str.contains("§8"))
         {
             color = Color.DARK_GRAY.getRGB();
-            str.replace("§8", "");
+            str.replace("§8", "");
         }
-        if(str.contains("§9"))
+        if(str.contains("§9"))
         {
             color = Color.BLUE.getRGB();
-            str.replace("§9", "");
+            str.replace("§9", "");
         }
-        if(str.contains("§a"))
+        if(str.contains("§a"))
         {
             color = Color.GREEN.getRGB();
-            str.replace("§a", "");
+            str.replace("§a", "");
         }
-        if(str.contains("§b"))
+        if(str.contains("§b"))
         {
             color = Color.CYAN.getRGB();
-            str.replace("§b", "");
+            str.replace("§b", "");
         }
-        if(str.contains("§c"))
+        if(str.contains("§c"))
         {
             color = Color.RED.getRGB();
-            str.replace("§c", "");
+            str.replace("§c", "");
         }
-        if(str.contains("§d"))
+        if(str.contains("§d"))
         {
             color = 11665663;
-            str.replace("§d", "");
+            str.replace("§d", "");
         }
-        if(str.contains("§e"))
+        if(str.contains("§e"))
         {
             color = Color.YELLOW.getRGB();
-            str.replace("§e", "");
+            str.replace("§e", "");
         }
-        if(str.contains("§f"))
+        if(str.contains("§f"))
         {
             color = Color.WHITE.getRGB();
-            str.replace("§f", "");
+            str.replace("§f", "");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
index 5fb37ba..2a130ac 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
@@ -47,7 +47,7 @@ public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRende
         modelTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
         if (jt != null)
         {
-            if (jt.hasJewelry && jt.jewelry.getIconIndex().getIconName() != "")
+            if (jt.hasJewelry && jt.jewelry.getIconIndex() != null && jt.jewelry.getIconIndex().getIconName() != "")
             {
                 GL11.glPushMatrix();
                 GL11.glDisable(GL11.GL_LIGHTING);
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
index 4ff6415..74044fb 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
@@ -64,7 +64,7 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
                 GL11.glEnable(GL11.GL_LIGHTING);
                 GL11.glPopMatrix();
             }
-            if (me.hasJewelBase && me.jewelBase.getIconIndex().getIconName() != "")
+            if (me.hasJewelBase && me.jewelBase.getIconIndex() != null && me.jewelBase.getIconIndex().getIconName() != "")
             {
                 GL11.glPushMatrix();
                 GL11.glDisable(GL11.GL_LIGHTING);
diff --git a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
index cf3a9c6..128a254 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -76,7 +76,7 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         GL11.glPopMatrix();
         if (st != null)
         {
-            if (st.hasMetal && st.metal.getIconIndex().getIconName() != "")
+            if (st.hasMetal && st.metal != null && st.metal.getIconIndex() != null && st.metal.getIconIndex().getIconName() != "")
             {
                 GL11.glPushMatrix();
                 GL11.glDisable(GL11.GL_LIGHTING);
diff --git a/common/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/common/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index d738b36..6e7d734 100644
--- a/common/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/common/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -1,7 +1,6 @@
 package darkknight.jewelrycraft.util;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;
 
@@ -18,7 +17,6 @@ public class JewelrycraftUtil
     public static ArrayList<ItemStack> jewelry = new ArrayList<ItemStack>();
     public static ArrayList<ItemStack> metal = new ArrayList<ItemStack>();
     public static ArrayList<String> jamcraftPlayers = new ArrayList<String>();
-    public static HashMap<ItemStack, ItemStack> combinations = new HashMap<ItemStack, ItemStack>();
     public static Random rand = new Random();
 
     public static void addStuff()
@@ -55,16 +53,6 @@ public class JewelrycraftUtil
         jewelry.add(new ItemStack(ItemList.necklace));
     }
     
-    public static void addSpecialCombinations()
-    {
-        combinations.put(new ItemStack(Item.enderPearl), new ItemStack(Block.chest));
-        combinations.put(new ItemStack(Item.enderPearl), new ItemStack(Item.bed));
-        combinations.put(new ItemStack(Block.obsidian), new ItemStack(Item.eyeOfEnder));
-        combinations.put(new ItemStack(Item.netherStar), new ItemStack(Block.chest));
-        //An ender pearl with any modifier that is not a chest or bed
-        combinations.put(new ItemStack(Item.enderPearl), new ItemStack(Item.itemsList.length, 0, 0));
-    }
-    
     public static void jamcrafters()
     {
         jamcraftPlayers.add("allout58");
@@ -94,7 +82,9 @@ public class JewelrycraftUtil
         {
             while(index2 < OreDictionary.getOres(OreDictionary.getOreNames()[index]).size())
             {
-                if(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2).getUnlocalizedName().toLowerCase().contains("ingot") && !JewelrycraftUtil.metal.contains(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2)))
+                ItemStack stack = OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2).copy();
+                if(stack.getItemDamage() == Short.MAX_VALUE) stack.setItemDamage(0);
+                if(stack.getUnlocalizedName().toLowerCase().contains("ingot") && !JewelrycraftUtil.metal.contains(stack))
                     metal.add(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2));
                 index2++;
             }