Moved source files

4 files changed, 584 insertions, 0 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java b/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java
new file mode 100644
index 0000000..f484c0b
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java
@@ -0,0 +1,46 @@
+package darkknight.jewelrycraft.worldGen;
+
+import java.util.Random;
+
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+import cpw.mods.fml.common.IWorldGenerator;
+import darkknight.jewelrycraft.block.BlockList;
+
+public class Generation implements IWorldGenerator
+{
+    @Override
+    public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
+    {
+        switch (world.provider.dimensionId)
+        {
+            case -1:
+                generateNether(world, random, chunkX << 4, chunkZ << 4);
+                break;
+            case 0:
+                generateSurface(world, random, chunkX << 4, chunkZ << 4);
+                break;
+            case 1:
+                generateEnd(world, random, chunkX << 4, chunkZ << 4);
+                break;
+        }
+    }
+    
+    private void generateEnd(World world, Random random, int i, int j)
+    {}
+    
+    private void generateSurface(World world, Random random, int i, int j)
+    {
+        for (int k = 0; k < 1; k++)
+        {
+            int x = i + random.nextInt(16);
+            int y = 5 + random.nextInt(4);
+            int z = j + random.nextInt(16);
+            world.setBlock(x, y, z, BlockList.shadowOre);
+            if(random.nextInt(3) == 0) world.setBlock(x + random.nextInt(2), y + random.nextInt(1), z + random.nextInt(2), BlockList.shadowOre);
+        }
+    }
+    
+    private void generateNether(World world, Random random, int i, int j)
+    {}
+}
diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
new file mode 100644
index 0000000..6924940
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
@@ -0,0 +1,355 @@
+package darkknight.jewelrycraft.worldGen.village;
+
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntityFurnace;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.structure.StructureBoundingBox;
+import net.minecraft.world.gen.structure.StructureComponent;
+import net.minecraft.world.gen.structure.StructureVillagePieces;
+import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
+import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.item.ItemMolds;
+import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;
+import darkknight.jewelrycraft.tileentity.TileEntityMolder;
+import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
+import darkknight.jewelrycraft.util.JewelryNBT;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
+
+public class ComponentJewelry extends StructureVillagePieces.House1
+{
+    private int averageGroundLevel = -1;
+
+    public ComponentJewelry()
+    {
+    }
+
+    public ComponentJewelry(Start par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5)
+    {
+        super();
+        this.coordBaseMode = par5;
+        this.boundingBox = par4StructureBoundingBox;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static ComponentJewelry buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5)
+    {
+        StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 11, 5, 12, p4);
+        return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentJewelry(villagePiece, p5, random,
+                structureboundingbox, p4) : null;
+    }
+
+    /**
+     * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at
+     * the end, it adds Fences...
+     */
+    public boolean addComponentParts (World world, Random random, StructureBoundingBox sbb)
+    {
+        if (this.averageGroundLevel < 0)
+        {
+            this.averageGroundLevel = this.getAverageGroundLevel(world, sbb);
+
+            if (this.averageGroundLevel < 0)
+            {
+                return true;
+            }
+
+            this.boundingBox.offset(0, this.averageGroundLevel - this.boundingBox.maxY + 3, 0);
+        }
+
+        /**
+         * 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, 6, 10, 5, 11, Block.getBlockById(0), Block.getBlockById(0), false);
+        this.fillWithBlocks(world, sbb, 2, 0, 0, 8, 5, 5, Block.getBlockById(0), Block.getBlockById(0), false);
+        //Pillars
+        this.fillWithBlocks(world, sbb, 2, 0, 0, 2, 3, 0, Blocks.log, Blocks.log, false);
+        this.fillWithBlocks(world, sbb, 2, 0, 3, 2, 3, 3, Blocks.log, Blocks.log, false);
+        this.fillWithBlocks(world, sbb, 8, 0, 0, 8, 3, 0, Blocks.log, Blocks.log, false);
+        this.fillWithBlocks(world, sbb, 8, 0, 3, 8, 3, 3, Blocks.log, Blocks.log, false);
+
+        //Walls
+        this.fillWithBlocks(world, sbb, 2, 0, 1, 2, 3, 2, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 2, 0, 4, 2, 3, 5, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 3, 2, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 8, 0, 4, 8, 3, 5, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 3, 0, 0, 7, 3, 0, Blocks.planks, Blocks.planks, false);
+
+        this.fillWithBlocks(world, sbb, 0, 0, 6, 10, 3, 6, Blocks.cobblestone, Blocks.cobblestone, false);
+        this.fillWithBlocks(world, sbb, 0, 0, 11, 10, 3, 11, Blocks.cobblestone, Blocks.cobblestone, false);
+        this.fillWithBlocks(world, sbb, 0, 0, 6, 0, 3, 11, Blocks.cobblestone, Blocks.cobblestone, false);
+        this.fillWithBlocks(world, sbb, 10, 0, 6, 10, 3, 11, Blocks.cobblestone, Blocks.cobblestone, false);
+
+        //Roof
+        for(int i = 3; i <= 7; i++)
+            for(int j = 1; j <= 5; j++)
+                this.placeBlockAtCurrentPosition(world, Blocks.wooden_slab, 2, i, 4, j, sbb);
+
+        for(int i = 3; i <= 7; i++)
+            for(int j = 6; j <= 6; j++)
+                this.placeBlockAtCurrentPosition(world, Blocks.stone_slab, 0, i, 4, j, sbb);
+
+        for(int i = 1; i <= 9; i++)
+            for(int j = 7; j <= 10; j++)
+                this.placeBlockAtCurrentPosition(world, Blocks.stone_slab, 3, i, 4, j, sbb);
+
+        for(int i = 2; i <= 8; i++)
+            this.placeBlockAtCurrentPosition(world, Blocks.double_wooden_slab, 2, i, 4, 0, sbb);
+
+        for(int i = 1; i <= 5; i++){
+            this.placeBlockAtCurrentPosition(world, Blocks.double_wooden_slab, 2, 2, 4, i, sbb);
+            this.placeBlockAtCurrentPosition(world, Blocks.double_wooden_slab, 2, 8, 4, i, sbb);
+        }
+
+        for(int i = 0; i <= 2; i++){
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, i, 4, 6, sbb);
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, i + 8, 4, 6, sbb);
+        }
+
+        for(int i = 7; i <= 11; i++){
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, 0, 4, i, sbb);
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, 10, 4, i, sbb);
+        }
+
+        for(int i = 0; i <= 10; i++)
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, i, 4, 11, sbb);
+
+        //Base
+        for(int i = 2; i <= 8; i++)
+            for(int j = 0; j <= 5; j++)
+                this.placeBlockAtCurrentPosition(world, Blocks.planks, 1, i, 0, j, sbb);
+        this.fillWithBlocks(world, sbb, 0, 0, 6, 10, 0, 11, Blocks.stonebrick, Blocks.stonebrick, false);
+
+        for(int i = 6; i <= 10; i++)
+            this.placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, 5, 0, i, sbb);
+
+        for(int i = 7; i <= 10; i++){
+            this.placeBlockAtCurrentPosition(world, Blocks.stonebrick, 3, 1, 0, i, sbb);
+            this.placeBlockAtCurrentPosition(world, Blocks.stonebrick, 3, 9, 0, i, sbb);
+        }
+
+        //Decorations        
+        this.placeDoorAtCurrentPosition(world, sbb, random, 6, 1, 0, this.getMetadataWithOffset(Blocks.wooden_door, 1));
+        this.placeDoorAtCurrentPosition(world, sbb, random, 5, 1, 6, this.getMetadataWithOffset(Blocks.wooden_door, 1));
+
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 3, 2, 0, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 4, 2, 0, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 1, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 2, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 4, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 5, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 1, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 2, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 4, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 5, sbb);
+
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 6, 3, 1, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 3, 3, 3, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 7, 3, 3, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 5, 3, 5, sbb);
+
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 5, 3, 7, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 5, 3, 10, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 1, 3, 8, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 1, 3, 9, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 9, 3, 8, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 9, 3, 9, sbb);
+
+        int bgCarpetColor = random.nextInt(16);
+
+        for(int i = 4; i <= 7; i++)
+            for(int j = 1; j <= 5; j++)
+                this.placeBlockAtCurrentPosition(world, Blocks.carpet, bgCarpetColor, i, 1, j, sbb);
+
+        generateChest(world, 3, 1, 1, 0, random, sbb, 2, 6);
+        generateDisplayer(world, 3, 1, 2, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb);
+        placeBlockAtCurrentPosition(world, BlockList.jewelCraftingTable, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, 3, 1, 3, sbb);
+        generateDisplayer(world, 3, 1, 4, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb);
+        generateChest(world, 3, 1, 5, 0, random, sbb, 2, 6);
+
+        generateFurnace(world, 1, 1, 7, 0, random, sbb, 1, 2, true);
+        generateFurnace(world, 1, 2, 7, 0, random, sbb, 2, 3, true);
+        generateFurnace(world, 1, 3, 7, 0, random, sbb, 1, 3, true);
+        generateFurnace(world, 1, 1, 10, 0, random, sbb, 1, 2, true);
+        generateFurnace(world, 1, 2, 10, 0, random, sbb, 2, 3, true);
+        generateFurnace(world, 1, 3, 10, 0, random, sbb, 1, 3, true);
+
+        generateSmelter(world, 1, 1, 8, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb, random.nextBoolean());
+        generateSmelter(world, 1, 1, 9, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb, random.nextBoolean());
+
+        generateMolder(world, 2, 1, 8, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb, random.nextBoolean(), random.nextBoolean());
+        generateMolder(world, 2, 1, 9, (coordBaseMode == 0 || coordBaseMode == 2)?1:2, random, sbb, random.nextBoolean(), random.nextBoolean());
+        
+        generateIngotChest(world, 9, 1, 7, 0, random, sbb, 3, 12, Blocks.chest, 5);
+        generateIngotChest(world, 9, 1, 8, 0, random, sbb, 5, 16, Blocks.chest, 3);
+        generateIngotChest(world, 9, 1, 9, 0, random, sbb, 3, 10, Blocks.trapped_chest, 2);
+        generateIngotChest(world, 9, 1, 10, 0, random, sbb, 3, 9, Blocks.trapped_chest, 6);
+        
+
+        for (int l = 0; l < 6; ++l)
+        {
+            for (int i1 = 2; i1 < 9; ++i1)
+            {
+                this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
+                this.func_151554_b(world, Blocks.cobblestone, 0, i1, -1, l, sbb);
+            }
+        }
+
+        for (int l = 6; l < 12; ++l)
+        {
+            for (int i1 = 0; i1 < 11; ++i1)
+            {
+                this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
+                this.func_151554_b(world, Blocks.cobblestone, 0, i1, -1, l, sbb);
+            }
+        }
+
+        this.spawnVillagers(world, sbb, 3, 1, 3, 1);
+
+        return true;
+    }
+
+    public void generateChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        int t = random.nextInt(max - min + 1) + min;
+        this.placeBlockAtCurrentPosition(world, Blocks.chest, metadata, i, j, k, sbb);
+        TileEntityChest chest = (TileEntityChest)world.getTileEntity(i1, j1, k1);
+        while(chest != null && t > 0)
+        {
+            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 chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), JewelrycraftUtil.jewel.get(random.nextInt(JewelrycraftUtil.jewel.size())));
+            t--;
+        }
+    }
+
+    public void generateIngotChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max, Block chestB, int randomAmount)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        int t = random.nextInt(max - min + 1) + min;
+        this.placeBlockAtCurrentPosition(world, chestB, metadata, i, j, k, sbb);
+        TileEntityChest chest = (TileEntityChest)world.getTileEntity(i1, j1, k1);
+        while(chest != null && t > 0)
+        {
+            chest.func_145976_a("Ingot Chest");
+            if(random.nextBoolean()) chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), new ItemStack(JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())).getItem(), 2 + random.nextInt(randomAmount)));
+            t--;
+        }
+    }
+
+    public void generateTrappedChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        int t = random.nextInt(max - min + 1) + min;
+        this.placeBlockAtCurrentPosition(world, Blocks.trapped_chest, metadata, i, j, k, sbb);
+        TileEntityChest chest = (TileEntityChest)world.getTileEntity(i1, j1, k1);
+        while(chest != null && t > 0)
+        {
+            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 chest.setInventorySlotContents(random.nextInt(chest.getSizeInventory()), JewelrycraftUtil.jewel.get(random.nextInt(JewelrycraftUtil.jewel.size())));
+            t--;
+        }
+    }
+
+    public void generateDisplayer(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        placeBlockAtCurrentPosition(world, BlockList.displayer, metadata, i, j, k, sbb);
+        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.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");
+            displayer.object = ring;
+            displayer.quantity = 1;
+            displayer.hasObject = true;
+        }
+    }
+
+    public void generateSmelter(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, boolean isEmpty)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        placeBlockAtCurrentPosition(world, BlockList.smelter, metadata, i, j, k, sbb);
+        TileEntitySmelter smelter = (TileEntitySmelter)world.getTileEntity(i1, j1, k1);
+        if(smelter != null && !isEmpty)
+        {
+            smelter.moltenMetal = JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size()));
+            smelter.hasMoltenMetal = true;
+        }
+    }
+
+    public void generateMolder(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, boolean hasMold, boolean hasStuff)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        placeBlockAtCurrentPosition(world, BlockList.molder, metadata, i, j, k, sbb);
+        TileEntityMolder molder = (TileEntityMolder)world.getTileEntity(i1, j1, k1);
+        if(molder != null)
+        {
+            if(hasMold){
+                int meta = random.nextInt(ItemMolds.moldsItemNames.length + 1);
+                molder.mold = new ItemStack(ItemList.molds, 1, meta);
+                molder.hasMold = true;
+                if(hasStuff){
+                    ItemStack ring = new ItemStack(ItemList.ring);
+                    JewelryNBT.addMetal(ring, JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())));
+                    if(meta == 0) molder.jewelBase = JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size())); 
+                    else molder.jewelBase = ring;
+                    molder.hasJewelBase = true;
+                }
+            }
+        }
+    }
+
+    public void generateFurnace(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max, boolean hasMetal)
+    {
+        int i1 = this.getXWithOffset(i, k);
+        int j1 = this.getYWithOffset(j);
+        int k1 = this.getZWithOffset(i, k);
+        placeBlockAtCurrentPosition(world, Blocks.furnace, metadata, i, j, k, sbb);
+        TileEntityFurnace furnace = (TileEntityFurnace)world.getTileEntity(i1, j1, k1);
+        if(furnace != null)
+        {
+            if(random.nextBoolean()) furnace.setInventorySlotContents(1, new ItemStack(Items.coal, 1 + random.nextInt(16)));
+            if(hasMetal){
+                ItemStack metal = JewelrycraftUtil.metal.get(random.nextInt(JewelrycraftUtil.metal.size()));
+                furnace.setInventorySlotContents(2, new ItemStack(metal.getItem(), random.nextInt(max - min + 1) + min));
+            }
+        }
+    }
+
+    /**
+     * Returns the villager type to spawn in this component, based on the number of villagers already spawned.
+     */
+    protected int getVillagerType (int par1)
+    {
+        return 3000;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
new file mode 100644
index 0000000..8b5c79e
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
@@ -0,0 +1,151 @@
+package darkknight.jewelrycraft.worldGen.village;
+
+import java.util.Random;
+
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.village.MerchantRecipe;
+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.util.JewelryNBT;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
+
+public class JCTrades implements IVillageTradeHandler
+{
+
+    public JCTrades()
+    {
+        super();
+    }
+
+    @Override
+    public void manipulateTradesForVillager (EntityVillager villager, MerchantRecipeList recipeList, Random random)
+    {
+        if (villager.getProfession() == 3000)
+        {
+            ItemStack ingredient = null;
+            ItemStack ingredient2 = null;
+            ItemStack result;
+
+            int type = random.nextInt(12);
+            switch(type)
+            {
+                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));
+                    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));
+                    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));
+                    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:
+                {
+                    result = new ItemStack(BlockList.shadowOre, 1 + random.nextInt(16)); 
+                    ingredient = new ItemStack(Items.emerald, 3 + random.nextInt(4));
+                    if(random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 3 + random.nextInt(4));
+                    break;
+                }
+                case 6:
+                {
+                    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));
+                    break;
+                }
+                case 7:
+                {
+                    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:
+                {
+                    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 value = end;
+                        if(value > 64) value = 64;
+                        ingredient = new ItemStack(Items.emerald, 2 + random.nextInt(value));
+                        if(random.nextBoolean()) ingredient2 = new ItemStack(Items.emerald, 2 + random.nextInt(value));
+                    }
+                    else
+                    {
+                        ingredient = new ItemStack(Blocks.emerald_block, 16 + random.nextInt(32));
+                        ingredient2 = new ItemStack(Blocks.emerald_block, 8 + random.nextInt(48));                        
+                    }
+                    break;
+                }
+                default: 
+                {
+                    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");
+                    ingredient = new ItemStack(Items.emerald, 16 + random.nextInt(20));
+                    ingredient2 = new ItemStack(Blocks.emerald_block, 5 + random.nextInt(5));
+                }
+            }
+
+            recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java
new file mode 100644
index 0000000..145c9a0
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java
@@ -0,0 +1,32 @@
+package darkknight.jewelrycraft.worldGen.village;
+
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.world.gen.structure.StructureVillagePieces.House1;
+import net.minecraft.world.gen.structure.StructureStart;
+import net.minecraft.world.gen.structure.MapGenStructureIO;
+import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight;
+import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler;
+
+public class VillageJewelryHandler implements IVillageCreationHandler
+{
+    @Override
+    public PieceWeight getVillagePieceWeight (Random random, int i)
+    {
+        return new PieceWeight(ComponentJewelry.class, 30, i + random.nextInt(4));
+    }
+
+    @Override
+    public Class<?> getComponentClass ()
+    {
+        return ComponentJewelry.class;
+    }
+
+    @Override
+    public Object buildComponent (PieceWeight villagePiece, Start startPiece, @SuppressWarnings("rawtypes") List pieces, Random random, int p1, int p2, int p3, int p4, int p5)
+    {
+        return ComponentJewelry.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5);
+    }
+}
\ No newline at end of file