% Moved Zhuhai's recipe generator to be later. It is now called in onLoadComplete() to ensure it's called after all mods are initialized.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 9b8c9236df..b99155c906 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.launchwrapper.Launch;
 
 import gregtech.api.enums.Materials;
+import gregtech.api.util.FishPondFakeRecipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 
@@ -191,9 +192,16 @@ public class GTplusplus implements ActionListener {
 
 	}
 	
+	
+	/**
+	 * This {@link EventHandler} is called after the {@link FMLPostInitializationEvent} stages of all loaded mods executes successfully.
+	 * {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to inject recipe generation after Gregtech and all other mods are entirely loaded and initialized.
+	 * @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s {@link #instance}.
+	 */
 	@Mod.EventHandler
     public void onLoadComplete(FMLLoadCompleteEvent event) {		
 		RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList();
+		FishPondFakeRecipe.generateFishPondRecipes();
 	}
 
 	protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
index 775c3e20e1..681256a385 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import gregtech.api.util.FishPondFakeRecipe;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialFishingPond;
@@ -11,8 +9,7 @@ public class GregtechIndustrialFishPond {
 	public static void run() {
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Logger.INFO("Gregtech5u Content | Registering Industrial Fishing Pond Multiblock.");
-			//if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
-			FishPondFakeRecipe.generateFishPondRecipes();
+			//if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {			
 			run1();
 			//}
 		}