Greatly improved NEI handling.

Fixed broken Manure Slurry recipes.

2 files changed, 142 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 81c16efa2c..b8e006b021 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -744,12 +744,24 @@ public class Material {
 			Materials Erf = MaterialUtils.getMaterial(this.unlocalizedName);
 			if (Erf != null && Erf != Materials._NULL) {
 				ItemStack Erg = ItemUtils.getOrePrefixStack(aPrefix, Erf, stacksize);
-				if (Erg != null) {
+				if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) {
 					Logger.MATERIALS("Found \"" + aKey + this.unlocalizedName + "\" using backup GT Materials option.");
 					g.put(aKey, Erg);
 					mComponentMap.put(unlocalizedName, g);
 					return Erg;
 				}
+				else {
+					// Try get a molten cell
+					if (aPrefix == OrePrefixes.cell) {
+						Erg = ItemUtils.getOrePrefixStack(OrePrefixes.cellMolten, Erf, stacksize);
+						if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) {
+							Logger.MATERIALS("Found \"" + OrePrefixes.cellMolten.name() + this.unlocalizedName + "\" using backup GT Materials option.");
+							g.put(aKey, Erg);
+							mComponentMap.put(unlocalizedName, g);
+							return Erg;
+						}
+					}
+				}
 			} else {
 				ItemStack u = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(aKey + this.unlocalizedName, stacksize);
 				if (u != null) {
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 73751ac49d..9e59758f73 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -69,6 +69,135 @@ public final class NUCLIDE {
 					new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
 			});
+	
+	
+	// LFTR Core Fluids
+	public static final Material LiBeF2UF4FP = new Material(
+			"LiBeF2UF4FP", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material UF6F2FP = new Material(
+			"UF6F2FP", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material LiFBeF2 = new Material(
+			"LiFBeF2", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
+			});
+	
+	public static final Material LiFBeF2UF4 = new Material(
+			"LiFBeF2UF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(LiFBeF2, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
+			});
+	
+	
+	
+	
+	
+	
+	// LFTR Blanket Fluids
+
+	public static final Material LiFThF4 = new Material(
+			"LiFThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	public static final Material LiFBeF2ThF4 = new Material(
+			"LiFBeF2ThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	public static final Material UF6F2 = new Material(
+			"UF6F2", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
+			});
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	// Secondary material is molten metal
 	public static final Material NAQ_FUEL_T1 = new Material(