Merge tag '1.7.20' into unified-build-script2

# Conflicts:
#	build.properties
#	src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java

1 files changed, 8 insertions, 31 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
index e84ce73a47..2e6de159d0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
@@ -1,51 +1,28 @@
 package gtPlusPlus.xmod.gregtech.loaders.misc;
 
-import java.lang.reflect.Method;
-
 import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_ProcessingArray_Manager;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.api.objects.Logger;
 
 public class AddCustomMachineToPA {
 
-	private static final boolean sDoesPatchExist;
-	private static final Class sManagerPA;
-	private static final Method sRegisterRecipeMapForMeta;
-
-	static {
-		sDoesPatchExist = ReflectionUtils.doesClassExist("gregtech.api.util.GT_ProcessingArray_Manager");
-		if (sDoesPatchExist) {
-			sManagerPA = ReflectionUtils.getClass("gregtech.api.util.GT_ProcessingArray_Manager");
-			sRegisterRecipeMapForMeta = ReflectionUtils.getMethod(sManagerPA, "registerRecipeMapForMeta", int.class, GT_Recipe_Map.class);
-		}
-		else {
-			sManagerPA = null;
-			sRegisterRecipeMapForMeta = null;
-		}
-	}
-
 	public static final void registerRecipeMapForID(int aID, GT_Recipe_Map aMap) {
-		if (sDoesPatchExist) {
-			ReflectionUtils.invokeNonBool(null, sRegisterRecipeMapForMeta, new Object[] {aID, aMap});
-		}
-
+		Logger.INFO("Attempting to add map "+aMap.mNEIName+" to Processing Array for Meta Tile "+aID+". Success? "+GT_ProcessingArray_Manager.registerRecipeMapForMeta(aID, aMap));
 	}
 
 	public static final void registerRecipeMapBetweenRangeOfIDs(int aMin, int aMax, GT_Recipe_Map aMap) {
-		if (sDoesPatchExist) {
-			for (int i=aMin; i<=aMax;i++) {
-				ReflectionUtils.invokeNonBool(null, sRegisterRecipeMapForMeta, new Object[] {i, aMap});
-				//GT_ProcessingArray_Manager.registerRecipeMapForMeta(i, aMap);
-			}
-		}		
+		for (int i=aMin; i<=aMax;i++) {
+			registerRecipeMapForID(i, aMap);
+		}	
 	}
 
 	public static void register() {
-		
+
 		// Simple Washers
 		registerRecipeMapForID(767, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
 		registerRecipeMapBetweenRangeOfIDs(31017, 31020, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
-		
+
 	}
 
 }