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

3 files changed, 95 insertions, 110 deletions

diff --git a/java/darkknight/jewelrycraft/block/BlockDisplayer.java b/java/darkknight/jewelrycraft/block/BlockDisplayer.java
index 6b029b9..3bb8fbb 100644
--- a/java/darkknight/jewelrycraft/block/BlockDisplayer.java
+++ b/java/darkknight/jewelrycraft/block/BlockDisplayer.java
@@ -69,10 +69,10 @@ public class BlockDisplayer extends BlockContainer
                 {
                     te.object = item.copy();
                     te.quantity += item.stackSize;
+                    te.object.stackSize = 1;
                     te.hasObject = true;
-                    if (!entityPlayer.capabilities.isCreativeMode) item.stackSize = 0;
+                    if (!entityPlayer.capabilities.isCreativeMode) entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize);
                     te.isDirty = true;
-                    te.markDirty();
                 }
                 else if (te.object.getItem() == item.getItem() && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) && te.object.getItemDamage() == item.getItemDamage())
                 {
@@ -81,14 +81,12 @@ public class BlockDisplayer extends BlockContainer
                         te.quantity += item.stackSize;
                         if (!entityPlayer.capabilities.isCreativeMode) entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize);
                         te.isDirty = true;
-                        te.markDirty();
                     }
                     else if (!te.object.hasTagCompound() && !item.hasTagCompound())
                     {
                         te.quantity += item.stackSize;
                         if (!entityPlayer.capabilities.isCreativeMode) entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize);
                         te.isDirty = true;
-                        te.markDirty();
                     }
                 }
             }
@@ -113,18 +111,17 @@ public class BlockDisplayer extends BlockContainer
                                 te.quantity += item.stackSize;
                                 if (!entityPlayer.capabilities.isCreativeMode) entityPlayer.inventory.decrStackSize(inv, item.stackSize);
                                 te.isDirty = true;
-                                te.markDirty();
                             }
                         }
                     }
                 }
-                else if(te.hasObject && te.object.getItem() != null)
+                else if(entityPlayer.capabilities.isCreativeMode && te.hasObject && te.object.getItem() != null)
                 {
                     te.quantity += 64;
-                    te.isDirty = true;
-                    te.markDirty();                    
+                    te.isDirty = true;                  
                 }
             }
+            te.isDirty = true;  
         }
         return true;
     }
@@ -145,6 +142,7 @@ public class BlockDisplayer extends BlockContainer
                         player.inventory.addItemStackToInventory(te.object);
                         te.object.stackSize = 1;
                         te.quantity -= te.object.getMaxStackSize();
+                        te.isDirty = true;
                     }
                     else
                     {
@@ -153,9 +151,9 @@ public class BlockDisplayer extends BlockContainer
                         te.hasObject = false;
                         te.object = new ItemStack(Item.getItemById(0), 0, 0);
                         te.quantity = 0;
+                        te.isDirty = true;
                     }
                     te.isDirty = true;
-                    te.markDirty();
                 }
                 else
                 {
@@ -163,7 +161,8 @@ public class BlockDisplayer extends BlockContainer
                     {
                         player.inventory.addItemStackToInventory(te.object);
                         te.object.stackSize = 1;
-                        --te.quantity;
+                        te.quantity--;
+                        te.isDirty = true;
                     }
                     else
                     {
@@ -172,9 +171,9 @@ public class BlockDisplayer extends BlockContainer
                         te.hasObject = false;
                         te.object = new ItemStack(Item.getItemById(0), 0, 0);
                         te.quantity = 0;
+                        te.isDirty = true;
                     }
                     te.isDirty = true;
-                    te.markDirty();
                 }
             }
         }
diff --git a/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
index f005e04..da3c5c1 100644
--- a/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
+++ b/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
@@ -2,6 +2,12 @@ package darkknight.jewelrycraft.block;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 import javax.imageio.ImageIO;
@@ -221,17 +227,13 @@ public class BlockMoltenMetal extends BlockFluidClassic
             world.setBlock(x, y, z, this, meta, 3);
             JewelrycraftMod.saveData.setString(stringFromLocation(x, y, z, world.provider.dimensionId), originData);
             String[] data = originData.split(":");
