Merge pull request #60 from SpaceWarpDev/fix_mod_persistence

Fix #58
SpaceWarpDev · Feb 28, 2023 · eefe0eb · eefe0eb
2 parents ef4afb2 + e522f04
commit eefe0eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/SpaceWarp/API/SpaceWarpManager.cs b/SpaceWarp/API/SpaceWarpManager.cs
@@ -68,7 +68,7 @@ private void Initialize()
         public void InitializeConfigManager()
         {
             GameObject confManagerObject = new GameObject("Configuration Manager");
-            DontDestroyOnLoad(confManagerObject);
+            Persist(confManagerObject);
 
             confManagerObject.AddComponent<ConfigurationManager>();
             confManagerObject.SetActive(true);
@@ -522,7 +522,7 @@ private void InitializeModObject(string modName, ModInfo info, Type mainModType)
 			try
 			{
                 ModLocator.Add(modComponent);
-                DontDestroyOnLoad(modObject);
+                Persist(modObject);
 				modComponent.Initialize();
 			}
             catch(Exception exception)
@@ -557,15 +557,15 @@ internal void InvokePostInitializeModsAfterAllModsLoaded()
         private void InitModUI()
         {
             GameObject modUIObject = new GameObject("Space Warp Mod UI");
-            DontDestroyOnLoad(modUIObject);
+            Persist(modUIObject);
 
             modUIObject.transform.SetParent(transform.parent);
             ModListUI = modUIObject.AddComponent<ModListUI>();
 
             modUIObject.SetActive(true);
 
             GameObject consoleUIObject = new GameObject("Space Warp Console");
-            DontDestroyOnLoad(consoleUIObject);
+            Persist(consoleUIObject);
             consoleUIObject.transform.SetParent(transform.parent);
             SpaceWarpConsole con = consoleUIObject.AddComponent<SpaceWarpConsole>();
             consoleUIObject.SetActive(true);
@@ -576,7 +576,7 @@ private void InitModUI()
         public T RegisterGameToolbarMenu<T>(string text, Sprite icon, string id) where T : ToolbarMenu
         {
             GameObject toolBarUIObject = new GameObject($"Toolbar: {id}");
-            DontDestroyOnLoad(toolBarUIObject);
+            Persist(toolBarUIObject);
             ToolbarMenu menu = toolBarUIObject.AddComponent<T>();
             menu.Name = text;
             toolBarUIObject.transform.SetParent(transform.parent);
@@ -585,6 +585,12 @@ public T RegisterGameToolbarMenu<T>(string text, Sprite icon, string id) where T
             return menu as T;
         }
 
+        public static void Persist(GameObject toPersist)
+        {
+            DontDestroyOnLoad(toPersist);
+            toPersist.tag = "Game Manager";
+        }
+
         private void LoadAllButtons()
         {
             foreach (var button in _buttonsToBeLoaded)

diff --git a/SpaceWarp/StartupManager.cs b/SpaceWarp/StartupManager.cs
@@ -43,7 +43,7 @@ public static void OnGameStarted()
         private static void CreateSpaceWarpManager()
         {
             GameObject spaceWarp = new GameObject("Space Warp");
-            Object.DontDestroyOnLoad(spaceWarp);
+            SpaceWarpManager.Persist(spaceWarp);
             SpaceWarpObject = spaceWarp.AddComponent<SpaceWarpManager>();
             spaceWarp.SetActive(true);
             // SpaceWarpObject.Initialize();