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

$ Cleaned up some code.

18 files changed, 83 insertions, 52 deletions

diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index fbd5d9eb4f..36a056f0c0 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -254,7 +254,7 @@ public class Recipe_GT extends GT_Recipe{
 		
 		//RTG Fuel Map
 		public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new Recipe_GT.GT_Recipe_Map_Fuel(
-				new HashSet(10), "gt.recipe.RTGgenerators", "RTG", null,
+				new HashSet<GT_Recipe>(10), "gt.recipe.RTGgenerators", "RTG", null,
 				"gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true);
 		
 		//Thermal Boiler map
diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
index cf1811781a..10c09390d9 100644
--- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -6,8 +6,8 @@ import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
 public class Gui_ID_Registry
 {
-	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap();
-	private static final Map<Integer, MU_GuiId> idMap = new HashMap();
+	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>();
+	private static final Map<Integer, MU_GuiId> idMap = new HashMap<Integer, MU_GuiId>();
 	private static int nextId = 0;
 
 	static
@@ -33,7 +33,7 @@ public class Gui_ID_Registry
 		MU_GuiId guiId = classMap.get(guiHandlerClass);
 		if (guiId == null) {
 			for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap.entrySet()) {
-				if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass))
+				if (((Class<?>)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass))
 				{
 					guiId = classGuiIdEntry.getValue();
 					break;
diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
index 289446eb07..951f69723c 100644
--- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
 public class Workbench_CraftingHandler {
 
 	private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler();
-	private final List recipes = new ArrayList();
+	private final List<IRecipe> recipes = new ArrayList<IRecipe>();
 
 	public static final Workbench_CraftingHandler getInstance() {
 		return instance;
@@ -66,7 +66,7 @@ public class Workbench_CraftingHandler {
 			}
 		}
 
-		final HashMap hashmap = new HashMap();
+		final HashMap<Character, ItemStack> hashmap = new HashMap<Character, ItemStack>();
 
 		for (; i < par2ArrayOfObj.length; i += 2)
 		{
@@ -110,7 +110,7 @@ public class Workbench_CraftingHandler {
 
 	public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[])
 	{
-		final ArrayList arraylist = new ArrayList();
+		final ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>();
 		final Object aobj[] = par2ArrayOfObj;
 		final int i = aobj.length;
 
@@ -146,9 +146,6 @@ public class Workbench_CraftingHandler {
 	public ItemStack findMatchingRecipe(final InventoryCrafting par1InventoryCrafting, final World par2World)
 	{
 		int i = 0;
-		ItemStack itemstack = null;
-		ItemStack itemstack1 = null;
-
 		for (int j = 0; j < par1InventoryCrafting.getSizeInventory(); j++)
 		{
 			final ItemStack itemstack2 = par1InventoryCrafting.getStackInSlot(j);
@@ -160,12 +157,10 @@ public class Workbench_CraftingHandler {
 
 			if (i == 0)
 			{
-				itemstack = itemstack2;
 			}
 
 			if (i == 1)
 			{
-				itemstack1 = itemstack2;
 			}
 
 			i++;
@@ -202,7 +197,7 @@ public class Workbench_CraftingHandler {
 	}
 
 
-	public List getRecipeList()
+	public List<IRecipe> getRecipeList()
 	{
 		return this.recipes;
 	}
diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
index b68ae89e5c..92a7dd56d3 100644
--- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
+++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
@@ -4,7 +4,7 @@ import java.util.Comparator;
 
 import net.minecraft.item.crafting.*;
 
-public class Workbench_RecipeSorter implements Comparator
+public class Workbench_RecipeSorter implements Comparator<Object>
 {
 	final Workbench_CraftingHandler CraftingManagerCrafter;
 
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 0faec7ff88..30d85628b9 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -587,6 +587,7 @@ public final class ModItems {
 		CoalTar.run();
 
 		//Misc Items
+		@SuppressWarnings("unused")
 		Item tI;
 		tI = new BaseItemMisc("Chilly", new short[]{0,64,196}, 32, MiscTypes.POTION, new String[]{"It's Blue"});
 		tI = new BaseItemMisc("4000DC's", new short[]{180,100,30}, 1, MiscTypes.BIGKEY, new String[]{"It opens things."});
@@ -704,7 +705,7 @@ public final class ModItems {
 			RfEuBattery = new RF2EU_Battery();
 
 			//Baubles Mod Test
-			try {final Class baublesTest = Class.forName("baubles.api.IBauble");
+			try {final Class<?> baublesTest = Class.forName("baubles.api.IBauble");
 			if (baublesTest != null){
 				COMPAT_Baubles.run();
 			}
diff --git a/src/Java/gtPlusPlus/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java
index 20ca894211..498362e817 100644
--- a/src/Java/gtPlusPlus/core/util/ClassUtils.java
+++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java
@@ -20,6 +20,7 @@ public class ClassUtils {
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName, final boolean invoke) throws Exception{
 		final Class<? extends Class> lookup = lookupClass.getClass();
 		final Method m = lookup.getDeclaredMethod(methodName);
@@ -30,7 +31,7 @@ public class ClassUtils {
 		return m;
 	}
 
-	public static Class getNonPublicClass(final String className){
+	public static Class<?> getNonPublicClass(final String className){
 		Class<?> c = null;
 		try {
 			c = Class.forName(className);
@@ -60,7 +61,7 @@ public class ClassUtils {
 
 				try {
 					final Object o = constructor.newInstance();
-					return (Class) o;
+					return (Class<?>) o;
 				} catch (InstantiationException | IllegalAccessException
 						| IllegalArgumentException | InvocationTargetException e) {
 					// TODO Auto-generated catch block
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index 863ba2b3b8..010f7b0bf0 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -14,6 +14,7 @@ public class MaterialUtils {
 
 	public static short firstID = 791;
 
+	@SuppressWarnings({ "rawtypes", "unused" })
 	private static Class[][] commonTypes =
 		{{Materials.class, int.class, TextureSet.class, float.class, int.class,
 			int.class, int.class, int.class, int.class, int.class, int.class,
@@ -32,6 +33,7 @@ public class MaterialUtils {
 	}
 
 	public static Material generateMaterialFromGtENUM(final Materials material){
+		@SuppressWarnings("deprecation")
 		String name = material.name();
 		final short[] rgba = material.mRGBa;
 		final int melting = material.mMeltingPoint;
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
index c1d0279f72..99a9bf2fa9 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
@@ -12,7 +12,7 @@ public class ClientProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class clientSideClass = Class.forName(sidedProxy.clientSide());
+					final Class<?> clientSideClass = Class.forName(sidedProxy.clientSide());
 					if(clientSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object clientProxy = clientSideClass.cast(fieldValue);
 						//do what you want with client proxy instance
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index c789871b6f..f88f8e32e0 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -102,7 +102,7 @@ public class ReflectionUtils {
 	/**
 	 * Allows to change the state of an immutable instance. Huh?!?
 	 */
-	public static void setFieldValue(Class clazz,  String fieldName, Object newValue) throws Exception {
+	public static void setFieldValue(Class<?> clazz,  String fieldName, Object newValue) throws Exception {
 		Field nameField = getField(clazz, fieldName);
 		setValue(clazz, nameField, newValue);
 	}
@@ -110,7 +110,7 @@ public class ReflectionUtils {
 	/**
 	 * Allows to change the state of final statics. Huh?!?
 	 */
-	public static void setDefault(Class clazz, String fieldName, Object newValue) throws Exception {
+	public static void setDefault(Class<?> clazz, String fieldName, Object newValue) throws Exception {
 		Field staticField = clazz.getDeclaredField(fieldName);
 		setValue(null, staticField, newValue);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
index 2fae02a9fd..38382b4a46 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
@@ -12,7 +12,7 @@ public class ServerProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class serverSideClass = Class.forName(sidedProxy.serverSide());
+					final Class<?> serverSideClass = Class.forName(sidedProxy.serverSide());
 					if(serverSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object serverProxy = serverSideClass.cast(fieldValue);
 						//do what you want with server proxy instance
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index 3eadb6116e..ed8b3f38b7 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -113,7 +113,8 @@ public class Biome_DarkWorld {
 			return 0xF67A14;
 		}
 		
-		private boolean addToMonsterSpawnLists(Class EntityClass, int a, int b, int c){
+		@SuppressWarnings("unchecked")
+		private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c){
 			this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c));
 			this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
 			return true;
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
index 0f8dcb4649..017fe3012b 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
@@ -71,7 +71,7 @@ extends TemplateRecipeHandler {
 	public void loadCraftingRecipes(final ItemStack aResult) {
 		final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
 
-		final ArrayList<ItemStack> tResults = new ArrayList();
+		final ArrayList<ItemStack> tResults = new ArrayList<ItemStack>();
 		tResults.add(aResult);
 		tResults.add(GT_OreDictUnificator.get(true, aResult));
 		if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
@@ -99,14 +99,13 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		final CachedDefaultRecipe tNEIRecipe;
 	}
 
 	@Override
 	public void loadUsageRecipes(final ItemStack aInput) {
 		final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
 
-		final ArrayList<ItemStack> tInputs = new ArrayList();
+		final ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
 		tInputs.add(aInput);
 		tInputs.add(GT_OreDictUnificator.get(false, aInput));
 		if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
@@ -134,7 +133,6 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		final CachedDefaultRecipe tNEIRecipe;
 	}
 
 	@Override
@@ -322,14 +320,14 @@ extends TemplateRecipeHandler {
 			if (this.permutated) {
 				return;
 			}
-			final ArrayList<ItemStack> tDisplayStacks = new ArrayList();
+			final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>();
 			for (final ItemStack tStack : this.items) {
 				if (GT_Utility.isStackValid(tStack)) {
 					if (tStack.getItemDamage() == 32767) {
 						final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem());
 						if (!permutations.isEmpty()) {
 							ItemStack stack;
-							for (final Iterator i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
+							for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
 								stack = (ItemStack) i$.next();
 							}
 						} else {
@@ -354,8 +352,8 @@ extends TemplateRecipeHandler {
 	public class CachedDefaultRecipe
 	extends TemplateRecipeHandler.CachedRecipe {
 		public final GT_Recipe mRecipe;
-		public final List<PositionedStack> mOutputs = new ArrayList();
-		public final List<PositionedStack> mInputs = new ArrayList();
+		public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>();
+		public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>();
 
 		public CachedDefaultRecipe(final GT_Recipe aRecipe) {
 			super();
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
index e36d24e695..0cd76fa734 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
@@ -13,16 +13,18 @@ import net.minecraft.world.gen.feature.*;
 
 public class SaplingRainforestTree extends SaplingBase {
 
-    public SaplingRainforestTree(){
-    	super("Rainforest Oak Sapling", "rainforestoak", new String[]{"rainforest"});
-    }
+	public SaplingRainforestTree(){
+		super("Rainforest Oak Sapling", "rainforestoak", new String[]{"rainforest"});
+	}
 
-    @Override
+	@Override
 	public void func_149878_d(World world, int x, int y, int z, Random rand){
 		Utils.LOG_WARNING("func_149878_d - 1");
 		if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(world, rand, x, y, z)) return;
 		int l = world.getBlockMetadata(x, y, z) & 7;
-		Object object = rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true);
+		rand.nextInt(10);
+		new WorldGenBigTree(true);
+		new WorldGenTrees(true);
 		int i1 = 0;
 		int j1 = 0;
 		boolean flag = false;
@@ -40,10 +42,8 @@ public class SaplingRainforestTree extends SaplingBase {
 		{
 			world.setBlock(x, y, z, block, 0, 4);
 		}
-//public WorldGenRainForestTree_Ex(Block wood, Block leaves, int woodMeta, int leavesMeta, boolean doBlockNotify, int minTreeHeight, int randomTreeHeight) {
-		Class C = BOP_Block_Registrator.class;
 		Object o = new WorldGenRainForestTree_Ex(BOP_Block_Registrator.log_Rainforest, BOP_Block_Registrator.leaves_Rainforest, 0, 0, true, 50, 75);
-		
+
 		if (!((WorldGenerator)o).generate(world, rand, x + i1, y, z + j1))
 		{
 			if (flag)
@@ -59,5 +59,5 @@ public class SaplingRainforestTree extends SaplingBase {
 			}
 		}
 	}
-    
+
 }
\ No newline at end of file
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) {