-            JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, x, y, z, Integer.parseInt(data[0]), Integer.parseInt(data[1])));
+            JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, x, y, z, Integer.parseInt(data[0]), Integer.parseInt(data[1]), Integer.parseInt(data[2])));
         }
     }
     
     @SideOnly(Side.CLIENT)
     public static int color(IBlockAccess world, int i, int j, int k, boolean forcecolor, Item itemC) throws IOException
     {
-        String domain = "", texture;
-        IResourceManager rm = Minecraft.getMinecraft().getResourceManager();
-        BufferedImage icon;
-        ItemStack item = new ItemStack(BlockList.moltenMetal);
         String ingotData = JewelrycraftMod.clientData.getString(String.valueOf(i) + " " + String.valueOf(j) + " " + String.valueOf(k) + " " + Minecraft.getMinecraft().theWorld.provider.dimensionId);
         if (ingotData == "")
         {
@@ -241,14 +243,15 @@ public class BlockMoltenMetal extends BlockFluidClassic
         else
         {
             String[] splitData = ingotData.split(":");
-            if (splitData.length == 2)
+            if (splitData.length == 3)
             {
-                int itemID, itemDamage;
+                int itemID, itemDamage, color;
                 try
                 {
                     itemID = Integer.parseInt(splitData[0]);
                     itemDamage = Integer.parseInt(splitData[1]);
-                    JewelryNBT.addMetal(item, new ItemStack(Item.getItemById(itemID), 1, itemDamage));
+                    color = Integer.parseInt(splitData[2]);
+                    return color;
                 }
                 catch (Exception e)
                 {
@@ -256,53 +259,9 @@ public class BlockMoltenMetal extends BlockFluidClassic
                 }
             }
         }
-        if (forcecolor) JewelryNBT.addMetal(item, new ItemStack(itemC));
-        int x = 0, y = 0, ok = 0, red, green, blue;
-        if (item != null && JewelryNBT.ingot(item) != null && JewelryNBT.ingot(item).getIconIndex() != null && JewelryNBT.ingotColor(item) == 16777215)
-        {
-            IIcon itemIcon = JewelryNBT.ingot(item).getItem().getIcon(JewelryNBT.ingot(item), 0);
-            String ingotIconName = itemIcon.getIconName();
-            
-            if (ingotIconName.substring(0, ingotIconName.indexOf(":") + 1) != "") domain = ingotIconName.substring(0, ingotIconName.indexOf(":") + 1).replace(":", " ").trim();
-            else domain = "minecraft";
-            
-            texture = ingotIconName.substring(ingotIconName.lastIndexOf(":") + 1) + ".png";
-            ResourceLocation ingot = null;
-            TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
-            
-            if (texturemanager.getResourceLocation(JewelryNBT.ingot(item).getItemSpriteNumber()).toString().contains("items")) ingot = new ResourceLocation(domain.toLowerCase(), "textures/items/" + texture);
-            else ingot = new ResourceLocation(domain.toLowerCase(), "textures/blocks/" + texture);
-            
-            icon = ImageIO.read(rm.getResource(ingot).getInputStream());
-            while (ok == 0)
-            {
-                red = (icon.getRGB(x, y) >> 16) & 0xFF;
-                green = (icon.getRGB(x, y) >> 8) & 0xFF;
-                blue = icon.getRGB(x, y) & 0xFF;
-                if (!isColorPretty(red, green, blue))
-                {
-                    if (x < icon.getTileWidth() - 1) x++;
-                    if (x >= icon.getTileWidth() - 1 && y < icon.getTileWidth() - 1)
-                    {
-                        x = 0;
-                        y++;
-                    }
-                    if (x == icon.getTileWidth() - 1 && y == icon.getTileWidth() - 1) ok = 1;
-                }
-                else ok = 1;
-            }
-            JewelryNBT.addIngotColor(item, icon.getRGB(x, y));
-        }
-        if (JewelryNBT.ingot(item) != null) return JewelryNBT.ingotColor(item);
         return 16777215;
     }
     
-    public static boolean isColorPretty(int r, int g, int b)
-    {
-        if ((r >= 100 && g >= 100 && b >= 100 && r < 200 && b < 200 && g < 200) || ((r >= 100 && (g < 100 || b < 100)) || (g >= 100 && (r < 100 || b < 100)) || (b >= 100 && (g < 100 || r < 100)))) return true;
-        else return false;
-    }
-    
     public static String stringFromLocation(int x, int y, int z, int dimID)
     {
         return x + " " + y + " " + z + " " + dimID;
diff --git a/java/darkknight/jewelrycraft/block/BlockSmelter.java b/java/darkknight/jewelrycraft/block/BlockSmelter.java
index 71ba64b..a4d379b 100644
--- a/java/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/java/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -1,5 +1,6 @@
 package darkknight.jewelrycraft.block;
 
+import java.io.IOException;
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -22,6 +23,7 @@ import net.minecraft.world.World;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.config.ConfigHandler;
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.item.ItemMoltenMetalBucket;
 import darkknight.jewelrycraft.network.PacketSendLiquidData;
 import darkknight.jewelrycraft.tileentity.TileEntityMolder;
 import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
@@ -55,6 +57,7 @@ public class BlockSmelter extends BlockContainer
         entityitem.motionX = 0;
         entityitem.motionZ = 0;
         entityitem.motionY = 0.11000000298023224D;
+        entityitem.delayBeforeCanPickup = 0;
         world.spawnEntityInWorld(entityitem);
     }
     
@@ -66,8 +69,22 @@ public class BlockSmelter extends BlockContainer
             if (te.hasMetal) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.metal.copy());
             if (te.hasMoltenMetal && te.moltenMetal != null && Item.getIdFromItem(te.moltenMetal.getItem()) > 0)
             {
-                JewelrycraftMod.saveData.setString(i + " " + j + " " + k + " " + world.provider.dimensionId, Item.getIdFromItem(te.moltenMetal.getItem()) + ":" + te.moltenMetal.getItemDamage());
-                JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, i, j, k, Item.getIdFromItem(te.moltenMetal.getItem()), te.moltenMetal.getItemDamage()));
+                ItemStack metal = te.moltenMetal;
+                ItemStack item = te.moltenMetal;
+                if (Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.carpet)) metal.setItemDamage(15 - metal.getItemDamage());
+                int color = 16777215;
+                JewelryNBT.addMetal(item, metal);
+                try
+                {
+                    color = ItemMoltenMetalBucket.color(item, 1);
+                    System.out.println(color);
+                }
+                catch (IOException e)
+                {
+                    e.printStackTrace();
+                }
+                JewelrycraftMod.saveData.setString(i + " " + j + " " + k + " " + world.provider.dimensionId, Item.getIdFromItem(metal.getItem()) + ":" + metal.getItemDamage() + ":" + color);
+                JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, i, j, k, Item.getIdFromItem(metal.getItem()), metal.getItemDamage(), color));
                 
                 world.setBlock(i, j, k, BlockList.moltenMetal, 0, 3);
                 int quant = (int) (te.quantity * 10);
