Made lots of changes

7 files changed, 377 insertions, 157 deletions

diff --git a/java/darkknight/jewelrycraft/container/ContainerJewelryTab.java b/java/darkknight/jewelrycraft/container/ContainerJewelryTab.java
new file mode 100644
index 0000000..e33976a
--- /dev/null
+++ b/java/darkknight/jewelrycraft/container/ContainerJewelryTab.java
@@ -0,0 +1,65 @@
+package darkknight.jewelrycraft.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.JewelrycraftMod;
+
+public class ContainerJewelryTab extends Container
+{
+    public ContainerJewelryTab(EntityPlayer player, InventoryPlayer inv)
+    {
+        int x, y;
+        // Rings
+        for (x = 0; x <= 9; x++)
+            this.addSlotToContainer(new SlotRing(new JewelryInventory(), x, 8 + x * 18, 7));
+
+        // Hotbar
+        for (x = 0; x < 9; ++x)
+            this.addSlotToContainer(new Slot(inv, x, 17 + x * 18, 142));
+        
+        // Inventory
+        for (x = 0; x < 3; ++x)
+            for (y = 0; y < 9; ++y)
+                this.addSlotToContainer(new Slot(inv, 9 + y + x * 9, 17 + y * 18, 84 + x * 18));
+        
+    }
+    
+    @Override
+    public boolean canInteractWith(EntityPlayer player)
+    {
+        return true;
+    }
+    
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
+    {
+        ItemStack itemstack = null;
+        Slot slot = (Slot) this.inventorySlots.get(par2);
+        
+//        if (slot != null && slot.getHasStack())
+//        {
+//            ItemStack itemstack1 = slot.getStack();
+//            itemstack = itemstack1.copy();
+//            
+//            if (par2 < 27)
+//            {
+//                if (!this.mergeItemStack(itemstack1, 27, this.inventorySlots.size(), true)) { return null; }
+//            }
+//            else if (!this.mergeItemStack(itemstack1, 0, 27, false)) { return null; }
+//            
+//            if (itemstack1.stackSize == 0)
+//            {
+//                slot.putStack((ItemStack) null);
+//            }
+//            else
+//            {
+//                slot.onSlotChanged();
+//            }
+//        }
+//        
+        return itemstack;
+    }
+}
diff --git a/java/darkknight/jewelrycraft/container/GuiHandler.java b/java/darkknight/jewelrycraft/container/GuiHandler.java
index cd9d72e..7773a38 100644
--- a/java/darkknight/jewelrycraft/container/GuiHandler.java
+++ b/java/darkknight/jewelrycraft/container/GuiHandler.java
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.client.GuiGuide;
+import darkknight.jewelrycraft.client.GuiJewelry;
 import darkknight.jewelrycraft.client.GuiRingChest;
 
 public class GuiHandler implements IGuiHandler
@@ -25,6 +26,8 @@ public class GuiHandler implements IGuiHandler
                 return new ContainerRingChest(player.inventory, (TileEntityChest) world.getTileEntity(x, y, z));
             case 1:
                 return new ContainerGuide();
+            case 2:
+                return new ContainerJewelryTab(player, player.inventory);
             default:
                 return null;
         }
@@ -39,6 +42,8 @@ public class GuiHandler implements IGuiHandler
                 return new GuiRingChest((ContainerRingChest) getServerGuiElement(ID, player, world, x, y, z));
             case 1:
                 return new GuiGuide((ContainerGuide) getServerGuiElement(ID, player, world, x, y, z), world);
+            case 2:
+                return new GuiJewelry(new ContainerJewelryTab(player, player.inventory));
             default:
                 return null;
         }
