Added more materials, broke something in the tool table.

6 files changed, 140 insertions, 11 deletions

diff --git a/src/main/java/lance5057/tDefense/util/BlocksBase.java b/src/main/java/lance5057/tDefense/util/BlocksBase.java
index d8ff0ab..d33f459 100644
--- a/src/main/java/lance5057/tDefense/util/BlocksBase.java
+++ b/src/main/java/lance5057/tDefense/util/BlocksBase.java
@@ -1,5 +1,7 @@
 package lance5057.tDefense.util;
 
+import java.util.ArrayList;
+
 import lance5057.tDefense.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -14,7 +16,8 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public abstract class BlocksBase {
-	
+	protected static ArrayList<Block> blockList = new ArrayList<Block>(); 
+	protected static ArrayList<Item> itemList = new ArrayList<Item>(); 
 	public BlocksBase()
 	{
 		
@@ -29,7 +32,7 @@ public abstract class BlocksBase {
 	protected Block setupRegister(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);
+		blockList.add(block);
 		return block;
 	}
 	
@@ -37,7 +40,7 @@ public abstract class BlocksBase {
 	{
 		ItemBlock item = new ItemBlock(block);
 		item.setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name).setCreativeTab(tabName);
-		GameRegistry.register(item);
+		itemList.add(item);
 		return item;
 	}
 	
diff --git a/src/main/java/lance5057/tDefense/util/ItemsBase.java b/src/main/java/lance5057/tDefense/util/ItemsBase.java
index e146579..aa45463 100644
--- a/src/main/java/lance5057/tDefense/util/ItemsBase.java
+++ b/src/main/java/lance5057/tDefense/util/ItemsBase.java
@@ -1,16 +1,21 @@
 package lance5057.tDefense.util;
 
+import java.util.ArrayList;
+
 import lance5057.tDefense.Reference;
+import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.RegistryEvent;
 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.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import slimeknights.mantle.client.CreativeTab;
+import net.minecraftforge.registries.IForgeRegistry;
 
 public abstract class ItemsBase {
+	protected static ArrayList<Item> itemList = new ArrayList<Item>(); 
 	public ItemsBase()
 	{
 		
@@ -22,10 +27,18 @@ public abstract class ItemsBase {
 	
 	public abstract void postInit(FMLPostInitializationEvent e);
 	
+	@SubscribeEvent
+	public static void registerItems(final RegistryEvent.Register<Item> event)
+	{
+		final IForgeRegistry registry = event.getRegistry();
+		
+		registry.registerAll((Item[]) itemList.toArray());
+	}
+	
 	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);
+		itemList.add(item);
 		return item;
 	}
 	
@@ -33,7 +46,7 @@ public abstract class ItemsBase {
 	{
 		Item item = new MetaItem(names).setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
 
-		GameRegistry.register(item);
+		itemList.add(item);
 		return (MetaItem) item;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/util/MetaItem.java b/src/main/java/lance5057/tDefense/util/MetaItem.java
index de51022..07b7c8e 100644
--- a/src/main/java/lance5057/tDefense/util/MetaItem.java
+++ b/src/main/java/lance5057/tDefense/util/MetaItem.java
@@ -5,6 +5,7 @@ import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
 
 public class MetaItem extends Item 
 {
@@ -22,11 +23,11 @@ public class MetaItem extends Item
 	}
 	
 	@Override
-    public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems)
+    public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems)
     {
 		for(int i = 0; i < items.length; i++)
 		{
-			subItems.add(new ItemStack(itemIn, 1, i));
+			subItems.add(new ItemStack(this, 1, i));
 		}
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/util/RegEvents.java b/src/main/java/lance5057/tDefense/util/RegEvents.java
new file mode 100644
index 0000000..9d40e1c
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/util/RegEvents.java
@@ -0,0 +1,13 @@
+package lance5057.tDefense.util;
+
+import lance5057.tDefense.Reference;
+import lance5057.tDefense.TinkersDefense;
+import net.minecraft.item.Item;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+
+public class RegEvents {
+	
+}
diff --git a/src/main/java/lance5057/tDefense/util/TDMatHelper.java b/src/main/java/lance5057/tDefense/util/TDMatHelper.java
new file mode 100644
index 0000000..c36c4ee
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/util/TDMatHelper.java
@@ -0,0 +1,99 @@
+package lance5057.tDefense.util;
+
+import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import slimeknights.tconstruct.library.fluid.FluidMolten;
+import slimeknights.tconstruct.library.materials.ArrowShaftMaterialStats;
+import slimeknights.tconstruct.library.materials.BowMaterialStats;
+import slimeknights.tconstruct.library.materials.BowStringMaterialStats;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
+import slimeknights.tconstruct.library.materials.FletchingMaterialStats;
+import slimeknights.tconstruct.library.materials.HandleMaterialStats;
+import slimeknights.tconstruct.library.materials.HeadMaterialStats;
+
+public class TDMatHelper {
+	public String name;
+	public int color; 
+	public FluidMolten fluid;
+	
+	public boolean isGem;
+	
+	public HeadMaterialStats head;
+	public ShieldMaterialStats shield;
+	public BowMaterialStats bow;
+	public ExtraMaterialStats extra;
+	public FletchingMaterialStats fletching;
+	public BowStringMaterialStats bowstring;
+	public HandleMaterialStats handle;
+	public ArrowShaftMaterialStats shaft;
+	
+	public TDMatHelper(String n, int c, FluidMolten f)
+	{
+		name = n;
+		color = c;
+		fluid = f;
+	}
+	
+	public TDMatHelper(String n, int c)
+	{
+		name = n;
+		color = c;
+		fluid = null;
+	}
+	
+	public TDMatHelper(String n, int c, boolean o)
+	{
+		name = n;
+		color = c;
+		fluid = null;
+		
+		isGem = o;
+	}
+	
+	public TDMatHelper setHead(HeadMaterialStats h)
+	{
+		head = h;
+		return this;
+	}
+	
+	public TDMatHelper setHandle(HandleMaterialStats h)
+	{
+		handle = h;
+		return this;
+	}
+	
+	public TDMatHelper setShield(ShieldMaterialStats h)
+	{
+		shield = h;
+		return this;
+	}
+	
+	public TDMatHelper setExtra(ExtraMaterialStats h)
+	{
+		extra = h;
+		return this;
+	}
+	
+	public TDMatHelper setBow(BowMaterialStats h)
+	{
+		bow = h;
+		return this;
+	}
+	
+	public TDMatHelper setFletching(FletchingMaterialStats h)
+	{
+		fletching = h;
+		return this;
+	}
+	
+	public TDMatHelper setString(BowStringMaterialStats h)
+	{
+		bowstring = h;
+		return this;
+	}
+	
+	public TDMatHelper setShaft(ArrowShaftMaterialStats h)
+	{
+		shaft = h;
+		return this;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/util/TDToolHelper.java b/src/main/java/lance5057/tDefense/util/TDToolHelper.java
index 8c5cfe1..d5b6e6e 100644
--- a/src/main/java/lance5057/tDefense/util/TDToolHelper.java
+++ b/src/main/java/lance5057/tDefense/util/TDToolHelper.java
@@ -31,8 +31,8 @@ public class TDToolHelper {
 			{
 				ItemTool i = (ItemTool) item.getItem();
 				
-				if(i.getToolMaterial() != i.getToolMaterial().WOOD ||
-						i.getToolMaterial() != i.getToolMaterial().STONE)
+				if(i.getToolMaterialName() != "WOOD" ||
+						i.getToolMaterialName() != "STONE")
 				{
 					
 				}