Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

5 files changed, 643 insertions, 921 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 7410a507c4..5156b938db 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -30,7 +30,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EnchantingUtils;
@@ -448,17 +447,17 @@ public class RECIPES_GREGTECH {
 		//Hypogen Creation
 		GT_Values.RA.addFusionReactorRecipe(
 				Materials.Neutronium.getMolten(128),
-				ALLOY.QUANTUM.getFluid(256),
-				ELEMENT.STANDALONE.HYPOGEN.getFluid(4),
+				ALLOY.QUANTUM.getFluidStack(256),
+				ELEMENT.STANDALONE.HYPOGEN.getFluidStack(4),
 				2048 * 4,
 				(int) MaterialUtils.getVoltageForTier(9),
 				600000000 * 2);
 
 		//Rhugnor
 		GT_Values.RA.addFusionReactorRecipe(
-				GenericChem.TEFLON.getFluid(64),
-				ALLOY.PIKYONIUM.getFluid(128),
-				ELEMENT.STANDALONE.RHUGNOR.getFluid(8),
+				GenericChem.TEFLON.getFluidStack(64),
+				ALLOY.PIKYONIUM.getFluidStack(128),
+				ELEMENT.STANDALONE.RHUGNOR.getFluidStack(8),
 				2048 * 4,
 				(int) MaterialUtils.getVoltageForTier(7),
 				150000000 * 2);
@@ -483,7 +482,7 @@ public class RECIPES_GREGTECH {
 		CORE.RA.addAssemblylineRecipe(
 				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 
 				20 * 60 * 30,
-				new ItemStack[] {
+				new Object[] {
 						ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
 						ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32),
 						ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16),
@@ -493,18 +492,17 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
 						ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4),
 						ALLOY.ARCANITE.getGear(GTNH ? 8 : 2),
-						CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32),
-						CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16),
-						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8),
+						new Object[] {CI.getTieredCircuitOreDictName(5), 64},
+						new Object[] {CI.getTieredCircuitOreDictName(6), 32},
+						new Object[] {CI.getTieredCircuitOreDictName(7), 16},
 						GregtechItemList.Laser_Lens_Special.get(1),
 						aCoilWire[3]
 				}, 
 				new FluidStack[] {
-						ALLOY.NITINOL_60.getFluid(144 * 9 * (GTNH ? 4 : 2)),
-						ALLOY.ENERGYCRYSTAL.getFluid(144 * 9 * (GTNH ? 8 : 4)),
-						ALLOY.TUMBAGA.getFluid(144 * 9 * (GTNH ? 32 : 8)),
-						ALLOY.NICHROME.getFluid(144 * 1 * (GTNH ? 16 : 4)),
-
+						ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
+						ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
+						ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
+						ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)),
 				},
 				ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 
 				20 * 60 * 10 * (GTNH ? 2 : 1),
