$ Added recipe hashing to prevent unwanted recipe changes.

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

53 files changed, 313 insertions, 280 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 6a0de88b05..339c0125fb 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -19,6 +19,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.util.*;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.chunkloading.GTPP_ChunkManager;
@@ -197,7 +198,7 @@ public class GTplusplus implements ActionListener {
 		//SprinklerHandler.registerModFerts();
 
 		BlockEventHandler.init();
-        Recipe_GT.reInit();
+        GTPP_Recipe.reInit();
 
 		Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 		Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: "
@@ -249,11 +250,15 @@ public class GTplusplus implements ActionListener {
 	public void onLoadComplete(FMLLoadCompleteEvent event) {
 		proxy.onLoadComplete(event);
 		generateGregtechRecipeMaps();
+		// Check our maps ar euntouched
+		Logger.INFO("Making sure that all GT++ recipes are untouched.");
+		GTPP_Recipe.checkRecipeModifications();
+		Logger.INFO("Passed verification checks.");
 	}
 
     @Mod.EventHandler
     public void onIDChangingEvent(FMLModIdMappingEvent aEvent) {
-        Recipe_GT.reInit();
+        GTPP_Recipe.reInit();
     }
 
 	public static void tryPatchTurbineTextures() {
@@ -313,9 +318,9 @@ public class GTplusplus implements ActionListener {
 			}
 		}
 
-		if (Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) {
-			for (GT_Recipe a : Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList) {
-				Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a);
+		if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) {
+			for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList) {
+				GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a);
 			}
 		}
 
@@ -344,9 +349,9 @@ public class GTplusplus implements ActionListener {
 			}
 		}
 
-		if (Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) {
-			for (GT_Recipe a : Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList) {
-				Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a);
+		if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) {
+			for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList) {
+				GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a);
 			}
 		}
 
