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

Conflicts:
	common/bspkrs/briefcasespeakers/config/ConfigHandler.java
	common/bspkrs/briefcasespeakers/item/ItemList.java

11 files changed, 13 insertions, 29 deletions

diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
index d843d27..6fc14db 100644
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
@@ -7,11 +7,13 @@ 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;
     public static int            idShadowIngot       = 17497;
     
+    public static int            idBriefcaseSpeakers = 1749;
+    
     public static int            idShadowOre         = 200;
     
     private static boolean       isInitialized       = false;
@@ -24,8 +26,11 @@ public class ConfigHandler
             
             config.load();
             
+            // Blocks
+            idBriefcaseSpeakers = config.getBlock("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt();
+            
+            // Items
             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();
             idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java
index a70f173..9a017b6 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemBase.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemBase.java
@@ -2,7 +2,7 @@ package bspkrs.briefcasespeakers.item;
 
 import net.minecraft.item.Item;
 
-public abstract class ItemBase extends Item
+public class ItemBase extends Item
 {
     public ItemBase(int par1)
     {
diff --git a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java
deleted file mode 100644
index bf85153..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-import net.minecraft.creativetab.CreativeTabs;
-
-public class ItemBriefcaseSpeakers extends ItemBase
-{
-    public ItemBriefcaseSpeakers(int par1)
-    {
-        super(par1);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
index e2f4307..66bd276 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemList.java
@@ -19,11 +19,11 @@ public class ItemList
     {
         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");
-            shadowIngot = new Item(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials).setTextureName("briefcasespeakers:shadowIngot");
+            thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(CreativeTabs.tabCombat);
+            speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(CreativeTabs.tabMisc);
+            remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(CreativeTabs.tabMisc);
+            shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials);
+
         }
     }
 }
diff --git a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java
deleted file mode 100644
index fe433be..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-public class ItemSpeaker extends ItemBase
-{
-    public ItemSpeaker(int par1)
-    {
-        super(par1);
-    }
-}
diff --git a/reference/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
index 954ce22..954ce22 100644
--- a/reference/assets/briefcasespeakers/lang/en_US.lang
+++ b/resources/assets/briefcasespeakers/lang/en_US.lang
diff --git a/reference/assets/briefcasespeakers/pack.mcmeta b/resources/assets/briefcasespeakers/pack.mcmeta
index 3aab978..3aab978 100644
--- a/reference/assets/briefcasespeakers/pack.mcmeta
+++ b/resources/assets/briefcasespeakers/pack.mcmeta
diff --git a/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
index e69de29..e69de29 100644
--- a/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
+++ b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
diff --git a/reference/assets/briefcasespeakers/textures/items/remote.png b/resources/assets/briefcasespeakers/textures/items/remote.png
index e69de29..e69de29 100644
--- a/reference/assets/briefcasespeakers/textures/items/remote.png
+++ b/resources/assets/briefcasespeakers/textures/items/remote.png
diff --git a/reference/assets/briefcasespeakers/textures/items/shadowIngot.png b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png
index 1522faf..1522faf 100644
--- a/reference/assets/briefcasespeakers/textures/items/shadowIngot.png
+++ b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png
diff --git a/reference/assets/briefcasespeakers/textures/items/speaker.png b/resources/assets/briefcasespeakers/textures/items/speaker.png
index e69de29..e69de29 100644
--- a/reference/assets/briefcasespeakers/textures/items/speaker.png
+++ b/resources/assets/briefcasespeakers/textures/items/speaker.png