Rings and molder

2 files changed, 13 insertions, 4 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java
index 36a48f7..f948e39 100644
--- a/common/darkknight/jewelrycraft/block/BlockMolder.java
+++ b/common/darkknight/jewelrycraft/block/BlockMolder.java
@@ -3,6 +3,7 @@ package darkknight.jewelrycraft.block;
 import java.util.Random;
 
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.tileentity.TileEntityMolder;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -108,11 +109,20 @@ public class BlockMolder extends BlockContainer
         TileEntityMolder me = (TileEntityMolder) world.getBlockTileEntity(i, j, k); 
         if(me != null && me.hasJewelBase)
         {
-            player.inventory.addItemStackToInventory(new ItemStack(me.jewelBase.itemID, 1, me.jewelBase.getItemDamage()));
+            giveJewelToPlayer(me, player, me.jewelBase, me.ringMetal);
             me.jewelBase = new ItemStack(0, 0, 0);
             me.hasJewelBase = false;            
         }        
     }
+    
+    public void giveJewelToPlayer(TileEntityMolder md, EntityPlayer player, ItemStack item, ItemStack metal)
+    {
+        if(item.getItem() == ItemList.ring){
+            ItemRing ring = new ItemRing(item.itemID, metal);  
+            player.inventory.addItemStackToInventory(new ItemStack(ring));
+        }
+        else player.inventory.addItemStackToInventory(item);
+    }
 
     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
     {
diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java
index cf9782d..d4119e4 100644
--- a/common/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -80,7 +80,7 @@ public class BlockSmelter extends BlockContainer
             {
                 te.metal = new ItemStack(item.itemID, 1, item.getItemDamage());
                 te.hasMetal = true;
-                te.melting = 200000;
+                te.melting = 2000;
                 --item.stackSize;
             }
             else if (te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot") && !item.getDisplayName().contains("Mold"))
@@ -115,7 +115,7 @@ public class BlockSmelter extends BlockContainer
             {
                 me.moltenMetal = te.moltenMetal;
                 me.hasMoltenMetal = true;
-                me.cooling = 2000;
+                me.cooling = 200;
                 te.moltenMetal = new ItemStack(0, 0, 0);
                 te.hasMoltenMetal = false;
             }
@@ -141,7 +141,6 @@ public class BlockSmelter extends BlockContainer
     {
         int rotation = MathHelper.floor_double((double)(entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
         world.setBlockMetadataWithNotify(i, j, k, rotation, 2);
-        System.out.println(world.getBlockMetadata(i, j, k));
     }
 
     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)