change method of mod initialization

FEZModding · Jan 23, 2023 · 959db0f · 959db0f
1 parent e5f2ee0
commit 959db0f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Patches/Fez.cs b/Patches/Fez.cs
@@ -1,4 +1,5 @@
-using HatModLoader.Helpers;
+using FezEngine.Tools;
+using HatModLoader.Helpers;
 using HatModLoader.Installers;
 using HatModLoader.Source;
 using Microsoft.Xna.Framework;
@@ -9,7 +10,7 @@
 
 namespace FezGame
 {
-    public class patch_Fez : Fez
+    class patch_Fez : Fez
     {
         public static Hat HatML;
 
@@ -36,7 +37,16 @@ protected override void Initialize()
             orig_Initialize();
             DrawingTools.Init();
             HatML.InitializeAssets();
-            HatML.InitalizeComponents();
+        }
+
+        internal static extern void orig_LoadComponents(Fez game);
+        internal static void LoadComponents(Fez game)
+        {
+            bool doLoad = !ServiceHelper.FirstLoadDone;
+            orig_LoadComponents(game);
+            if (doLoad) {
+                HatML.InitalizeComponents();
+            }
         }
 
         protected extern void orig_Update(GameTime gameTime);

diff --git a/Source/Mod.cs b/Source/Mod.cs
@@ -97,7 +97,8 @@ public void InitializeComponents()
             foreach (var component in Components)
             {
                 ServiceHelper.AddComponent(component);
-                component.Initialize();
+                // initialization is done by just adding component if they're added past game init
+                //component.Initialize();
             }
         }