diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index e99f077a..e685759d 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -18,7 +18,8 @@ using UnityEngine.SceneManagement; using Logger = NewHorizons.Utility.Logger; using NewHorizons.Utility.DebugUtilities; using Newtonsoft.Json; - +using NewHorizons.Utility.DebugMenu; + namespace NewHorizons { diff --git a/NewHorizons/Utility/DebugUtilities/DebugMenu.cs b/NewHorizons/Utility/DebugMenu/DebugMenu.cs similarity index 96% rename from NewHorizons/Utility/DebugUtilities/DebugMenu.cs rename to NewHorizons/Utility/DebugMenu/DebugMenu.cs index 204dd728..da80fd80 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugMenu.cs +++ b/NewHorizons/Utility/DebugMenu/DebugMenu.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.InputSystem; -namespace NewHorizons.Utility.DebugUtilities +namespace NewHorizons.Utility.DebugMenu { class DebugMenu : MonoBehaviour { @@ -186,7 +186,7 @@ namespace NewHorizons.Utility.DebugUtilities private void LoadMod(IModBehaviour mod) { loadedMod = mod; - DebugPropPlacer.active = true; + submenus.ForEach(submenu => submenu.OnBeginLoadMod(this)); var folder = loadedMod.ModHelper.Manifest.ModFolderPath; diff --git a/NewHorizons/Utility/DebugUtilities/DebugMenuDummySubmenu.cs b/NewHorizons/Utility/DebugMenu/DebugMenuDummySubmenu.cs similarity index 81% rename from NewHorizons/Utility/DebugUtilities/DebugMenuDummySubmenu.cs rename to NewHorizons/Utility/DebugMenu/DebugMenuDummySubmenu.cs index da005c65..6d0eb404 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugMenuDummySubmenu.cs +++ b/NewHorizons/Utility/DebugMenu/DebugMenuDummySubmenu.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NewHorizons.Utility.DebugUtilities +namespace NewHorizons.Utility.DebugMenu { class DebugMenuDummySubmenu : DebugSubmenu { @@ -18,6 +18,10 @@ namespace NewHorizons.Utility.DebugUtilities { } + internal override void OnBeginLoadMod(DebugMenu debugMenu) + { + } + internal override void OnGUI(DebugMenu menu) { } diff --git a/NewHorizons/Utility/DebugUtilities/DebugMenuPropPlacer.cs b/NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs similarity index 94% rename from NewHorizons/Utility/DebugUtilities/DebugMenuPropPlacer.cs rename to NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs index 90d8cb74..9c20e146 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugMenuPropPlacer.cs +++ b/NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs @@ -1,5 +1,6 @@ using NewHorizons.External.Configs; using NewHorizons.External.Modules; +using NewHorizons.Utility.DebugUtilities; using System; using System.Collections.Generic; using System.Linq; @@ -7,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using UnityEngine; -namespace NewHorizons.Utility.DebugUtilities +namespace NewHorizons.Utility.DebugMenu { class DebugMenuPropPlacer : DebugSubmenu { @@ -36,6 +37,11 @@ namespace NewHorizons.Utility.DebugUtilities _drc = menu.GetComponent(); LoadFavoriteProps(); } + + internal override void OnBeginLoadMod(DebugMenu debugMenu) + { + DebugPropPlacer.active = true; + } internal override void LoadConfigFile(DebugMenu menu, PlanetConfig config) { diff --git a/NewHorizons/Utility/DebugUtilities/DebugSubmenu.cs b/NewHorizons/Utility/DebugMenu/DebugSubmenu.cs similarity index 81% rename from NewHorizons/Utility/DebugUtilities/DebugSubmenu.cs rename to NewHorizons/Utility/DebugMenu/DebugSubmenu.cs index 8bc03461..0f7e6f5f 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugSubmenu.cs +++ b/NewHorizons/Utility/DebugMenu/DebugSubmenu.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NewHorizons.Utility.DebugUtilities +namespace NewHorizons.Utility.DebugMenu { abstract class DebugSubmenu { @@ -14,6 +14,7 @@ namespace NewHorizons.Utility.DebugUtilities internal abstract void PreSave(DebugMenu menu); internal abstract void OnInit(DebugMenu menu); internal abstract void LoadConfigFile(DebugMenu menu, PlanetConfig config); + internal abstract void OnBeginLoadMod(DebugMenu debugMenu); internal abstract string SubmenuName();