@@ -565,7 +563,7 @@ public class RECIPES_GREGTECH {
 		CORE.RA.addAssemblylineRecipe(
 				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 
 				20 * 60 * 60 * 24,
-				new ItemStack[] {
+				new Object[] {
 						CI.getTieredMachineHull(8, 4),
 						CI.getConveyor(8, GTNH ? 24 : 12),
 						CI.getElectricMotor(7, GTNH ? 32 : 16),
@@ -575,15 +573,15 @@ public class RECIPES_GREGTECH {
 						CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
 						CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
 						CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
-						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 20 : 10),
+						new Object[] {CI.getTieredCircuitOreDictName(7), 20},
 						CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8),
 				}, 
 				new FluidStack[] {
 						CI.getTieredFluid(8, 144 * 32),
 						CI.getAlternativeTieredFluid(7, 144 * 16),
 						CI.getTertiaryTieredFluid(7, 144 * 16),
-						ALLOY.BABBIT_ALLOY.getFluid(128 * 144),
-						ALLOY.ZERON_100.getFluid(144 * 64)
+						ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144),
+						ALLOY.ZERON_100.getFluidStack(144 * 64)
 
 				},
 				GregtechItemList.Hatch_Input_TurbineHousing.get(4), 
@@ -652,11 +650,11 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addAssemblylineRecipe(
 					aExoticInputs[aCasingSlot], 
 					20 * 60 * 60 * 5,
-					new ItemStack[] {
+					new Object[] {
 							aGemCasings[aCasingSlot],
 							ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
 							CI.getTieredComponent(OrePrefixes.plate, j, 16),
-							CI.getTieredComponent(OrePrefixes.circuit, j, 8),
+							new Object[] {CI.getTieredCircuitOreDictName(j), 8},
 							CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16),
 							CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
 							CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4),
@@ -678,10 +676,10 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addAssemblylineRecipe(
 					ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 
 					20 * 60 * 10,
-					new ItemStack[] {
+					new Object[] {
 							ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
 							CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
-							CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+							new Object[] {CI.getTieredCircuitOreDictName(7), 16},
 							CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
 							CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
 							CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
@@ -723,12 +721,12 @@ public class RECIPES_GREGTECH {
 				CORE.RA.addAssemblylineRecipe(
 						aChargeResearch[aCurrSlot], 
 						20 * 60 * 10 * (aCurrSlot + 1),
-						new ItemStack[] {
+						new Object[] {
 								ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot],2),
 								aCoilWire[aCurrSlot],
 								CI.getTieredComponent(OrePrefixes.plate, h, 8),
-								CI.getTieredComponent(OrePrefixes.circuit, h, 4),
-								CI.getTieredComponent(OrePrefixes.circuit, h-1, 8),
+								new Object[] {CI.getTieredCircuitOreDictName(h), 4},
+								new Object[] {CI.getTieredCircuitOreDictName(h-1), 8},
 								CI.getTieredComponent(OrePrefixes.cableGt12, h-1, 16),
 								CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
 								CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
@@ -750,10 +748,10 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addAssemblylineRecipe(
 					ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 
 					20 * 60 * 10,
-					new ItemStack[] {
+					new Object[] {
 							ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
 							CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
-							CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+							new Object[] {CI.getTieredCircuitOreDictName(7), 16},
 							CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
 							CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
 							CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
@@ -935,7 +933,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(1),
 						ELEMENT.getInstance().SILICON.getDust(4)
 				},
-				ALLOY.EGLIN_STEEL.getFluid(16 * 144),
+				ALLOY.EGLIN_STEEL.getFluidStack(16 * 144),
 				0, 
 				20 * 45,
 				120);
@@ -949,8 +947,8 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CALCIUM.getDust(2),
 						ELEMENT.getInstance().COPPER.getDust(3),
 				},
-				ELEMENT.getInstance().OXYGEN.getFluid(8000),
-				ALLOY.HG1223.getFluid(16 * 144),
+				ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
+				ALLOY.HG1223.getFluidStack(16 * 144),
 				new ItemStack[] { 
 						CI.emptyCells(1)
 				},
@@ -965,7 +963,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().TITANIUM.getDust(3),
 						ELEMENT.getInstance().NICKEL.getDust(2)
 				},
-				ALLOY.NITINOL_60.getFluid(5 * 144),
+				ALLOY.NITINOL_60.getFluidStack(5 * 144),
 				0,
 				20 * 75,
 				7680);
@@ -982,7 +980,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().GERMANIUM.getFluid(288),
+				ELEMENT.getInstance().GERMANIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				4000);
@@ -996,7 +994,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1007,7 +1005,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1018,7 +1016,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1029,7 +1027,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(8000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(144),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				8000);
@@ -1042,7 +1040,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(10000),
-				ELEMENT.getInstance().RHENIUM.getFluid(144),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				4000);
@@ -1053,7 +1051,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(7500),
-				ELEMENT.getInstance().RHENIUM.getFluid(144),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				4000);
@@ -1064,7 +1062,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(5000),
-				ELEMENT.getInstance().RHENIUM.getFluid(288),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				4000);
@@ -1078,7 +1076,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(64),
 				},
 				Materials.SulfuricAcid.getFluid(5000),
-				ELEMENT.getInstance().THALLIUM.getFluid(288+144),
+				ELEMENT.getInstance().THALLIUM.getFluidStack(288+144),
 				0,
 				20 * 300,
 				8000);
@@ -1093,7 +1091,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().ALUMINIUM.getDust(8),
 				},
 				null,
