$ Added recipe hashing to prevent unwanted recipe changes.

$ Made certain TileEntities blacklisted against the World accelerator in both GT++ & GTNH.

5 files changed, 16 insertions, 25 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
index 40994040bd..9fe86985f4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -106,7 +106,7 @@ public class RecipeGen_FluidCanning implements Runnable {
 
 		//Check validity
 
-		Recipe_GT aRecipe = new Recipe_GT(
+		GTPP_Recipe aRecipe = new GTPP_Recipe(
 				true,
 				new ItemStack[] { aInput },
 				new ItemStack[] { aOutput },
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 007f390112..56d11520d0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -3,18 +3,16 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_Recipe;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class RecipeGen_Plates extends RecipeGen_Base {
 
@@ -126,14 +124,7 @@ public class RecipeGen_Plates extends RecipeGen_Base {
 	}
 
 	public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aOutput1, int aDuration, final int aEUt) {
-		if ((aInput1 == null) || (aOutput1 == null)) {
-			return false;
-		}
-		if ((aDuration = GregTech_API.sRecipeFile.get("bender", aInput1, aDuration)) <= 0) {
-			return false;
-		}
-		new GT_Recipe(aEUt, aDuration, aInput1, aOutput1);
-		return true;
+		return GT_Values.RA.addBenderRecipe(aInput1, aOutput1, aDuration, aEUt);
 	}
 
 	public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
index 321cab4628..e84ce73a47 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.gregtech.loaders.misc;
 
 import java.lang.reflect.Method;
 
-import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -43,8 +43,8 @@ public class AddCustomMachineToPA {
 	public static void register() {
 		
 		// Simple Washers
-		registerRecipeMapForID(767, Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes);
-		registerRecipeMapBetweenRangeOfIDs(31017, 31020, Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes);
+		registerRecipeMapForID(767, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
+		registerRecipeMapBetweenRangeOfIDs(31017, 31020, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
index 1091533a52..053c71c89d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.WeightedCollection;
@@ -103,7 +103,7 @@ public class RecipeLoader_AlgaeFarm {
 		// We set these elsewhere
 		ItemStack[] aOutputs = getOutputsForTier(aTier);
 
-		GT_Recipe tRecipe = new Recipe_GT(
+		GT_Recipe tRecipe = new GTPP_Recipe(
 				false, 
 				aInputs,
 				aOutputs,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index 768bfec3d3..424c2ecce5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.GTPP_Recipe;
 
 import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap;
 import gtPlusPlus.core.recipe.common.CI;
@@ -30,7 +30,7 @@ public class RecipeLoader_LFTR {
 		//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
 
 		//LiFBeF2ThF4UF4
-		GT_Recipe LFTR1 = new Recipe_GT(
+		GT_Recipe LFTR1 = new GTPP_Recipe(
 				true, 
 				new ItemStack[] {CI.getNumberedCircuit(1)},
 				new ItemStack[] {},
@@ -49,7 +49,7 @@ public class RecipeLoader_LFTR {
 				);
 
 		//LiFBeF2ZrF4UF4
-		GT_Recipe LFTR2 = new Recipe_GT(
+		GT_Recipe LFTR2 = new GTPP_Recipe(
 				true, 
 				new ItemStack[] {CI.getNumberedCircuit(2)},
 				new ItemStack[] {},
@@ -68,7 +68,7 @@ public class RecipeLoader_LFTR {
 				);
 
 		//LiFBeF2ZrF4U235
-		GT_Recipe LFTR3 = new Recipe_GT(
+		GT_Recipe LFTR3 = new GTPP_Recipe(
 				true, 
 				new ItemStack[] {CI.getNumberedCircuit(3)},
 				new ItemStack[] {},
@@ -89,9 +89,9 @@ public class RecipeLoader_LFTR {
 		/*mRecipesLFTR.add(LFTR1);
 		mRecipesLFTR.add(LFTR2);
 		mRecipesLFTR.add(LFTR3);*/		
-		Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR1);
-		Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR2);
-		Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR3);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR1);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR2);
+		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR3);
 		
 
 	}