+ Added a Molten Li2BeF4 fluid.

% Modified BaseItemComponent.java to support custom cell generation more easily.
+ Added a LFTR test recipe.
+ Added LFTR recipe support.
% Changed FirePit Model.

2 files changed, 33 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 26a8770d44..65c0e87fd9 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -3,10 +3,13 @@ package gtPlusPlus.core.util.fluid;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.fluids.GenericFluid;
+import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.init.Items;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.*;
 
@@ -335,5 +338,27 @@ public class FluidUtils {
 	public static ItemStack container(final ItemStack aStack, final boolean aCheckIFluidContainerItems, final int aStacksize) {
 		return amount(aStacksize, container(aStack, aCheckIFluidContainerItems));
 	}	
+	
+	public final static Fluid generateFluid(String unlocalizedName, String localizedName, int MeltingPoint, short[] RGBA){
+		if (FluidUtils.getFluidStack("molten"+localizedName, 1) == null){
+			Utils.LOG_WARNING("Generating our own fluid.");
+
+			//Generate a Cell if we need to
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
+				@SuppressWarnings("unused")
+				Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
+			}
+			return FluidUtils.addGTFluid(
+					unlocalizedName,
+					"Molten "+localizedName,		
+					RGBA,
+					4,
+					MeltingPoint,
+					ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1),
+					ItemList.Cell_Empty.get(1L, new Object[0]),
+					1000);
+		}
+		return null;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 75d8452975..c864df491c 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -258,6 +258,13 @@ public class MathUtils {
 	    return result;
 	}
 	
-	
+	final public static int getRgbAsHex(short[] RGBA){
+
+		int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+		if (returnValue == 0){
+			return (int) 0;
+		}		
+		return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+	}
 
 }