Merge branch 'master' of https://github.com/draknyte1/GTplusplus

11 files changed, 431 insertions, 217 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
index 0f31c4c61d..bb5732c319 100644
--- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
+++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.recipe;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -35,28 +35,28 @@ public class Gregtech_Recipe_Adder {
 		
 		resetVars();
 		if (addMaceratorRecipe){
-			inputStack1 = UtilsItems.getSimpleStack(maceratorInput, maceratorInputAmount1);
-			outputStack1 = UtilsItems.getSimpleStack(maceratorOutput, maceratorOutputAmount1);
+			inputStack1 = ItemUtils.getSimpleStack(maceratorInput, maceratorInputAmount1);
+			outputStack1 = ItemUtils.getSimpleStack(maceratorOutput, maceratorOutputAmount1);
 			addMaceratorRecipe(inputStack1, outputStack1);
 		}
 		resetVars();
 		if (addCompressorRecipe){
-			inputStack1 = UtilsItems.getSimpleStack(compressorInput, compressorInputAmount1);
-			outputStack1 = UtilsItems.getSimpleStack(compressorOutput, compressorOutputAmount1);
+			inputStack1 = ItemUtils.getSimpleStack(compressorInput, compressorInputAmount1);
+			outputStack1 = ItemUtils.getSimpleStack(compressorOutput, compressorOutputAmount1);
 			addCompressorRecipe(inputStack1, outputStack1);
 		}
 		resetVars();
 		if (addBlastFurnaceRecipe){
-			inputStack1 = UtilsItems.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1);
-			inputStack2 = UtilsItems.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2);
-			outputStack1 = UtilsItems.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1);
-			outputStack2 = UtilsItems.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2);
+			inputStack1 = ItemUtils.getSimpleStack(blastFurnaceInput, blastFurnaceInputAmount1);
+			inputStack2 = ItemUtils.getSimpleStack(blastFurnaceInput2, blastFurnaceInputAmount2);
+			outputStack1 = ItemUtils.getSimpleStack(blastFurnaceOutput, blastFurnaceOutputAmount1);
+			outputStack2 = ItemUtils.getSimpleStack(blastFurnaceOutput2, blastFurnaceOutputAmount2);
 			addBlastFurnaceRecipe(inputStack1, inputStack2, outputStack1, outputStack2, blastFurnaceTemp);
 		}
 		resetVars();
 		if (addSmeltingRecipe){
-			inputStack1 = UtilsItems.getSimpleStack(smeltingInput, smeltingInputAmount1);
-			outputStack1 = UtilsItems.getSimpleStack(smeltingOutput, smeltingOutputAmount1);
+			inputStack1 = ItemUtils.getSimpleStack(smeltingInput, smeltingInputAmount1);
+			outputStack1 = ItemUtils.getSimpleStack(smeltingOutput, smeltingOutputAmount1);
 			addSmeltingRecipe(inputStack1, outputStack1);
 		}
 		resetVars();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index bb482d96d5..46cf4e0a7d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -11,8 +11,9 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_GREGTECH {
@@ -29,7 +30,9 @@ public class RECIPES_GREGTECH {
 		distilleryRecipes();
 		extractorRecipes();
 		chemicalBathRecipes();
+		chemicalReactorRecipes();
 		dehydratorRecipes();
+		blastFurnaceRecipes();
 		addFuels();
 	}
 
@@ -58,7 +61,7 @@ public class RECIPES_GREGTECH {
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
 					Materials.SulfuricAcid.getFluid(60L), //Fluid Input
 					Materials.Creosote.getFluid(250L), //Fluid Output
-					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
+					ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
 					600,  //Time in ticks
 					120); //EU			
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
@@ -84,7 +87,7 @@ public class RECIPES_GREGTECH {
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
 					FluidUtils.getFluidStack("oxygen", 185), //Fluid Input
 					Materials.Creosote.getFluid(200L), //Fluid Output
-					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
+					ItemUtils.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
 					900,  //Time in ticks
 					120); //EU
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
@@ -130,31 +133,122 @@ public class RECIPES_GREGTECH {
 					30); //EU	
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/
 		try {
-			
-			ItemStack cells = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
-			
+
+			ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
+
 			if (cells == null){
-				cells = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12);
+				cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12);
 			}
-			
-			ItemStack[] input = {cells, UtilsItems.getItemStackOfAmountFromOreDict("dustLepidolite", 20)};
-			
+
+			ItemStack[] input = {cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)};
+
 			CORE.RA.addDehydratorRecipe(
 					input, //Item input (Array, up to 2)
 					FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1)
