Working on stuph

4 files changed, 10 insertions, 9 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index 967aa18..e67249c 100644
--- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
@@ -65,14 +64,14 @@ public class BlockJewelrsCraftingTable extends BlockContainer
 
             if (te.hasModifier && entityPlayer.isSneaking())
             {
-                entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.modifier.itemID, 1, te.modifier.getItemDamage()));
+                entityPlayer.inventory.addItemStackToInventory(te.modifier);
                 entityPlayer.inventory.onInventoryChanged();
                 te.modifier = new ItemStack(0, 0, 0);
                 te.hasModifier = false;
             }
             if (te.hasJewel && entityPlayer.isSneaking())
             {
-                entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.jewel.itemID, 1, te.jewel.getItemDamage()));
+                entityPlayer.inventory.addItemStackToInventory(te.jewel);
                 entityPlayer.inventory.onInventoryChanged();
                 te.jewel = new ItemStack(0, 0, 0);
                 te.hasJewel = false;
diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java
index 57501a2..5576ea3 100644
--- a/common/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -92,7 +92,9 @@ public class BlockSmelter extends BlockContainer
                 entityPlayer.addChatMessage(StatCollector.translateToLocalFormatted("chatmessage.jewelrycraft.smelter.alreadyhasingot", te.metal.getDisplayName()));
             else if (te.hasMoltenMetal)
                 entityPlayer.addChatMessage(StatCollector.translateToLocalFormatted("chatmessage.jewelrycraft.smelter.hasmolteningot", te.moltenMetal.getDisplayName()));
-            else if (item != null && !item.getDisplayName().contains("Ingot"))
+            else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot") && item.getDisplayName().contains("Ingot"))
+                entityPlayer.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.smelter.itemrenamedtoingot"));
+            else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot"))
                 entityPlayer.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.smelter.itemneedstobeingot"));
             
             if (te.hasMetal && entityPlayer.isSneaking())
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
index f026fb5..413e290 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
@@ -45,10 +45,10 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
                 me.mold.getIconIndex().getInterpolatedU(0);
                 int decal = 0;
                 int decal2 = 0;
-//                if (me.mold.getItemDamage() == 0)
-//                    decal = 32;
-//                else if (me.mold.getItemDamage() > 0)
-//                    decal = 64;
+                if (me.mold.getItemDamage() == 0)
+                    decal = 32;
+                else if (me.mold.getItemDamage() > 0)
+                    decal = 64;
                 double minu = me.mold.getIconIndex().getInterpolatedU(decal2);
                 double minv = me.mold.getIconIndex().getInterpolatedV(-decal);
                 double maxu = me.mold.getIconIndex().getInterpolatedU(256 + decal2);
diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
index 00e727c..d86b4b9 100644
--- a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
@@ -79,7 +79,7 @@ public class TileEntitySmelter extends TileEntity
             if (flow <= 0)
                 n = 0;
         }
-        if (metal.itemID != 0)
+        if (this.hasMetal)
         {
             for (int l = 0; l < 2; ++l)
             {