@@ -96,8 +113,8 @@ public class BlockSmelter extends BlockContainer
             te.quantity = 0f;
             te.hasMoltenMetal = false;
             ItemStack metalBucket = new ItemStack(ItemList.bucket, 1);
-            ItemStack ingot = te.moltenMetal;
-            if (Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass_pane) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.carpet)) ingot.setItemDamage(15 - ingot.getItemDamage());
+            ItemStack ingot = te.moltenMetal.copy();
+            if (Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.carpet)) ingot.setItemDamage(15 - ingot.getItemDamage());
             JewelryNBT.addMetal(metalBucket, ingot);
             --item.stackSize;
             entityPlayer.inventory.addItemStackToInventory(metalBucket);
@@ -106,17 +123,20 @@ public class BlockSmelter extends BlockContainer
         }
         if (te != null && !world.isRemote)
         {
-            int index = -1;
-            for (int a = 0; a < JewelrycraftUtil.jamcraftPlayers.size(); a++)
-                if (entityPlayer.getDisplayName().equals(JewelrycraftUtil.jamcraftPlayers.get(a))) index = a;
-            boolean canPlace = (item != null && (JewelrycraftUtil.isMetal(item) || JewelrycraftUtil.isOre(item) || index >= 0));
-            boolean isOre = false;
-            boolean oreCoincidesWithMetal = false;
-            boolean itemCoincidesWithMetal = false;
-            boolean itemCoincidesWithMoltenMetal = false;
-            boolean overflow = false;
-            if (item != null && item.getItem() != null)
+            if (te.hasMetal && entityPlayer.isSneaking())
             {
+                dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.metal.copy());
+                te.hasMetal = false;
+                te.melting = -1;
+                te.isDirty = true;
+            }
+            if (item != null && item.getItem() != null && !(item.getItem() instanceof ItemMoltenMetalBucket))
+            {
+                int index = -1;
+                for (int a = 0; a < JewelrycraftUtil.jamcraftPlayers.size(); a++)
+                    if (entityPlayer.getDisplayName().equals(JewelrycraftUtil.jamcraftPlayers.get(a))) index = a;
+                boolean canPlace = (item != null && (JewelrycraftUtil.isMetal(item) || JewelrycraftUtil.isOre(item) || index >= 0));
+                boolean isOre = false, oreCoincidesWithMetal = false, itemCoincidesWithMetal = false, itemCoincidesWithMoltenMetal = false, overflow = false;
                 isOre = JewelrycraftUtil.isOre(item);
                 if (te.metal != null && te.metal.getItem() != null) itemCoincidesWithMetal = item.getItem().equals(te.metal.getItem()) && item.getItemDamage() == te.metal.getItemDamage();
                 if (te.moltenMetal != null && te.moltenMetal.getItem() != null)
@@ -125,45 +145,52 @@ public class BlockSmelter extends BlockContainer
                     if (isOre) oreCoincidesWithMetal = te.moltenMetal.getItem().equals(JewelrycraftUtil.getIngotFromOre(item.getItem()).getItem()) && te.moltenMetal.getItemDamage() == JewelrycraftUtil.getIngotFromOre(item.getItem()).getItemDamage();
                 }
                 overflow = isOre ? (te.metal.stackSize * 0.2f + te.quantity < 0.8f) : (te.metal.stackSize * 0.1f + te.quantity < 0.9f);
