Added a new multiblock for sparging.

More Nuclear reprocessing work.
Updated Tooltips on all multiblocks.

3 files changed, 18 insertions, 5 deletions

diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/Java/gregtech/api/util/GTPP_Recipe.java
index 51212c21bc..ce8eaf1d82 100644
--- a/src/Java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/Java/gregtech/api/util/GTPP_Recipe.java
@@ -407,6 +407,7 @@ public class GTPP_Recipe extends GT_Recipe  implements IComparableRecipe {
 		
 		//Special Maps for Multis
 		public static final GTPP_Recipe_Map_Internal sFishPondRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true);
+        public static final GTPP_Recipe_Map_Internal sSpargeTowerRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.spargetower", "Sparging", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, E, 1, E, true, true);
 		
 		//public static final GTPP_Recipe_Map sMultiblockCentrifugeRecipes = new GT_Recipe_Map_LargeCentrifuge();
 		//public static final GTPP_Recipe_Map sMultiblockElectrolyzerRecipes = new GT_Recipe_Map_LargeElectrolyzer();
diff --git a/src/Java/gregtech/api/util/GasSpargingRecipe.java b/src/Java/gregtech/api/util/GasSpargingRecipe.java
index 1b21a3fab2..86e52e19de 100644
--- a/src/Java/gregtech/api/util/GasSpargingRecipe.java
+++ b/src/Java/gregtech/api/util/GasSpargingRecipe.java
@@ -1,34 +1,43 @@
 package gregtech.api.util;
 
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
 
 	public final FluidStack mInputGas;
+	public final FluidStack mInputSpentFuel;
 	public final int[] mMaxOutputQuantity;
 	public final FluidStack[] mFluidInputs;
 	public final FluidStack[] mFluidOutputs;
 	public final ItemStack[] mInputs;
 	public final ItemStack[] mOutputs;
+	public final int mDuration;
+	public final int mEUt;
 
-	public GasSpargingRecipe(FluidStack aSpargeGas, FluidStack[] aOutputs, int[] aMaxOutputQuantity) {
+	public GasSpargingRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack[] aOutputs, int[] aMaxOutputQuantity) {
 		mInputGas = aSpargeGas;
-		mFluidInputs = new FluidStack[] {mInputGas};
+		mInputSpentFuel = aSpentFuel;
+		mFluidInputs = new FluidStack[] {mInputGas, mInputSpentFuel};
 		mFluidOutputs = aOutputs;
 		mMaxOutputQuantity = aMaxOutputQuantity;
-		mInputs = new ItemStack[] {GT_Utility.getFluidDisplayStack(mFluidInputs[0], true)};
+		mInputs = new ItemStack[] {GT_Utility.getFluidDisplayStack(mFluidInputs[0], true), GT_Utility.getFluidDisplayStack(mFluidInputs[1], true)};
 		mOutputs = new ItemStack[mFluidOutputs.length];
 		for (int i=0; i<mFluidOutputs.length;i++) {
 			mOutputs[i] = GT_Utility.getFluidDisplayStack(mFluidOutputs[i], true);
 		}
+		mDuration = 20 * 60 * 5;
+		mEUt = MaterialUtils.getVoltageForTier(3);
 	}
 
 	@Override
 	public boolean equals(Object o) {
 		if (o instanceof GasSpargingRecipe) {
 			GasSpargingRecipe i = (GasSpargingRecipe) o;
-			this.mInputGas.equals(i.mInputGas);
+			if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -42,6 +51,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
 
 	public boolean isValid() {
 		if (mInputGas == null || mInputGas.amount <= 0 ||
+				mInputSpentFuel == null || mInputSpentFuel.amount <= 0 ||
 				mFluidOutputs == null || mFluidOutputs.length < 1 ||
 				mMaxOutputQuantity == null || mMaxOutputQuantity.length < 1 ||
 				mFluidOutputs.length != mMaxOutputQuantity.length) {
diff --git a/src/Java/gregtech/api/util/GasSpargingRecipeMap.java b/src/Java/gregtech/api/util/GasSpargingRecipeMap.java
index 4f4bba9aca..bf12f4dc79 100644
--- a/src/Java/gregtech/api/util/GasSpargingRecipeMap.java
+++ b/src/Java/gregtech/api/util/GasSpargingRecipeMap.java
@@ -14,8 +14,9 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe>{
 	public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png";
 	
 	
-	public static boolean addRecipe(FluidStack aSpargeGas, FluidStack[] aOutputs, int[] aMaxOutputs) {
+	public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack[] aOutputs, int[] aMaxOutputs) {
 		if (aSpargeGas == null || aSpargeGas.amount <= 0 ||
+				aSpentFuel == null || aSpentFuel.amount <= 0 ||
 				aOutputs == null || aOutputs.length < 1 ||
 				aMaxOutputs == null || aMaxOutputs.length < 1 ||
 				aOutputs.length != aMaxOutputs.length) {
@@ -24,6 +25,7 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe>{
 		int aMapSize = mRecipes.size();
 		GasSpargingRecipe aRecipe = new GasSpargingRecipe(
 				aSpargeGas,
+				aSpentFuel,
 				aOutputs,
 				aMaxOutputs
 				);