added Open method to each menu type (#385)

Co-authored-by: Michael Wilson <[email protected]> Co-authored-by: Roflmuffin <[email protected]>
roflmuffin · Apr 1, 2024 · 211516c · 211516c
1 parent ab211a4
commit 211516c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 14 deletions.
diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/BaseMenu.cs b/managed/CounterStrikeSharp.API/Modules/Menu/BaseMenu.cs
@@ -31,20 +31,31 @@ public abstract class BaseMenu : IMenu
     public List<ChatMenuOption> MenuOptions { get; } = new();
     public PostSelectAction PostSelectAction { get; set; } = PostSelectAction.Reset;
     public bool ExitButton { get; set; } = true;
-    
+
     protected BaseMenu(string title)
     {
         Title = title;
     }
-
-    public virtual ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false)
+
+    public virtual ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect,
+        bool disabled = false)
     {
         var option = new ChatMenuOption(display, disabled, onSelect);
         MenuOptions.Add(option);
         return option;
     }
+
+    public abstract void Open(CCSPlayerController player);
+
+    public void OpenToAll()
+    {
+        foreach (var player in Utilities.GetPlayers())
+        {
+            Open(player);
+        }
+    }
 }
-    
+
 // This must be called ChatMenuOption to maintain backwards compatibility with the old API
 public class ChatMenuOption
 {
@@ -114,7 +125,7 @@ public void OnKeyPress(CCSPlayerController player, int key)
         if (menuItemIndex >= 0 && menuItemIndex < Menu.MenuOptions.Count)
         {
             var menuOption = Menu.MenuOptions[menuItemIndex];
-                
+
             if (!menuOption.Disabled)
             {
                 menuOption.OnSelect(Player, menuOption);
@@ -142,7 +153,7 @@ public virtual void Reset()
         Page = 0;
         PrevPageOffsets.Clear();
     }
-        
+
     public virtual void Close()
     {
         MenuManager.CloseActiveMenu(Player);

diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/CenterHtmlMenu.cs b/managed/CounterStrikeSharp.API/Modules/Menu/CenterHtmlMenu.cs
@@ -21,9 +21,23 @@ namespace CounterStrikeSharp.API.Modules.Menu;
 
 public class CenterHtmlMenu : BaseMenu
 {
+    private readonly BasePlugin? _plugin;
+
+    public CenterHtmlMenu(string title, BasePlugin plugin) : base(ModifyTitle(title))
+    {
+        _plugin = plugin;
+    }
+
     public CenterHtmlMenu(string title) : base(ModifyTitle(title))
     {
     }
+
+    public override void Open(CCSPlayerController player)
+    {
+        if (_plugin == null) return; 
+
+        MenuManager.OpenCenterHtmlMenu(_plugin, player, this);
+    }
 
     public override ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect,
         bool disabled = false)

diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/ChatMenu.cs b/managed/CounterStrikeSharp.API/Modules/Menu/ChatMenu.cs
@@ -24,6 +24,11 @@ public ChatMenu(string title) : base(title)
     {
         ExitButton = false;
     }
+
+    public override void Open(CCSPlayerController player)
+    {
+        MenuManager.OpenChatMenu(player, this);
+    }
 }
 
 public class ChatMenuInstance : BaseMenuInstance

diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/ConsoleMenu.cs b/managed/CounterStrikeSharp.API/Modules/Menu/ConsoleMenu.cs
@@ -21,6 +21,11 @@ public class ConsoleMenu : BaseMenu
     public ConsoleMenu(string title) : base(title)
     {
     }
+
+    public override void Open(CCSPlayerController player)
+    {
+        MenuManager.OpenConsoleMenu(player, this);
+    }
 }
 
 public class ConsoleMenuInstance : BaseMenuInstance

diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/IMenu.cs b/managed/CounterStrikeSharp.API/Modules/Menu/IMenu.cs
@@ -20,16 +20,18 @@ namespace CounterStrikeSharp.API.Modules.Menu;
 
 public interface IMenu
 {
-    public string Title { get; set; }
-    public List<ChatMenuOption> MenuOptions { get; }
-    public PostSelectAction PostSelectAction
+    string Title { get; set; }
+    List<ChatMenuOption> MenuOptions { get; }
+    PostSelectAction PostSelectAction
     {
         get { throw new NotImplementedException(); }
         set { throw new NotImplementedException(); }
     }
-    public bool ExitButton { get; set; }
+    bool ExitButton { get; set; }
 
-    public ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false);
+    ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false);
+    void Open(CCSPlayerController player);
+    void OpenToAll();
 }
 
 public interface IMenuInstance

diff --git a/managed/CounterStrikeSharp.API/Modules/Menu/MenuManager.cs b/managed/CounterStrikeSharp.API/Modules/Menu/MenuManager.cs
@@ -41,23 +41,23 @@ public static void CloseActiveMenu(CCSPlayerController player)
 
         ActiveMenus.Remove(player.Handle);
     }
-
+    
     public static void OpenChatMenu(CCSPlayerController player, ChatMenu menu)
     {
         CloseActiveMenu(player);
 
         ActiveMenus[player.Handle] = new ChatMenuInstance(player, menu);
         ActiveMenus[player.Handle].Display();
     }
-
+    
     public static void OpenCenterHtmlMenu(BasePlugin plugin, CCSPlayerController player, CenterHtmlMenu menu)
     {
         CloseActiveMenu(player);
 
         ActiveMenus[player.Handle] = new CenterHtmlMenuInstance(plugin, player, menu);
         ActiveMenus[player.Handle].Display();
     }
-
+    
     public static void OpenConsoleMenu(CCSPlayerController player, ConsoleMenu menu)
     {
         CloseActiveMenu(player);