-				ELEMENT.getInstance().OXYGEN.getFluid(8000),
+				ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
 				new ItemStack[] { 
 						ELEMENT.getInstance().ALUMINIUM.getIngot(8),
 						ELEMENT.getInstance().STRONTIUM.getIngot(8)
@@ -1229,310 +1227,86 @@ public class RECIPES_GREGTECH {
 	private static void dehydratorRecipes() {
 		Logger.INFO("Loading Recipes for Chemical Dehydrator.");
 
-		try {
-			// Makes Lithium Carbonate
-			CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), 
-					FluidUtils.getFluidStack("sulfuriclithium", 440), 
-					new ItemStack[] {
-							CI.emptyCells(1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) 
-			}, 
-					30 * 20, // Time in ticks
-					30); // EU
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-		try {
-
-			ItemStack cells = CI.emptyCells(12);
-
-			final ItemStack[] input = { cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) };
-
-			CORE.RA.addDehydratorRecipe(input, // Item input (Array, up to 2)
-					FluidUtils.getFluidStack("sulfuricacid", 10000), 
-					FluidUtils.getFluidStack("sulfuriclithium", 10000),
-					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 (final NullPointerException e) {
-			Logger.INFO("[dustLepidolite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-		try {
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
-					}, 
-					FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), 
-					null, 
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
-							CI.emptyCells(10) 
-					}, 
-					new int[] { 0 }, 150 * 20, // Time in ticks
-					2000); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustUraniumTetrafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-		try {
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
-					}, // Item
-					FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid
-					null, // Fluid output (slot 2)
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
-							CI.emptyCells(10) }, // Output
-					new int[] { 0 }, 300 * 20, // Time in ticks
-					4000); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustUraniumHexafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-
-		// Raisins from Grapes
-		try {
-
-			ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1);
-			ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1);
-
-			if (cropGrape != null && foodRaisins != null)			
-				CORE.RA.addDehydratorRecipe(new ItemStack[] { 
-						cropGrape
-				}, // Item
-						null, // Fluid input (slot 1)
-						null, // Fluid output (slot 2)
-						new ItemStack[] { 
-								foodRaisins
-				}, // Output
-						new int[] { 0 }, 10, // Time in ticks
-						2); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[foodRaisins] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-
-		// Calcium Hydroxide
-		if ((ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1)))	|| LoadedMods.IHL) {
-			try {
-
-				CORE.RA.addDehydratorRecipe(
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item
-						FluidUtils.getFluidStack("water", 10000), // Fluid input
-						// (slot 1)
-						null, // Fluid output (slot 2)
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output
-						new int[] { 0 }, 120 * 20, // Time in ticks
-						120); // EU
-
-			}
-			catch (final NullPointerException e) {
-				Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-			}	
-
-		}
-
-		// Process Waste Water
-		try {
-
-			CORE.RA.addDehydratorRecipe(null, 
-					FluidUtils.getFluidStack("fluid.sludge", 1000), 
-					FluidUtils.getFluidStack("nitricacid", 10), 
-					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) },
-					new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 },
-					2 * 20, 
-					500); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-
-
-
-		// 2 LiOH + CaCO3
-		try {
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5)
-					}, // Item
-					null, // Fluid input (slot 1)
-					null, // Fluid output (slot 2)
-					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) 
-					}, // Output
-					new int[] { 0 }, 120 * 20, // Time in ticks
-					1000); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
 
-		// LiOH Liquid to Dust
-		try {
+		ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1);
+		ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1);
 
-			CORE.RA.addDehydratorRecipe(new ItemStack[] {
-					ItemUtils.getGregtechCircuit(0)
+		if (cropGrape != null && foodRaisins != null)			
+			CORE.RA.addDehydratorRecipe(new ItemStack[] { 
+					CI.getNumberedBioCircuit(20),
+					cropGrape
 			}, // Item
-					FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid
+					null, // Fluid input (slot 1)
 					null, // Fluid output (slot 2)
 					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)
+							foodRaisins
 			}, // Output
-					new int[] { 0 },
-					1 * 20, // Time in ticks
-					64); // EU
+					new int[] { 10000 },
+					10, // Time in ticks
+					2); // EU
 
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
 
