Lots of modifications

13 files changed, 88 insertions, 14 deletions

diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
index b7e2bbc..e54e1e8 100644
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
@@ -7,6 +7,7 @@ import net.minecraft.network.NetLoginHandler;
 import net.minecraft.network.packet.NetHandler;
 import net.minecraft.network.packet.Packet1Login;
 import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.oredict.OreDictionary;
 import bspkrs.briefcasespeakers.block.BlockList;
 import bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient;
 import bspkrs.briefcasespeakers.config.ConfigHandler;
@@ -14,6 +15,7 @@ import bspkrs.briefcasespeakers.item.ItemList;
 import bspkrs.briefcasespeakers.lib.Reference;
 import bspkrs.briefcasespeakers.recipes.CraftingRecipes;
 import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer;
+import bspkrs.briefcasespeakers.worldGen.Generation;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -27,6 +29,7 @@ import cpw.mods.fml.common.network.IConnectionHandler;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
 import cpw.mods.fml.common.network.Player;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION)
 @NetworkMod(clientSideRequired = false, serverSideRequired = false,
@@ -51,14 +54,15 @@ public class BriefcaseSpeakersMod implements IConnectionHandler
     {
         ConfigHandler.preInit(e);
         ItemList.preInit(e);
-        CraftingRecipes.preInit(e);
         BlockList.preInit(e);
+        CraftingRecipes.preInit(e);
     }
     
     @EventHandler
     public void init(FMLInitializationEvent e)
     {   
-        
+        OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
+        GameRegistry.registerWorldGenerator(new Generation());
     }
     
     @EventHandler
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;
diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
index 1ce4ad3..d80da55 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
@@ -38,14 +38,13 @@ public class ItemThiefGloves extends ItemBase
                 {
                     MerchantRecipe recipe = (MerchantRecipe)iterator.next();
                     int quantity;
-                    String multiple; 
-                    if(recipe.getItemToSell().isStackable()){ quantity = recipe.getItemToSell().stackSize * 7; multiple = "s.";}
-                    else {quantity = 1; multiple = ".";}
+                    if(recipe.getItemToSell().isStackable()) quantity = recipe.getItemToSell().stackSize * 7;
+                    else quantity = 1;
                     ItemStack s = new ItemStack(recipe.getItemToSell().itemID, quantity, recipe.getItemToSell().getItemDamage());
                     s.setTagCompound(recipe.getItemToSell().getTagCompound());
                     if(par2EntityPlayer.inventory.addItemStackToInventory(s));
                     else villager.entityDropItem(s, 0);
-                    par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + multiple);
+                    par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "!");
                 }    
                 buyingList.clear();
                 ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j");
diff --git a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
index 61a5b78..7b6f97b 100644
--- a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
+++ b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
@@ -1,5 +1,6 @@
 package bspkrs.briefcasespeakers.recipes;
 
+import bspkrs.briefcasespeakers.block.BlockList;
 import bspkrs.briefcasespeakers.item.ItemList;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -15,7 +16,7 @@ public class CraftingRecipes
         if (!isInitialized)
         {
             GameRegistry.addRecipe(new ItemStack(ItemList.thiefGloves), "x x", "yxy", "yxy", 'x', ItemList.shadowIngot, 'y', new ItemStack(Block.cloth, 1, 15));
-
+            GameRegistry.addSmelting(BlockList.shadowOre.blockID, new ItemStack(ItemList.shadowIngot), 1.5f);
         }
     }
 }
diff --git a/common/bspkrs/briefcasespeakers/worldGen/Generation.java b/common/bspkrs/briefcasespeakers/worldGen/Generation.java
new file mode 100644
index 0000000..5be3e26
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/worldGen/Generation.java
@@ -0,0 +1,45 @@
+package bspkrs.briefcasespeakers.worldGen;
+
+import java.util.Random;
+
+import bspkrs.briefcasespeakers.block.BlockList;
+
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import cpw.mods.fml.common.IWorldGenerator;
+
+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 * 16, chunkZ * 16);
+                break;
+            case 0:
+                generateSurface(world, random, chunkX * 16, chunkZ * 16);
+                break;
+            case 1:
+                generateEnd(world, random, chunkX * 16, chunkZ * 16);
+                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 = random.nextInt(5);
+            int z = j + random.nextInt(16);
+            (new WorldGenMinable(BlockList.shadowOre.blockID, 1)).generate(world, random, x, y, z);
+        }
+    }
+
+    private void generateNether(World world, Random random, int i, int j) {}
+
+}
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png
index f248291..31ee2a6 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png
+++ b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta
index 09994da..bf4c01e 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta
+++ b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "animation": {
-    "frametime": 4
+    "frametime": 1
 	}
 }
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
deleted file mode 100644
index e69de29..0000000
--- a/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
+++ /dev/null
diff --git a/resources/assets/briefcasespeakers/textures/items/remote.png b/resources/assets/briefcasespeakers/textures/items/remote.png
deleted file mode 100644
index e69de29..0000000
--- a/resources/assets/briefcasespeakers/textures/items/remote.png
+++ /dev/null
diff --git a/resources/assets/briefcasespeakers/textures/items/speaker.png b/resources/assets/briefcasespeakers/textures/items/speaker.png
deleted file mode 100644
index e69de29..0000000
--- a/resources/assets/briefcasespeakers/textures/items/speaker.png
+++ /dev/null
diff --git a/resources/assets/briefcasespeakers/textures/items/theifGlove.png b/resources/assets/briefcasespeakers/textures/items/thiefGloves.png
index b56e925..b56e925 100644
--- a/resources/assets/briefcasespeakers/textures/items/theifGlove.png
+++ b/resources/assets/briefcasespeakers/textures/items/thiefGloves.png