Added a new block and implemented an on/off "switch" for the rings that give buffs, also working on balancing the rings

2 files changed, 9 insertions, 1 deletions

diff --git a/common/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/common/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
index 2d9b99e..3983274 100644
--- a/common/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
+++ b/common/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
@@ -13,6 +13,7 @@ import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.tileentity.TileEntityFurnace;
@@ -67,7 +68,8 @@ public class ComponentJewelry extends ComponentVillage
          * arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int
          * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)
          */
-        this.fillWithBlocks(world, sbb, 0, 0, 0, 11, 5, 12, 0, 0, false);
+        this.fillWithBlocks(world, sbb, 0, 0, 6, 10, 5, 11, 0, 0, false);
+        this.fillWithBlocks(world, sbb, 2, 0, 0, 8, 5, 5, 0, 0, false);
         //Pillars
         this.fillWithBlocks(world, sbb, 2, 0, 0, 2, 3, 0, Block.wood.blockID, Block.wood.blockID, false);
         this.fillWithBlocks(world, sbb, 2, 0, 3, 2, 3, 3, Block.wood.blockID, Block.wood.blockID, false);
@@ -262,6 +264,9 @@ public class ComponentJewelry extends ComponentVillage
             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(Item.netherStar)) && JewelryNBT.isModifierX(ring, new ItemStack(Item.book))) 
+                JewelryNBT.addMode(ring, "Disenchant");
             displayer.object = ring;
             displayer.quantity = 1;
             displayer.hasObject = true;
diff --git a/common/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/common/darkknight/jewelrycraft/worldGen/village/JCTrades.java
index 4e1022d..a60696b 100644
--- a/common/darkknight/jewelrycraft/worldGen/village/JCTrades.java
+++ b/common/darkknight/jewelrycraft/worldGen/village/JCTrades.java
@@ -131,6 +131,9 @@ public class JCTrades implements IVillageTradeHandler
                     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(Item.netherStar)) && JewelryNBT.isModifierX(result, new ItemStack(Item.book))) 
+                        JewelryNBT.addMode(result, "Disenchant");
                     ingredient = new ItemStack(Item.emerald, 16 + random.nextInt(20));
                     ingredient2 = new ItemStack(Block.blockEmerald, 5 + random.nextInt(5));
                 }