-					FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 1)
+					FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 2)
+					new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					75*20, //Time in ticks
+					1000); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		try {
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
+					}, //Item input (Array, up to 2)
+					FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
 					new ItemStack[]{
-						UtilsItems.getItemStackOfAmountFromOreDict("dustPotassium", 1),
-						UtilsItems.getItemStackOfAmountFromOreDict("dustAluminium", 4),
-						UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 10),
-						UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 2),
-						UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
+						ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
 					}, //Output Array of Items - Upto 9,
 					new int[]{0},
-					90*20, //Time in ticks
+					150*20, //Time in ticks
 					2000); //EU	
 
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		try {
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
+					}, //Item input (Array, up to 2)
+					FluidUtils.getFluidStack("uraniumhexafluoride", 1440), //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
+					new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					300*20, //Time in ticks
+					4000); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		
+		//Raisins from Grapes
+		try {
+			
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1)
+					}, //Item input (Array, up to 2)
+					null, //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
+					new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1)
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					10*20, //Time in ticks
+					8); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+
+		//Calcium Hydroxide
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken || LoadedMods.IHL){
+			try {
+				
+				CORE.RA.addDehydratorRecipe(
+						new ItemStack[]{
+								ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10)
+						}, //Item input (Array, up to 2)
+						FluidUtils.getFluidStack("water", 10000), //Fluid input (slot 1)
+						null, //Fluid output (slot 2)
+						new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20)
+						}, //Output Array of Items - Upto 9,
+						new int[]{0},
+						120*20, //Time in ticks
+						120); //EU	
+
+			}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+			
+			//2 LiOH + CaCO3
+			try {
+				
+				CORE.RA.addDehydratorRecipe(
+						new ItemStack[]{
+								ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5)
+						}, //Item input (Array, up to 2)
+						null, //Fluid input (slot 1)
+						null, //Fluid output (slot 2)
+						new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3)
+						}, //Output Array of Items - Upto 9,
+						new int[]{0},
+						120*20, //Time in ticks
+						1000); //EU	
+
+			}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		}
 		
 	}
 
@@ -167,14 +261,21 @@ public class RECIPES_GREGTECH {
 	private static void distilleryRecipes(){
 		Utils.LOG_INFO("Registering Distillery/Distillation Tower Recipes.");
 		GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false);
-		GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), UtilsItems.getSimpleStack(ModItems.itemHeliumBlob, 1), 200, 60);
+		GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHeliumBlob, 1), 200, 60);
 	}
 
 	private static void addFuels(){
 		Utils.LOG_INFO("Registering New Fuels.");
-		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
-		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
-		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
+		GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
+		GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
+		GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
+
+
+
+		//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
+		GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
+		GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2);
+		GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2);
 		//System.exit(1);
 	}
 
@@ -187,17 +288,55 @@ public class RECIPES_GREGTECH {
 
 	private static void chemicalBathRecipes(){
 		int[] chances = {10000, 5000, 2500};
-		GT_Values.RA.addChemicalBathRecipe(UtilsItems.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400),
-				UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1),
-				UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1),
-				UtilsItems.getItemStackOfAmountFromOreDict("dustZirconium", 1), 
+		GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), 
 				chances,
 				30*20,
 				240);
+		
+		GT_Values.RA.addChemicalBathRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
+				FluidUtils.getFluidStack("hydrofluoricacid", 20000),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5),
+				null,
+				null, 
+				new int[]{},
+				90*20,
+				500);
 	}
