+ Materials handler now generates blocks and frames from each metal.

+ Static materials added are now added dynamically with no side effects.
+ Added some new Materials.

3 files changed, 41 insertions, 24 deletions

diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index 8f6a988a27..5ead0bc76f 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -488,6 +488,13 @@ public class Utils {
 		return false;
 	}
 	
+	public static boolean invertBoolean(boolean booleans){
+		if (booleans == true){
+			return false;
+		}
+		return true;
+	}
+	
 
 }
 
diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java
index 114a877e1e..37be076562 100644
--- a/src/Java/miscutil/core/util/item/UtilsItems.java
+++ b/src/Java/miscutil/core/util/item/UtilsItems.java
@@ -4,6 +4,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 
 import java.util.ArrayList;
 
+import miscutil.core.block.base.BasicBlock.BlockTypes;
+import miscutil.core.block.base.BlockBaseModular;
 import miscutil.core.item.ModItems;
 import miscutil.core.item.base.BasicSpawnEgg;
 import miscutil.core.item.base.bolts.BaseItemBolt;
@@ -20,6 +22,7 @@ import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.wrapper.var;
+import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -234,23 +237,30 @@ public class UtilsItems {
 	 return getSimpleStack(ModItems.AAA_Broken, amount);
 	}
 	
-	public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int Colour, boolean hotIngot){
+	public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int materialTier, int Colour, boolean hotIngot){
+		if (materialTier > 10 || materialTier <= 0){
+			materialTier = 2;
+		}
 		Item temp;
-		temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, Colour, "Dust");
-		temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny");
-		temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, Colour, "Small");
+		Block tempBlock;
+		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.FRAME, Colour);
 		temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour);
 		if (hotIngot){
-		Item tempIngot = temp;
-		temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1));
-		}
-		temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour);
+			Item tempIngot = temp;
+			temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1), materialTier);
+			}
+		temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, Colour, "Dust", hotIngot, materialTier);
+		temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny", hotIngot, materialTier);
+		temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, Colour, "Small", hotIngot, materialTier);
+		
+		temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier);
+		temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier);
+		temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour, materialTier);
+		temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour, materialTier);
+		temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour, materialTier);
 		temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour);
+		temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier);
 	}
 
 }
diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
index 3de2e5e887..9e36652b10 100644
--- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
@@ -318,17 +318,17 @@ public class UtilsRecipe {
 			Object InputItem1, Object InputItem2, Object InputItem3,
 			Object InputItem4, Object InputItem5, Object InputItem6,
 			Object InputItem7, Object InputItem8, Object InputItem9,
-			ItemStack OutputItem){
-
-		if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String)) || 
-				(!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String)) || 
-				(!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String)) || 
-				(!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String)) || 
-				(!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String)) || 
-				(!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String)) || 
-				(!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String)) || 
-				(!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String)) || 
-				(!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String))){
+			ItemStack OutputItem){	
+
+		if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && (InputItem1 != null)) || 
+				(!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && (InputItem2 != null)) || 
+				(!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String) && (InputItem3 != null)) || 
+				(!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String) && (InputItem4 != null)) || 
+				(!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String) && (InputItem5 != null)) || 
+				(!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String) && (InputItem6 != null)) || 
+				(!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String) && (InputItem7 != null)) || 
+				(!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String) && (InputItem8 != null)) || 
+				(!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String) && (InputItem9 != null))){
 			Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
 			return;
 		}