Made a few modifications to some classes, added earrings and bracelets. Improved coloring algorithm and balanced the Thieving Glove

2 files changed, 36 insertions, 59 deletions

diff --git a/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
index aadc084..f07a4a6 100644
--- a/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
+++ b/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
@@ -235,8 +235,7 @@ public class ComponentJewelry extends StructureVillagePieces.House1
         {
             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);
+            if (jewels.getItem() == Items.nether_star && ConfigHandler.generateVillageNetherstar) chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), jewels);
             else if (random.nextBoolean() && jewels.getItem() != Items.nether_star) chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), jewels);
             t--;
         }
@@ -289,13 +288,12 @@ public class ComponentJewelry extends StructureVillagePieces.House1
         TileEntityDisplayer displayer = (TileEntityDisplayer) world.getTileEntity(i1, j1, k1);
         if (displayer != null)
         {
-            ItemStack ring = new ItemStack(ItemList.ring);
-            JewelryNBT.addMetal(ring, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
-            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;
+            Item[] jewels = {ItemList.ring, ItemList.necklace};
+            ItemStack jewel = new ItemStack(jewels[random.nextInt(jewels.length)]);
+            JewelryNBT.addMetal(jewel, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
+            JewelryNBT.addModifiers(jewel, JewelrycraftUtil.addRandomModifiers(random.nextInt(4)));
+            JewelryNBT.addGem(jewel, JewelrycraftUtil.gem.get(random.nextInt(JewelrycraftUtil.gem.size())));
+            displayer.object = jewel;
             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 bddf7b3..1d474b0 100644
--- a/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
+++ b/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
@@ -11,6 +11,7 @@ import net.minecraft.village.MerchantRecipeList;
 import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.item.ItemMolds;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
@@ -37,82 +38,55 @@ public class JCTrades implements IVillageTradeHandler
                 case 0:
                 {
                     result = JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size()));
-                    result.stackSize = 5 + random.nextInt(8);
-                    ingredient = new ItemStack(Items.emerald, 2 + random.nextInt(2));
+                    result.stackSize = 5 + random.nextInt(5);
+                    ingredient = new ItemStack(Items.emerald, 2 + random.nextInt(7));
                     if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 2 + random.nextInt(2));
                     break;
                 }
                 case 1:
                 {
-                    result = new ItemStack(ItemList.molds, 5 + random.nextInt(7), random.nextInt(2));
-                    ingredient = new ItemStack(Items.emerald, 1 + random.nextInt(1));
+                    result = new ItemStack(ItemList.molds, 5 + random.nextInt(7), random.nextInt(ItemMolds.moldsItemNames.length));
+                    ingredient = new ItemStack(Items.emerald, 1);
                     if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 1 + random.nextInt(2));
                     break;
                 }
                 case 2:
                 {
-                    result = new ItemStack(ItemList.thiefGloves);
-                    ingredient = new ItemStack(Items.emerald, 16 + random.nextInt(8));
-                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 8 + random.nextInt(4));
+                    int number = random.nextInt(3);
+                    result = new ItemStack(BlockList.displayer, 1 + number);
+                    ingredient = new ItemStack(Blocks.emerald_block, 2 + number*3 + random.nextInt(2));
+                    ingredient2 = new ItemStack(Items.emerald, 3 + number + random.nextInt(8));
                     break;
                 }
                 case 3:
                 {
-                    result = new ItemStack(BlockList.displayer, 1 + random.nextInt(6));
-                    ingredient = new ItemStack(Items.emerald, 3 + random.nextInt(8));
-                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 3 + random.nextInt(8));
-                    break;
-                }
-                case 4:
-                {
                     result = new ItemStack(BlockList.jewelCraftingTable);
                     ingredient = new ItemStack(Items.emerald, 1 + random.nextInt(2));
                     if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 1 + random.nextInt(2));
                     break;
                 }
-                case 5:
+                case 4:
                 {
-                    result = new ItemStack(BlockList.shadowOre, 1 + random.nextInt(16));
+                    result = new ItemStack(BlockList.shadowOre, 1 + random.nextInt(6));
                     ingredient = new ItemStack(Items.emerald, 3 + random.nextInt(4));
                     if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 3 + random.nextInt(4));
                     break;
                 }
-                case 6:
+                case 5:
                 {
                     result = new ItemStack(BlockList.molder, 5 + random.nextInt(5));
-                    ingredient = new ItemStack(Items.emerald, 1 + random.nextInt(1));
-                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 1 + random.nextInt(1));
+                    ingredient = new ItemStack(Items.emerald, 1);
+                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 1);
                     break;
                 }
-                case 7:
+                case 6:
                 {
                     result = new ItemStack(BlockList.smelter);
                     ingredient = new ItemStack(Items.emerald, 1 + random.nextInt(2));
                     if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 1 + random.nextInt(2));
                     break;
                 }
-                case 8:
-                {
-                    int end = random.nextInt(JewelrycraftUtil.modifiers.size());
-                    result = JewelrycraftUtil.modifiers.get(end);
-                    if (JewelrycraftUtil.modifiers.size() - 1 - end >= 3)
-                    {
-                        result.stackSize = 1 + random.nextInt(JewelrycraftUtil.modifiers.size() - end);
-                        int value = end;
-                        if (value > 64) value = 64;
-                        ingredient = new ItemStack(Items.emerald, 3 + random.nextInt(value));
-                        if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 4 + random.nextInt(value));
-                    }
-                    else
-                    {
-                        result.stackSize = 1 + random.nextInt(7);
-                        ingredient = new ItemStack(Items.emerald, result.stackSize / 2 + 1 + random.nextInt(7));
-                        ingredient2 = new ItemStack(Items.emerald, result.stackSize / 2 + 1 + random.nextInt(4));
-                    }
-                    if (result.getMaxStackSize() <= 1) result.stackSize = 1;
-                    break;
-                }
-                case 9:
+                case 7:
                 {
                     int end = random.nextInt(JewelrycraftUtil.gem.size());
                     result = JewelrycraftUtil.gem.get(end);
@@ -131,24 +105,29 @@ public class JCTrades implements IVillageTradeHandler
                     }
                     break;
                 }
-                case 10:
+                case 8:
                 {
                     result = JewelrycraftUtil.ores.get(random.nextInt(JewelrycraftUtil.ores.size()));
-                    result.stackSize = 3 + random.nextInt(8);
-                    ingredient = new ItemStack(Items.emerald, 2 + random.nextInt(2));
-                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 2 + random.nextInt(2));
+                    result.stackSize = 3 + random.nextInt(3);
+                    ingredient = new ItemStack(Items.emerald, 2 + random.nextInt(5));
+                    if (random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 2 + random.nextInt(6));
+                    break;
+                }
+                case 9:
+                {
+                    result = new ItemStack(ItemList.guide, 1);
+                    ingredient = new ItemStack(Items.emerald, 1);
                     break;
                 }
                 default:
                 {
                     result = new ItemStack(ItemList.ring, 1, 0);
+                    int randValue = random.nextInt(4);
                     JewelryNBT.addMetal(result, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
-                    JewelryNBT.addModifiers(result, JewelrycraftUtil.addRandomModifiers());
+                    JewelryNBT.addModifiers(result, JewelrycraftUtil.addRandomModifiers(randValue));
                     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));
+                    ingredient2 = new ItemStack(Blocks.emerald_block, 2 + randValue);
                 }
             }