3 files changed, 65 insertions, 22 deletions

diff --git a/src/main/java/lance5057/tDefense/util/BlocksBase.java b/src/main/java/lance5057/tDefense/util/BlocksBase.java
new file mode 100644
index 0000000..5cd3ac6
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/util/BlocksBase.java
@@ -0,0 +1,49 @@
+package lance5057.tDefense.util;
+
+import lance5057.tDefense.Reference;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
+public abstract class BlocksBase {
+	
+	public BlocksBase()
+	{
+		
+	}
+	
+	public abstract void preInit(FMLPreInitializationEvent e);
+	
+	public abstract void init(FMLInitializationEvent e);
+	
+	public abstract void postInit(FMLPostInitializationEvent e);
+	
+	protected Block register(String name, CreativeTabs tabName, float hardness) 
+	{
+		Block block = new Block(Material.IRON).setCreativeTab(tabName).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name).setHardness(hardness);
+		GameRegistry.register(block);
+		return block;
+	}
+	
+	protected ItemBlock register(String name, int size, CreativeTabs tabName, Block block) 
+	{
+		ItemBlock item = new ItemBlock(block);
+		item.setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name).setCreativeTab(tabName);
+		GameRegistry.register(item);
+		return item;
+	}
+}
+	
+//	protected MetaItem registerMeta(String name, String[] names,int size) 
+//	{
+//		Item item = new MetaItem(names).setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
+//
+//		GameRegistry.register(item);
+//		return (MetaItem) item;
+//	}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/util/ItemsBase.java b/src/main/java/lance5057/tDefense/util/ItemsBase.java
index ddfa882..e146579 100644
--- a/src/main/java/lance5057/tDefense/util/ItemsBase.java
+++ b/src/main/java/lance5057/tDefense/util/ItemsBase.java
@@ -1,38 +1,35 @@
 package lance5057.tDefense.util;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.proxy.ClientProxy;
-import net.minecraft.init.Items;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import slimeknights.mantle.client.CreativeTab;
 
 public abstract class ItemsBase {
-	public CreativeTab					tabName;
-	
 	public ItemsBase()
 	{
 		
 	}
 	
-	public abstract void preInit();
+	public abstract void preInit(FMLPreInitializationEvent e);
 	
-	public abstract void init();
+	public abstract void init(FMLInitializationEvent e);
 	
-	protected void setTab(String tab, ItemStack stack)
-	{
-		tabName = new CreativeTab(tab, stack);
-	}
+	public abstract void postInit(FMLPostInitializationEvent e);
 	
-	protected Item register(String name, int size) 
+	protected Item register(String name, int size, CreativeTabs tabName) 
 	{
 		Item item = new Item().setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
 		GameRegistry.register(item);
 		return item;
 	}
 	
-	protected MetaItem registerMeta(String name, String[] names,int size) 
+	protected MetaItem registerMeta(String name, String[] names,int size, CreativeTabs tabName) 
 	{
 		Item item = new MetaItem(names).setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
 
diff --git a/src/main/java/lance5057/tDefense/util/ModuleBase.java b/src/main/java/lance5057/tDefense/util/ModuleBase.java
index d8264ce..f03ef9c 100644
--- a/src/main/java/lance5057/tDefense/util/ModuleBase.java
+++ b/src/main/java/lance5057/tDefense/util/ModuleBase.java
@@ -2,18 +2,15 @@ package lance5057.tDefense.util;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 public abstract class ModuleBase 
-{
-	protected ItemsBase items;
+{	
+	public abstract void preInit(FMLPreInitializationEvent e);
 	
-	public void preInit()
-	{
-		items.preInit();
-	}
+	public abstract void init(FMLInitializationEvent e);
 	
-	public void init()
-	{
-		items.init();
-	}
+	public abstract void postInit(FMLPostInitializationEvent e);
 }