events for menus (#50)

ow-mods · Jan 6, 2020 · d73bf52 · d73bf52
1 parent 92c50a4
commit d73bf52
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 16 deletions.
diff --git a/OWML.Common/IModMenus.cs b/OWML.Common/IModMenus.cs
@@ -3,6 +3,6 @@
     public interface IModMenus
     {
         IModMenu MainMenu { get; }
-        IModMenu PauseMenu { get; }
+        IModPopupMenu PauseMenu { get; }
     }
 }
diff --git a/OWML.Common/IModPopupMenu.cs b/OWML.Common/IModPopupMenu.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace OWML.Common
+{
+    public interface IModPopupMenu : IModMenu
+    {
+        Action OnOpen { get; set; }
+        Action OnClose { get; set; }
+
+        bool IsOpen { get; }
+
+        void Open();
+        void Close();
+        void Toggle();
+    }
+}
diff --git a/OWML.Common/OWML.Common.csproj b/OWML.Common/OWML.Common.csproj
@@ -67,6 +67,7 @@
     <Compile Include="IModAssets.cs" />
     <Compile Include="IModAsset.cs" />
     <Compile Include="IModConfig.cs" />
+    <Compile Include="IModPopupMenu.cs" />
     <Compile Include="IOwmlConfig.cs" />
     <Compile Include="IModEvents.cs" />
     <Compile Include="IModFinder.cs" />

diff --git a/OWML.Launcher/App.cs b/OWML.Launcher/App.cs
@@ -10,7 +10,7 @@ namespace OWML.Launcher
 {
     public class App
     {
-        private const string Version = "0.3.14";
+        private const string Version = "0.3.15";
 
         private readonly IOwmlConfig _config;
         private readonly IModConsole _writer;

diff --git a/OWML.ModHelper.Events/HarmonyHelper.cs b/OWML.ModHelper.Events/HarmonyHelper.cs
@@ -26,7 +26,7 @@ private HarmonyInstance CreateInstance()
             try
             {
                 _logger.Log("Creating harmony instance");
-                harmony = HarmonyInstance.Create("com.owml" + _manifest.UniqueName);
+                harmony = HarmonyInstance.Create("com.owml." + _manifest.UniqueName);
                 _logger.Log("Created harmony instance");
             }
             catch (Exception ex)

diff --git a/OWML.ModHelper.Menus/ModMenus.cs b/OWML.ModHelper.Menus/ModMenus.cs
@@ -5,7 +5,7 @@ namespace OWML.ModHelper.Menus
     public class ModMenus : IModMenus
     {
         public IModMenu MainMenu { get; }
-        public IModMenu PauseMenu { get; }
+        public IModPopupMenu PauseMenu { get; }
 
         public ModMenus(IModLogger logger, IModConsole console)
         {

diff --git a/OWML.ModHelper.Menus/ModPauseMenu.cs b/OWML.ModHelper.Menus/ModPauseMenu.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using OWML.Common;
 using OWML.ModHelper.Events;
@@ -7,13 +8,17 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public class ModPauseMenu : IModMenu
+    public class ModPauseMenu : IModPopupMenu
     {
+        public Action OnOpen { get; set; }
+        public Action OnClose { get; set; }
+        public bool IsOpen { get; private set; }
+
         private readonly IModLogger _logger;
         private readonly IModConsole _console;
+        private PauseMenuManager _pauseMenuManager;
         private Menu _menu;
         private LayoutGroup _layoutGroup;
-        private bool _isInitialized;
 
         public ModPauseMenu(IModLogger logger, IModConsole console)
         {
@@ -23,7 +28,7 @@ public ModPauseMenu(IModLogger logger, IModConsole console)
 
         public List<Button> GetButtons()
         {
-            if (!_isInitialized)
+            if (_menu == null)
             {
                 _console.WriteLine("Warning: can't get pause buttons before player wakes up");
                 return new List<Button>();
@@ -35,12 +40,12 @@ public Button AddButton(string name, int index)
         {
             _console.WriteLine("Adding pause button: " + name);
 
-            if (!_isInitialized)
+            if (_menu == null)
             {
                 Initialize();
             }
 
-            if (!_isInitialized)
+            if (_menu == null)
             {
                 _console.WriteLine("Warning: can't add pause buttons before player wakes up.");
                 return null;
@@ -64,15 +69,60 @@ public Button AddButton(string name, int index)
         private void Initialize()
         {
             _logger.Log("Trying to initialize pause menu");
-            var pauseMenuManager = GameObject.FindObjectOfType<PauseMenuManager>();
-            if (pauseMenuManager == null)
+            _pauseMenuManager = GameObject.FindObjectOfType<PauseMenuManager>();
+            if (_pauseMenuManager == null)
             {
                 _console.WriteLine("Warning: can't initialize pause menu before player wakes up");
                 return;
             }
-            _menu = pauseMenuManager.GetValue<Menu>("_pauseMenu");
+            _menu = _pauseMenuManager.GetValue<Menu>("_pauseMenu");
             _layoutGroup = _menu.GetComponentInChildren<LayoutGroup>();
-            _isInitialized = true;
+            _menu.OnActivateMenu += OnActivateMenu;
+            _menu.OnDeactivateMenu += OnDeactivateMenu;
+        }
+
+        private void OnDeactivateMenu()
+        {
+            IsOpen = false;
+            OnClose?.Invoke();
+        }
+
+        private void OnActivateMenu()
+        {
+            IsOpen = true;
+            OnOpen?.Invoke();
+        }
+
+        public void Open()
+        {
+            if (_menu == null)
+            {
+                Console.WriteLine("Warning: can't open menu, it doesn't exist.");
+                return;
+            }
+            _pauseMenuManager.TryOpenPauseMenu();
+        }
+
+        public void Close()
+        {
+            if (_menu == null)
+            {
+                Console.WriteLine("Warning: can't close menu, it doesn't exist.");
+                return;
+            }
+            _menu.Deactivate();
+        }
+
+        public void Toggle()
+        {
+            if (IsOpen)
+            {
+                Close();
+            }
+            else
+            {
+                Open();
+            }
         }
 
     }

diff --git a/OWML.SampleMods/OWML.EnableDebugMode/manifest.json b/OWML.SampleMods/OWML.EnableDebugMode/manifest.json
@@ -4,6 +4,6 @@
   "name": "EnableDebugMode",
   "uniqueName": "Alek.EnableDebugMode",
   "version": "0.2",
-  "owmlVersion": "0.3.14",
+  "owmlVersion": "0.3.15",
   "enabled": false
 }
diff --git a/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json b/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json
@@ -4,6 +4,6 @@
   "name": "LoadCustomAssets",
   "uniqueName": "Alek.LoadCustomAssets",
   "version": "0.4",
-  "owmlVersion": "0.3.14",
+  "owmlVersion": "0.3.15",
   "enabled": false
 }