-		// Zirconium Chloride -> TetraFluoride
-		try {
 
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
-							CI.emptyCells(9)
-					}, // Item
-					FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), 
-					null, 
-					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-							FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)
-					},
-					new int[] { 0 }, 120 * 20, // Time in ticks
-					500); // EU
-
-
-			if (Utils.getGregtechVersionAsInt() >= 50929) {
-				CORE.RA.addDehydratorRecipe(
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
-								CI.emptyCells(9) },
-						FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
-						null,
-						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-								FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },						
-						new int[] { 0 },
-						120 * 20, // Time in ticks
-						500); // EU
-			}
-
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
+		// Process Waste Water
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(21)
+				}, 
+				FluidUtils.getFluidStack("fluid.sludge", 1000), 
+				FluidUtils.getFluidStack("nitricacid", 10), 
+				new ItemStack[] { 
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) },
+				new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 },
+				2 * 20, 
+				500); // EU
 
 		// CaF2 + H2SO4 → CaSO4(solid) + 2 HF
-		try {
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),
-							CI.emptyCells(16)
-					},
-					FluidUtils.getFluidStack("sulfuricacid", 56 * 144),
-					null, // Fluid output (slot 2)
-					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
-					}, 
-					new int[] { 0, 0, 100, 100, 300, 200 },
-					10 * 60 * 20, 
-					230); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+		FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000);
+		if (aGregtechHydro == null) {
+			aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000);
 		}
 
-		// Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
-		try {
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4)
-					}, 
-					null, // Fluid input (slot 1)
-					FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), 
-					new ItemStack[] {
-							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4),
-							CI.emptyCells(2)
-					}, 
-					new int[] { 0, 0, 0 }, 
-					32 * 20, // Time in ticks
-					64); // EU
-
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
-
-		// (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
-		try {
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] {
-							CI.emptyCells(5) 
-					},
-					FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), 
-					null, // Fluid output (slot 2)
-					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
-							ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, 
-					new int[] { 0, 0, 0 }, 
-					5 * 60 * 20, // Time in ticks
-					120); // EU
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[] { 
+						CI.getNumberedAdvancedCircuit(5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),							
+				},
+				FluidUtils.getFluidStack("sulfuricacid", 56 * 144),
+				aGregtechHydro, // Fluid output (slot 2)
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
+				}, 
+				new int[] { 10000, 100, 100, 300, 200 },
+				10 * 60 * 20, 
+				230); // EU
 
-		}
-		catch (final NullPointerException e) {
-			Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
-		}
 
