+ 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.

12 files changed, 105 insertions, 90 deletions

diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
index bff3b1f3c3..e529e8329b 100644
--- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
+++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
@@ -21,8 +21,9 @@ public class BaseItemBolt extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemBolt(String unlocalizedName, String materialName, int colour) {
+	public BaseItemBolt(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -30,6 +31,7 @@ public class BaseItemBolt extends Item{
 		this.setMaxStackSize(64);
 		this.setTextureName(CORE.MODID + ":" + "itemBolt");
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemB", "b"), UtilsItems.getSimpleStack(this));
@@ -68,7 +70,11 @@ public class BaseItemBolt extends Item{
 		String tempIngot = unlocalName.replace("itemBolt", "ingot");
 		ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
 		if (null != tempOutputStack){
-			GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Bolt.get(1), UtilsItems.getSimpleStack(this, 8), 10*20, 24);	
+			GT_Values.RA.addExtruderRecipe(tempOutputStack, 
+					ItemList.Shape_Extruder_Bolt.get(1), 
+					UtilsItems.getSimpleStack(this, 8),
+					30*mTier*20,
+					24*mTier);	
 		}				
 	}
 
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index 993ed9636b..9e98fbb821 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -1,6 +1,7 @@
 package miscutil.core.item.base.dusts;
 
 import static miscutil.core.creative.AddToCreativeTab.tabMisc;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 
@@ -21,9 +22,11 @@ public class BaseItemDust extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String pileType;
+	protected boolean useBlastFurnace;
 	String name = "";
+	private int mTier;
 
-	public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize) {
+	public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize, boolean blastFurnaceRequired, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setUnlocalizedName(unlocalizedName);
 		this.setMaxStackSize(64);	
@@ -34,7 +37,9 @@ public class BaseItemDust extends Item{
 		this.setMaxStackSize(64);
 		this.setCreativeTab(tabMisc);
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
+		this.useBlastFurnace = blastFurnaceRequired;
 		GameRegistry.registerItem(this, unlocalizedName);
 
 		String temp = "";
@@ -61,6 +66,7 @@ public class BaseItemDust extends Item{
 		if (temp != null && temp != ""){
 			GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
 		}
+		addFurnaceRecipe();
 		addMacerationRecipe();
 	}
 
@@ -166,7 +172,7 @@ public class BaseItemDust extends Item{
 		String tempDust = getUnlocalizedName().replace("item.itemDust", "dust");
 		ItemStack tempInputStack;
 		ItemStack tempOutputStack;
-		
+
 		if (getUnlocalizedName().contains("DustSmall") || getUnlocalizedName().contains("DustTiny")){
 			return;
 		}
@@ -192,4 +198,51 @@ public class BaseItemDust extends Item{
 		}						
 	}
 
+	private void addFurnaceRecipe(){		
+
+		String temp = "";
+		if (getUnlocalizedName().contains("item.")){
+			temp = getUnlocalizedName().replace("item.", "");
+		}
+		else {
+			temp = getUnlocalizedName();
+		}
+		if (temp.contains("DustTiny") || temp.contains("DustSmall")){
+			return;
+		}
+		temp = temp.replace("itemDust", "ingot");		
+		if (temp != null && temp != ""){
+
+			if (this.useBlastFurnace){
+				Utils.LOG_INFO("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace.");
+				String tempIngot = temp.replace("ingot", "ingotHot");
+				ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
+				Utils.LOG_INFO("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
+				if (null != tempOutputStack){
+					addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);		
+				}				
+				return;
+			}
+			Utils.LOG_INFO("Adding recipe for "+materialName+" Ingots in a furnace.");
+			ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+			Utils.LOG_INFO("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
+			if (null != tempOutputStack){
+				GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(UtilsItems.getSimpleStack(this), tempOutputStack);			
+			}			
+		}	
+	}
+
+	private void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){
+		//Utils.LOG_INFO("Adding Blast Furnace recipe for a Hot Ingot of "+materialName+".");
+		GT_Values.RA.addBlastRecipe(
+				input1,
+				input2,
+				GT_Values.NF, GT_Values.NF,
+				output1,
+				output2,
+				250*mTier*20,
+				mTier*64, 
+				tempRequired);
+	}
+
 }
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java
deleted file mode 100644
index 2e0334887b..0000000000
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package miscutil.core.item.base.dusts;
-
-import java.util.List;
-
-import miscutil.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-public class BaseItemDustSmall extends BaseItemDust{
-	
-	protected int colour = 0;
-	protected String materialName;
-	
-	public BaseItemDustSmall(String unlocalizedName, String materialName, int colour, String size) {
-		super(unlocalizedName, materialName, colour, size);
-		this.setTextureName(CORE.MODID + ":" + "dustSmall");
-		this.setMaxStackSize(64);
-		this.colour = colour;
-		this.materialName = materialName;
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
-		list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust.");
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-	
-}
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java
deleted file mode 100644
index 814f79ebd7..0000000000
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package miscutil.core.item.base.dusts;
-
-import java.util.List;
-
-import miscutil.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-public class BaseItemDustTiny extends BaseItemDust{
-	
-	protected int colour = 0;
-	protected String materialName;
-	
-	public BaseItemDustTiny(String unlocalizedName, String materialName, int colour, String size) {
-		super(unlocalizedName, materialName, colour, size);
-		this.setTextureName(CORE.MODID + ":" + "dustTiny");
-		this.setMaxStackSize(64);
-		this.colour = colour;
-		this.materialName = materialName;
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
-		list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust.");
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-	
-}
diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
index b91a17ddd3..5c427a025f 100644
--- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
+++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
@@ -21,8 +21,9 @@ public class BaseItemGear extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemGear(String unlocalizedName, String materialName, int colour) {
+	public BaseItemGear(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -30,6 +31,7 @@ public class BaseItemGear extends Item{
 		this.setMaxStackSize(64);
 		this.setTextureName(CORE.MODID + ":" + "itemGear");
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemG", "g"), UtilsItems.getSimpleStack(this));
@@ -68,7 +70,11 @@ public class BaseItemGear extends Item{
 		String tempIngot = unlocalName.replace("itemGear", "ingot");
 		ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 8);
 		if (null != tempOutputStack){
-			GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Gear.get(1), UtilsItems.getSimpleStack(this), 15*20, 24);	
+			GT_Values.RA.addExtruderRecipe(tempOutputStack,
+					ItemList.Shape_Extruder_Gear.get(1),
+					UtilsItems.getSimpleStack(this),
+					40*mTier*20,
+					24*mTier);	
 		}				
 	}
 
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
index 8a3e8a60b0..bd66c3a6bb 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
@@ -1,8 +1,6 @@
 package miscutil.core.item.base.ingots;
 
-import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
 
 import java.util.List;
 
@@ -76,12 +74,4 @@ public class BaseItemIngot extends Item{
 
 	}
 
-	private void addBendingRecipe(){
-		if (!unlocalName.toLowerCase().contains("ingothot")){
-			GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(1L, new Object[]{this}),
-					UtilsItems.getItemStackOfAmountFromOreDict("plate"+materialName, 1),
-					1200, 24);
-		}
-	}
-
 }
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
index bcf4aa935c..e7be91bc8c 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
@@ -19,11 +19,13 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	private ItemStack outputIngot;
 	private int tickCounter = 0;
 	private int tickCounterMax = 200;
+	private int mTier;
 
-	public BaseItemIngotHot(String unlocalizedName, String materialName, ItemStack coldIngot) {
+	public BaseItemIngotHot(String unlocalizedName, String materialName, ItemStack coldIngot, int tier) {
 		super(unlocalizedName, materialName, Utils.rgbtoHexValue(225, 225, 225));
 		this.setTextureName(CORE.MODID + ":" + "itemIngotHot");
 		this.outputIngot = coldIngot;
+		this.mTier = tier;
 		generateRecipe();
 	}
 	
@@ -47,9 +49,11 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	}
 
 	private void generateRecipe(){
-		Utils.LOG_INFO("Adding recipe for a Hot Ingot of "+materialName+".");
-		GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 500);
-	}
+		Utils.LOG_INFO("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+".");
+		GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 60*mTier);
+
+		
+	}	
 
 	@Override
 	public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 80dc8864cf..93784ca78a 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -12,7 +12,7 @@ public class ItemBlockGtFrameBox extends ItemBlock{
 	public ItemBlockGtFrameBox(Block block) {
 		super(block);
 		this.blockColour = block.getBlockColor();
-		GT_OreDictUnificator.registerOre(block.getUnlocalizedName().replace("BlockGtFrame", "frameGt"), UtilsItems.getSimpleStack(this));
+		GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
 	}
 
     public int getRenderColor(int aMeta) {
diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
index 0e9bb37f38..689f085198 100644
--- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
@@ -20,8 +20,9 @@ public class BaseItemPlate extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemPlate(String unlocalizedName, String materialName, int colour) {
+	public BaseItemPlate(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -30,6 +31,7 @@ public class BaseItemPlate extends Item{
 		this.setTextureName(CORE.MODID + ":" + "itemPlate");
 		this.setMaxStackSize(64);
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemP", "p"), UtilsItems.getSimpleStack(this));
@@ -70,7 +72,8 @@ public class BaseItemPlate extends Item{
 		if (null != tempOutputStack){
 			GT_Values.RA.addBenderRecipe(tempOutputStack,
 					UtilsItems.getSimpleStack(this),
-					1200, 24);	
+					14*mTier*20,
+					64*mTier);	
 		}				
 	}
 
diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
index d60abf2524..0938076905 100644
--- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
@@ -21,8 +21,9 @@ public class BaseItemRing extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemRing(String unlocalizedName, String materialName, int colour) {
+	public BaseItemRing(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -30,6 +31,7 @@ public class BaseItemRing extends Item{
 		this.setMaxStackSize(64);
 		this.setTextureName(CORE.MODID + ":" + "itemRing");
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this));
@@ -68,7 +70,11 @@ public class BaseItemRing extends Item{
 		String tempIngot = unlocalName.replace("itemRing", "ingot");
 		ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
 		if (null != tempOutputStack){
-			GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Ring.get(1), UtilsItems.getSimpleStack(this, 4), 1600, 96);	
+			GT_Values.RA.addExtruderRecipe(tempOutputStack,
+					ItemList.Shape_Extruder_Ring.get(1),
+					UtilsItems.getSimpleStack(this, 4),
+					160*mTier,
+					32*mTier);	
 		}				
 	}
 
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
index d292733538..6d7424c96d 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
@@ -22,8 +22,9 @@ public class BaseItemRod extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemRod(String unlocalizedName, String materialName, int colour) {
+	public BaseItemRod(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -31,6 +32,7 @@ public class BaseItemRod extends Item{
 		this.setTextureName(CORE.MODID + ":" + "itemRod");
 		this.setMaxStackSize(64);
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this));
@@ -69,14 +71,17 @@ public class BaseItemRod extends Item{
 		String tempIngot = unlocalName.replace("itemRod", "ingot");
 		ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
 		if (null != tempOutputStack){
-			GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Rod.get(1), UtilsItems.getSimpleStack(this, 2), 1200, 24);	
+			GT_Values.RA.addExtruderRecipe(tempOutputStack,
+					ItemList.Shape_Extruder_Rod.get(1),
+					UtilsItems.getSimpleStack(this, 2),
+					12*mTier*20, 24*mTier);	
 		}	
 		ItemStack rods = UtilsItems.getSimpleStack(this, 1);
 		UtilsRecipe.addShapedGregtechRecipe(
 				rods, rods, rods,
 				rods, "craftingToolWrench", rods,
 				rods, rods, rods,
-				UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemR", "frameGt"), 1));
+				UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemRod", "frameGt"), 2));
 	}
 
 }
diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
index c34530d672..37efc3e935 100644
--- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
@@ -21,8 +21,9 @@ public class BaseItemScrew extends Item{
 	protected int colour;
 	protected String materialName;
 	protected String unlocalName;
+	private int mTier;
 
-	public BaseItemScrew(String unlocalizedName, String materialName, int colour) {
+	public BaseItemScrew(String unlocalizedName, String materialName, int colour, int tier) {
 		setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(unlocalizedName);
@@ -31,6 +32,7 @@ public class BaseItemScrew extends Item{
 		this.setTextureName(CORE.MODID + ":" + "itemScrew");
 		this.setMaxStackSize(64);
 		this.colour = colour;
+		this.mTier = tier;
 		this.materialName = materialName;
 		GameRegistry.registerItem(this, unlocalizedName);
 		GT_OreDictUnificator.registerOre(unlocalName.replace("itemS", "s"), UtilsItems.getSimpleStack(this));
@@ -70,7 +72,7 @@ public class BaseItemScrew extends Item{
 		if (null != boltStack){
 			GT_Values.RA.addLatheRecipe(boltStack,
 					UtilsItems.getSimpleStack(this), null,
-					60, 16);	
+					60*mTier, 16*mTier);	
 			UtilsRecipe.addShapedGregtechRecipe(
 					"craftingToolFile", boltStack, null,
 					boltStack, null, null,