+ Began work adding hot ingot system that uses GT to generate them.

+ Continued work on the GT-alike material class, from which to generate items. (Added Staballoy, Tantalloy 60 & 61, EnderIO Alloys, BR Materials)
+ Adding debug logging to the centrifuge.
+ Added Shading to Batteries, to differentiate them.
+ Added in blast furnace recipes for Staballoy.
% Changed a few recipes and how they're handle.

4 files changed, 108 insertions, 70 deletions

diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index 9a54a9d04e..4b5c2613b2 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -12,6 +12,7 @@ import miscutil.core.util.Utils;
 import miscutil.core.util.fluid.FluidUtils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 public class RECIPES_GREGTECH {
 
@@ -150,4 +151,24 @@ public class RECIPES_GREGTECH {
 	private static void registerSkookumChoocher(){
 		//GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), tBits, new Object[]{"fX", Character.valueOf('X'), OrePrefixes.toolHeadShovel.get(aMaterial)});
 	}
+	
+	private static void blastFurnaceRecipes(){
+		GT_Values.RA.addBlastRecipe(
+				UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1),
+				UtilsItems.getItemStackOfAmountFromOreDict("ingotUranium", 8),
+				GT_Values.NF, GT_Values.NF,
+				GT_OreDictUnificator.get(OrePrefixes.ingotHot, GT_Materials.Staballoy, 1L),
+				GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L),
+				(int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp,
+				1000, GT_Materials.Staballoy.mBlastFurnaceTemp);
+		
+		GT_Values.RA.addBlastRecipe(
+				UtilsItems.getItemStackOfAmountFromOreDict("dustStaballoy", 1),
+				null,
+				GT_Values.NF, GT_Values.NF,
+				GT_OreDictUnificator.get(OrePrefixes.ingotHot, GT_Materials.Staballoy, 1L),
+				GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L),
+				(int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp,
+				2000, GT_Materials.Staballoy.mBlastFurnaceTemp);
+	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
index 4fd5b1fa77..4625263eee 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
@@ -6,27 +6,13 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_OreDictUnificator;
+import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.recipe.UtilsRecipe;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
 
 public class RECIPES_MachineComponents {
-
-	//Outputs
-	static ItemStack RECIPE_Circuit_IV = GregtechItemList.Circuit_IV.get(1);
-	static ItemStack RECIPE_Circuit_LuV = GregtechItemList.Circuit_LuV.get(1);
-	static ItemStack RECIPE_Circuit_ZPM = GregtechItemList.Circuit_ZPM.get(1);
-	static ItemStack RECIPE_Circuit_Board_IV = GregtechItemList.Circuit_Board_IV.get(1);
-	static ItemStack RECIPE_Circuit_Board_LuV = GregtechItemList.Circuit_Board_LuV.get(1);
-	static ItemStack RECIPE_Circuit_Board_ZPM = GregtechItemList.Circuit_Board_ZPM.get(1);
-	static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_IV = GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(1);
-	static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_LuV = GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(1);
-	static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_ZPM = GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(1);
-	static ItemStack RECIPE_Circuit_Parts_IV = GregtechItemList.Circuit_Parts_IV.get(1);
-	static ItemStack RECIPE_Circuit_Parts_LuV = GregtechItemList.Circuit_Parts_LuV.get(1);
-	static ItemStack RECIPE_Circuit_Parts_ZPM = GregtechItemList.Circuit_Parts_ZPM.get(1);
-
+	
 	//Wire
 	static String wireTier6 = "wireGt08NiobiumTitanium";
 	static String wireTier7 = "wireGt08Osmium";
@@ -101,8 +87,10 @@ public class RECIPES_MachineComponents {
 	static String craftingToolScrewdriver = "craftingToolScrewdriver";
 
 	public static final void RECIPES_LOAD(){	
-		Utils.LOG_INFO("Loading Recipes for the Various Circuits and their components.");	
-		run();
+		Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components.");	
+		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+			run();	
+		}
 		GregtechMachinePhase();
 	}
 
@@ -283,12 +271,12 @@ public class RECIPES_MachineComponents {
 				circuitTier10, plateTier10, plateTier10,
 				RECIPE_CONSTANTS.sensor_MAX);
 
-		Utils.LOG_INFO("Done loading recipes for the Various circuit content.");
+		Utils.LOG_INFO("Done loading recipes for the Various machine components.");
 
 	}		
 
 	private static void GregtechMachinePhase(){
-		Utils.LOG_INFO("Adding Gregtech machine recipes for the components.");
+		Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits.");
 		GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256);
 		GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512);
 		GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), 96, 1024);
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index 70aa5a52a2..2e104f3e94 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -2,7 +2,6 @@ package miscutil.core.recipe;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
@@ -347,19 +346,19 @@ public class RECIPES_Machines {
 
 			UtilsRecipe.addShapedGregtechRecipe(
 					ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV,
-					ItemList.Electric_Motor_EV, ItemList.Hull_EV, ItemList.Electric_Motor_EV,
-					OrePrefixes.gearGt.get(Materials.Titanium), OrePrefixes.cableGt02.get(Materials.Aluminium), OrePrefixes.gearGt.get(Materials.Titanium),
-					GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]));
+					ItemList.Electric_Motor_EV, machineCasing_EV, ItemList.Electric_Motor_EV,
+					"gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium",
+					UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 793, 1));
 			UtilsRecipe.addShapedGregtechRecipe(
 					ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV,
-					ItemList.Electric_Motor_IV, ItemList.Hull_IV, ItemList.Electric_Motor_IV,
-					OrePrefixes.gearGt.get(Materials.TungstenSteel), OrePrefixes.cableGt02.get(Materials.Platinum), OrePrefixes.gearGt.get(Materials.TungstenSteel),
-					GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]));
+					ItemList.Electric_Motor_IV, machineCasing_IV, ItemList.Electric_Motor_IV,
+					"gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel",
+					UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 794, 1));
 			UtilsRecipe.addShapedGregtechRecipe(
 					RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV,
-					RECIPE_CONSTANTS.electricMotor_LuV, ItemList.Hull_LuV, RECIPE_CONSTANTS.electricMotor_LuV,
-					OrePrefixes.gearGt.get(Materials.Chrome), OrePrefixes.cableGt02.get(Materials.Tungsten), OrePrefixes.gearGt.get(Materials.Chrome),
-					GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]));
+					RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV,
+					"gearGtChrome", "cableGt02Tungsten", "gearGtChrome",
+					UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 795, 1));
 
 			//Buffer Core
 			UtilsRecipe.addShapedGregtechRecipe(
diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
index f5e180fccd..9bb1b24bd8 100644
--- a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
@@ -8,79 +8,109 @@ import net.minecraft.item.ItemStack;
 public class RECIPE_CONSTANTS {
 
 	//Machine Components
-	public static ItemStack electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1);
-	public static ItemStack electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1);
-	public static ItemStack electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1);
-	public static ItemStack electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
-	public static ItemStack electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1);
-	public static ItemStack electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1);
-	public static ItemStack electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1);
-	public static ItemStack electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
-	public static ItemStack electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1);
-	public static ItemStack electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1);
-	public static ItemStack electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1);
-	public static ItemStack electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
-	public static ItemStack robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1);
-	public static ItemStack robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1);
-	public static ItemStack robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1);
-	public static ItemStack robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
-	public static ItemStack conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1);
-	public static ItemStack conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1);
-	public static ItemStack conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1);
-	public static ItemStack conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
-	public static ItemStack emitter_LuV = GregtechItemList.Emitter_LuV.get(1);
-	public static ItemStack emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1);
-	public static ItemStack emitter_UV = GregtechItemList.Emitter_UV.get(1);
-	public static ItemStack emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
-	public static ItemStack fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1);
-	public static ItemStack fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1);
-	public static ItemStack fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1);
-	public static ItemStack fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
-	public static ItemStack sensor_LuV = GregtechItemList.Sensor_LuV.get(1);
-	public static ItemStack sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1);
-	public static ItemStack sensor_UV = GregtechItemList.Sensor_UV.get(1);
-	public static ItemStack sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
+	public static ItemStack electricMotor_LuV;
+	public static ItemStack electricMotor_ZPM;
+	public static ItemStack electricMotor_UV;
+	public static ItemStack electricMotor_MAX;
+	public static ItemStack electricPump_LuV;
+	public static ItemStack electricPump_ZPM;
+	public static ItemStack electricPump_UV;
+	public static ItemStack electricPump_MAX;
+	public static ItemStack electricPiston_LuV;
+	public static ItemStack electricPiston_ZPM;
+	public static ItemStack electricPiston_UV ;
+	public static ItemStack electricPiston_MAX;
+	public static ItemStack robotArm_LuV;
+	public static ItemStack robotArm_ZPM;
+	public static ItemStack robotArm_UV;
+	public static ItemStack robotArm_MAX;
+	public static ItemStack conveyorModule_LuV;
+	public static ItemStack conveyorModule_ZPM;
+	public static ItemStack conveyorModule_UV;
+	public static ItemStack conveyorModule_MAX;
+	public static ItemStack emitter_LuV;
+	public static ItemStack emitter_ZPM;
+	public static ItemStack emitter_UV;
+	public static ItemStack emitter_MAX;
+	public static ItemStack fieldGenerator_LuV;
+	public static ItemStack fieldGenerator_ZPM;
+	public static ItemStack fieldGenerator_UV;
+	public static ItemStack fieldGenerator_MAX;
+	public static ItemStack sensor_LuV;
+	public static ItemStack sensor_ZPM;
+	public static ItemStack sensor_UV;
+	public static ItemStack sensor_MAX;
 	
 	public static void initialise(){
 		if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			registerGTExperimentalComponents();
 		}