diff --git a/java/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java b/java/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
index d7f552d..d586348 100644
--- a/java/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
+++ b/java/darkknight/jewelrycraft/container/GuiTabJewelsAndModifiers.java
@@ -13,7 +13,7 @@ public class GuiTabJewelsAndModifiers extends GuiTab
 {
     public GuiTabJewelsAndModifiers(int id)
     {
-        super("Jewels, modifiers and ingots", id);
+        super("Gems, modifiers and ingots", id);
     }
     
     public ItemStack getIcon()
@@ -26,14 +26,14 @@ public class GuiTabJewelsAndModifiers extends GuiTab
     {
         int xPos = (page % 2 == 0) ? 107 : -35;
         for (int i = (page - 1) * 9; i < page * 9; i++)
-            if (i < JewelrycraftUtil.jewel.size())
+            if (i < JewelrycraftUtil.gem.size())
             {
-                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Jewels", gui.getLeft() + xPos + 40, gui.getTop(), 0);
-                gui.renderItem(JewelrycraftUtil.jewel.get(i), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16 * (i - 9 * (page - 1)), 30f);
-                gui.getFont().drawString(JewelrycraftUtil.jewel.get(i).getDisplayName(), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16 * (i - 9 * (page - 1)), 0);
+                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Gems", gui.getLeft() + xPos + 40, gui.getTop(), 0);
+                gui.renderItem(JewelrycraftUtil.gem.get(i), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16 * (i - 9 * (page - 1)), 30f);
+                gui.getFont().drawString(JewelrycraftUtil.gem.get(i).getDisplayName(), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16 * (i - 9 * (page - 1)), 0);
                 GL11.glDisable(GL11.GL_LIGHTING);
             }
-        page -= (JewelrycraftUtil.jewel.size() / 9 + 1);
+        page -= (JewelrycraftUtil.gem.size() / 9 + 1);
         for (int i = (page - 1) * 9; i < page * 9; i++)
         {
             if (i < JewelrycraftUtil.modifiers.size() && page > 0)
@@ -59,7 +59,7 @@ public class GuiTabJewelsAndModifiers extends GuiTab
     
     public int getMaxPages()
     {
-        return JewelrycraftUtil.jewel.size() / 9 + JewelrycraftUtil.modifiers.size() / 9 + JewelrycraftUtil.metal.size() / 9 + 2;
+        return JewelrycraftUtil.gem.size() / 9 + JewelrycraftUtil.modifiers.size() / 9 + JewelrycraftUtil.metal.size() / 9 + 2;
     }
     
     @Override
diff --git a/java/darkknight/jewelrycraft/container/GuiTabNecklaces.java b/java/darkknight/jewelrycraft/container/GuiTabNecklaces.java
index 08e93c9..531de4a 100644
--- a/java/darkknight/jewelrycraft/container/GuiTabNecklaces.java
+++ b/java/darkknight/jewelrycraft/container/GuiTabNecklaces.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import darkknight.jewelrycraft.client.GuiGuide;
@@ -26,7 +25,7 @@ public class GuiTabNecklaces extends GuiTab
     {
         ItemStack it = new ItemStack(ItemList.necklace);
         JewelryNBT.addMetal(it, new ItemStack(Items.iron_ingot));
-        JewelryNBT.addJewel(it, new ItemStack(Blocks.redstone_block));
+        JewelryNBT.addGem(it, new ItemStack(Blocks.redstone_block));
         return it;
     }
     
@@ -34,7 +33,7 @@ public class GuiTabNecklaces extends GuiTab
     public void drawBackground(GuiGuide gui, int x, int y, int page)
     {
         ArrayList<String> text = new ArrayList<String>();
-        ArrayList<ItemStack> jewels = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> gems = new ArrayList<ItemStack>();
         ItemStack item = new ItemStack(ItemList.necklace);
         int xPos = (page % 2 == 0) ? 107 : -35;
         switch (page)
@@ -46,9 +45,9 @@ public class GuiTabNecklaces extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + 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");
@@ -80,10 +79,10 @@ public class GuiTabNecklaces extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
-                JewelryNBT.addModifier(item, new ItemStack(Items.bed));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + 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");
@@ -109,10 +108,10 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 5:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -122,13 +121,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.blaze_powder));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Blaze Powder");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -142,21 +141,21 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 6:
-                text.add("Depending on the jewel");
+                text.add("Depending on the gem");
                 text.add("used, you and the");
                 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("haven't got any gem,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 7:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -166,13 +165,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.sugar));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Sugar");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -186,20 +185,20 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 8:
-                text.add("Depending on the jewel");
+                text.add("Depending on the gem");
                 text.add("used, you and the");
                 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("gem, II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 9:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -209,13 +208,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.iron_pickaxe));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Iron Pickaxe");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -229,20 +228,20 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 10:
-                text.add("Depending on the jewel");
+                text.add("Depending on the gem");
                 text.add("used, you and the");
                 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("gem, II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 11:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -252,13 +251,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.feather));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Feather");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -272,20 +271,20 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 12:
-                text.add("Depending on the jewel");
+                text.add("Depending on the gem");
                 text.add("used, you and the");
                 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("gem, II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 13:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -295,13 +294,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.potionitem, 1, 8270));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "8min Potion of");
                 text.add("Invisibility");
@@ -316,20 +315,20 @@ public class GuiTabNecklaces extends GuiTab
                 break;
             case 14:
                 text.add("right click with it.");
-                text.add("Depending on the jewel");
+                text.add("Depending on the gem");
                 text.add("used, you and the");
                 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("gem, II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 15:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                gems.add(null);
+                gems.add(new ItemStack(Items.diamond));
+                gems.add(new ItemStack(Items.emerald));
+                gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -339,13 +338,13 @@ public class GuiTabNecklaces extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.dye, 1, 15));
+                JewelryNBT.addGem(item, gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Bone Meal");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -359,7 +358,7 @@ public class GuiTabNecklaces extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 16:
-                text.add("determined by the jewel");
+                text.add("determined by the gem");
                 text.add("used. For none, the");
                 text.add("area is a block, diamond");
                 text.add("is 3x3, emerald 5x5 and");
@@ -375,10 +374,10 @@ public class GuiTabNecklaces extends GuiTab
                 break;
             case 17:
                 JewelryNBT.addMetal(item, new ItemStack(ItemList.shadowIngot));
-                JewelryNBT.addJewel(item, new ItemStack(Items.nether_star));
-                JewelryNBT.addModifier(item, new ItemStack(Items.diamond_pickaxe));
+                JewelryNBT.addGem(item, new ItemStack(Items.nether_star));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Nether Star");
+                text.add(EnumChatFormatting.DARK_GREEN + "gem: " + 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");
diff --git a/java/darkknight/jewelrycraft/container/GuiTabRings.java b/java/darkknight/jewelrycraft/container/GuiTabRings.java
index 5a924f0..1e30659 100644
--- a/java/darkknight/jewelrycraft/container/GuiTabRings.java
+++ b/java/darkknight/jewelrycraft/container/GuiTabRings.java
@@ -25,7 +25,7 @@ public class GuiTabRings extends GuiTab
     {
         ItemStack it = new ItemStack(ItemList.ring);
         JewelryNBT.addMetal(it, new ItemStack(Items.gold_ingot));
-        JewelryNBT.addJewel(it, new ItemStack(Items.ender_pearl));
+        JewelryNBT.addGem(it, new ItemStack(Items.ender_pearl));
         return it;
     }
     
@@ -33,7 +33,7 @@ public class GuiTabRings extends GuiTab
     public void drawBackground(GuiGuide gui, int x, int y, int page)
     {
         ArrayList<String> text = new ArrayList<String>();
-        ArrayList<ItemStack> jewels = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> Gems = new ArrayList<ItemStack>();
         ItemStack item = new ItemStack(ItemList.ring);
         int xPos = (page % 2 == 0) ? 107 : -35;
         switch (page)
@@ -45,9 +45,9 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + 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 allows you");
@@ -82,15 +82,15 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
-                JewelryNBT.addModifier(item, new ItemStack(Items.bed));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + 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("ring that had only an");
-                text.add("ender pearl as a jewel,");
+                text.add("ender pearl as a Gem,");
                 text.add("by adding a bed as a");
                 text.add("modifier to it you can");
                 text.add("travel between");
@@ -113,10 +113,10 @@ public class GuiTabRings extends GuiTab
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 5:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                Gems.add(null);
+                Gems.add(new ItemStack(Items.diamond));
+                Gems.add(new ItemStack(Items.emerald));
+                Gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -126,13 +126,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > Gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.blaze_powder));
+                JewelryNBT.addGem(item, Gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Blaze Powder");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -142,22 +142,22 @@ public class GuiTabRings extends GuiTab
                 text.add("inventory. To deactivate");
                 text.add("it simply right click with");
                 text.add("it. Depending on the");
-                text.add("jewel you used, you");
+                text.add("Gem you used, you");
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 6:
                 text.add("get " + EnumChatFormatting.DARK_RED + "Fire Resistance" + EnumChatFormatting.BLACK + " I");
                 text.add("if you haven't got any");
-                text.add("jewel, II for Diamond,");
+                text.add("Gem, II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 7:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                Gems.add(null);
+                Gems.add(new ItemStack(Items.diamond));
+                Gems.add(new ItemStack(Items.emerald));
+                Gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -167,13 +167,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > Gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.sugar));
+                JewelryNBT.addGem(item, Gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Sugar");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -183,22 +183,22 @@ public class GuiTabRings extends GuiTab
                 text.add("To deactivate it simply");
                 text.add("right click with it.");
                 text.add("Depending on the");
-                text.add("jewel you used, you");
+                text.add("Gem you used, you");
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 8:
                 text.add("get " + EnumChatFormatting.DARK_RED + "Speed" + EnumChatFormatting.BLACK + " I if you");
-                text.add("haven't got any jewel,");
+                text.add("haven't got any Gem,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 9:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                Gems.add(null);
+                Gems.add(new ItemStack(Items.diamond));
+                Gems.add(new ItemStack(Items.emerald));
+                Gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -208,13 +208,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > Gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.iron_pickaxe));
+                JewelryNBT.addGem(item, Gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Iron Pickaxe");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -224,22 +224,22 @@ public class GuiTabRings extends GuiTab
                 text.add("To deactivate it simply");
                 text.add("right click with it.");
                 text.add("Depending on the");
-                text.add("jewel you used, you");
+                text.add("Gem you used, you");
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 10:
                 text.add("get " + EnumChatFormatting.DARK_RED + "Haste" + EnumChatFormatting.BLACK + " I if you");
-                text.add("haven't got any jewel,");
+                text.add("haven't got any Gem,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 11:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                Gems.add(null);
+                Gems.add(new ItemStack(Items.diamond));
+                Gems.add(new ItemStack(Items.emerald));
+                Gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -249,13 +249,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > Gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.feather));
+                JewelryNBT.addGem(item, Gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Feather");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
@@ -269,20 +269,20 @@ public class GuiTabRings extends GuiTab
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
                 break;
             case 12:
-                text.add("Depending on the jewel");
+                text.add("Depending on the Gem");
                 text.add("you used, you get");
                 text.add(EnumChatFormatting.DARK_RED + "Jump Boost" + EnumChatFormatting.BLACK + " I if you");
-                text.add("haven't got any jewel,");
+                text.add("haven't got any Gem,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 13:
-                jewels.add(null);
-                jewels.add(new ItemStack(Items.diamond));
-                jewels.add(new ItemStack(Items.emerald));
-                jewels.add(new ItemStack(Items.nether_star));
+                Gems.add(null);
+                Gems.add(new ItemStack(Items.diamond));
+                Gems.add(new ItemStack(Items.emerald));
+                Gems.add(new ItemStack(Items.nether_star));
                 
                 if (del == 0)
                 {
@@ -292,13 +292,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > jewels.size() - 1) jValues = 0;
+                if (jValues > Gems.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, jewels.get(jValues));
-                JewelryNBT.addModifier(item, new ItemStack(Items.potionitem, 1, 8270));
+                JewelryNBT.addGem(item, Gems.get(jValues));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "None, Diamond");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "None, Diamond");
                 text.add("Emerald or Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "8min Potion of");
                 text.add("Invisibility");
@@ -313,10 +313,10 @@ public class GuiTabRings extends GuiTab
                 break;
             case 14:
                 text.add("right click with it.");
-                text.add("Depending on the jewel");
+                text.add("Depending on the Gem");
                 text.add("you used, you get");
                 text.add(EnumChatFormatting.DARK_RED + "Invisibility" + EnumChatFormatting.BLACK + " I if you");
-                text.add("haven't got any jewel,");
+                text.add("haven't got any Gem,");
                 text.add("II for Diamond,");
                 text.add("III for Emerald and");
                 text.add("VIII for Nether Star.");
@@ -329,10 +329,10 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.nether_star));
-                JewelryNBT.addModifier(item, new ItemStack(Items.book));
+                JewelryNBT.addGem(item, new ItemStack(Items.nether_star));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Nether Star");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Book");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This has the power");
@@ -438,10 +438,10 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
-                JewelryNBT.addModifier(item, new ItemStack(Blocks.chest));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Ender Pearl");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Chest");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This ring can link");
@@ -476,10 +476,10 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Blocks.obsidian));
-                JewelryNBT.addModifier(item, new ItemStack(Items.ender_eye));
+                JewelryNBT.addGem(item, new ItemStack(Blocks.obsidian));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Obsidian");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Obsidian");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Eye of Ender");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This ring is connected");
@@ -496,10 +496,10 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.nether_star));
-                JewelryNBT.addModifier(item, new ItemStack(Blocks.chest));
+                JewelryNBT.addGem(item, new ItemStack(Items.nether_star));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Nether Star");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Nether Star");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Chest");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  This ring can store");
@@ -527,13 +527,13 @@ public class GuiTabRings extends GuiTab
                 del++;
                 if (del >= 300) del = 0;
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
-                if (jValues > JewelrycraftUtil.jewel.size() - 1) jValues = 0;
+                if (jValues > JewelrycraftUtil.gem.size() - 1) jValues = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, JewelrycraftUtil.jewel.get(jValues).copy());
-                JewelryNBT.addModifier(item, new ItemStack(Items.dye, 1, 15));
+                JewelryNBT.addGem(item, JewelrycraftUtil.gem.get(jValues).copy());
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Any");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Any");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Bone Meal");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  While having it in");
@@ -565,10 +565,10 @@ public class GuiTabRings extends GuiTab
                 if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
