Added more nuclear processing recipes.

Removed lots of useless nuclear generated items.
More NEI improvements.
Made Dehydrator and FFPP recipe handling more lenient.

1 files changed, 90 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index 7ca838a8f0..90901e6847 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
 import gregtech.api.enums.Materials;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.lib.CORE;
@@ -21,15 +20,15 @@ public class RecipeLoader_NuclearFuelProcessing {
 
 		// Create Fuels
 		
-		final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluid(100);
-		final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluid(100);
-		final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid(100);
-		final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluid(100);
-		final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluid(100);
-		final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluid(1000);
-		final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluid(100);
-		final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluid(100);	
-		final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluid(100);	
+		final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(100);
+		final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluidStack(100);
+		final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100);
+		final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100);
+		final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(100);
+		final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluidStack(1000);
+		final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100);
+		final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100);	
+		final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100);	
 
 		// 7LiF - BeF2 - ZrF4 - U235 - 590C
 		CORE.RA.addFissionFuel(
@@ -76,16 +75,85 @@ public class RecipeLoader_NuclearFuelProcessing {
 		final FluidStack aBurntLiFBeF2ZrF4U235 = new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 17);
 		final FluidStack aBurntLiFBeF2ZrF4UF4 = new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 17);
 		final FluidStack aBurntLiFBeF2ThF4UF4 = new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 17);
-		FluidStack Li2BeF4 = new FluidStack(ModItems.fluidFLiBeSalt, 34);
-		final FluidStack aBurntLi2BeF4 = new FluidStack(ModItems.fluidFLiBeSaltBurnt, 34);
 		final FluidStack aHelium = Materials.Helium.getGas(1000);
 		final FluidStack aFluorine = Materials.Fluorine.getGas(1000);
 		
+		
+		// Reactor Core step 0 - Process Burnt Salt
+		
+
+		
+		// Tier 1 Fuel - Gives back FLIBE and breeds U233
+		CORE.RA.addReactorProcessingUnitRecipe(
+				CI.getNumberedAdvancedCircuit(1),
+				CI.emptyCells(2),
+				new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000),
+				new ItemStack[] {
+						FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
+						ELEMENT.getInstance().URANIUM233.getCell(1)
+						},
+				new int[] {10000, 10000},
+				NUCLIDE.LiFBeF2.getFluidStack(2000),
+				20 * 60 * 60,
+				MaterialUtils.getVoltageForTier(3));
+		
+		// Tier 2 Fuel
+		CORE.RA.addFissionFuel(
+				new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 3000),
+				null, null, null, null, null, null, null, null, // Extra 5 inputs
+				FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000),
+				NUCLIDE.LiFBeF2UF4.getFluidStack(2000),
+				60 * 60 * 20, // Duration
+				MaterialUtils.getVoltageForTier(4)
+				);
+		
+		// Tier 3 Fuel
+		CORE.RA.addFissionFuel(
+				new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 3000),
+				null, null, null, null, null, null, null, null, // Extra 5 inputs
+				FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000),
+				NUCLIDE.LiFBeF2UF4.getFluidStack(2000),
+				120 * 60 * 20, // Duration
+				MaterialUtils.getVoltageForTier(4)
+				);
+		
+
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		// Reactor Blanket step 0 - Splitting
+		/*		CORE.RA.addReactorProcessingUnitRecipe(
+						CI.getNumberedAdvancedCircuit(6),
+						CI.emptyCells(1),
+						new FluidStack(ModItems.fluidFLiBeSaltBurnt, 3000),
+						new ItemStack[] {
+								FLUORIDES.LITHIUM_FLUORIDE.getCell(1)
+								},
+						new int[] {10000},
+						NUCLIDE.LiFBeF2.getFluidStack(2000),
+						20 * 60 * 60,
+						MaterialUtils.getVoltageForTier(3));*/	
+		
+		
 		// Reactor Blanket step 1 - Fluorination
-		boolean a1 = CORE.RA.addReactorProcessingUnitRecipe(
+		CORE.RA.addReactorProcessingUnitRecipe(
 				CI.getNumberedAdvancedCircuit(7),
 				ELEMENT.getInstance().FLUORINE.getCell(10),
-				NUCLIDE.LiFThF4.getFluid(10000),
+				NUCLIDE.LiFThF4.getFluidStack(10000),
 				new ItemStack[] {
 						CI.emptyCells(8),
 						ELEMENT.getInstance().LITHIUM.getCell(2),
@@ -97,13 +165,13 @@ public class RecipeLoader_NuclearFuelProcessing {
 						ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
 						},
 				new int[] {10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
-				NUCLIDE.UF6F2.getFluid(10000),
+				NUCLIDE.UF6F2.getFluidStack(10000),
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(5));		
-		boolean a2 = CORE.RA.addReactorProcessingUnitRecipe(
+		CORE.RA.addReactorProcessingUnitRecipe(
 				CI.getNumberedAdvancedCircuit(8),
 				ELEMENT.getInstance().FLUORINE.getCell(10),
-				NUCLIDE.LiFBeF2ThF4.getFluid(10000),
+				NUCLIDE.LiFBeF2ThF4.getFluidStack(10000),
 				new ItemStack[] {
 						CI.emptyCells(6),
 						ELEMENT.getInstance().LITHIUM.getCell(2),
@@ -116,17 +184,16 @@ public class RecipeLoader_NuclearFuelProcessing {
 						ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
 						},
 				new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
-				NUCLIDE.UF6F2.getFluid(10000),
+				NUCLIDE.UF6F2.getFluidStack(10000),
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(5));
-		Logger.INFO("Adding LFTR Blanket step 1 - Fluorination ["+a1+"|"+a2+"]");
 		
 
 		// Reactor Blanket step 2 - Sorption + Cold Trap
-		boolean a3 = CORE.RA.addColdTrapRecipe(
+		CORE.RA.addColdTrapRecipe(
 				8,
 				FLUORIDES.SODIUM_FLUORIDE.getCell(2),
-				NUCLIDE.UF6F2.getFluid(3000),
+				NUCLIDE.UF6F2.getFluidStack(3000),
 				new ItemStack[] {
 						ELEMENT.getInstance().FLUORINE.getCell(2),
 						ELEMENT.getInstance().URANIUM233.getDust(1),
@@ -134,26 +201,15 @@ public class RecipeLoader_NuclearFuelProcessing {
 						ELEMENT.getInstance().URANIUM233.getDust(1)
 				},
 				new int[] {10000, 3000, 2000, 1000},
-				FLUORIDES.URANIUM_HEXAFLUORIDE.getFluid(1000),
+				FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1000),
 				20 * 60 * 10,
 				MaterialUtils.getVoltageForTier(3));		
-		Logger.INFO("Adding LFTR Blanket step 2 - Sorption + Cold Trap ["+a3+"]");
 		
 		
 		
 		
 		
-		CORE.RA.addFissionFuel(
-				FluidUtils.getFluidStack(aBurntLiFBeF2ZrF4U235, 500),
-				FluidUtils.getFluidStack(aBerylliumFluoride, 280),
-				FluidUtils.getFluidStack(aThoriumFluoride, 70),
-				FluidUtils.getFluidStack(aUraniumTetraFluoride, 70),
-				null, null, null, null, null, // Extra 5 inputs
-				FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000),
-				null,
-				150 * 60 * 20, // Duration
-				MaterialUtils.getVoltageForTier(5)
-				);
+
 
 	}
 }