diff --git a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java
index 5d79fd8a51..ddbf9f38bb 100644
--- a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java
+++ b/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.api.interfaces;
 
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.GTPP_Recipe;
 
 public interface IComparableRecipe extends Comparable<GT_Recipe>{
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 7745f50010..719e5145e9 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -9,7 +9,7 @@ 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.GT_Utility;
-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.minecraft.ItemPackage;
@@ -281,8 +281,8 @@ public class RocketFuels extends ItemPackage {
 	}
 
 	private static void addRocketFuelsToMap() {		
-		HashMap<Integer, Recipe_GT> mRocketFuels = new LinkedHashMap<Integer, Recipe_GT>();
-		mRocketFuels.put(0, new Recipe_GT(
+		HashMap<Integer, GTPP_Recipe> mRocketFuels = new LinkedHashMap<Integer, GTPP_Recipe>();
+		mRocketFuels.put(0, new GTPP_Recipe(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -294,7 +294,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				256)); //Fuel Value
 
-		mRocketFuels.put(1, new Recipe_GT(
+		mRocketFuels.put(1, new GTPP_Recipe(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -306,7 +306,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				512)); //Fuel Value
 
-		mRocketFuels.put(2, new Recipe_GT(
+		mRocketFuels.put(2, new GTPP_Recipe(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -318,7 +318,7 @@ public class RocketFuels extends ItemPackage {
 				0,
 				768)); //Fuel Value
 
-		mRocketFuels.put(3, new Recipe_GT(
+		mRocketFuels.put(3, new GTPP_Recipe(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -336,11 +336,11 @@ public class RocketFuels extends ItemPackage {
 
 		mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel));
 		for (int mID : mRocketFuels.keySet()) {
-			Recipe_GT aFuelRecipe = mRocketFuels.get(mID);
+			GTPP_Recipe aFuelRecipe = mRocketFuels.get(mID);
 			if (aFuelRecipe != null) {
 				mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid()));
 				mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid());
-				Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.add(aFuelRecipe);		
+				GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels.add(aFuelRecipe);		
 			}
 		}
 
@@ -1007,8 +1007,8 @@ public class RocketFuels extends ItemPackage {
 		return true;
 	}
 
-	private static Recipe_GT getHalfBakedRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, int aEU) {
-		return new Recipe_GT(false,	aInputs, null, null, null, aFluidInputs, null, 0, aEU, 0);
+	private static GTPP_Recipe getHalfBakedRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, int aEU) {
+		return new GTPP_Recipe(false,	aInputs, null, null, null, aFluidInputs, null, 0, aEU, 0);
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
index add55b8d27..4b9cda0b9b 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.slots;
 
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -20,9 +20,9 @@ public class SlotChemicalPlantInput extends Slot {
 	}
 	
 	public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) {
-		boolean validItem = Gregtech_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack);		
+		boolean validItem = GTPP_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack);		
 		if (!validItem) {
-			for (Recipe_GT f : Gregtech_Recipe_Map.sChemicalPlantRecipes.mRecipeList) {
+			for (GTPP_Recipe f : GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) {
 				if (f.mFluidInputs.length > 0) {
 					for (FluidStack g : f.mFluidInputs) {
 						if (g != null) {
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index e7b7c46e7b..2d389d8bb2 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
 import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 
 public class ModTileEntities {
 
@@ -52,6 +53,12 @@ public class ModTileEntities {
 		if (LoadedMods.Thaumcraft){
 			
 		}
+		blacklistTilesFromAcceleration();
+	}
+	
+	private static void blacklistTilesFromAcceleration() {
+		Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEntityFishTrap");
+		Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest");
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
index 279f45f756..12c1b501bd 100644
--- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
+++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
@@ -19,7 +19,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.gui.GT_GUIContainer_BasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gregtech.common.gui.GT_GUIContainer_FusionReactor;
 import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace;
 import net.minecraft.client.Minecraft;
@@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandler
         GuiContainerManager.addTooltipHandler(new GT_RectHandler());
     }
 
-    protected final Gregtech_Recipe_Map mRecipeMap;
+    protected final GTPP_Recipe_Map mRecipeMap;
 
-    public GTPP_NEI_DefaultHandler(Gregtech_Recipe_Map tMap) {
+    public GTPP_NEI_DefaultHandler(GTPP_Recipe_Map tMap) {
         this.mRecipeMap = tMap;
         this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0]));
         if (!NEI_GT_Config.sIsAdded) {
diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
index 8bf048730a..0d9fc52943 100644
--- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
+++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
@@ -19,7 +19,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.gui.GT_GUIContainer_BasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gregtech.common.gui.GT_GUIContainer_FusionReactor;
 import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace;
 import net.minecraft.client.Minecraft;
@@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandlerEx
         GuiContainerManager.addTooltipHandler(new GT_RectHandler());
     }
 
-    protected final Gregtech_Recipe_Map mRecipeMap;
+    protected final GTPP_Recipe_Map mRecipeMap;
 
-    public GTPP_NEI_DefaultHandlerEx(Gregtech_Recipe_Map tMap) {
+    public GTPP_NEI_DefaultHandlerEx(GTPP_Recipe_Map tMap) {
         this.mRecipeMap = tMap;
         this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0]));
         if (!NEI_GT_Config.sIsAdded) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
index 0d4e84b4b7..c4eff20a27 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
@@ -19,7 +19,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -41,7 +41,7 @@ extends TemplateRecipeHandler {
 	protected GT_Recipe_Map mRecipeMap;
 
 	public GT_NEI_FlotationCell() {
-		this.mRecipeMap = Gregtech_Recipe_Map.sFlotationCellRecipes;
+		this.mRecipeMap = GTPP_Recipe_Map.sFlotationCellRecipes;
 		this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
 		if (!NEI_GT_Config.sIsAdded) {
 			FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -50,8 +50,8 @@ extends TemplateRecipeHandler {
 		}
 	}
 
-	public List<Recipe_GT> getSortedRecipes() {
-		List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+	public List<GTPP_Recipe> getSortedRecipes() {
+		List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
 		Collections.sort(result);
 		return result;
 	}
@@ -68,7 +68,7 @@ extends TemplateRecipeHandler {
 	@Override
 	public void loadCraftingRecipes(final String outputId, final Object... results) {
 		if (outputId.equals(getRecipeMapName())) {
-			for (Recipe_GT tRecipe : getSortedRecipes()) {
+			for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 				if (!tRecipe.mHidden) {
 					this.arecipes.add(new CachedDefaultRecipe(tRecipe));
 				}
@@ -99,7 +99,7 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		for (Recipe_GT tRecipe : getSortedRecipes()) {
+		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
 				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
 				for (ItemStack tStack : tResults) {
@@ -133,7 +133,7 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		for (Recipe_GT tRecipe : getSortedRecipes()) {
+		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
 				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
 				for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
index 29c3cecb6f..57e6e1a899 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
@@ -26,8 +26,8 @@ import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.client.Minecraft;
@@ -47,10 +47,10 @@ extends TemplateRecipeHandler {
 		GuiContainerManager.addTooltipHandler(new GT_RectHandler());
 	}
 
-	protected Gregtech_Recipe_Map mRecipeMap;
+	protected GTPP_Recipe_Map mRecipeMap;
 
 	public GT_NEI_FluidReactor() {
-		this.mRecipeMap = Gregtech_Recipe_Map.sChemicalPlantRecipes;
+		this.mRecipeMap = GTPP_Recipe_Map.sChemicalPlantRecipes;
 		this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
 		if (!NEI_GT_Config.sIsAdded) {
 			FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -59,8 +59,8 @@ extends TemplateRecipeHandler {
 		}
 	}
 
-	public List<Recipe_GT> getSortedRecipes() {
-		List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+	public List<GTPP_Recipe> getSortedRecipes() {
+		List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
 		Collections.sort(result);
 		return result;
 	}
@@ -77,7 +77,7 @@ extends TemplateRecipeHandler {
 	@Override
 	public void loadCraftingRecipes(final String outputId, final Object... results) {
 		if (outputId.equals(getRecipeMapName())) {
-			for (Recipe_GT tRecipe : getSortedRecipes()) {
+			for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 				if (!tRecipe.mHidden) {
 					this.arecipes.add(new CachedDefaultRecipe(tRecipe));
 				}
@@ -108,7 +108,7 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		for (Recipe_GT tRecipe : getSortedRecipes()) {
+		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
 				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
 				for (ItemStack tStack : tResults) {
@@ -142,7 +142,7 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
-		for (Recipe_GT tRecipe : getSortedRecipes()) {
+		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
 				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
 				for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
index b868c2422c..8aea87b6d4 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
@@ -28,8 +28,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -51,7 +51,7 @@ extends TemplateRecipeHandler {
 	protected GT_Recipe_Map mRecipeMap;
 
 	public GT_NEI_MillingMachine() {
-		this.mRecipeMap =