Modified a few stuff and added a ninja model

6 files changed, 12 insertions, 8 deletions

diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
index 00c088d..1e653fa 100644
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
@@ -10,6 +10,7 @@ public class ConfigHandler
     public static int            idBriefcaseSpeakers = 17494;
     public static int            idSpeaker           = 17495;
     public static int            idRemote            = 17496;
+    public static int            idShadowIngot         = 17497;
     
     private static boolean       isInitialized       = false;
     
@@ -25,6 +26,7 @@ public class ConfigHandler
             idBriefcaseSpeakers = config.getItem("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt();
             idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt();
             idRemote = config.getItem("id.Remote", idRemote).getInt();
+            idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
             
             config.save();
             
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
index b127882..a283d7b 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemList.java
@@ -1,5 +1,6 @@
 package bspkrs.briefcasespeakers.item;
 
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import bspkrs.briefcasespeakers.config.ConfigHandler;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -10,6 +11,7 @@ public class ItemList
     public static Item     briefcaseSpeakers;
     public static Item     speaker;
     public static Item     remote;
+    public static Item     shadowIngot;
     
     private static boolean isInitialized = false;
     
@@ -21,6 +23,7 @@ public class ItemList
             briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers");
             speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers");
             remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote");
+            shadowIngot = new Item(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials).setTextureName("shadowIngot");
         }
     }
 }
diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
index f05e661..fbdb8ea 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
@@ -30,26 +30,24 @@ public class ItemThiefGloves extends ItemBase
         {
             EntityVillager villager = (EntityVillager) par3EntityLivingBase;
             int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz");
-            boolean needsInitilization = (Boolean) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "needsInitilization", "field_70959_by");
-            int timeUntilReset = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "timeUntilReset", "field_70961_j");
             MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i");
             if(buyingList!=null)
             {
-                Iterator iterator = buyingList.iterator();
+                Iterator<?> iterator = buyingList.iterator();
                 while(iterator.hasNext())
                 {
                     MerchantRecipe recipe = (MerchantRecipe)iterator.next();
                     ItemStack s = new ItemStack(recipe.getItemToSell().itemID, recipe.getItemToSell().stackSize * 7, recipe.getItemToSell().getItemDamage());
                     s.setTagCompound(recipe.getItemToSell().getTagCompound());
                     if(par2EntityPlayer.inventory.addItemStackToInventory(s));
-                    villager.entityDropItem(s, 0);
-                    String professions[] = {"Farmer", "Librarian", "Priest", "Blacksmith", "Butcher"};
-                    par2EntityPlayer.addChatMessage(professions[villager.getProfession()] + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "s.");
+                    else villager.entityDropItem(s, 0);
+                    par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "s.");
                 }    
                 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;
diff --git a/reference/assets/briefcasespeakers/lang/en_US.lang b/reference/assets/briefcasespeakers/lang/en_US.lang
index bd376e1..1282df4 100644
--- a/reference/assets/briefcasespeakers/lang/en_US.lang
+++ b/reference/assets/briefcasespeakers/lang/en_US.lang
@@ -1,4 +1,5 @@
 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
+item.briefcasespeakers.thiefGloves=Thiefing Gloves
+item.briefcasespeakers.ingotShadow=Shadow Ingot
\ No newline at end of file
diff --git a/reference/assets/briefcasespeakers/textures/items/shadowIngot.png b/reference/assets/briefcasespeakers/textures/items/shadowIngot.png
new file mode 100644
index 0000000..1736496
--- /dev/null
+++ b/reference/assets/briefcasespeakers/textures/items/shadowIngot.png
diff --git a/resources/Ninja.png b/resources/Ninja.png
new file mode 100644
index 0000000..22b8fc1
--- /dev/null
+++ b/resources/Ninja.png