-            }
-            boolean isValid = te.hasMoltenMetal ? itemCoincidesWithMoltenMetal : true;
-            if (te.quantity < 0.9f && !te.pouring && canPlace && isValid)
-            {
-                boolean check = isOre ? (oreCoincidesWithMetal && te.quantity < 0.8f) : itemCoincidesWithMoltenMetal;
-                boolean check2 = isOre ? oreCoincidesWithMetal : itemCoincidesWithMetal;
-                if ((!te.hasMetal && !te.hasMoltenMetal) || (!te.hasMetal && te.hasMoltenMetal && check))
+                boolean isValid = te.hasMoltenMetal ? itemCoincidesWithMoltenMetal : true;
+                if (te.quantity < 0.9f && !te.pouring && canPlace && isValid)
                 {
-                    entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.nowsmeltingingot", item.getDisplayName())));
-                    te.metal = item.copy();
-                    te.metal.stackSize = 1;
-                    te.hasMetal = true;
-                    te.melting = ConfigHandler.ingotMeltingTime;
-                    if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
+                    boolean check = isOre ? (oreCoincidesWithMetal && te.quantity < 0.8f) : itemCoincidesWithMoltenMetal;
+                    boolean check2 = isOre ? oreCoincidesWithMetal : itemCoincidesWithMetal;
+                    if ((!te.hasMetal && !te.hasMoltenMetal) || (!te.hasMetal && te.hasMoltenMetal && check))
+                    {
+                        entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.nowsmeltingingot", item.getDisplayName())));
+                        te.metal = item.copy();
+//                        if (Item.getIdFromItem(te.metal.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(te.metal.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(te.metal.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(te.metal.getItem()) == Block.getIdFromBlock(Blocks.carpet)) te.metal.setItemDamage(15 - te.metal.getItemDamage());
+                        te.metal.stackSize = 1;
+                        te.hasMetal = true;
+                        te.melting = ConfigHandler.ingotMeltingTime;
+                        if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
+                        te.isDirty = true;
+                    }
+                    else if ((te.hasMetal && te.hasMoltenMetal && check2 && overflow) || (te.hasMetal && !te.hasMoltenMetal && itemCoincidesWithMetal && overflow))
+                    {
+                        entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("Smelting extra " + (isOre ? "ores" : "ingots") + " (" + (te.metal.stackSize + 1) + ")")));
+                        te.metal.stackSize++;
+                        te.hasMetal = true;
+                        te.melting += ConfigHandler.ingotMeltingTime;
+                        if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
+                        te.isDirty = true;
+                    }
                     te.isDirty = true;
                 }
