Merge 84646e4451 into 82b82722a6

- Possibility to force menu type by config
- Possibility to reload admins by css command `css_admins_reload`

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -11,7 +11,7 @@ using MySqlConnector;
 
 namespace CS2_SimpleAdmin;
 
-[MinimumApiVersion(276)]
+[MinimumApiVersion(279)]
 public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
 {
     internal static CS2_SimpleAdmin Instance { get; private set; } = new();
@@ -19,7 +19,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
     public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
     public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     public override string ModuleAuthor => "daffyy & Dliix66";
-    public override string ModuleVersion => "1.6.4a";
+    public override string ModuleVersion => "1.6.5a";
     
     public override void Load(bool hotReload)
     {

CS2-SimpleAdmin/Commands/basecommands.cs

@@ -494,13 +494,13 @@ public partial class CS2_SimpleAdmin
     {
         if (_localizer == null || caller == null) return;
 
-        var disconnectedMenu = MenuApi?.NewMenu(_localizer["sa_menu_disconnected_title"]);
+        var disconnectedMenu = Helper.CreateMenu(_localizer["sa_menu_disconnected_title"]);
 
         DisconnectedPlayers.ForEach(player =>
         {
             disconnectedMenu?.AddMenuOption(player.Name, (_, _) =>
             {
-                var disconnectedMenuAction = MenuApi?.NewMenu(_localizer["sa_menu_disconnected_action_title"]);
+                var disconnectedMenuAction = Helper.CreateMenu(_localizer["sa_menu_disconnected_action_title"]);
                 disconnectedMenuAction?.AddMenuOption(_localizer["sa_ban"], (_, _) =>
                 {
                     DurationMenu.OpenMenu(caller, _localizer["sa_ban"], player, (_, _, duration) =>
@@ -564,7 +564,7 @@ public partial class CS2_SimpleAdmin
 
             var userId = player.UserId.Value;
 
-            IMenu? warnsMenu = MenuApi?.NewMenu(_localizer["sa_admin_warns_menu_title", player.PlayerName]);
+            IMenu? warnsMenu = Helper.CreateMenu(_localizer["sa_admin_warns_menu_title", player.PlayerName]);
 
             Task.Run(async () =>
             {

CS2-SimpleAdmin/Commands/basevotes.cs

@@ -33,7 +33,7 @@ public partial class CS2_SimpleAdmin
             {
                 using (new WithTemporaryCulture(player.GetLanguage()))
                 {
-                    IMenu? voteMenu = MenuApi?.NewMenu(_localizer["sa_admin_vote_menu_title", question]);
+                    IMenu? voteMenu = Helper.CreateMenu(_localizer["sa_admin_vote_menu_title", question]);
                     if (voteMenu == null)
                         return;
                     //ChatMenu voteMenu = new(_localizer!["sa_admin_vote_menu_title", question]);

CS2-SimpleAdmin/Config.cs

@@ -108,6 +108,8 @@ public class CustomServerCommandData
 
 public class MenuConfig
 {
+    [JsonPropertyName("MenuType")] public string MenuType { get; set; } = "selectable";
+
     [JsonPropertyName("Durations")]
     public DurationItem[] Durations { get; set; } =
     [
@@ -223,7 +225,7 @@ public class OtherSettings
 
 public class CS2_SimpleAdminConfig : BasePluginConfig
 {
-    [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 22;
+    [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 23;
 
     [JsonPropertyName("DatabaseHost")]
     public string DatabaseHost { get; set; } = "";

CS2-SimpleAdmin/Events.cs

@@ -161,6 +161,12 @@ public partial class CS2_SimpleAdmin
 
         var command = info.GetArg(0).ToLower();
 
+        if (command == "css_admins_reload")
+        {
+            AddTimer(1.0f, () => ReloadAdmins(null));
+            return HookResult.Continue;
+        }
+
         if (!command.Contains("say"))
             return HookResult.Continue;
 
@@ -175,9 +181,13 @@ public partial class CS2_SimpleAdmin
             return HookResult.Stop;
 
         if (command == "say" && info.GetArg(1).StartsWith($"@") &&
-            AdminManager.PlayerHasPermissions(player, "@css/chat"))
+            AdminManager.PlayerHasPermissions(player, "@vip/chat"))
         {
-            player.ExecuteClientCommandFromServer($"css_say {info.GetArg(1).Remove(0, 1)}");
+            sb.Append(_localizer!["sa_vipchat_template", player.PlayerName, info.GetArg(1).Remove(0, 1)]);
+            foreach (var p in Utilities.GetPlayers().Where(p => p.IsValid && p is { IsBot: false, IsHLTV: false } && AdminManager.PlayerHasPermissions(p, "@vip/chat")))
+            {
+                p.PrintToChat(sb.ToString());
+            }
             return HookResult.Stop;
         }
         

CS2-SimpleAdmin/Helper.cs

@@ -20,6 +20,7 @@ using System.Text.Json;
 using System.Text.RegularExpressions;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CS2_SimpleAdmin.Managers;
+using MenuManager;
 
 namespace CS2_SimpleAdmin;
 
@@ -516,6 +517,33 @@ internal static class Helper
             CS2_SimpleAdmin._localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})",
                 commandString]));
     }
+
+    public static IMenu? CreateMenu(string title)
+    {
+        var menuType = CS2_SimpleAdmin.Instance.Config.MenuConfigs.MenuType.ToLower();
+        
+        var menu = menuType switch
+        {
+            _ when menuType.Equals("selectable", StringComparison.CurrentCultureIgnoreCase) =>
+                CS2_SimpleAdmin.MenuApi?.NewMenu(title),
+
+            _ when menuType.Equals("dynamic", StringComparison.CurrentCultureIgnoreCase) =>
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ButtonMenu),
+
+            _ when menuType.Equals("center", StringComparison.CurrentCultureIgnoreCase) =>
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.CenterMenu),
+
+            _ when menuType.Equals("chat", StringComparison.CurrentCultureIgnoreCase) =>
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ChatMenu),
+
+            _ when menuType.Equals("console", StringComparison.CurrentCultureIgnoreCase) =>
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ConsoleMenu),
+
+            _ => CS2_SimpleAdmin.MenuApi?.NewMenu(title)
+        };
+
+        return menu;
+    }
 }
 
 public static class PluginInfo

CS2-SimpleAdmin/Menus/AdminMenu.cs

@@ -8,7 +8,7 @@ public static class AdminMenu
 {
     public static IMenu? CreateMenu(string title)
     {
-        return CS2_SimpleAdmin.MenuApi?.NewMenu(title);
+        return Helper.CreateMenu(title);
         // return CS2_SimpleAdmin.Instance.Config.UseChatMenu ? new ChatMenu(title) : new CenterHtmlMenu(title, CS2_SimpleAdmin.Instance);
     }
 

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.6.4a
+1.6.5a

CS2-SimpleAdmin/lang/ar.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}نتائج التصويت لـ {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}الإداري: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(إداري) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(لاعب) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** أصدر الأمر `{1}` على الخادم `HOSTNAME`"

CS2-SimpleAdmin/lang/de.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}ABSTIMMUNGSERGEBNISSE FÜR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(SPIELER) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** hat den Befehl `{1}` auf dem Server `HOSTNAME` ausgeführt"

CS2-SimpleAdmin/lang/en.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}VOTING RESULTS FOR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(PLAYER) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** issued command `{1}` on server `HOSTNAME`"

CS2-SimpleAdmin/lang/es.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DE LA VOTACIÓN PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JUGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** ejecutó el comando `{1}` en el servidor `HOSTNAME`"

CS2-SimpleAdmin/lang/fa.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}نتایج رأی‌گیری برای {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ادمین: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ادمین) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(بازیکن) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** فرمان `{1}` را در سرور `HOSTNAME` اجرا کرد"

CS2-SimpleAdmin/lang/fr.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}RÉSULTATS DU VOTE POUR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOUEUR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** a exécuté la commande `{1}` sur le serveur `HOSTNAME`"

CS2-SimpleAdmin/lang/lv.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}BALSOŠANAS REZULTĀTI PAR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(SPĒLĒTĀJS) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** izpildīja komandu `{1}` serverī `HOSTNAME`"

CS2-SimpleAdmin/lang/pl.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}WYNIKI GŁOSOWANIA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}[{1}]",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(GRACZ) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** użył komendy `{1}` na serwerze `HOSTNAME`"

CS2-SimpleAdmin/lang/pt-BR.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DA VOTAÇÃO PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** executou o comando `{1}` no servidor `HOSTNAME`"

CS2-SimpleAdmin/lang/pt-PT.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DA VOTAÇÃO PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** executou o comando `{1}` no servidor `HOSTNAME`"

CS2-SimpleAdmin/lang/ru.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}РЕЗУЛЬТАТЫ ГОЛОСОВАНИЯ ЗА {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}АДМИН: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(ВИП ЧАТ) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(АДМИН) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(ИГРОК) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** выполнил команду `{1}` на сервере `HOSTNAME`"

CS2-SimpleAdmin/lang/tr.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}OY SONUÇLARI {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}Yönetici: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(Yönetici) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(Oyuncu) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** `{1}` komutunu `HOSTNAME` sunucusunda gerçekleştirdi"

CS2-SimpleAdmin/lang/zh-Hans.json

@@ -122,6 +122,7 @@
 	"sa_admin_vote_message_results": "{lime}投票结果 {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}管理员: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(管理员) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(玩家) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** 在服务器 `HOSTNAME` 上发出了 `{1}` 命令"