-
-	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 chemicalReactorRecipes(){
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2
+				null, //Fluid Input
+				null, //Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), //Output Stack
+				600*20
+				);		
+		
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1
+				null, //Input Stack 2
+				FluidUtils.getFluidStack("hydrofluoricacid", 2500), //Fluid Input
+				FluidUtils.getFluidStack("water", 2500), //Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack
+				600*20
+				);	
+	}
+	
+	private static void blastFurnaceRecipes(){
+		GT_Values.RA.addBlastRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1),
+				GT_Values.NF, GT_Values.NF,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3),
+				null,
+				60*20,
+				2000, 
+				3000);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
new file mode 100644
index 0000000000..aa3026133e
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -0,0 +1,48 @@
+package gtPlusPlus.core.recipe;
+
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class RECIPES_General {
+
+	static ItemStack RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
+	static String RECIPE_LapisDust = "dustLazurite";
+	static ItemStack OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);
+	static ItemStack RECIPE_CraftingTable = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table));
+	static String RECIPE_BronzePlate = "plateAnyBronze";
+	static ItemStack RECIPE_BasicCasingIC2;
+	static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
+	static ItemStack NULL = null;
+
+	public static void RECIPES_LOAD(){
+		
+		if (LoadedMods.Gregtech){
+			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
+		run();
+		}
+	}
+	
+	private static void run(){
+		
+		
+		RecipeUtils.recipeBuilder(
+				RECIPE_Paper, RECIPE_LapisDust, NULL,
+				RECIPE_Paper, RECIPE_LapisDust, NULL,
+				RECIPE_LapisDust, RECIPE_LapisDust, NULL,
+				OUTPUT_Blueprint);	
+		
+		RecipeUtils.recipeBuilder(
+				RECIPE_BronzePlate, RECIPE_CraftingTable, RECIPE_BronzePlate,
+				RECIPE_BronzePlate, RECIPE_BasicCasingIC2, RECIPE_BronzePlate,
+				RECIPE_BronzePlate, RECIPE_BronzePlate, RECIPE_BronzePlate,
+				OUTPUT_Workbench_Bronze);
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
index 6d81ba42ad..14f4a1c998 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.recipe;
 
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.core.util.wrapper.var;
 
 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class RECIPES_MTWRAPPER {
 		 * 
 		 */
 
-		ItemStack outputItem = UtilsItems.getCorrectStacktype(item_Output, 1);
+		ItemStack outputItem = ItemUtils.getCorrectStacktype(item_Output, 1);
 
 		ArrayList<Object> validSlots = new ArrayList<Object>();
 		String a,b,c,d,e,f,g,h,i;
@@ -92,7 +92,7 @@ public class RECIPES_MTWRAPPER {
 		validSlots.add(2, lineThree);
 
 		try {
-			UtilsRecipe.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy());
+			RecipeUtils.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy());
 			MT_RECIPES_LOADED++;		
 		}
 		catch(NullPointerException | ClassCastException k){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 2e69775b78..e3f47844c7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class RECIPES_MachineComponents {
@@ -99,176 +99,176 @@ public class RECIPES_MachineComponents {
 
 	private static void run(){
 		//Electric Motors
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier7, wireTier7, rodTier7a,
 				wireTier7, rodTier7b, wireTier7,
 				rodTier7a, wireTier7, cableTier7,
 				RECIPE_CONSTANTS.electricMotor_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier8, wireTier8, rodTier8a,
 				wireTier8, rodTier8b, wireTier8,
 				rodTier8a, wireTier8, cableTier8,
 				RECIPE_CONSTANTS.electricMotor_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier9, wireTier9, rodTier9a,
 				wireTier9, rodTier9b, wireTier9,
 				rodTier9a, wireTier9, cableTier9,
 				RECIPE_CONSTANTS.electricMotor_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, wireTier10, rodTier10a,
 				wireTier10, rodTier10b, wireTier10,
 				rodTier10a, wireTier10, cableTier10,
 				RECIPE_CONSTANTS.electricMotor_MAX);
 
 		//Electric Pump
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier7, rotorTier7, itemRubberRing,
 				craftingToolScrewdriver, pipeTier7, craftingToolWrench,
 				itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, cableTier7,
 				RECIPE_CONSTANTS.electricPump_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier8, rotorTier8, itemRubberRing,
 				craftingToolScrewdriver, pipeTier8, craftingToolWrench,
 				itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8,
 				RECIPE_CONSTANTS.electricPump_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier9, rotorTier9, itemRubberRing,
 				craftingToolScrewdriver, pipeTier9, craftingToolWrench,
 				itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, cableTier9,
 				RECIPE_CONSTANTS.electricPump_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, rotorTier10, itemRubberRing,
 				craftingToolScrewdriver, pipeTier10, craftingToolWrench,
 				itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10,
 				RECIPE_CONSTANTS.electricPump_MAX);
 
 		//Electric Pump
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier7, plateTier7, plateTier7,
 				cableTier7, rodTier7a, rodTier7a,
 				cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, smallGearTier7,
 				RECIPE_CONSTANTS.electricPiston_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier8, plateTier8, plateTier8,
 				cableTier8, rodTier8a, rodTier8a,
 				cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, smallGearTier8,
 				RECIPE_CONSTANTS.electricPiston_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier9, plateTier9, plateTier9,
 				cableTier9, rodTier9a, rodTier9a,
 				cableTier9, RECIPE_CONSTANTS.electricMotor_UV, smallGearTier9,
 				RECIPE_CONSTANTS.electricPiston_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier10, plateTier10, plateTier10,
 				cableTier10, rodTier10a, rodTier10a,
 				cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10,
 				RECIPE_CONSTANTS.electricPiston_MAX);
 
 		//Robot Arms
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier7, cableTier7, cableTier7,
 				RECIPE_CONSTANTS.electricMotor_LuV, rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV,
 				RECIPE_CONSTANTS.electricPiston_LuV, circuitTier7, rodTier7a,
 				RECIPE_CONSTANTS.robotArm_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier8, cableTier8, cableTier8,
 				RECIPE_CONSTANTS.electricMotor_ZPM, rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM,
 				RECIPE_CONSTANTS.electricPiston_ZPM, circuitTier8, rodTier8a,
 				RECIPE_CONSTANTS.robotArm_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier9, cableTier9, cableTier9,
 				RECIPE_CONSTANTS.electricMotor_UV, rodTier9a, RECIPE_CONSTANTS.electricMotor_UV,
 				RECIPE_CONSTANTS.electricPiston_UV, circuitTier9, rodTier9a,
 				RECIPE_CONSTANTS.robotArm_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, cableTier10, cableTier10,
 				RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX,
 				RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a,
 				RECIPE_CONSTANTS.robotArm_MAX);
 
 		//Conveyor Modules
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, RECIPE_CONSTANTS.electricMotor_LuV,
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.conveyorModule_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM,
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.conveyorModule_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.electricMotor_UV, cableTier9, RECIPE_CONSTANTS.electricMotor_UV,
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.conveyorModule_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX,
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.conveyorModule_MAX);
 
 		//Emitter Modules
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				rodTier7c, rodTier7c, circuitTier7,
 				cableTier7, circuitTier6, rodTier7c,
 				circuitTier7, cableTier7, rodTier7c,
 				RECIPE_CONSTANTS.emitter_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				rodTier8c, rodTier8c, circuitTier8,
 				cableTier8, circuitTier7, rodTier8c,
 				circuitTier8, cableTier8, rodTier8c,
 				RECIPE_CONSTANTS.emitter_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				rodTier9c, rodTier9c, circuitTier9,
 				cableTier9, circuitTier8, rodTier9c,
 				circuitTier9, cableTier9, rodTier9c,
 				RECIPE_CONSTANTS.emitter_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				rodTier10c, rodTier10c, circuitTier10,
 				cableTier10, circuitTier9, rodTier10c,
 				circuitTier10, cableTier10, rodTier10c,
 				RECIPE_CONSTANTS.emitter_MAX);
 
 		//Field Generator Modules
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				wireTier7, circuitTier7, wireTier7,
 				circuitTier7, circuitTier6, circuitTier7,
 				wireTier7, circuitTier7, wireTier7,
 				RECIPE_CONSTANTS.fieldGenerator_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				wireTier8, circuitTier8, wireTier8,
 				circuitTier8, circuitTier7, circuitTier8,
 				wireTier8, circuitTier8, wireTier8,
 				RECIPE_CONSTANTS.fieldGenerator_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				wireTier9, circuitTier9, wireTier9,
 				circuitTier9, circuitTier8, circuitTier9,
 				wireTier9, circuitTier9, wireTier9,
 				RECIPE_CONSTANTS.fieldGenerator_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				wireTier10, circuitTier10, wireTier10,
 				circuitTier10, circuitTier9, circuitTier10,
 				wireTier10, circuitTier10, wireTier10,
 				RECIPE_CONSTANTS.fieldGenerator_MAX);
 
 		//Sensor Modules
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier7, null, circuitTier6,
 				plateTier7, rodTier7c, null,
 				circuitTier7, plateTier7, plateTier7,
 				RECIPE_CONSTANTS.sensor_LuV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier8, null, circuitTier7,
 				plateTier8, rodTier8c, null,
 				circuitTier8, plateTier8, plateTier8,
 				RECIPE_CONSTANTS.sensor_ZPM);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier9, null, circuitTier8,
 				plateTier9, rodTier9c, null,
 				circuitTier9, plateTier9, plateTier9,
 				RECIPE_CONSTANTS.sensor_UV);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier10, null, circuitTier9,
 				plateTier10, rodTier10c, null,
 				circuitTier10, plateTier10, plateTier10,
