% Initial start to LFTR reworking.

% Changed around the capes a lil bit.

8 files changed, 177 insertions, 56 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 6bd45fd46f..373396f9d5 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -321,6 +321,14 @@ public class GTplusplus implements ActionListener {
 		mBetaTestCapes.put(new Pair<String, String>("Bear989Sr", "1964e3d1-6500-40e7-9ff2-e6161d41a8c2"));
 		mBetaTestCapes.put(new Pair<String, String>("CrazyJ1984", "d84f9654-87ea-46a9-881f-c6aa45dd5af8"));
 		mBetaTestCapes.put(new Pair<String, String>("AndreyKV", "9550c173-a8c5-4e7f-bf8d-b5ded56921ef"));
+		
+		//GTNH Beta Testers
+		mBetaTestCapes.put(new Pair<String, String>("bartimaeusnek", "578c2d13-9358-4ae8-95e7-a30ab9f9f3c7"));
+		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
+		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
+		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
+		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
+		//mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
 
 		//Dev Capes
 		mDevCapes.put(new Pair<String, String>("draknyte1", "5652713c-668e-47f3-853a-3fa959a9dfd3"));
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java
new file mode 100644
index 0000000000..0aeaedb01d
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java
@@ -0,0 +1,39 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.Collection;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Recipe;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+
+public class NoConflictGTRecipeMap {
+
+	private AutoMap<GT_Recipe> mRecipeCache = new AutoMap<GT_Recipe>();
+	private final IGregTechTileEntity mMachineType;
+
+	public NoConflictGTRecipeMap () {
+		this(null);
+	}
+	
+	public NoConflictGTRecipeMap (IGregTechTileEntity tile0) {
+		this.mMachineType = tile0;
+	}
+	public boolean put(GT_Recipe recipe) {
+		return add(recipe);
+	}
+	
+	public boolean add(GT_Recipe recipe) {
+		return mRecipeCache.setValue(recipe);
+	}
+	
+	public Collection<GT_Recipe> getRecipeMap() {
+		return mRecipeCache.values();
+	}
+	
+	public boolean isMapValidForMachine(IGregTechTileEntity tile) {
+		return tile == mMachineType;
+	}
+
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index f3e1c64049..0e9d11dd3c 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -32,6 +32,7 @@ import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.HealthBoostBauble;
 import gtPlusPlus.core.item.bauble.ModularBauble;
 import gtPlusPlus.core.item.chemistry.CoalTar;
+import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.*;
 import gtPlusPlus.core.item.general.books.ItemBaseBook;
@@ -737,6 +738,9 @@ public final class ModItems {
 
 		//Chemistry
 		CoalTar.run();
+		
+		//Nuclear Processing
+		NuclearChem.run();
 
 		//Only used for debugging.
 		/*if (CORE.DEVENV) {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
new file mode 100644
index 0000000000..6432bf68bb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import net.minecraftforge.fluids.Fluid;
+
+public class NuclearChem {
+
+	public static Fluid Burnt_LiFBeF2ThF4UF4;
+	public static Fluid Burnt_LiFBeF2ZrF4UF4;
+	public static Fluid Burnt_LiFBeF2ZrF4U235;
+
+	public static void run(){
+
+		//Create Coal Gas
+		Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[]{48, 48, 175, 100}, null, null);
+		Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten("Burnt_LiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[]{48, 68, 165, 100}, null, null);
+		Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten("Burnt_LiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[]{68, 48, 185, 100}, null, null);
+		
+		createRecipes();
+
+
+	}
+
+	private static void createRecipes() {
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 73c70fa1e7..d4eadedc48 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -831,71 +831,20 @@ public class RECIPES_GREGTECH {
 			Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 		}
 		try {
-			// Fli2BeF4 + Thorium TetraFluoride = Uranium233
-			CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 144 * 4), // Fluid
-					// input
-					// (slot
-					// 1)
-					FluidUtils.getFluidStack("molten.li2bef4", 1200), // Fluid
-					// output
-					// (slot
-					// 2)
-					FluidUtils.getFluidStack("molten.uraniumhexafluoride", (1200 + (144 * 4))), // Output
-					// Array
-					// of
-					// Items
-					// -
-					// Upto
-					// 9,
-					300 * 60 * 20, // Time in ticks
-					3500); // EU
+			
 
 		}
 		catch (final NullPointerException e) {
 			Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 		}
 		try {
-			// Fli2BeF4 + Uranium235 = 1x Uranium233
-			CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 144 * 16), // Fluid
-					// input
-					// (slot
-					// 1)
-					FluidUtils.getFluidStack("molten.li2bef4", 144 * 12), // Fluid
-					// output
-					// (slot
-					// 2)
-					FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3 * 144), // Output
-					// Array
-					// of
-					// Items
-					// -
-					// Upto
-					// 9,
-					120 * 60 * 20, // Time in ticks
-					8000); // EU
+			
 		}
 		catch (final NullPointerException e) {
 			Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 		}
 		try {
-			// Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
-			CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 144 * 2), // Fluid
-					// input
-					// (slot
-					// 1)
-					FluidUtils.getFluidStack("molten.li2bef4", 500), // Fluid
-					// output
-					// (slot
-					// 2)
-					FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1288), // Output
-					// Array
-					// of
-					// Items
-					// -
-					// Upto
-					// 9,
-					420 * 60 * 20, // Time in ticks
-					4000); // EU
+			
 
 		}
 		catch (final NullPointerException e) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index ef1dd0e353..895ad35a14 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -29,7 +29,7 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 
 public class GTPP_CapeRenderer
 extends RenderPlayer {
-	private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")};
+	private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")};
 	private final Collection<String> mCapeList;
 
 	public GTPP_CapeRenderer(Collection<String> aCapeList) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 3f2d622c70..931896b2e2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -34,7 +34,6 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 
-	public GT_Recipe mLastRecipe;
 	protected long mEUStore;
 	protected int fuelConsumption = 0;
 	protected int fuelValue = 0;
@@ -447,6 +446,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 								}
 
 
+								if (this.getBaseMetaTileEntity().getWorld().getTotalWorldTime() % 100 == 0) {
 								//Try Sparge Noble Gases
 								if (this.heliumSparging){
 									if (this.depleteInput(Materials.Helium.getGas(1000L))){
@@ -484,6 +484,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 										}
 									}
 								}
+								}
 
 
 								if (aFuel != null){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
new file mode 100644
index 0000000000..5b897a0ad0
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -0,0 +1,94 @@
+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.Recipe_GT;
+
+import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+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 static void generate() {
+		// Fli2BeF4 + Thorium TetraFluoride = Uranium233
+		//72k Ticks/hr
+		//1l/4t = 1000l/hr
+		//1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4
+		//1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4
+		//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
+
+		//LiFBeF2ThF4UF4
+		GT_Recipe LFTR1 = new Recipe_GT(
+				true, 
+				new ItemStack[] {CI.getNumberedCircuit(1)},
+				new ItemStack[] {},
+				null, new int[] {5000, 2500},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.li2bef4", 34),
+						FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 17)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10),
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5)
+				},
+				12000,//time
+				0,//cost
+				4096//fuel value
+				);
+
+		//LiFBeF2ZrF4UF4
+		GT_Recipe LFTR2 = new Recipe_GT(
+				true, 
+				new ItemStack[] {CI.getNumberedCircuit(2)},
+				new ItemStack[] {},
+				null, new int[] {2500, 1250},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.li2bef4", 34),
+						FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 17)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4),
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2)						
+				},
+				6000,//time
+				0,//cost
+				4096//fuel value
+				);
+
+		//LiFBeF2ZrF4U235
+		GT_Recipe LFTR3 = new Recipe_GT(
+				true, 
+				new ItemStack[] {CI.getNumberedCircuit(3)},
+				new ItemStack[] {},
+				null, new int[] {1000, 500},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.li2bef4", 34),
+						FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 17)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2),
+						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1)
+				},
+				3000,//time
+				0,//cost
+				4096//fuel value
+				);
+
+		mRecipesLFTR.add(LFTR1);
+		mRecipesLFTR.add(LFTR2);
+		mRecipesLFTR.add(LFTR3);
+
+	}
+}