Greatly improved NEI handling.

Fixed broken Manure Slurry recipes.

2 files changed, 69 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 1397ddc1eb..712caae6a2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -64,7 +64,7 @@ public class RecipeLoader_Nuclear {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1),
 				GT_Values.NF, 
 				GT_Values.NF,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3),
+				ItemUtils.getSimpleStack(ModItems.dustLi2BeF4, 3),
 				null, 
 				60 * 20, 2000, 
 				3000);
@@ -495,7 +495,7 @@ public class RecipeLoader_Nuclear {
 	private static void fluidExtractorRecipes() {
 
 		//FLiBe fuel
-		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1),
+		CORE.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(ModItems.dustLi2BeF4, 1),
 				new FluidStack(ModItems.fluidFLiBeSalt, 144), 100, 500);
 		//LFTR Fuel 1
 		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
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 764d7cffdd..7ca838a8f0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -1,14 +1,18 @@
 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;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
+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 net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeLoader_NuclearFuelProcessing {	
@@ -72,10 +76,73 @@ 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 Blanket step 1 - Fluorination
+		boolean a1 = CORE.RA.addReactorProcessingUnitRecipe(
+				CI.getNumberedAdvancedCircuit(7),
+				ELEMENT.getInstance().FLUORINE.getCell(10),
+				NUCLIDE.LiFThF4.getFluid(10000),
+				new ItemStack[] {
+						CI.emptyCells(8),
+						ELEMENT.getInstance().LITHIUM.getCell(2),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
+						},
+				new int[] {10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
+				NUCLIDE.UF6F2.getFluid(10000),
+				20 * 60 * 5,
+				MaterialUtils.getVoltageForTier(5));		
+		boolean a2 = CORE.RA.addReactorProcessingUnitRecipe(
+				CI.getNumberedAdvancedCircuit(8),
+				ELEMENT.getInstance().FLUORINE.getCell(10),
+				NUCLIDE.LiFBeF2ThF4.getFluid(10000),
+				new ItemStack[] {
+						CI.emptyCells(6),
+						ELEMENT.getInstance().LITHIUM.getCell(2),
+						FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+						ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
+						},
+				new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
+				NUCLIDE.UF6F2.getFluid(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(
+				8,
+				FLUORIDES.SODIUM_FLUORIDE.getCell(2),
+				NUCLIDE.UF6F2.getFluid(3000),
+				new ItemStack[] {
+						ELEMENT.getInstance().FLUORINE.getCell(2),
+						ELEMENT.getInstance().URANIUM233.getDust(1),
+						ELEMENT.getInstance().URANIUM233.getDust(1),
+						ELEMENT.getInstance().URANIUM233.getDust(1)
+				},
+				new int[] {10000, 3000, 2000, 1000},
+				FLUORIDES.URANIUM_HEXAFLUORIDE.getFluid(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),