@@ -279,42 +279,42 @@ public class RECIPES_MachineComponents {
 	}		
 	
 	private static void onlyMaxComponents(){
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, wireTier10, rodTier10a,
 				wireTier10, rodTier10b, wireTier10,
 				rodTier10a, wireTier10, cableTier10,
 				RECIPE_CONSTANTS.electricMotor_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, rotorTier10, itemRubberRing,
 				craftingToolScrewdriver, pipeTier10, craftingToolWrench,
 				itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10,
 				RECIPE_CONSTANTS.electricPump_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier10, plateTier10, plateTier10,
 				cableTier10, rodTier10a, rodTier10a,
 				cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10,
 				RECIPE_CONSTANTS.electricPiston_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				cableTier10, cableTier10, cableTier10,
 				RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX,
 				RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a,
 				RECIPE_CONSTANTS.robotArm_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX,
 				plateRubber, plateRubber, plateRubber,
 				RECIPE_CONSTANTS.conveyorModule_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				rodTier10c, rodTier10c, circuitTier10,
 				cableTier10, circuitTier9, rodTier10c,
 				circuitTier10, cableTier10, rodTier10c,
 				RECIPE_CONSTANTS.emitter_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				wireTier10, circuitTier10, wireTier10,
 				circuitTier10, circuitTier9, circuitTier10,
 				wireTier10, circuitTier10, wireTier10,
 				RECIPE_CONSTANTS.fieldGenerator_MAX);
