created ItemBase.java and implemented it in item classes

6 files changed, 34 insertions, 23 deletions

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/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 ccd24ea..10e54d2 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
@@ -1,17 +1,13 @@
 package bspkrs.briefcasespeakers.item;
 
-import java.lang.reflect.Field;
-import java.util.Iterator;
-
 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)
     {
@@ -19,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;
         }
diff --git a/reference/assets/briefcasespeakers/lang/en_US.lang b/reference/assets/briefcasespeakers/lang/en_US.lang
index e69de29..bd376e1 100644
--- a/reference/assets/briefcasespeakers/lang/en_US.lang
+++ b/reference/assets/briefcasespeakers/lang/en_US.lang
@@ -0,0 +1,4 @@
+item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers
+item.briefcasespeakers.remote=Audio Remote
+item.briefcasespeakers.speaker=Speaker
+item.briefcasespeakers.thiefGloves=Thiefing Gloves
\ No newline at end of file