Added more nuclear processing recipes.

Removed lots of useless nuclear generated items.
More NEI improvements.
Made Dehydrator and FFPP recipe handling more lenient.

2 files changed, 7 insertions, 6 deletions

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 c13824a51a..c65dbbb13e 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
@@ -38,6 +38,7 @@ import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.item.ItemStack;
@@ -367,7 +368,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		int aFuelStored = 0;
 		FluidStack aFuelFluid = null;
 		for (FluidStack aFluidInput : aRecipe.mFluidInputs) {
-			if (!aFluidInput.getFluid().equals(ModItems.fluidFLiBeSalt)) {
+			if (!aFluidInput.getFluid().equals(NUCLIDE.Li2BeF4.getFluid())) {
 				aFuelFluid = aFluidInput;
 				break;
 			}
@@ -417,7 +418,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 			// Find li2bef4, Helium & Fluorine
 			for (final FluidStack hatchFluid1 : tFluids) { //Loops through hatches
 				if (hatchFluid1 != null) {
-					if (hatchFluid1.getFluid().equals(ModItems.fluidFLiBeSalt)){
+					if (hatchFluid1.getFluid().equals(NUCLIDE.Li2BeF4.getFluid())){
 						foundLi2bef4 = true;
 						Logger.WARNING("Found "+hatchFluid1.getLocalizedName());
 						continue;
@@ -425,7 +426,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 				}
 			}			
 			if (!foundLi2bef4) {
-				Logger.WARNING("Did not find "+ModItems.fluidFLiBeSalt.getLocalizedName());
+				Logger.WARNING("Did not find "+NUCLIDE.Li2BeF4.getFluid().getLocalizedName());
 				return false;
 			}
 			// Reset outputs and progress stats
@@ -620,7 +621,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		else {
 			// Try output some Uranium-233
 			if (MathUtils.randInt(1, 300) == 1){
-				this.addOutput(ELEMENT.getInstance().URANIUM233.getFluid(MathUtils.randInt(1, 10)));
+				this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10)));
 			}			
 			// Set a random tick counter, count it up.
 			if (this.mSpargeTime == 0) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
index c26633805e..6ab1ea477c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
@@ -318,7 +318,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi
 		
 		if (tFluids.size() > 0 && tRecipeList != null) {
 			
-			if (tFluids.contains(MISC_MATERIALS.CARBON_DIOXIDE.getFluid(this.boostEu ? 3 : 1)) || tFluids.contains(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) {
+			if (tFluids.contains(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || tFluids.contains(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) {
 				if (this.mRuntime % 72 == 0 || this.mRuntime == 0) {
 					if (!consumeCO2()) {
 						freeFuelTicks = 0;
@@ -421,7 +421,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi
 	}
 
 	public boolean consumeCO2() {
-		if (this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluid(this.boostEu ? 3 : 1)) || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) {
+		if (this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) {
 			return true;
 		}
 		else {