-		UtilsRecipe.addShapedGregtechRecipe(
+		RecipeUtils.addShapedGregtechRecipe(
 				plateTier10, null, circuitTier9,
 				plateTier10, rodTier10c, null,
 				circuitTier10, plateTier10, plateTier10,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 09a7acbfd6..c8aa454e9a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -4,8 +4,8 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
@@ -48,19 +48,23 @@ public class RECIPES_Machines {
 	//
 	static ItemStack RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1);
 	static ItemStack RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1);
+	//Industrial Coke Oven
+	static ItemStack RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
+	static ItemStack RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
+	static ItemStack RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1);
 
 
 	//Buffer Cores
-	static ItemStack RECIPE_BufferCore_ULV = UtilsItems.getItemStack("miscutils:item.itemBufferCore1", 1);
-	static ItemStack RECIPE_BufferCore_LV = UtilsItems.getItemStack("miscutils:item.itemBufferCore2", 1);
-	static ItemStack RECIPE_BufferCore_MV = UtilsItems.getItemStack("miscutils:item.itemBufferCore3", 1);
-	static ItemStack RECIPE_BufferCore_HV = UtilsItems.getItemStack("miscutils:item.itemBufferCore4", 1);
-	static ItemStack RECIPE_BufferCore_EV = UtilsItems.getItemStack("miscutils:item.itemBufferCore5", 1);
-	static ItemStack RECIPE_BufferCore_IV = UtilsItems.getItemStack("miscutils:item.itemBufferCore6", 1);
-	static ItemStack RECIPE_BufferCore_LuV = UtilsItems.getItemStack("miscutils:item.itemBufferCore7", 1);
-	static ItemStack RECIPE_BufferCore_ZPM = UtilsItems.getItemStack("miscutils:item.itemBufferCore8", 1);
-	static ItemStack RECIPE_BufferCore_UV = UtilsItems.getItemStack("miscutils:item.itemBufferCore9", 1);
-	static ItemStack RECIPE_BufferCore_MAX = UtilsItems.getItemStack("miscutils:item.itemBufferCore10", 1);
+	static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1);
+	static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1);
+	static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1);
+	static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStack("miscutils:item.itemBufferCore4", 1);
+	static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStack("miscutils:item.itemBufferCore5", 1);
+	static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStack("miscutils:item.itemBufferCore6", 1);
+	static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1);
+	static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStack("miscutils:item.itemBufferCore8", 1);
+	static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStack("miscutils:item.itemBufferCore9", 1);
+	static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStack("miscutils:item.itemBufferCore10", 1);
 
 
 	//Wire
@@ -95,8 +99,8 @@ public class RECIPES_Machines {
 	static String plateTier4 = "plateGold";
 	static String plateTier5 = "plateAluminium";
 	static String plateTier6 = "plateMaragingSteel250";
-	static String plateTier7 = "plateTungsten";
-	static String plateTier8 = "plateTungstenSteel";
+	static String plateTier7 = "plateTantalloy61";
+	static String plateTier8 = "plateInconel792";
 	static String plateTier9 = "plateZeron100";
 	static String plateTier10 = "plateNaquadahEnriched";
 	static String plateTier11 = "plateNeutronium";
@@ -108,12 +112,12 @@ public class RECIPES_Machines {
 	static String rodTier4 = "stickGold";
 	static String rodTier5 = "stickAluminium";
 	static String rodTier6 = "stickMaragingSteel250";
-	static String rodTier7 = "stickTungsten";
-	static String rodTier8 = "stickTungstenSteel";
+	static String rodTier7 = "stickTantalloy61";
+	static String rodTier8 = "stickInconel792";
 	static String rodTier9 = "stickZeron100";
 	static String rodTier10 = "stickNaquadahEnriched";
 	static String rodTier11 = "stickNeutronium";