% Swapped FFPP checkRecipe logic to use the Fusion Reactor logic for fluid handling.

$ Cleaned up some code.

5 files changed, 46 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
index d3ec2b024b..e480ffbfef 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
@@ -60,7 +60,7 @@ public class CONTAINER_AdvancedBoiler
         this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / (this.maxStorage-100)));
         this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
 
-        Iterator var2 = this.crafters.iterator();
+        Iterator<?> var2 = this.crafters.iterator();
         while (var2.hasNext()) {
             ICrafting var1 = (ICrafting) var2.next();
             var1.sendProgressBarUpdate(this, 100, this.mTemperature);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index 0a5351afdc..fb35c0ac21 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -120,7 +120,7 @@ public class GregtechItemData {
 	}
 
 	public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() {
-		final ArrayList<GregtechMaterialStack> rList = new ArrayList();
+		final ArrayList<GregtechMaterialStack> rList = new ArrayList<GregtechMaterialStack>();
 		if (this.hasValidMaterialData()) {
 			rList.add(this.mMaterial);
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
index 191312dbfa..dd2837b021 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
@@ -65,13 +65,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 
 	private EntityPlayerMP farmerAI;
 
-	private SAWTOOL mCurrentMachineTool = SAWTOOL.NONE;
 	private boolean canChop = false;
 
-	private final int cuttingNumber = 0;
-	private final int cuttingNumber2 = 0;
-	private final int cuttingNumber3 = 0;
-
 	public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -253,10 +248,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 		final SAWTOOL currentInputItem = TreeFarmHelper.isCorrectMachinePart(aStack);
 		if (currentInputItem != SAWTOOL.NONE){
 			if (currentInputItem == SAWTOOL.SAW){
-				this.mCurrentMachineTool = SAWTOOL.SAW;
 			}
 			else {
-				this.mCurrentMachineTool = SAWTOOL.BUZZSAW;
 			}
 			isValid = true;
 		}
@@ -423,6 +416,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 
 
 
+	@SuppressWarnings("unused")
 	private boolean findLogs(final IGregTechTileEntity aBaseMetaTileEntity){
 
 		Utils.LOG_MACHINE_INFO("called findLogs()");
@@ -556,6 +550,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock
 		return true;
 	}
 
+	@SuppressWarnings("deprecation")
 	private boolean plantSaplings(final IGregTechTileEntity aBaseMetaTileEntity){
 		Utils.LOG_MACHINE_INFO("called plantSaplings()");
 		final World world = aBaseMetaTileEntity.getWorld();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
index ab47262d38..e13360b7c5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java
@@ -58,6 +58,7 @@ public class GregtechMetaTileEntity_CatalyticReactor extends GT_MetaTileEntity_M
 		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png");
 	}
 
+	@SuppressWarnings("unused")
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 		if ((this.mInventory[1] == null) || (this.mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && (this.mInventory[1].stackSize < this.mInventory[1].getMaxStackSize()))) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
index cf1cd7b439..875990a12e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import java.util.ArrayList;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -26,8 +27,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBlockBase {
 
-	private boolean completedCycle = false;
-
+	public GT_Recipe mLastRecipe;
+	
 	public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -68,7 +69,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png");
 	}
 
-	@Override
+	/*@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 
 		ArrayList<FluidStack> tFluidList = getStoredFluids();
@@ -127,7 +128,43 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc
 		}
 		Utils.LOG_INFO("Bad Recipe. [1]");
 		return false;
-	}
+	}*/
+	
+	@Override
+    public boolean checkRecipe(ItemStack aStack) {
+        ArrayList<FluidStack> tFluidList = getStoredFluids();
+        int tFluidList_sS=tFluidList.size();
+        for (int i = 0; i < tFluidList_sS - 1; i++) {
+            for (int j = i + 1; j < tFluidList_sS; j++) {
+                if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) {
+                    if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) {
+                        tFluidList.remove(j--); tFluidList_sS=tFluidList.size();
+                    } else {
+                        tFluidList.remove(i--); tFluidList_sS=tFluidList.size();
+                        break;
+                    }
+                }
+            }
+        }
+        if (tFluidList.size() > 1) {
+            FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
+            GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[4], tFluids, new ItemStack[]{});
+            if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) {
+                this.mLastRecipe = null;
+                return false;
+            }
+            if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) {
+            this.mLastRecipe = tRecipe;
+            this.mEUt = this.mLastRecipe.mEUt;
+            this.mMaxProgresstime = this.mLastRecipe.mDuration;
+            this.mEfficiencyIncrease = 10000;
+            this.mOutputFluids = this.mLastRecipe.mFluidOutputs;
+            mRunningOnLoad = false;
+            return true;
+            }
+        }
+        return false;
+    }
 
 	@Override
 	public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {