Made lots of changes

2 files changed, 13 insertions, 13 deletions

diff --git a/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
index 706282a..aadc084 100644
--- a/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
+++ b/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
@@ -233,7 +233,7 @@ public class ComponentJewelry extends StructureVillagePieces.House1
         TileEntityChest chest = (TileEntityChest) world.getTileEntity(i1, j1, k1);
         while (chest != null && t > 0)
         {
-            ItemStack jewels = JewelrycraftUtil.jewel.get(random.nextInt(JewelrycraftUtil.jewel.size()));
+            ItemStack jewels = JewelrycraftUtil.gem.get(random.nextInt(JewelrycraftUtil.gem.size()));
             chest.func_145976_a("Jeweler's Chest");
             if (random.nextBoolean()) chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), JewelrycraftUtil.modifiers.get(random.nextInt(JewelrycraftUtil.modifiers.size())));
             else if (jewels.getItem() == Items.nether_star && ConfigHandler.generateVillageNetherstar) chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), jewels);
@@ -291,10 +291,10 @@ public class ComponentJewelry extends StructureVillagePieces.House1
         {
             ItemStack ring = new ItemStack(ItemList.ring);
             JewelryNBT.addMetal(ring, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
-            JewelryNBT.addModifier(ring, JewelrycraftUtil.modifiers.get(random.nextInt(JewelrycraftUtil.modifiers.size())));
-            JewelryNBT.addJewel(ring, JewelrycraftUtil.jewel.get(random.nextInt(JewelrycraftUtil.jewel.size())));
-            if (JewelryNBT.isModifierEffectType(ring)) JewelryNBT.addMode(ring, "Activated");
-            if (JewelryNBT.isJewelX(ring, new ItemStack(Items.nether_star)) && JewelryNBT.isModifierX(ring, new ItemStack(Items.book))) JewelryNBT.addMode(ring, "Disenchant");
+            JewelryNBT.addModifiers(ring, JewelrycraftUtil.addRandomModifiers());
+            JewelryNBT.addGem(ring, JewelrycraftUtil.gem.get(random.nextInt(JewelrycraftUtil.gem.size())));
+//            if (JewelryNBT.isModifierEffectType(ring)) JewelryNBT.addMode(ring, "Activated");
+            if (JewelryNBT.isGemX(ring, new ItemStack(Items.nether_star)) && JewelryNBT.isModifierX(ring, new ItemStack(Items.book))) JewelryNBT.addMode(ring, "Disenchant");
             displayer.object = ring;
             displayer.quantity = 1;
             displayer.hasObject = true;
diff --git a/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
index 7cec830..bddf7b3 100644
--- a/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
+++ b/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
@@ -114,10 +114,10 @@ public class JCTrades implements IVillageTradeHandler
                 }
                 case 9:
                 {
-                    int end = random.nextInt(JewelrycraftUtil.jewel.size());
-                    result = JewelrycraftUtil.jewel.get(end);
-                    result.stackSize = 1 + random.nextInt(JewelrycraftUtil.jewel.size() - end);
-                    if (JewelrycraftUtil.jewel.size() - 1 - end >= 1)
+                    int end = random.nextInt(JewelrycraftUtil.gem.size());
+                    result = JewelrycraftUtil.gem.get(end);
+                    result.stackSize = 1 + random.nextInt(JewelrycraftUtil.gem.size() - end);
+                    if (JewelrycraftUtil.gem.size() - 1 - end >= 1)
                     {
                         int value = end;
                         if (value > 64) value = 64;
@@ -143,10 +143,10 @@ public class JCTrades implements IVillageTradeHandler
                 {
                     result = new ItemStack(ItemList.ring, 1, 0);
                     JewelryNBT.addMetal(result, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
-                    JewelryNBT.addModifier(result, JewelrycraftUtil.modifiers.get(random.nextInt(JewelrycraftUtil.modifiers.size())));
-                    JewelryNBT.addJewel(result, JewelrycraftUtil.jewel.get(random.nextInt(JewelrycraftUtil.jewel.size())));
-                    if (JewelryNBT.isModifierEffectType(result)) JewelryNBT.addMode(result, "Activated");
-                    if (JewelryNBT.isJewelX(result, new ItemStack(Items.nether_star)) && JewelryNBT.isModifierX(result, new ItemStack(Items.book))) JewelryNBT.addMode(result, "Disenchant");
+                    JewelryNBT.addModifiers(result, JewelrycraftUtil.addRandomModifiers());
+                    JewelryNBT.addGem(result, JewelrycraftUtil.gem.get(random.nextInt(JewelrycraftUtil.gem.size())));
+//                    if (JewelryNBT.isModifierEffectType(result)) JewelryNBT.addMode(result, "Activated");
+                    if (JewelryNBT.isGemX(result, new ItemStack(Items.nether_star)) && JewelryNBT.isModifierX(result, new ItemStack(Items.book))) JewelryNBT.addMode(result, "Disenchant");
                     ingredient = new ItemStack(Items.emerald, 16 + random.nextInt(20));
                     ingredient2 = new ItemStack(Blocks.emerald_block, 5 + random.nextInt(5));
                 }