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

8 files changed, 96 insertions, 31 deletions

diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
index 656ea1a..f5dc840 100644
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
@@ -1,14 +1,13 @@
 package bspkrs.briefcasespeakers;
 
-import net.minecraft.item.Item;
 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 bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient;
-import bspkrs.briefcasespeakers.item.ItemBriefcaseSpeakers;
-import bspkrs.briefcasespeakers.item.ItemThiefGloves;
+import bspkrs.briefcasespeakers.config.ConfigHandler;
+import bspkrs.briefcasespeakers.item.ItemList;
 import bspkrs.briefcasespeakers.lib.Reference;
 import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer;
 import cpw.mods.fml.common.Mod;
@@ -24,7 +23,6 @@ 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.LanguageRegistry;
 
 @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION)
 @NetworkMod(clientSideRequired = false, serverSideRequired = false,
@@ -42,20 +40,17 @@ public class BriefcaseSpeakersMod implements IConnectionHandler
     @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy")
     public static CommonProxy          proxy;
     
-    public static Item bspkrs = new ItemBriefcaseSpeakers(1000).setUnlocalizedName("BriefcaseSpeakers");
-    public static Item thief = new ItemThiefGloves(1001).setUnlocalizedName("ThiefGloves");    
-    
     @EventHandler
     public void preInit(FMLPreInitializationEvent e)
-    {   
-        
+    {
+        ConfigHandler.preInit(e);
+        ItemList.preInit(e);
     }
     
     @EventHandler
     public void init(FMLInitializationEvent e)
     {   
-        LanguageRegistry.addName(bspkrs, "Briefcase Speakers");
-        LanguageRegistry.addName(thief, "Thiefing Gloves");
+        
     }
     
     @EventHandler
diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
new file mode 100644
index 0000000..00c088d
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
@@ -0,0 +1,34 @@
+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            idBriefcaseSpeakers = 17494;
+    public static int            idSpeaker           = 17495;
+    public static int            idRemote            = 17496;
+    
+    private static boolean       isInitialized       = false;
+    
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        if (!isInitialized)
+        {
+            config = new Configuration(e.getSuggestedConfigurationFile());
+            
+            config.load();
+            
+            idThiefGloves = config.getItem("id.ThiefGloves", idThiefGloves).getInt();
+            idBriefcaseSpeakers = config.getItem("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt();
+            idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt();
+            idRemote = config.getItem("id.Remote", idRemote).getInt();
+            
+            config.save();
+            
+            isInitialized = true;
+        }
+    }
+}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java
new file mode 100644
index 0000000..a70f173
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/item/ItemBase.java
@@ -0,0 +1,18 @@
+package bspkrs.briefcasespeakers.item;
+
+import net.minecraft.item.Item;
+
+public abstract 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/ItemBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java
index 51793a2..818db27 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java
@@ -1,21 +1,19 @@
 package bspkrs.briefcasespeakers.item;
 
-import bspkrs.briefcasespeakers.BriefcaseSpeakersMod;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 
-public class ItemBriefcaseSpeakers extends Item
+public class ItemBriefcaseSpeakers extends ItemBase
 {
     public ItemBriefcaseSpeakers(int par1)
     {
         super(par1);
-        setCreativeTab(CreativeTabs.tabMaterials); 
+        setCreativeTab(CreativeTabs.tabMaterials);
     }
     
-    public void registerIcons(IconRegister reg) 
-    { 
-        if (itemID == BriefcaseSpeakersMod.bspkrs.itemID);
+    @Override
+    public void registerIcons(IconRegister reg)
+    {
         this.itemIcon = reg.registerIcon("amethyst");
-    }    
+    }
 }
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
new file mode 100644
index 0000000..b127882
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/item/ItemList.java
@@ -0,0 +1,26 @@
+package bspkrs.briefcasespeakers.item;
+
+import net.minecraft.item.Item;
+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;
+    
+    private static boolean isInitialized = false;
+    
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        if (!isInitialized)
+        {
+            thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves");
+            briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers");
+            speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers");
+            remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote");
+        }
+    }
+}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemRemote.java b/common/bspkrs/briefcasespeakers/item/ItemRemote.java
index 4fdfbe2..d9ba959 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemRemote.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemRemote.java
@@ -1,12 +1,9 @@
 package bspkrs.briefcasespeakers.item;
 
-import net.minecraft.item.Item;
-
-public class ItemRemote extends Item
+public class ItemRemote extends ItemBase
 {
     public ItemRemote(int par1)
     {
         super(par1);
     }
-    
 }
diff --git a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java
index f94e84e..fe433be 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java
@@ -1,12 +1,9 @@
 package bspkrs.briefcasespeakers.item;
 
-import net.minecraft.item.Item;
-
-public class ItemSpeaker extends Item
+public class ItemSpeaker extends ItemBase
 {
     public ItemSpeaker(int par1)
     {
         super(par1);
     }
-    
 }
diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
index 680e536..10e54d2 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
@@ -4,11 +4,10 @@ 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;
 
-public class ItemThiefGloves extends Item
+public class ItemThiefGloves extends ItemBase
 {
     public ItemThiefGloves(int par1)
     {
@@ -16,12 +15,13 @@ public class ItemThiefGloves extends Item
         this.setCreativeTab(CreativeTabs.tabTools);
     }
     
+    @Override
     public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase)
     {
         if (par3EntityLivingBase instanceof EntityVillager)
         {
-            EntityVillager entityliving = (EntityVillager)par3EntityLivingBase;
-            MerchantRecipe recipe = null;            
+            EntityVillager entityliving = (EntityVillager) par3EntityLivingBase;
+            MerchantRecipe recipe = null;
             entityliving.dropItem(recipe.getItemToSell().itemID, recipe.getItemToSell().stackSize);
             return true;
         }