+		else {
+			registerGTStandardComponents();
+		}
 	}
 	
 	private static void registerGTExperimentalComponents(){
-		//Outputs
 		//Machine Components
 		electricMotor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1);
 		electricMotor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1);
 		electricMotor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1);
-	
 		electricPump_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1);
 		electricPump_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1);
 		electricPump_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1);
-	
 		electricPiston_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1);
 		electricPiston_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1);
 		electricPiston_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1);
-	
 		robotArm_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1);
 		robotArm_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1);
 		robotArm_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1);
-	
 		conveyorModule_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1);
 		conveyorModule_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1);
 		conveyorModule_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
-	
 		emitter_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1);
 		emitter_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1);
 		emitter_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1);
-	
 		fieldGenerator_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1);
 		fieldGenerator_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1);
 		fieldGenerator_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1);
-	
 		sensor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
 		sensor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
 		sensor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
 	}
+	
+	private static void registerGTStandardComponents(){
+		electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1);
+		electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1);
+		electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1);
+		electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
+		electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1);
+		electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1);
+		electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1);
+		electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
+		electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1);
+		electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1);
+		electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1);
+		electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
+		robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1);
+		robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1);
+		robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1);
+		robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
+		conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1);
+		conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1);
+		conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1);
+		conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
+		emitter_LuV = GregtechItemList.Emitter_LuV.get(1);
+		emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1);
+		emitter_UV = GregtechItemList.Emitter_UV.get(1);
+		emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
+		fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1);
+		fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1);
+		fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1);
+		fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
+		sensor_LuV = GregtechItemList.Sensor_LuV.get(1);
+		sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1);
+		sensor_UV = GregtechItemList.Sensor_UV.get(1);
+		sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
+	}
 
 }