-                JewelryNBT.addJewel(item, new ItemStack(Items.ender_pearl));
-                JewelryNBT.addModifier(item, new ItemStack(Items.diamond_pickaxe));
+                JewelryNBT.addGem(item, new ItemStack(Items.ender_pearl));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Ender Pearl");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + EnumChatFormatting.BLACK + "Ender Pearl");
                 text.add(EnumChatFormatting.DARK_GREEN + "Modifier: " + EnumChatFormatting.BLACK + "Diamond Pick");
                 text.add(EnumChatFormatting.DARK_GREEN + "Ingot: " + EnumChatFormatting.BLACK + "Any");
                 text.add("  You can right click");
@@ -583,10 +583,10 @@ public class GuiTabRings extends GuiTab
                 break;
             case 30:
                 JewelryNBT.addMetal(item, new ItemStack(ItemList.shadowIngot));
-                JewelryNBT.addJewel(item, new ItemStack(Items.nether_star));
-                JewelryNBT.addModifier(item, new ItemStack(Items.diamond_pickaxe));
+                JewelryNBT.addGem(item, new ItemStack(Items.nether_star));
+                JewelryNBT.addModifiers(item, JewelrycraftUtil.addRandomModifiers());
                 
-                text.add(EnumChatFormatting.DARK_GREEN + "Jewel: " + EnumChatFormatting.BLACK + "Nether Star");
+                text.add(EnumChatFormatting.DARK_GREEN + "Gem: " + 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("  Right clicking with");
diff --git a/java/darkknight/jewelrycraft/container/JewelryInventory.java b/java/darkknight/jewelrycraft/container/JewelryInventory.java
new file mode 100644
index 0000000..05accfa
--- /dev/null
+++ b/java/darkknight/jewelrycraft/container/JewelryInventory.java
@@ -0,0 +1,118 @@
+package darkknight.jewelrycraft.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+
+public class JewelryInventory implements IInventory
+{
+    public ItemStack[] inventory = new ItemStack[18];    
+    public JewelryInventory()
+    {
+    }
+    
+    @Override
+    public int getSizeInventory()
+    {
+        return inventory.length;
+    }
+    
+    @Override
+    public ItemStack getStackInSlot(int slot)
+    {
+        return inventory[slot];
+    }
+    
+    @Override
+    public ItemStack decrStackSize(int slot, int amount)
+    {
+        ItemStack stack = getStackInSlot(slot);
+        if (stack != null)
+        {
+            if (stack.stackSize > amount)
+            {
+                stack = stack.splitStack(amount);
+                markDirty();
+            }
+            else
+            {
+                setInventorySlotContents(slot, null);
+            }
+        }
+        
+        return stack;
+    }
+    
+    @Override
+    public ItemStack getStackInSlotOnClosing(int slot)
+    {
+        ItemStack stack = getStackInSlot(slot);
+        setInventorySlotContents(slot, null);
+        return stack;
+    }
+    
+    @Override
+    public void setInventorySlotContents(int slot, ItemStack stack)
+    {
+        inventory[slot] = stack;
+        if (stack != null && stack.stackSize > getInventoryStackLimit())
+        {
+            stack.stackSize = getInventoryStackLimit();
+        }
+        markDirty();
+    }
+    
+    @Override
+    public String getInventoryName()
+    {
+        return "Jewelry";
+    }
+    
+    @Override
+    public boolean hasCustomInventoryName()
+    {
+        return false;
+    }
+    
+    @Override
+    public int getInventoryStackLimit()
+    {
+        return 1;
+    }
+    
+    @Override
+    public void markDirty()
+    {
+        for (int i = 0; i < getSizeInventory(); ++i)
+        {
+            if (getStackInSlot(i) != null && getStackInSlot(i).stackSize == 0)
+            {
+                inventory[i] = null;
+            }
+        }
+    }
+    
+    @Override
+    public boolean isUseableByPlayer(EntityPlayer player)
+    {
+        return true;
+    }
+    
+    @Override
+    public void openInventory()
+    {
+    }
+    
+    @Override
+    public void closeInventory()
+    {
+    }
+    
+    @Override
+    public boolean isItemValidForSlot(int slot, ItemStack stack)
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/java/darkknight/jewelrycraft/container/SlotRing.java b/java/darkknight/jewelrycraft/container/SlotRing.java
new file mode 100644
index 0000000..3207301
--- /dev/null
+++ b/java/darkknight/jewelrycraft/container/SlotRing.java
@@ -0,0 +1,33 @@
+package darkknight.jewelrycraft.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.item.ItemRing;
+
+public class SlotRing extends Slot
+{
+    public SlotRing(IInventory tile, int slotID, int x, int y)
+    {
+        super(tile, slotID, x, y);
+    }
+    
+    @Override
+    public boolean isItemValid(ItemStack stack)
+    {
+        return stack.getItem() instanceof ItemRing;
+    }
+    
+    @Override
+    public ItemStack decrStackSize(int amount)
+    {
+        return super.decrStackSize(amount);
+    }
+    
+    @Override
+    public boolean canTakeStack(EntityPlayer player)
+    {
+        return true;
+    }
+}