Lots of modifications

3 files changed, 31 insertions, 6 deletions

diff --git a/common/bspkrs/briefcasespeakers/block/BlockBase.java b/common/bspkrs/briefcasespeakers/block/BlockBase.java
new file mode 100644
index 0000000..a895483
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/block/BlockBase.java
@@ -0,0 +1,19 @@
+package bspkrs.briefcasespeakers.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
+public class BlockBase extends Block
+{
+    public BlockBase(int par1, Material mat)
+    {
+        super(par1, mat);
+    }
+    
+    @Override
+    public Block setUnlocalizedName(String name)
+    {
+        Block r = super.setUnlocalizedName(name);
+        return r.setTextureName(name.replaceAll("\\.", ":"));
+    }
+}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java
index 207a789..282134f 100644
--- a/common/bspkrs/briefcasespeakers/block/BlockList.java
+++ b/common/bspkrs/briefcasespeakers/block/BlockList.java
@@ -21,10 +21,10 @@ public class BlockList
     {
         if (!isInitialized)
         {
-            shadowOre = new Block(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setTextureName("shadowOre").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            smelter = new Block(ConfigHandler.idSmelter, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.smelter").setTextureName("smelter").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            molder = new Block(ConfigHandler.idMolder, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.molder").setTextureName("moldder").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            jewelCraftingTable = new Block(ConfigHandler.idJewelCraftingTable, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.jewelCraftingTable").setTextureName("jewelCraftingTable").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
+            shadowOre = new BlockBase(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
+            smelter = new BlockSmelter(ConfigHandler.idSmelter, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.smelter").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
+            molder = new BlockMolder(ConfigHandler.idMolder, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.molder").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
+            jewelCraftingTable = new BlockBase(ConfigHandler.idJewelCraftingTable, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.jewelCraftingTable").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
             
             GameRegistry.registerBlock(shadowOre, "shadowOre");
             GameRegistry.registerBlock(smelter, "Smelter");
diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
index c1df82c..3d81914 100644
--- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
+++ b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
@@ -27,18 +27,24 @@ public class BlockSmelter extends BlockContainer
         return false;
     }
     
+    @Override
     public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
     {
         TileEntitySmelter te = (TileEntitySmelter)world.getBlockTileEntity(i, j, k);
         ItemStack item = entityPlayer.inventory.getCurrentItem();
         if(te != null)
         {
-            if(!te.hasMetal)
+            if(!te.hasMetal && item != null && item.getDisplayName().contains("Ingot"))
             {
                 te.metalID = item.getItem().itemID;
                 te.hasMetal = true;
+                --item.stackSize;
             }
-            if(te.hasMetal && entityPlayer.isSneaking()){ entityPlayer.dropItem(te.metalID, 1); te.hasMetal = false;}            
+            if(te.hasMetal && entityPlayer.isSneaking())
+            { 
+                entityPlayer.dropItem(te.metalID, 1); 
+                te.hasMetal = false;
+            }            
             world.setBlockTileEntity(i, j, k, te);
         }
         return true;