From 05d33ad675adcad53cbca8480f4cc6402d49f9df Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Thu, 14 Nov 2019 15:28:25 +0100
Subject: moved recipes edit +to fix CircuitAssembler Recipes +might break
 scripts

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: 9a7dd8ebf5574611e275aef1ca3e4e3cd10e8823
---
 .../github/bartimaeusnek/bartworks/MainMod.java    | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index 6be66988c3..34a148d499 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -54,10 +54,7 @@ import com.google.common.collect.ArrayListMultimap;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -206,26 +203,27 @@ public final class MainMod {
     public void onServerStarted(FMLServerStartedEvent event) {
         MainMod.runOnPlayerJoined(ConfigHandler.classicMode, ConfigHandler.disableExtraGassesForEBF);
     }
+    @Mod.EventHandler
+    public void onModLoadingComplete(FMLLoadCompleteEvent event) {
+        removeIC2Recipes();
+        MainMod.addElectricImplosionCompressorRecipes();
+        PlatinumSludgeOverHaul.replacePureElements();
+        new CircuitImprintLoader().run();
+        runOnServerStarted();
+        fixEnergyRequirements();
+        MainMod.unificationEnforcer();
+    }
 
     public static void runOnPlayerJoined(boolean classicMode, boolean extraGasRecipes){
         OreDictHandler.adaptCacheForWorld();
         if (!recipesAdded) {
-            removeIC2Recipes();
-            MainMod.addElectricImplosionCompressorRecipes();
-            MainMod.unificationEnforcer();
-
-            PlatinumSludgeOverHaul.replacePureElements();
-
             if (!extraGasRecipes) {
                 ArrayListMultimap<SubTag, GT_Recipe> toChange = MainMod.getRecipesToChange(NOBLE_GAS, ANAEROBE_GAS);
                 HashSet<ItemStack> noGas = MainMod.getNoGasItems(toChange);
                 MainMod.editRecipes(toChange, noGas);
             }
-            new CircuitImprintLoader().run();
             if (classicMode)
                 new DownTierLoader().run();
-            runOnServerStarted();
-            fixEnergyRequirements();
 //        removeDuplicateRecipes();
             recipesAdded = true;
         }
-- 
cgit