Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

As well as added the smelter and working on the molder

23 files changed, 0 insertions, 711 deletions

diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
deleted file mode 100644
index e54e1e8..0000000
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package bspkrs.briefcasespeakers;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.INetworkManager;
-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;
-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;
-import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-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,
-        clientPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = BriefcaseSpeakersClient.class),
-        serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = BriefcaseSpeakersServer.class),
-        connectionHandler = BriefcaseSpeakersMod.class)
-public class BriefcaseSpeakersMod implements IConnectionHandler
-{
-    @Instance(Reference.MODID)
-    public static BriefcaseSpeakersMod instance;
-    
-    @Metadata(Reference.MODID)
-    public static ModMetadata          metadata;
-    
-    @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy")
-    public static CommonProxy          proxy;
-    
-    public static CreativeTabs shadowspkrs = new CreativeTabs("shadowspkrs") {public ItemStack getIconItemStack() {return new ItemStack(ItemList.shadowIngot, 1, 0);}};
-    
-    @EventHandler
-    public void preInit(FMLPreInitializationEvent e)
-    {
-        ConfigHandler.preInit(e);
-        ItemList.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
-    public void postInit(FMLPostInitializationEvent e)
-    {   
-        
-    }
-    
-    @Override
-    // 2) Called when a player logs into the server SERVER SIDE
-    public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
-    {   
-        
-    }
-    
-    @Override
-    // If you don't want the connection to continue, return a non-empty string here SERVER SIDE
-    public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
-    {
-        return null;
-    }
-    
-    @Override
-    // 1) Fired when a remote connection is opened CLIENT SIDE
-    public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
-    {   
-        
-    }
-    
-    @Override
-    // 1) Fired when a local connection is opened CLIENT SIDE
-    public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
-    {   
-        
-    }
-    
-    @Override
-    // Fired when a connection closes ALL SIDES
-    public void connectionClosed(INetworkManager manager)
-    {   
-        
-    }
-    
-    @Override
-    // 3) Fired when the client established the connection to the server CLIENT SIDE
-    public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
-    {   
-        
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/CommonProxy.java b/common/bspkrs/briefcasespeakers/CommonProxy.java
deleted file mode 100644
index c961322..0000000
--- a/common/bspkrs/briefcasespeakers/CommonProxy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package bspkrs.briefcasespeakers;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import cpw.mods.fml.common.network.IGuiHandler;
-
-public class CommonProxy implements IGuiHandler
-{
-
-    @Override
-    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockBase.java b/common/bspkrs/briefcasespeakers/block/BlockBase.java
deleted file mode 100644
index a895483..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockBase.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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/BlockBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java
deleted file mode 100644
index 36819ea..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import bspkrs.briefcasespeakers.tileentity.TileEntityBriefcaseSpeakers;
-
-public class BlockBriefcaseSpeakers extends BlockContainer
-{
-    protected BlockBriefcaseSpeakers(int par1, Material par2Material)
-    {
-        super(par1, par2Material);
-    }
-    
-    @Override
-    public TileEntity createNewTileEntity(World world)
-    {
-        return new TileEntityBriefcaseSpeakers();
-    }
-    
-    @Override
-    public boolean renderAsNormalBlock()
-    {
-        return false;
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java
deleted file mode 100644
index 282134f..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockList.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import bspkrs.briefcasespeakers.BriefcaseSpeakersMod;
-import bspkrs.briefcasespeakers.config.ConfigHandler;
-import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class BlockList
-{
-    public static Block    shadowOre;
-    public static Block    smelter;
-    public static Block    molder;
-    public static Block    jewelCraftingTable;
-    
-    private static boolean isInitialized = false;
-    
-    public static void preInit(FMLPreInitializationEvent e)
-    {
-        if (!isInitialized)
-        {
-            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");
-            GameRegistry.registerBlock(molder, "Molder");
-            GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable");
-            
-            GameRegistry.registerTileEntity(TileEntitySmelter.class, "30");
-        }
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockMolder.java b/common/bspkrs/briefcasespeakers/block/BlockMolder.java
deleted file mode 100644
index a4e4337..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockMolder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import bspkrs.briefcasespeakers.tileentity.TileEntityMolder;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-public class BlockMolder extends BlockContainer
-{
-    protected BlockMolder(int par1, Material par2Material)
-    {
-        super(par1, par2Material);
-    }
-    
-    @Override
-    public TileEntity createNewTileEntity(World world)
-    {
-        return new TileEntityMolder();
-    }
-    
-    @Override
-    public boolean renderAsNormalBlock()
-    {
-        return false;
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
deleted file mode 100644
index 745c5da..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockSmelter extends BlockContainer
-{
-    protected BlockSmelter(int par1, Material par2Material)
-    {
-        super(par1, par2Material);
-    }
-    
-    @Override
-    public TileEntity createNewTileEntity(World world)
-    {
-        return new TileEntitySmelter();
-    }
-    
-    @Override
-    public boolean renderAsNormalBlock()
-    {
-        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 && !world.isRemote)
-        {
-            if(!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot"))
-            {
-                te.metalID = item.getItem().itemID;
-                te.hasMetal = true;
-                te.melting = 200000;
-                --item.stackSize;
-            }
-            else if(te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName());
-            else if(te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", ""));
-            else if(item != null && !item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The item needs to be an ingot!");
-            
-            if(te.hasMetal && entityPlayer.isSneaking())
-            { 
-                entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0)); 
-                te.hasMetal = false;
-            }            
-            world.setBlockTileEntity(i, j, k, te);
-        }
-        return true;
-    }
-    
-    public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
-    {
-       return false;
-    }
-
-    public boolean isOpaqueCube()
-    {
-       return false;
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java b/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java
deleted file mode 100644
index bd08761..0000000
--- a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package bspkrs.briefcasespeakers.client;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class BriefcaseSpeakersClient implements IPacketHandler
-{
-    @Override
-    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/client/ClientProxy.java b/common/bspkrs/briefcasespeakers/client/ClientProxy.java
deleted file mode 100644
index 190101d..0000000
--- a/common/bspkrs/briefcasespeakers/client/ClientProxy.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.client;
-
-import bspkrs.briefcasespeakers.CommonProxy;
-
-public class ClientProxy extends CommonProxy
-{   
-    
-}
diff --git a/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java b/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java
deleted file mode 100644
index 79395c4..0000000
--- a/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.client.gui;
-
-import net.minecraft.client.gui.GuiScreen;
-
-public class GuiRemote extends GuiScreen
-{   
-    
-}
diff --git a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java
deleted file mode 100644
index 5ec065d..0000000
--- a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package bspkrs.briefcasespeakers.client.render;
-
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntityRenderBriefcaseSpeakers extends TileEntitySpecialRenderer
-{
-    @Override
-    public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
deleted file mode 100644
index 5bc5515..0000000
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package bspkrs.briefcasespeakers.config;
-
-import net.minecraftforge.common.Configuration;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class ConfigHandler
-{
-    private static Configuration config;
-    public static int            idThiefGloves       = 17493;
-
-    public static int            idSpeaker           = 17495;
-    public static int            idRemote            = 17496;
-    public static int            idShadowIngot       = 17497;
-    
-    public static int            idBriefcaseSpeakers = 1749;    
-    public static int            idShadowOre         = 1750;
-    public static int            idSmelter           = 1751;
-    public static int            idMolder            = 1752;
-    public static int            idJewelCraftingTable= 1753;
-    
-    private static boolean       isInitialized       = false;
-    
-    public static void preInit(FMLPreInitializationEvent e)
-    {
-        if (!isInitialized)
-        {
-            config = new Configuration(e.getSuggestedConfigurationFile());
-            
-            config.load();
-            
-            // Blocks
-            idBriefcaseSpeakers = config.getBlock("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt();
-            
-            // Items
-            idThiefGloves = config.getItem("id.ThiefGloves", idThiefGloves).getInt();
-            idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt();
-            idRemote = config.getItem("id.Remote", idRemote).getInt();
-            idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
-            idShadowOre = config.getBlock("id.ShadowOre", idShadowOre).getInt();
-            idSmelter = config.getBlock("id.Smelter", idSmelter).getInt();
-            idMolder = config.getBlock("id.Molder", idMolder).getInt();
-            idJewelCraftingTable = config.getBlock("id.JewelCraftingTable", idJewelCraftingTable).getInt();
-            
-            config.save();
-            
-            isInitialized = true;
-        }
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java
deleted file mode 100644
index 9a017b6..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemBase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-import net.minecraft.item.Item;
-
-public class ItemBase extends Item
-{
-    public ItemBase(int par1)
-    {
-        super(par1);
-    }
-    
-    @Override
-    public Item setUnlocalizedName(String name)
-    {
-        Item r = super.setUnlocalizedName(name);
-        return r.setTextureName(name.replaceAll("\\.", ":"));
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
deleted file mode 100644
index eb39976..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-import net.minecraft.item.Item;
-import bspkrs.briefcasespeakers.BriefcaseSpeakersMod;
-import bspkrs.briefcasespeakers.config.ConfigHandler;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class ItemList
-{
-    public static Item     thiefGloves;
-    public static Item     briefcaseSpeakers;
-    public static Item     speaker;
-    public static Item     remote;
-    public static Item     shadowIngot;
-    
-    private static boolean isInitialized = false;
-    
-    public static void preInit(FMLPreInitializationEvent e)
-    {
-        if (!isInitialized)
-        {
-            thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-            shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-
-        }
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemRemote.java b/common/bspkrs/briefcasespeakers/item/ItemRemote.java
deleted file mode 100644
index d9ba959..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemRemote.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-public class ItemRemote extends ItemBase
-{
-    public ItemRemote(int par1)
-    {
-        super(par1);
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
deleted file mode 100644
index d80da55..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-import java.util.Iterator;
-import java.util.Random;
-
-import cpw.mods.fml.relauncher.ReflectionHelper;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.village.MerchantRecipe;
-import net.minecraft.village.MerchantRecipeList;
-
-public class ItemThiefGloves extends ItemBase
-{
-    public Random rand;
-    public ItemThiefGloves(int par1)
-    {
-        super(par1);
-        this.setCreativeTab(CreativeTabs.tabTools);
-    }
-    
-    @Override
-    public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase)
-    {
-        if (par3EntityLivingBase instanceof EntityVillager)
-        {
-            EntityVillager villager = (EntityVillager) par3EntityLivingBase;
-            int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz");
-            MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i");
-            if(buyingList!=null)
-            {
-                Iterator<?> iterator = buyingList.iterator();
-                while(iterator.hasNext())
-                {
-                    MerchantRecipe recipe = (MerchantRecipe)iterator.next();
-                    int quantity;
-                    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() + "!");
-                }    
-                buyingList.clear();
-                ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j");
-                ReflectionHelper.setPrivateValue(EntityVillager.class, villager, true, "needsInitilization", "field_70959_by");
-            } 
-
-            villager.dropItem(Item.emerald.itemID, wealth);
-            ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 0, "wealth", "field_70956_bz");
-            return true;
-        }
-        else
-        {
-            return super.itemInteractionForEntity(par1ItemStack, par2EntityPlayer, par3EntityLivingBase);
-        }
-    }
-    
-}
diff --git a/common/bspkrs/briefcasespeakers/lib/Reference.java b/common/bspkrs/briefcasespeakers/lib/Reference.java
deleted file mode 100644
index fe0a200..0000000
--- a/common/bspkrs/briefcasespeakers/lib/Reference.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package bspkrs.briefcasespeakers.lib;
-
-public class Reference
-{
-    public static final String MODID          = "BriefcaseSpeakers";
-    public static final String MODNAME        = "BriefcaseSpeakers";
-    public static final String VERSION        = "1.0.0";
-    public static final String PACKET_CHANNEL = "bspeakers";
-}
diff --git a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
deleted file mode 100644
index 7b6f97b..0000000
--- a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package bspkrs.briefcasespeakers.recipes;
-
-import bspkrs.briefcasespeakers.block.BlockList;
-import bspkrs.briefcasespeakers.item.ItemList;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class CraftingRecipes
-{    
-    private static boolean isInitialized = false;
-    
-    public static void preInit(FMLPreInitializationEvent e)
-    {
-        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/server/BriefcaseSpeakersServer.java b/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java
deleted file mode 100644
index d01feb0..0000000
--- a/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package bspkrs.briefcasespeakers.server;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class BriefcaseSpeakersServer implements IPacketHandler
-{
-    @Override
-    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java
deleted file mode 100644
index 8125ac1..0000000
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.tileentity;
-
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntityBriefcaseSpeakers extends TileEntity
-{   
-    
-}
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java
deleted file mode 100644
index 73d89e5..0000000
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.tileentity;
-
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntityMolder extends TileEntity
-{
-
-}
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java
deleted file mode 100644
index 7387cb5..0000000
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package bspkrs.briefcasespeakers.tileentity;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet132TileEntityData;
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntitySmelter extends TileEntity
-{
-    public int moltenMetalID, metalID, melting;
-    public boolean hasMetal, hasMoltenMetal;
-
-    public TileEntitySmelter()
-    {
-        this.moltenMetalID = 0;
-        this.metalID = 0;
-        this.melting = 0;
-        this.hasMetal = false;
-        this.hasMoltenMetal= false;
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound par1)
-    {
-        super.writeToNBT(par1);
-        par1.setInteger("moltenMetalID", moltenMetalID);
-        par1.setInteger("metalID", metalID);
-        par1.setInteger("melting", melting);
-        par1.setBoolean("hasMetal", hasMetal);
-        par1.setBoolean("hasMoltenMetal", hasMoltenMetal);
-    }
-
-    @Override
-    public void readFromNBT(NBTTagCompound par1)
-    {
-        super.readFromNBT(par1);
-        this.moltenMetalID = par1.getInteger("moltenMetalID");
-        this.metalID = par1.getInteger("metalID");
-        this.melting = par1.getInteger("melting");
-        this.hasMetal = par1.getBoolean("hasMetal");
-        this.hasMoltenMetal = par1.getBoolean("hasMoltenMetal");
-    }
-
-    public void updateEntity()
-    {
-        super.updateEntity();
-        if(this.hasMetal && !this.hasMoltenMetal)
-        {            
-            while(melting > 0)
-            {
-                this.melting--;
-                System.out.println(melting);
-            }
-            if(melting == 0)
-            {
-                this.hasMetal = false;
-                this.moltenMetalID = metalID;
-                this.metalID = 0;
-                this.hasMoltenMetal = true;
-            }
-        }
-    }
-
-    public Packet getDescriptionPacket() 
-    {
-        NBTTagCompound nbtTag = new NBTTagCompound();
-        this.writeToNBT(nbtTag);
-        return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, 1, nbtTag);
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/worldGen/Generation.java b/common/bspkrs/briefcasespeakers/worldGen/Generation.java
deleted file mode 100644
index 5be3e26..0000000
--- a/common/bspkrs/briefcasespeakers/worldGen/Generation.java
+++ /dev/null
@@ -1,45 +0,0 @@
-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) {}
-
-}