From e42c71394ca8e9b82a47ca8b35aad2d19ff16ac3 Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Tue, 14 Apr 2020 18:46:45 +0100
Subject: $ Fixed GTPP recipe maps being mapped to to the
 GT_Recipe_Map.sMappings list. Prevents BartWorks from touching my recipes.

---
 src/Java/gtPlusPlus/GTplusplus.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/Java/gtPlusPlus/GTplusplus.java')

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 4ddec1f9f4..6a0de88b05 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -11,23 +11,15 @@ import java.util.Collection;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.util.FishPondFakeRecipe;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.SemiFluidFuelHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.chunkloading.GTPP_ChunkManager;
 import gtPlusPlus.core.commands.CommandDebugChunks;
@@ -205,6 +197,7 @@ public class GTplusplus implements ActionListener {
 		//SprinklerHandler.registerModFerts();
 
 		BlockEventHandler.init();
+        Recipe_GT.reInit();
 
 		Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 		Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: "
@@ -258,6 +251,11 @@ public class GTplusplus implements ActionListener {
 		generateGregtechRecipeMaps();
 	}
 
+    @Mod.EventHandler
+    public void onIDChangingEvent(FMLModIdMappingEvent aEvent) {
+        Recipe_GT.reInit();
+    }
+
 	public static void tryPatchTurbineTextures() {
 		if (enableAnimatedTurbines) {
 			BlockIcons h = Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE;
-- 
cgit