+ Added Ammonium Tetrafluoroberyllate.

+ Added recipes for all the new compounds.
$ Fixed fluids not always generating for complex materials.

5 files changed, 95 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index c76da62e87..0faec7ff88 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -357,6 +357,7 @@ public final class ModItems {
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component
+			MaterialGenerator.generate(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component
 
 			//Generate Fluorides
 			MaterialGenerator.generateNuclearMaterial(FLUORIDES.FLUORITE);
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index bab0967114..00388c4a5c 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -119,7 +119,7 @@ public class MaterialGenerator {
 				temp = new BaseItemPlateDouble(matInfo);
 			}		
 			else if (matInfo.getState() == MaterialState.PURE_LIQUID){
-				//FluidUtils.generateFluidNoPrefix(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C);
+				FluidUtils.generateFluidNoPrefix(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C);
 				return true;
 			}
 
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index 04d41d8e30..3c0783daee 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -212,6 +212,20 @@ public class FLUORIDES {
 					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
 			});
 	
+	public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
+			"Ammonium Tetrafluoroberyllate", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{140, 220, 140, 0}, //Material Colour
+			280, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.AMMONIUM, 2),
+					new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
+			});
 	
 	
 	
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c706acdbd0..96714bee6f 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -280,7 +280,7 @@ public class RECIPES_GREGTECH {
 
 			}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 
-			//CaF2 + H2SO4 → CaSO4(solid) + 2 HF
+			//CaF2 + H2SO4 → CaSO4(solid) + 2 HF
 			try {
 
 				CORE.RA.addDehydratorRecipe(
@@ -303,6 +303,26 @@ public class RECIPES_GREGTECH {
 						230); //EU
 
 			}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+			
+			//(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
+			try {
+				CORE.RA.addDehydratorRecipe(
+						new ItemStack[]{
+								ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5)
+						}, //Item input (Array, up to 2)
+						FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), //Fluid input (slot 1)
+						null, //Fluid output (slot 2)
+						new ItemStack[]{
+								ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
+								ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
+								ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1)
+						}, //Output Array of Items - Upto 9,
+						new int[]{0, 0, 0},
+						5*60*20, //Time in ticks
+						120); //EU
+
+			}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+			
 		}
 
 	}
@@ -466,7 +486,7 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
 						ItemUtils.getSimpleStack(Blocks.obsidian)
-						},
+				},
 				new int[]{2000, 1000, 250, 250, 250, 250, 500},
 				0);
 
@@ -576,8 +596,61 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16),
 				FluidUtils.getFluidStack("water", 1000),
 				FluidUtils.getFluidStack("lithiumhydroxide", 144*4),
-				null,
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
 				300*20);
+
+
+
+		//LFTR Fuel Related Compounds
+
+		//Hydroxide
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1),
+				GT_Values.NF,
+				FluidUtils.getFluidStack("hydroxide", 2000),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				8*20);
+		//Ammonia
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0),
+				FluidUtils.getFluidStack("nitrogen", 1000),
+				FluidUtils.getFluidStack("ammonia", 2000),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+				14*20);
+		//Ammonium
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1),
+				GT_Values.NF,
+				FluidUtils.getFluidStack("ammonium", 2000),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				20*20);
+		//Ammonium Bifluoride
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+				GT_Values.NI,
+				FluidUtils.getFluidStack("ammonium", 1000),
+				FluidUtils.getFluidStack("ammoniumbifluoride", 2000),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+				26*20);
+		//Beryllium Hydroxide
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7),
+				GT_Values.NI,
+				FluidUtils.getFluidStack("hydroxide", 1000),
+				FluidUtils.getFluidStack("berylliumhydroxide", 2008),
+				GT_Values.NI,
+				8*20);
+		//Ammonium Tetrafluoroberyllate
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 1),
+				GT_Values.NF,
+				FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 2000),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				32*20);
 	}
 
 	private static void blastFurnaceRecipes(){
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index b820e674aa..02835a92ef 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -311,6 +311,9 @@ public class FluidUtils {
 		if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
 			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
 		}
+		else {
+			//Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+".");
+		}
 		return rFluid;
 	}