-		// Makes Styrene
 		CORE.RA.addDehydratorRecipe(
-				CI.emptyCells(3), // Item Input
-				FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), // Fluid
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(18),
+						CI.emptyCells(3)
+				}, 
+				FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), 
+				null, 
 				new ItemStack[] {
 						ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, // Output		
-				3 * 20, // Time in ticks
-				30); // EU
+						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2)						
+				},
+				new int[] {10000, 10000}, 
+				3 * 20,
+				30);
 
 		/*
 		 * Try Add custom Recipe for drying leather
@@ -1542,11 +1316,16 @@ public class RECIPES_GREGTECH {
 			aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1);
 			aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1);			
 			CORE.RA.addDehydratorRecipe(
-					aLeather1,
-					GT_Values.NF,
 					new ItemStack[] {
-							aLeather2
+							CI.getNumberedAdvancedCircuit(18),
+							aLeather1
+					}, 
+					FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), 
+					null, 
+					new ItemStack[] {
+							aLeather2						
 					},
+					new int[] {10000}, 
 					5 * 20,
 					180);
 		}
@@ -1586,77 +1365,6 @@ public class RECIPES_GREGTECH {
 	private static void fissionFuelRecipes() {
 		try {
 
-			final String salt_LiFBeF2ThF4UF4 = "LiFBeF2ThF4UF4".toLowerCase();
-			final String salt_LiFBeF2ZrF4U235 = "LiFBeF2ZrF4U235".toLowerCase();
-			final String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase();
-
-			final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumfluoride", 100); // Re-usable
-			// FluidStacks
-			final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumfluoride", 100); // Re-usable
-			// FluidStacks
-			final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); // Re-usable
-			// FluidStacks
-			final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("zirconiumtetrafluoride", 100); // Re-usable
-			// FluidStacks
-			final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); // Re-usable
-			// FluidStacks
-			final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); // Re-usable
-			// FluidStacks
-
-			final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ThF4UF4, 100); // Re-usable
-			// FluidStacks
-			final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4U235, 100); // Re-usable
-			// FluidStacks
-			final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4UF4, 100); // Re-usable
-			// FluidStacks
-
-			// 7LiF - BeF2 - ZrF4 - UF4 - 650C
-			CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 650), // Input
-					// A
-					FluidUtils.getFluidStack(BerylliumFluoride, 250), // Input
-					// B
-					FluidUtils.getFluidStack(ZirconiumFluoride, 80), // Input C
-					FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input
-					// D
-					null, null, null, null, null, // Extra 5 inputs
-					FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 1000), // Output
-					// Fluid
-					// 1
-					null, // Output Fluid 2
-					60 * 60 * 20, // Duration
-					500);
-
-			// 7LiF - BeF2 - ZrF4 - U235 - 590C
-			CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 550), // Input
-					// A
-					FluidUtils.getFluidStack(BerylliumFluoride, 150), // Input
-					// B
-					FluidUtils.getFluidStack(ZirconiumFluoride, 60), // Input C
-					FluidUtils.getFluidStack(Uranium235, 240), // Input D
-					null, null, null, null, null, // Extra 5 inputs
-					FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 1000), // Output
-					// Fluid
-					// 1
-					null, // Output Fluid 2
-					45 * 60 * 20, // Duration
-					500);
-
-			// 7liF - BeF2 - ThF4 - UF4 - 566C
-			CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 620), // Input
-					// A
-					FluidUtils.getFluidStack(BerylliumFluoride, 280), // Input
-					// B
-					FluidUtils.getFluidStack(ThoriumFluoride, 70), // Input C
-					FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input
-					// D
-					null, null, null, null, null, // Extra 5 inputs
-					FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 1000), // Output
-					// Fluid
-					// 1
-					null, // Output Fluid 2
-					60 * 60 * 20, // Duration
-					500);
-
 		}
 		catch (final NullPointerException e) {
 			Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
@@ -1703,7 +1411,7 @@ public class RECIPES_GREGTECH {
 				T5, 1000, 128000);
 		addAR(T5,
 				ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4),
-				FluidUtils.getFluidStack("molten.krypton", 500),
+				FluidUtils.getFluidStack("krypton", 500),
 				T6, 2000, 512000);
 
 		addAR(ItemUtils.getItemStackOfAmountFromOreDict(
@@ -2022,160 +1730,45 @@ public class RECIPES_GREGTECH {
 				ItemList.Battery_Hull_HV.get(4L, new Object[0]));
 	}
 
-	private static void fluidExtractorRecipes() {		
-		//FLiBe fuel
-		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1),
-				FluidUtils.getFluidStack("li2bef4", 144), 100, 500);
-		//LFTR Fuel 1
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
-				NUCLIDE.LiFBeF2ZrF4U235.getFluid(144), 250, 1000);
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1),
-				NUCLIDE.LiFBeF2ZrF4UF4.getFluid(144), 150, 2000);
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1),
-				NUCLIDE.LiFBeF2ThF4UF4.getFluid(144), 200, 1500);
-
-		//ZIRCONIUM_TETRAFLUORIDE
-		CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1),
-				FluidUtils.getFluidStack(ModItems.fluidZrF4, 144), 200, 512+256);
-
-
-
-		/*		GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ZrF4U235", 1), null,
-				FluidUtils.getFluidStack("molten.libef2zrf4u235", 144), 10000, 250, 1000);
-		//LFTR Fuel 2
-		GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ZrF4UF4", 1), null,
-				FluidUtils.getFluidStack("molten.libef2zrf4uf4", 144), 10000, 150, 2000);
-		//LFTR Fuel 2
-		GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ThF4UF4", 1), null,
-				FluidUtils.getFluidStack("molten.libef2thf4uf4", 144), 10000, 200, 1500);*/
+	private static void fluidExtractorRecipes() {
+		
 	}
 
 	private static void chemicalBathRecipes() {
-		int[] chances = {9000, 6000, 3000};
-		GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12),
-				FluidUtils.getFluidStack("chlorine", 2400),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 4),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 5), chances, 30 * 20, 480);
-		chances = new int[]{9000, 3000, 1000};
-		GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5),
-				FluidUtils.getFluidStack("chlorine", 4000),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustTitanium", 1),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1),
-				chances, 30 * 20, 1024);		
-
-		GT_Values.RA.addChemicalBathRecipe(FLUORIDES.FLUORITE.getCrushed(2), FluidUtils.getFluidStack("hydrogen", 2000),
-				FLUORIDES.FLUORITE.getCrushedPurified(8), FLUORIDES.FLUORITE.getDustImpure(4),
-				FLUORIDES.FLUORITE.getDustPurified(2), new int[] { 10000, 5000, 1000 }, 30 * 20, 240);
-
-		GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
-				FluidUtils.getFluidStack("hydrofluoricacid", 10 * 144),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 10), null, null, new int[] {}, 90 * 20,
-				500);
 
