Added new NEI handler for LFTR.

Fixed LFTR fuel recipes.
Fixed LFTR recipe handling.

1 files changed, 30 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index 424c2ecce5..af692c8bbf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -1,25 +1,16 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
-import java.util.Collection;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GTPP_Recipe;
-
-import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap;
-import gtPlusPlus.core.recipe.common.CI;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.chemistry.NuclearChem;
+import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-public class RecipeLoader_LFTR {
-
-
-	protected final static NoConflictGTRecipeMap mRecipesLFTR = new NoConflictGTRecipeMap();
-
-	public static Collection<GT_Recipe> getRecipes(){
-		return mRecipesLFTR.getRecipeMap();
-	}
+public class RecipeLoader_LFTR {	
 
 	public static void generate() {
 		// Fli2BeF4 + Thorium TetraFluoride = Uranium233
@@ -28,70 +19,75 @@ public class RecipeLoader_LFTR {
 		//1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4
 		//1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4
 		//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
+		
+		FluidStack Li2BeF4 = new FluidStack(ModItems.fluidFLiBeSalt, 34);
 
 		//LiFBeF2ThF4UF4
 		GT_Recipe LFTR1 = new GTPP_Recipe(
 				true, 
-				new ItemStack[] {CI.getNumberedCircuit(1)},
 				new ItemStack[] {},
-				null, new int[] {5000, 2500},
+				new ItemStack[] {},
+				null, new int[] {10000, 5000, 2500},
 				new FluidStack[] {
-						FluidUtils.getFluidStack("molten.li2bef4", 34),
-						FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 17)
+						NUCLIDE.LiFBeF2ThF4UF4.getFluid(17),
+						Li2BeF4
 				},
 				new FluidStack[] {
+						new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 17),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5)
 				},
 				12000,//time
 				0,//cost
-				4096//fuel value
+				8192//fuel value
 				);
 
 		//LiFBeF2ZrF4UF4
 		GT_Recipe LFTR2 = new GTPP_Recipe(
 				true, 
-				new ItemStack[] {CI.getNumberedCircuit(2)},
 				new ItemStack[] {},
-				null, new int[] {2500, 1250},
+				new ItemStack[] {},
+				null, new int[] {10000, 2500, 1250},
 				new FluidStack[] {
-						FluidUtils.getFluidStack("molten.li2bef4", 34),
-						FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 17)
+						NUCLIDE.LiFBeF2ZrF4UF4.getFluid(17),
+						Li2BeF4
 				},
 				new FluidStack[] {
+						new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 17),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2)						
 				},
 				6000,//time
 				0,//cost
-				4096//fuel value
+				8192//fuel value
 				);
 
 		//LiFBeF2ZrF4U235
 		GT_Recipe LFTR3 = new GTPP_Recipe(
 				true, 
-				new ItemStack[] {CI.getNumberedCircuit(3)},
 				new ItemStack[] {},
-				null, new int[] {1000, 500},
+				new ItemStack[] {},
+				null, new int[] {10000, 1000, 500},
 				new FluidStack[] {
-						FluidUtils.getFluidStack("molten.li2bef4", 34),
-						FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 17)
+						NUCLIDE.LiFBeF2ZrF4U235.getFluid(17),
+						Li2BeF4
 				},
 				new FluidStack[] {
+						new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 17),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1)
 				},
 				3000,//time
 				0,//cost
-				4096//fuel value
+				8192//fuel value
 				);
 
 		/*mRecipesLFTR.add(LFTR1);
 		mRecipesLFTR.add(LFTR2);
 		mRecipesLFTR.add(LFTR3);*/		
-		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR1);
-		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR2);
-		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR3);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR1);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR2);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR3);
 		
 
 	}