-                else if ((te.hasMetal && te.hasMoltenMetal && check2 && overflow) || (te.hasMetal && !te.hasMoltenMetal && itemCoincidesWithMetal && overflow))
-                {
-                    entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("Smelting extra " + (isOre ? "ores" : "ingots") + " (" + (te.metal.stackSize + 1) + ")")));
-                    te.metal.stackSize++;
-                    te.hasMetal = true;
-                    te.melting = ConfigHandler.ingotMeltingTime;
-                    if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
-                    te.isDirty = true;
-                }
-                te.isDirty = true;
+                else if (item != null && (te.hasMetal || te.hasMoltenMetal) && !itemCoincidesWithMoltenMetal && te.quantity < 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("Item does not match contents!")));
+                else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot") && te.quantity < 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.itemrenamedtoingot")));
+                else if (item != null && te.quantity >= 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("Smelter is at full capacity.")));
             }
-            else if (item == null && te.hasMoltenMetal && te.moltenMetal.getItem() != null) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.hasmolteningot", te.moltenMetal.getDisplayName())));
-            else if (item != null && (te.hasMetal || te.hasMoltenMetal) && !itemCoincidesWithMoltenMetal && te.quantity < 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("Item does not match contents!")));
-            else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot") && te.quantity < 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.itemrenamedtoingot")));
-            else if (item != null && te.quantity >= 0.9f) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("Smelter is at full capacity.")));
-            
-            if (te.hasMetal && entityPlayer.isSneaking())
+            else if (item != null && item.getItem() != null && item.getItem() instanceof ItemMoltenMetalBucket && !te.hasMoltenMetal && !te.hasMetal)
             {
-                dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.metal.copy());
-                te.hasMetal = false;
-                te.melting = -1;
+                te.hasMoltenMetal = true;
+                ItemStack ingot = JewelryNBT.ingot(item);
+                if (Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.carpet)) ingot.setItemDamage(15 - ingot.getItemDamage());
+                te.moltenMetal = ingot;
+                te.quantity = 0.9f;
                 te.isDirty = true;
+                if (!entityPlayer.capabilities.isCreativeMode)
+                {
+                    --item.stackSize;
+                    dropItem(world, entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, new ItemStack(Items.bucket));
+                }
             }
+            else if (item == null && te.hasMoltenMetal && te.moltenMetal.getItem() != null) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.hasmolteningot", te.moltenMetal.getDisplayName())));
             world.setTileEntity(i, j, k, te);
         }
         return true;
@@ -186,7 +213,7 @@ public class BlockSmelter extends BlockContainer
                 te.pouring = true;
                 te.isDirty = true;
             }
-            else if (te.hasMetal && te.melting > 0) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.metalismelting", te.metal.getDisplayName()) + " (" + ((ConfigHandler.ingotMeltingTime - te.melting) * 100 / ConfigHandler.ingotMeltingTime) + "%)"));
+            else if (te.hasMetal && te.melting > 0) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.metalismelting", te.metal.getDisplayName()) + " (" + (((ConfigHandler.ingotMeltingTime*te.metal.stackSize) - te.melting) * 100 / (ConfigHandler.ingotMeltingTime*te.metal.stackSize)) + "%)"));
             else if (te.hasMoltenMetal && !isConnectedToMolder(world, i, j, k)) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderismissing")));
             else if (!me.hasMold && te.hasMoltenMetal) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderhasnomold")));
             else if (me.hasMoltenMetal && te.hasMoltenMetal) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderhasmoltenmetal")));