Merged in MultiFixes (pull request #11)

MultiFixes

5 files changed, 377 insertions, 80 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index ea1bcdb9de..34142d0390 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -39,6 +39,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -92,6 +93,7 @@ public class RECIPES_GREGTECH {
 		vacuumFreezerRecipes();
 		fluidheaterRecipes();
 		chemplantRecipes();
+		packagerRecipes();
 
 
 		/**
@@ -107,16 +109,21 @@ public class RECIPES_GREGTECH {
 
 		addFuels();
 	}
-	
 
 
+
+	private static void packagerRecipes() {
+		
+		
+	}
+
 	private static void chemplantRecipes() {
 
 		//This is subsequently absorbed in water to form nitric acid and nitric oxide.
-	    //3 NO2 (g) + H2O (l) → 2 HNO3 (aq) + NO (g) (ΔH = −117 kJ/mol)
-	    //The nitric oxide is cycled back for reoxidation. Alternatively, if the last step is carried out in air:
-	    //4 NO2 (g) + O2 (g) + 2 H2O (l) → 4 HNO3 (aq)
-		
+		//3 NO2 (g) + H2O (l) → 2 HNO3 (aq) + NO (g) (ΔH = −117 kJ/mol)
+		//The nitric oxide is cycled back for reoxidation. Alternatively, if the last step is carried out in air:
+		//4 NO2 (g) + O2 (g) + 2 H2O (l) → 4 HNO3 (aq)
+
 		// Advanced method for Nitric Acid Production
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
@@ -137,7 +144,63 @@ public class RECIPES_GREGTECH {
 				10 * 20,
 				480,
 				3);
-		
+
+		// Advanced recipe for Fluorine Production
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(17),
+						CI.getPurpleCatalyst(0),
+						ItemUtils.getSimpleStack(Blocks.sandstone, 64),
+						ItemUtils.getSimpleStack(Blocks.sandstone, 64)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("nitricacid", 4000),	
+						FluidUtils.getAir(8000)
+				},
+				new ItemStack[] {
+						FLUORIDES.FLUORITE.getOre(8),
+						FLUORIDES.FLUORITE.getOre(4),
+						FLUORIDES.FLUORITE.getOre(4),
+						FLUORIDES.FLUORITE.getOre(4),
+				},
+				new FluidStack[] {
+
+				},
+				new int[] {
+						0, 2500, 2000, 1500 
+				},
+				10 * 20,
+				1024,
+				5);
+
+		// Advanced recipe for Fluorine Production
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(17),
+						CI.getPurpleCatalyst(0),
+						ItemUtils.getSimpleStack(Blocks.sand, 64),
+						ItemUtils.getSimpleStack(Blocks.sand, 64)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("nitricacid", 5000),	
+						FluidUtils.getAir(12000)
+				},
+				new ItemStack[] {
+						FLUORIDES.FLUORITE.getOre(4),
+						FLUORIDES.FLUORITE.getOre(2),
+						FLUORIDES.FLUORITE.getOre(2),
+						FLUORIDES.FLUORITE.getOre(2),
+				},
+				new FluidStack[] {
+
+				},
+				new int[] {
+						7500, 1500, 1000, 500 
+				},
+				10 * 20,
+				1024,
+				5);
+
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedAdvancedCircuit(16),
@@ -157,7 +220,7 @@ public class RECIPES_GREGTECH {
 				10 * 20,
 				480,
 				2);
-		
+
 		// Produce Boric Acid
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
@@ -177,8 +240,8 @@ public class RECIPES_GREGTECH {
 				},
 				20 * 30, 
 				MaterialUtils.getVoltageForTier(3), 
-				2);
-		
+				3);
+
 		// Produce Th232
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
@@ -203,7 +266,131 @@ public class RECIPES_GREGTECH {
 				},
 				20 * 300, 
 				MaterialUtils.getVoltageForTier(4), 
-				3);
+				4);
+
+		// Modify Sapling into Pine Sapling
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(6),
+						ItemUtils.getSimpleStack(Blocks.sapling, 32)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("fluid.geneticmutagen", 2000),
+						FluidUtils.getDistilledWater(8000)
+				},
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16)
+				},
+				new FluidStack[] {
+
+				},
+				120 * 20,
+				64,
+				2);
+
+
+		// Convert GT++ Plutonium239 into normal Plutonium
+		if (Materials.Plutonium.mDefaultLocalName.equals("Plutonium 239")) {
+			CORE.RA.addChemicalPlantRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(16),
+							ELEMENT.getInstance().PLUTONIUM239.getDust(1)
+					},
+					new FluidStack[] {
+
+					},
+					new ItemStack[] {
+							ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1)
+					},
+					new FluidStack[] {
+
+					},
+					5 * 20,
+					1,
+					2);
+			CORE.RA.addChemicalPlantRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(16),
+							ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1)
+					},
+					new FluidStack[] {
+
+					},
+					new ItemStack[] {
+							ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1)
+					},
+					new FluidStack[] {
+
+					},
+					5 * 20,
+					1,
+					2);
+			CORE.RA.addChemicalPlantRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(16),
+							ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1)
+					},
+					new FluidStack[] {
+
+					},
+					new ItemStack[] {
+							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1)
+					},
+					new FluidStack[] {
+
+					},
+					5 * 20,
+					1,
+					2);
+		}
+
+		int aLaureniumTier = ALLOY.LAURENIUM.vTier;
+		// Adding Recipes for Casings
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(12),
+						CI.getTieredMachineCasing(aLaureniumTier-1),
+						ALLOY.LAURENIUM.getPlate(8),
+						CI.getGear(aLaureniumTier, 2)
+				},
+				new FluidStack[] {
+						CI.getTieredFluid(aLaureniumTier, 2 * 144),
+						CI.getAlternativeTieredFluid(aLaureniumTier-1, 4 * 144),
+						CI.getTertiaryTieredFluid(aLaureniumTier-2, 6 * 144)
+				},
+				new ItemStack[] {
+					GregtechItemList.Casing_Machine_Custom_3.get(1)
+				},
+				new FluidStack[] {
+
+				},
+				20 * 20,
+				MaterialUtils.getVoltageForTier(aLaureniumTier-2),
+				5);
+		
+		int aBotmiumTier = ALLOY.BOTMIUM.vTier;
+		// Adding Recipes for Casings
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(12),
+						CI.getTieredMachineCasing(aBotmiumTier-1),
+						ALLOY.BOTMIUM.getPlate(8),
+						CI.getGear(aBotmiumTier, 2)
+				},
+				new FluidStack[] {
+						CI.getTieredFluid(aBotmiumTier, 2 * 144),
+						CI.getAlternativeTieredFluid(aBotmiumTier-1, 4 * 144),
+						CI.getTertiaryTieredFluid(aBotmiumTier-2, 6 * 144)
+				},
+				new ItemStack[] {
+					GregtechItemList.Casing_Machine_Custom_4.get(1)
+				},
+				new FluidStack[] {
+
+				},
+				20 * 20,
+				MaterialUtils.getVoltageForTier(aBotmiumTier-2),
+				6);
 
 	}
 
@@ -530,7 +717,7 @@ public class RECIPES_GREGTECH {
 					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
 					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),			
 			};
-			
+
 			int aCurrSlot = 0;
 			for (int h = 6; h < 10; h++) {
 				CORE.RA.addAssemblylineRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 5048c5f2a5..08d8dda039 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -18,13 +18,13 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -63,14 +63,14 @@ public class RECIPES_General {
 
 	private static void run() {
 		//Workbench Blueprint
-		/*RecipeUtils.recipeBuilder(
+		/*RecipeUtils.addShapedRecipe(
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_LapisDust, RECIPE_LapisDust, NULL,
 				OUTPUT_Blueprint);*/
 
 		//Bronze Workbench
-		/*RecipeUtils.recipeBuilder(
+		/*RecipeUtils.addShapedRecipe(
 				RECIPE_BronzePlate, RECIPE_CraftingTable, RECIPE_BronzePlate,
 				RECIPE_BronzePlate, RECIPE_BasicCasingIC2, RECIPE_BronzePlate,
 				RECIPE_BronzePlate, RECIPE_BronzePlate, RECIPE_BronzePlate,
@@ -79,25 +79,25 @@ public class RECIPES_General {
 		//Generates recipes for the Dull shard when TC is not installed.
 		if (!LoadedMods.Thaumcraft) {
 			//Dull Shard to Aer
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					RECIPE_HydrogenDust, RECIPE_HydrogenDust, RECIPE_HydrogenDust,
 					RECIPE_HydrogenDust, ItemUtils.getSimpleStack(ModItems.shardDull), RECIPE_HydrogenDust,
 					RECIPE_HydrogenDust, RECIPE_HydrogenDust, RECIPE_HydrogenDust,
 					ItemUtils.getSimpleStack(ModItems.shardAer));
 			//Dull Shard to Ignis
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					RECIPE_Obsidian, RECIPE_Obsidian, RECIPE_Obsidian,
 					RECIPE_Obsidian, ItemUtils.getSimpleStack(ModItems.shardDull), RECIPE_Obsidian,
 					RECIPE_Obsidian, RECIPE_Obsidian, RECIPE_Obsidian,
 					ItemUtils.getSimpleStack(ModItems.shardIgnis));
 			//Dull Shard to Terra
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					RECIPE_Dirt, RECIPE_Dirt, RECIPE_Dirt,
 					RECIPE_Dirt, ItemUtils.getSimpleStack(ModItems.shardDull), RECIPE_Dirt,
 					RECIPE_Dirt, RECIPE_Dirt, RECIPE_Dirt,
 					ItemUtils.getSimpleStack(ModItems.shardTerra));
 			//Dull Shard to Aqua
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					RECIPE_LapisDust, RECIPE_LapisDust, RECIPE_LapisDust,
 					RECIPE_LapisDust, ItemUtils.getSimpleStack(ModItems.shardDull), RECIPE_LapisDust,
 					RECIPE_LapisDust, RECIPE_LapisDust, RECIPE_LapisDust,
@@ -111,7 +111,7 @@ public class RECIPES_General {
 		}
 
 		//Rainforest oak Sapling
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				"stickWood", "stickWood", "stickWood",
 				"stickWood", "treeSapling", "stickWood",
 				"stickWood", "dustBone", "stickWood",
@@ -128,7 +128,7 @@ public class RECIPES_General {
 		}
 
 		//Fish Trap
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				ironBars, ironBars, ironBars,
 				ironBars, "frameGtWroughtIron", ironBars,
 				ironBars, ironBars, ironBars,
@@ -145,7 +145,7 @@ public class RECIPES_General {
 			for (int y=0;y<ironTypes.length;y++) {
 				//Iron bars
 				String ironRecipe = "stick"+ironTypes[y]+"Iron";
-				if (RecipeUtils.recipeBuilder(
+				if (RecipeUtils.addShapedRecipe(
 						null, CI.craftingToolWrench, null,
 						ironRecipe, ironRecipe, ironRecipe,
 						ironRecipe, ironRecipe, ironRecipe,
@@ -181,15 +181,53 @@ public class RECIPES_General {
 
 
 
+		if (CORE.ConfigSwitches.enableMachine_Pollution) {
+			RecipeUtils.addShapedRecipe(
+					CI.craftingToolFile, "plateIron", "stickIron", 
+					"plateIron", "ringIron", "plateIron", 
+					"stickIron", "plateIron", CI.craftingToolHammer_Hard, 
+					ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 0, 1)
+					);
+			RecipeUtils.addShapedRecipe(
+					CI.craftingToolFile, "plateBronze", "stickBronze", 
+					"plateBronze", "ringBronze", "plateBronze", 
+					"stickBronze", "plateBronze", CI.craftingToolHammer_Hard, 
+					ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 1, 1)
+					);
+		}
 
-
-
+		if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(4),
+							ItemUtils.getSimpleStack(Blocks.glass, 16),
+							ItemUtils.getSimpleStack(Blocks.glowstone, 16),
+							ItemList.Large_Fluid_Cell_Steel.get(1)
+					}, 
+					FluidUtils.getFluidStack("molten.borosilicateglass", 2000), 
+					VolumetricFlaskHelper.getLargeVolumetricFlask(2),
+					20 * 15, 
+					MaterialUtils.getVoltageForTier(3));
+			
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(5),
+							ItemUtils.getSimpleStack(Blocks.glass, 64),
+							ItemUtils.getSimpleStack(Blocks.glowstone, 64),
+							ItemList.Large_Fluid_Cell_TungstenSteel.get(1)
+					}, 
+					FluidUtils.getFluidStack("molten.borosilicateglass", 8000), 
+					VolumetricFlaskHelper.getGiganticVolumetricFlask(2),
+					20 * 15, 
+					MaterialUtils.getVoltageForTier(5));
+			
+		}
 
 
 
 		//Mining Explosive
 		Logger.RECIPE("[Inspection] Explosives");
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				CI.explosiveITNT, CI.explosiveTNT, CI.explosiveITNT,
 				CI.explosiveTNT, "frameGtIron", CI.explosiveTNT,
 				"dustSulfur", CI.explosiveTNT, "dustSulfur",
@@ -198,7 +236,7 @@ public class RECIPES_General {
 		}
 
 		//Alkalus Coin
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				"gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond",
 				"gemFlawlessRuby", ItemList.Credit_Greg_Osmium.get(1), "gemFlawlessSapphire",
 				"gemExquisiteEmerald", "gemFlawlessEmerald", "gemExquisiteSapphire",
@@ -222,7 +260,7 @@ public class RECIPES_General {
 		}*/
 
 		Logger.RECIPE("[Inspection] Wither Cage");
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
 				"plateTungstenSteel", getSimpleStack(Items.nether_star), "plateTungstenSteel",
 				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
@@ -231,7 +269,7 @@ public class RECIPES_General {
 		}
 
 		/*Logger.RECIPE("[Inspection] Xp Converter");
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
@@ -259,7 +297,7 @@ public class RECIPES_General {
 			Logger.INFO("Added a recipe for Fiber.");
 		}
 
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
 				ItemUtils.getSimpleStack(ModItems.itemFiber, 1), CI.craftingToolKnife, ItemUtils.getSimpleStack(ModItems.itemFiber, 1),
 				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
@@ -268,7 +306,7 @@ public class RECIPES_General {
 		}
 
 		Logger.RECIPE("[Inspection] Net");
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
 				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
 				null, null, null,
@@ -307,7 +345,7 @@ public class RECIPES_General {
 
 	private static boolean addCompressedObsidian(){
 		//Invert Obsidian
-		if (RecipeUtils.recipeBuilder(
+		if (RecipeUtils.addShapedRecipe(
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
 				getSimpleStack(Items.glowstone_dust), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 1, 1), getSimpleStack(Items.glowstone_dust),
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
@@ -327,7 +365,7 @@ public class RECIPES_General {
 			final ItemStack input = mItems[r];
 			final ItemStack output = mItems[r+1];
 
-			if (RecipeUtils.recipeBuilder(
+			if (RecipeUtils.addShapedRecipe(
 					input, input, input,
 					input, input, input,
 					input, input, input,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index fd513809ed..71b4c4ef48 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -264,22 +264,22 @@ public class RECIPES_MachineComponents {
 				CI.fieldGenerator_MAX);
 
 		//Sensor Modules
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateTier7, null, circuitTier6,
 				plateTier7, rodTier7c, null,
 				circuitTier7, plateTier7, plateTier7,
 				CI.sensor_LuV);
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateTier8, null, circuitTier7,
 				plateTier8, rodTier8c, null,
 				circuitTier8, plateTier8, plateTier8,
 				CI.sensor_ZPM);
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateTier9, null, circuitTier8,
 				plateTier9, rodTier9c, null,
 				circuitTier9, plateTier9, plateTier9,
 				CI.sensor_UV);
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateTier10, null, circuitTier9,
 				plateTier10, rodTier10c, null,
 				circuitTier10, plateTier10, plateTier10,
@@ -334,7 +334,7 @@ public class RECIPES_MachineComponents {
 				wireTier0, circuitTier0, wireTier0,
 				CI.fieldGenerator_ULV);
 
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateTier0, null, circuitTier1,
 				plateTier0, rodTier2, null,
 				circuitTier0, plateTier0, plateTier0,
@@ -377,7 +377,7 @@ public class RECIPES_MachineComponents {
 				circuitTier10, circuitTier9, circuitTier10,
 				wireTier10, circuitTier10, wireTier10,
 				CI.fieldGenerator_MAX);
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				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 387f7bef65..0b0bf56a1c 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2,14 +2,10 @@ package gtPlusPlus.core.recipe;
 
 import static gtPlusPlus.core.lib.CORE.GTNH;
 
-import codechicken.nei.api.API;
 import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
@@ -20,17 +16,15 @@ import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -247,9 +241,27 @@ public class RECIPES_Machines {
 		distillus();
 		algaeFarm();
 		chemPlant();
+		zyngen();
 
 	}
 
+	private static void zyngen() {
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(6),
+						CI.getTieredMachineHull(4),
+						ItemList.Machine_EV_AlloySmelter.get(1),
+						CI.getGear(3, 16),
+						CI.getBolt(3, 64),
+						CI.getPlate(4, 16)
+				}, 
+				CI.getAlternativeTieredFluid(4, 144 * 8), 
+				GregtechItemList.Industrial_AlloySmelter.get(1),
+				20 * 30, 
+				MaterialUtils.getVoltageForTier(4));
+				
+	}
+
 	private static void chemPlant() {
 
 		CORE.RA.addSixSlotAssemblingRecipe(
@@ -335,7 +347,7 @@ public class RECIPES_Machines {
 				},
 				20 * 600, 
 				MaterialUtils.getVoltageForTier(6), 
-				3);
+				5);
 
 	}
 
@@ -627,8 +639,37 @@ public class RECIPES_Machines {
 						RECIPE_SteamCondenser);
 			}
 
+			ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
+			// Steam Macerator Multi
+			RecipeUtils.addShapedGregtechRecipe(
+					aBronzeBricks, ALLOY.TUMBAGA.getGear(1), aBronzeBricks,
+					aBronzeBricks, ALLOY.TUMBAGA.getFrameBox(1), aBronzeBricks,
+					aBronzeBricks, ALLOY.TUMBAGA.getGear(1), aBronzeBricks,
+					GregtechItemList.Controller_SteamMaceratorMulti.get(1));
 
-			//Steam Condenser
+			// Steam Hatch
+			RecipeUtils.addShapedGregtechRecipe(
+					"plateBronze", "pipeMediumBronze", "plateBronze",
+					"plateBronze", GregtechItemList.GT_FluidTank_ULV.get(1), "plateBronze",
+					"plateBronze", "pipeMediumBronze", "plateBronze",
+					GregtechItemList.Hatch_Input_Steam.get(1));
+			
+			// Steam Input Bus
+			RecipeUtils.addShapedGregtechRecipe(
+					"plateBronze", ALLOY.TUMBAGA.getPlate(1), "plateBronze",
+					"plateTin", ItemUtils.getSimpleStack(Blocks.hopper), "plateTin",
+					"plateBronze", ALLOY.TUMBAGA.getPlate(1), "plateBronze",
+					GregtechItemList.Hatch_Input_Bus_Steam.get(1));
+			
+			// Steam Output Bus
+			RecipeUtils.addShapedGregtechRecipe(
+					"plateBronze", "plateTin", "plateBronze",
+					ALLOY.TUMBAGA.getPlate(1), ItemUtils.getSimpleStack(Blocks.hopper), ALLOY.TUMBAGA.getPlate(1),
+					"plateBronze", "plateTin", "plateBronze",
+					GregtechItemList.Hatch_Output_Bus_Steam.get(1));
+			
+
+			//RF Convertor
 			if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor){
 				RecipeUtils.addShapedGregtechRecipe(
 						CI.getPlate(4, 1), CI.getTieredCircuitOreDictName(5), CI.getPlate(4, 1),
@@ -636,6 +677,37 @@ public class RECIPES_Machines {
 						CI.getPlate(4, 1), plateEnergeticAlloy, CI.getPlate(4, 1),
 						GregtechItemList.Energy_Buffer_RF_Convertor.get(1));
 			}
+			
+			// Egg Box			
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedAdvancedCircuit(8),
+							CI.getTieredMachineHull(3),
+							ItemUtils.getSimpleStack(Items.egg, 64),
+							ItemUtils.getSimpleStack(ModItems.itemRope, 32),
+							CI.getPlate(4, GTNH ? 16 : 8)
+					}, 
+					FluidUtils.getFluidStack("mobessence", 4096), 
+					ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1),
+					20 * 60, 
+					480);
+			
+			//Flask Configurator
+			if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {				
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] {
+								CI.getNumberedAdvancedCircuit(8),
+								CI.getTieredMachineHull(2),
+								ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
+								VolumetricFlaskHelper.getVolumetricFlask(8),
+								CI.getTieredComponent(OrePrefixes.pipeSmall, 2, GTNH ? 4 : 2),
+								CI.getPlate(2, GTNH ? 8 : 4)
+						}, 
+						CI.getAlternativeTieredFluid(1, 144 * 8), 
+						ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
+						20 * 60, 
+						120);
+			}
 
 
 			if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace){
@@ -1462,7 +1534,7 @@ public class RECIPES_Machines {
 
 
 			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						"screwTitanium", "plateIncoloy020", "screwTitanium",
 						"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
 						"screwTitanium", "plateIncoloy020", "screwTitanium",
@@ -1470,7 +1542,7 @@ public class RECIPES_Machines {
 
 				ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
 
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						"plateIncoloyMA956", mBattery, "plateIncoloyMA956",
 						GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1),
 						"plateIncoloy020", "plateIncoloyMA956", "plateIncoloy020",
@@ -1478,13 +1550,13 @@ public class RECIPES_Machines {
 			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge){
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						"plateRedSteel", CI.craftingToolHammer_Hard, "plateRedSteel",
 						"plateRedSteel", "frameGtBlackSteel", "plateRedSteel",
 						"plateRedSteel", CI.craftingToolWrench, "plateRedSteel",
 						GregtechItemList.Casing_ThermalCentrifuge.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						"plateRedSteel","circuitData","plateRedSteel",
 						"stickTalonite",EV_MACHINE_ThermalCentrifuge,"stickTalonite",
 						"plateRedSteel","gearGtTalonite","plateRedSteel",
@@ -1492,13 +1564,13 @@ public class RECIPES_Machines {
 			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant){
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						"plateGrisium", CI.craftingToolHammer_Hard, "plateGrisium",
 						"plateTalonite", "frameGtGrisium", "plateTalonite",
 						"plateGrisium", CI.craftingToolWrench, "plateGrisium",
 						GregtechItemList.Casing_WashPlant.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						"plateGrisium",CI.electricPump_MV,"plateGrisium",
 						"plateTalonite",EV_MACHINE_OreWasher,"plateTalonite",
 						"plateGrisium","circuitData","plateGrisium",
@@ -1550,13 +1622,13 @@ public class RECIPES_Machines {
 
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine){
 				ItemStack plate = ALLOY.MARAGING300.getPlate(1);
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, CI.craftingToolHammer_Hard, plate,
 						"plateStellite", "frameGtTalonite", "plateStellite",
 						plate, CI.craftingToolWrench, plate,
 						GregtechItemList.Casing_CuttingFactoryFrame.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						plate,CI.getTieredCircuit(3),plate,
 						"wireFinePlatinum", EV_MACHINE_Cutter, "wireFinePlatinum",
 						plate,CI.getTieredCircuit(4),plate,
@@ -1566,13 +1638,13 @@ public class RECIPES_Machines {
 			//EV_MACHINE_Extruder
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine){
 				ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, CI.craftingToolHammer_Hard, plate,
 						"plateTalonite", "frameGtStaballoy", "plateTalonite",
 						plate, CI.craftingToolWrench, plate,
 						GregtechItemList.Casing_Extruder.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						plate,CI.getTieredCircuit(4),plate,
 						CI.electricPiston_EV, EV_MACHINE_Extruder, CI.electricPiston_EV,
 						plate,CI.getTieredCircuit(4),plate,
@@ -1581,13 +1653,13 @@ public class RECIPES_Machines {
 
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort){
 				ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1);
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, CI.craftingToolHammer_Hard, plate,
 						"plateEglinSteel", "frameGtEglinSteel", "plateEglinSteel",
 						plate, CI.craftingToolWrench, plate,
 						GregtechItemList.Casing_FishPond.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						plate,CI.getTieredCircuit(3),plate,
 						"wireFineElectrum", ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), "wireFineElectrum",
 						plate,CI.getTieredCircuit(2),plate,
@@ -1602,12 +1674,12 @@ public class RECIPES_Machines {
 				ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1);
 				ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1);
 
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, gear, plate,
 						cell1, frame, cell2,
 						plate, gear, plate,
 						GregtechItemList.Casing_AdvancedVacuum.get(Casing_Amount));
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						gear,CI.getTieredCircuit(6),gear,
 						CI.electricPiston_IV, GregtechItemList.Casing_AdvancedVacuum.get(1), CI.electricPiston_IV,
 						plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate,
@@ -1621,12 +1693,12 @@ public class RECIPES_Machines {
 				cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
 				ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1);
 
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, cell1, plate,
 						cell3, frame, cell2,
 						plate, gear, plate,
 						GregtechItemList.Casing_Adv_BlastFurnace.get(Casing_Amount));
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						gear,CI.getTieredCircuit(6),gear,
 						CI.robotArm_IV, GregtechItemList.Casing_Adv_BlastFurnace.get(1), CI.robotArm_IV,
 						plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate,
@@ -1639,7 +1711,7 @@ public class RECIPES_Machines {
 				cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
 				cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						gear,CI.getTieredCircuit(6),gear,
 						CI.fieldGenerator_IV, CI.machineHull_ZPM, CI.robotArm_IV,
 						plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate,
@@ -1657,12 +1729,12 @@ public class RECIPES_Machines {
 				ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils.getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1)) : ItemList.Machine_IV_Unboxinator.get(1);
 
 
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), plate,
 						cell1, frame, cell2,
 						plate, gear, plate,
 						GregtechItemList.Casing_AmazonWarehouse.get(Casing_Amount));
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						casingAmazon, CI.getTieredCircuit(7), casingAmazon,
 						CI.robotArm_LuV, aTieredUnboxinator, CI.robotArm_LuV,
 						CI.conveyorModule_LuV, GregtechItemList.Gregtech_Computer_Cube.get(1), CI.conveyorModule_LuV,
@@ -1670,7 +1742,7 @@ public class RECIPES_Machines {
 
 
 				//Industrial Mixing Machine
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						"plateStaballoy",CI.getTieredCircuit(5),"plateStaballoy",
 						"plateZirconiumCarbide", EV_MACHINE_Mixer, "plateZirconiumCarbide",
 						"plateStaballoy",CI.getTieredCircuit(5),"plateStaballoy",
@@ -1704,13 +1776,13 @@ public class RECIPES_Machines {
 					o_Distillery = ItemList.Machine_EV_FluidExtractor.get(1);
 					o_Extractor = ItemList.Machine_EV_Extractor.get(1);	
 				}					
-				RecipeUtils.recipeBuilder(
+				RecipeUtils.addShapedRecipe(
 						plate, CI.craftingToolHammer_Hard, plate,
 						"plateStainlessSteel", "frameGtZirconiumCarbide", "plateStainlessSteel",
 						plate, CI.craftingToolWrench, plate,
 						GregtechItemList.Casing_Multi_Use.get(Casing_Amount));
 
-				RecipeUtils.recipeBuilder( 
+				RecipeUtils.addShapedRecipe( 
 						o_Compressor, o_Lathe, o_Electromagnet,
 						plate, ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), plate,
 						o_Fermenter, o_Distillery, o_Extractor,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 2cc6d7b41a..42448e6b74 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -135,42 +135,42 @@ public class RECIPES_Tools {
 
 	private static void run(){
 		//Staballoy Pickaxe
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateStaballoy, plateStaballoy, ingotStaballoy,
 				craftingToolFile, stickTungsten, craftingToolHardHammer,
 				craftingToolWrench, stickTungsten, craftingToolHardHammer,
 				RECIPE_StaballoyPickaxe);
 
 		//Staballoy Axe
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateStaballoy, ingotStaballoy, craftingToolHardHammer,
 				plateStaballoy, stickTungsten, craftingToolHardHammer,
 				craftingToolFile, stickTungsten, craftingToolWrench,
 				RECIPE_StaballoyAxe);
 
 		//Cobble to Sand
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				CobbleStone, CobbleStone, CobbleStone,
 				CobbleStone, sandHammer, CobbleStone,
 				CobbleStone, CobbleStone, CobbleStone,
 				RECIPE_Sand);
 		
 		//Sand to Sandstone
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				Sand, Sand, Sand,
 				Sand, sandHammer, Sand,
 				Sand, Sand, Sand,
 				RECIPE_SandStone);
 
 		//Sandstone Hammer
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				plateElectrum, ingotElectrum, plateElectrum,
 				craftingToolScrewdriver, stickBronze, craftingToolHardHammer,
 				null, stickSteel, null,
 				RECIPE_SandstoneHammer);
 
 		//Basic Firemaker
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedRecipe(
 				"cropWheat", "cropWheat", "cropWheat",
 				ItemUtils.getSimpleStack(Items.string), stickWood, ItemUtils.getSimpleStack(Items.string),
 				"cropWheat", "cropWheat", "cropWheat",