+		GT_Values.RA.addChemicalBathRecipe(
+				FLUORIDES.FLUORITE.getCrushed(2), 
+				FluidUtils.getFluidStack("hydrogen", 2000),
+				FLUORIDES.FLUORITE.getCrushedPurified(8), 
+				FLUORIDES.FLUORITE.getDustImpure(4),
+				FLUORIDES.FLUORITE.getDustPurified(2),
+				new int[] { 10000, 5000, 1000 }, 
+				30 * 20, 
+				240);
+		
 	}
 
-	private static void centrifugeRecipes() {				
-
-		//Process Used Fuel Rods for Krypton
-
-		//Uranium
-		GT_Values.RA.addCentrifugeRecipe(
-				CI.getNumberedCircuit(20),
-				ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8),
-				GT_Values.NF,
-				ELEMENT.getInstance().KRYPTON.getFluid(60),
-				ItemList.IC2_Fuel_Rod_Empty.get(8),
-				ELEMENT.getInstance().URANIUM238.getDust(2),
-				ELEMENT.getInstance().URANIUM232.getSmallDust(1),
-				ELEMENT.getInstance().URANIUM233.getSmallDust(1),
-				ELEMENT.getInstance().URANIUM235.getSmallDust(1),
-				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
-				new int[] { 0, 0, 1000, 1000, 1000, 500 }, 500 * 20, 4000);
-		//Mox
-		GT_Values.RA.addCentrifugeRecipe(
-				CI.getNumberedCircuit(20),
-				ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8),
-				GT_Values.NF,
-				ELEMENT.getInstance().KRYPTON.getFluid(90),
-				ItemList.IC2_Fuel_Rod_Empty.get(8),
-				ELEMENT.getInstance().PLUTONIUM244.getDust(2),
-				ELEMENT.getInstance().PLUTONIUM241.getTinyDust(1),
-				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
-				ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1),
-				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
-				new int[] { 0, 0, 500, 500, 500, 500 }, 750 * 20, 4000);
-
-		//Thorium
-		GT_Values.RA.addCentrifugeRecipe(
-				CI.getNumberedCircuit(20),
-				ItemList.Depleted_Thorium_1.get(8),
-				GT_Values.NF,
-				ELEMENT.getInstance().KRYPTON.getFluid(30),
-				ItemList.IC2_Fuel_Rod_Empty.get(8),
-				ELEMENT.getInstance().THORIUM.getDust(2),
-				ELEMENT.getInstance().THORIUM232.getDust(1),
-				ELEMENT.getInstance().LUTETIUM.getSmallDust(1),
-				ELEMENT.getInstance().POLONIUM.getSmallDust(1),
-				ELEMENT.getInstance().THALLIUM.getTinyDust(1),
-				new int[] { 0, 0, 5000, 5000, 5000, 2500 }, 250 * 20, 4000);
-
-
-
+	private static void centrifugeRecipes() {
+		
 	}
 
 	private static void mixerRecipes() {
-		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null,
-				FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
-		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null,
-				FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5),
-				FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500);
-		/*GT_Values.RA.addMixerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
+