Fix it again

2 files changed, 21 insertions, 24 deletions

diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 5b8ac5e7ce..99781534dc 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GT_RecipeAdder
         implements IGT_RecipeAdder {
+	@Deprecated
     public boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, int aStartEU) {
         return false;
     }
@@ -25,6 +26,9 @@ public class GT_RecipeAdder
         if (aInput1 == null || aInput2 == null || aOutput1 == null || aDuration < 1 || aEUt < 1 || aStartEU < 1) {
             return false;
         }
+        if ((aOutput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("fusion", aOutput1.getFluid().getName(), aDuration)) <= 0)) {
+            return false;
+        }
         GT_Recipe.GT_Recipe_Map.sFusionRecipes.addRecipe(null, new FluidStack[]{aInput1, aInput2}, new FluidStack[]{aOutput1}, aDuration, aEUt, aStartEU);
         return true;
     }
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
index 7c2cfed0ae..aa3d120357 100644
--- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
+++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
@@ -191,31 +191,24 @@ public class GT_ThaumcraftCompat
         return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copy(new Object[]{aOutput}), aInstability, getAspectList(aAspects), aMainInput, aSideInputs);
     }
     
-    public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) {
-        if (aAspects.isEmpty()) {
-            return false;
-        }
-        AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aExampleStack);
-        if ((tAlreadyRegisteredAspects == null) || (tAlreadyRegisteredAspects.size() <= 0)) {
-            ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects));
-        }
-        return true;
-    }
+	public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) {
+		if (aAspects.isEmpty()) return false;
+		ThaumcraftApi.registerObjectTag(aOreDict, (AspectList)getAspectList(aAspects));
+		return true;
+	}
 
-    public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_Aspects.TC_AspectStack> aAspects, boolean aAdditive) {
-        if (aAspects.isEmpty()) {
-            return false;
-        }
-        if (aAdditive) {
-            ThaumcraftApi.registerComplexObjectTag(aStack, getAspectList(aAspects));
-            return true;
-        }
-        AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack);
-        if ((tAlreadyRegisteredAspects == null) || (tAlreadyRegisteredAspects.size() <= 0)) {
-            ThaumcraftApi.registerObjectTag(aStack, getAspectList(aAspects));
-        }
-        return true;
-    }
+	public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_Aspects.TC_AspectStack> aAspects, boolean aAdditive) {
+		if (aAspects.isEmpty()) return false;
+		if (aAdditive) {
+			ThaumcraftApi.registerComplexObjectTag(aStack, (AspectList)getAspectList(aAspects));
+			return true;
+		}
+		AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack);
+		if (tAlreadyRegisteredAspects == null || tAlreadyRegisteredAspects.size() <= 0) {
+			ThaumcraftApi.registerObjectTag(aStack, (AspectList)getAspectList(aAspects));
+		}
+		return true;
+	}
 
     public boolean registerPortholeBlacklistedBlock(Block aBlock) {
         ThaumcraftApi.portableHoleBlackList.add(aBlock);