Fixed some bugs!

1 files changed, 42 insertions, 41 deletions

diff --git a/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java b/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
index 65b9721..1d1e233 100644
--- a/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
+++ b/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import darkknight.jewelrycraft.client.GuiGuide;
 import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.util.JewelryNBT;
@@ -45,9 +46,9 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
                 JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
 
-                text.add("§2Jewel: §0Ender Pearl");
-                text.add("§2Modifier: §0None");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "None");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This ring teleports");
                 text.add("you and anyone around ");
                 text.add("in any location from the");
@@ -60,7 +61,7 @@ public class GuiTabNecklaces extends GuiTab
                 break;
             case 2: 
                 text.add("to teleport there.");
-                text.add("§4§nAltar Effect");
+                text.add(EnumChatFormatting.DARK_RED + "\u00a7nAltar Effect");
                 text.add("  This teleports anyone");
                 text.add("or anything that steps");
                 text.add("or goes near the altar");
@@ -80,9 +81,9 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
                 JewelryNBT.addModifier(item, new ItemStack(Item.bed));
 
-                text.add("§2Jewel: §0Ender Pearl");
-                text.add("§2Modifier: §0Bed");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Bed");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  Just like the other");
                 text.add("necklace this teleports");
                 text.add("you and anybody close");
@@ -94,7 +95,7 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 4: 
-                text.add("§4§nAltar Effect");
+                text.add(EnumChatFormatting.DARK_RED + "\u00a7nAltar Effect");
                 text.add("  This teleports anyone");
                 text.add("or anything that step");
                 text.add("on or around the altar");
@@ -121,13 +122,13 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.blazePowder));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §0Blaze Powder");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Blaze Powder");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This necklace gives");
                 text.add("you and those around");
-                text.add("you §4Fire Resistance§0");
+                text.add("you " + EnumChatFormatting.DARK_RED + "Fire Resistance");
                 text.add("when activated and in");
                 text.add("your inventory. To");
                 text.add("deactivate it simply");
@@ -137,8 +138,8 @@ public class GuiTabNecklaces extends GuiTab
             case 6: 
                 text.add("Depending on the jewel");
                 text.add("used, you and the");
-                text.add("others get §4Fire");
-                text.add("§4Resistance§0 I if you");
+                text.add("others get " + EnumChatFormatting.DARK_RED + "Fire");
+                text.add(EnumChatFormatting.DARK_RED + "Resistance" + EnumChatFormatting.BLACK + " I if you");
                 text.add("haven't got any jewel,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
@@ -161,13 +162,13 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.sugar));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §0Sugar");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Sugar");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This necklace gives");
                 text.add("you and those around");
-                text.add("you §4Speed§0 when");
+                text.add("you " + EnumChatFormatting.DARK_RED + "Speed" + EnumChatFormatting.BLACK + " when");
                 text.add("activated and in your");
                 text.add("inventory. To");
                 text.add("deactivate it simply");
@@ -177,7 +178,7 @@ public class GuiTabNecklaces extends GuiTab
             case 8: 
                 text.add("Depending on the jewel");
                 text.add("used, you and the");
-                text.add("others get §4Speed§0 I");
+                text.add("others get " + EnumChatFormatting.DARK_RED + "Speed" + EnumChatFormatting.BLACK + " I");
                 text.add("if you haven't got any");
                 text.add("jewel, II for Diamond,");
                 text.add("III for Emerald and");
@@ -200,13 +201,13 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeIron));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §0Iron Pickaxe");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Iron Pickaxe");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This necklace gives");
                 text.add("you and those around");
-                text.add("you §4Haste§0 when");
+                text.add("you " + EnumChatFormatting.DARK_RED + "Haste" + EnumChatFormatting.BLACK + " when");
                 text.add("activated and in your");
                 text.add("inventory. To");
                 text.add("deactivate it simply");
@@ -216,7 +217,7 @@ public class GuiTabNecklaces extends GuiTab
             case 10: 
                 text.add("Depending on the jewel");
                 text.add("used, you and the");
-                text.add("others get §4Haste§0 I");
+                text.add("others get " + EnumChatFormatting.DARK_RED + "Haste" + EnumChatFormatting.BLACK + " I");
                 text.add("if you haven't got any");
                 text.add("jewel, II for Diamond,");
                 text.add("III for Emerald and");
@@ -239,13 +240,13 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.feather));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §0Feather");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Feather");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This necklace gives");
                 text.add("you and those around");
-                text.add("you §4Jump Boost§0 when");
+                text.add("you " + EnumChatFormatting.DARK_RED + "Jump Boost" + EnumChatFormatting.BLACK + " when");
                 text.add("activated and in your");
                 text.add("inventory. To");
                 text.add("deactivate it simply");
@@ -255,7 +256,7 @@ public class GuiTabNecklaces extends GuiTab
             case 12: 
                 text.add("Depending on the jewel");
                 text.add("used, you and the");
-                text.add("others get §4Jump Boost");
+                text.add("others get " + EnumChatFormatting.DARK_RED + "Jump Boost");
                 text.add("I if you haven't got any");
                 text.add("jewel, II for Diamond,");
                 text.add("III for Emerald and");
@@ -278,14 +279,14 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.potion, 1, 8270));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §08min Potion of");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "8min Potion of");
                 text.add("Invisibility");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This necklace gives");
                 text.add("you and those around");
-                text.add("you §4Invisibility§0 when");
+                text.add("you " + EnumChatFormatting.DARK_RED + "Invisibility" + EnumChatFormatting.BLACK + " when");
                 text.add("activated and in your");
                 text.add("inventory. To");
                 text.add("deactivate it simply");
@@ -295,7 +296,7 @@ public class GuiTabNecklaces extends GuiTab
                 text.add("right click with it.");
                 text.add("Depending on the jewel");
                 text.add("used, you and the");
-                text.add("others get §4Invisibility§0 I");
+                text.add("others get " + EnumChatFormatting.DARK_RED + "Invisibility" + EnumChatFormatting.BLACK + " I");
                 text.add("if you haven't got any");
                 text.add("jewel, II for Diamond,");
                 text.add("III for Emerald and");
@@ -318,10 +319,10 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, jewels.get(jValues));
                 JewelryNBT.addModifier(item, new ItemStack(Item.dyePowder, 1, 15));
 
-                text.add("§2Jewel: §0None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
-                text.add("§2Modifier: §0Bone Meal");
-                text.add("§2Ingot: §0Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Bone Meal");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This hydrates the");
                 text.add("farm blocks under you");
                 text.add("in a defined area. If");
@@ -337,7 +338,7 @@ public class GuiTabNecklaces extends GuiTab
                 text.add("area is a block, diamond");
                 text.add("is 3x3, emerald 5x5 and");
                 text.add("nether star 11x11.");
-                text.add("§4§nAltar Effect");
+                text.add(EnumChatFormatting.DARK_RED + "\u00a7nAltar Effect");
                 text.add("  In the altar, this");
                 text.add("has the ability to");
                 text.add("hydrate any tilted land");
@@ -351,9 +352,9 @@ public class GuiTabNecklaces extends GuiTab
                 JewelryNBT.addJewel(item, new ItemStack(Item.netherStar));
                 JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeDiamond));
 
-                text.add("§2Jewel: §0Nether Star");
-                text.add("§2Modifier: §0Diamond Pick");
-                text.add("§2Ingot: §0Shadow Ingot");
+                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Nether Star");
+                text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Diamond Pick");
+                text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Shadow Ingot");
                 text.add("  This will break all");
                 text.add("blocks in a 3x3x1 area.");
                 text.add("Just right click on a");