Merge pull request #34 from HerrMagiic/feature/toggleservercommands

Feature/toggleservercommands

Author: HerrMagiic

CustomCommands/CustomCommands.cs

@@ -9,7 +9,7 @@ namespace CustomCommands;
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
-    public override string ModuleVersion => "1.1.0";
+    public override string ModuleVersion => "2.0.0";
     public override string ModuleAuthor => "HerrMagic";
     public override string ModuleDescription => "Create your own commands per config";
 

CustomCommands/Interfaces/ICooldownManager.cs

@@ -1,4 +1,3 @@
-
 using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;
 

CustomCommands/Interfaces/IPluginGlobals.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;
 
 namespace CustomCommands.Interfaces;

CustomCommands/Interfaces/IPluginUtilities.cs

@@ -1,4 +1,3 @@
-
 using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;
 

CustomCommands/Model/CommandsConfig.cs

@@ -12,7 +12,6 @@ public class Commands
     public Sender PrintTo { get; set; } = Sender.ClientChat;
     public List<string> ServerCommands { get; set; } = new();
     public Permission Permission { get; set; } = new();
-
 }
 public class Cooldown
 {

CustomCommands/Services/CooldownManager.cs

@@ -1,4 +1,3 @@
-
 using System.Text.Json;
 using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;

CustomCommands/Services/EventManager.cs

@@ -1,4 +1,3 @@
-
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;

CustomCommands/Services/PluginUtilities.cs

@@ -1,22 +1,26 @@
-using System.Text.Json;
 using System.Text.RegularExpressions;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
+using CounterStrikeSharp.API.Modules.Cvars;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
+using Microsoft.Extensions.Logging;
 
 namespace CustomCommands.Services;
 
 public class PluginUtilities : IPluginUtilities
 {
     private readonly IPluginGlobals PluginGlobals;
     private readonly IReplaceTagsFunctions ReplaceTagsFunctions;
+    private readonly ILogger<CustomCommands> Logger;
 
-    public PluginUtilities(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions)
+    public PluginUtilities(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions,
+                            ILogger<CustomCommands> Logger)
     {
         this.PluginGlobals = PluginGlobals;
         this.ReplaceTagsFunctions = ReplaceTagsFunctions;
+        this.Logger = Logger;
     }
 
     public string[] SplitStringByCommaOrSemicolon(string str)
@@ -25,16 +29,53 @@ public string[] SplitStringByCommaOrSemicolon(string str)
                         .Where(s => !string.IsNullOrEmpty(s))
                         .ToArray();
     }
-    
+    /// <summary>
+    /// Executes the server commands from the command object
+    /// </summary>
+    /// <param name="cmd"></param>
+    /// <param name="player"></param>
     public void ExecuteServerCommands(Commands cmd, CCSPlayerController player) 
     {
         if (cmd.ServerCommands.Count == 0) return;
 
         foreach (var serverCommand in cmd.ServerCommands)
         {
+            // If the command starts with "toggle" we want to toggle the cvar
+            if (serverCommand.StartsWith("toggle"))
+            {
+                HandleToggleCommand(serverCommand);
+                continue;
+            }
+
             Server.ExecuteCommand(ReplaceTagsFunctions.ReplaceMessageTags(serverCommand, player));
         }
     }
+    /// <summary>
+    /// Handles the toggle command
+    /// </summary>
+    /// <param name="serverCommand"></param>
+    private void HandleToggleCommand(string serverCommand)
+    {
+        string commandWithoutToggle = serverCommand.Replace("toggle ", "");
+        var commandCvar = ConVar.Find(commandWithoutToggle);
+        if (commandCvar != null)
+        {
+            if(commandCvar.GetPrimitiveValue<bool>())
+                Server.ExecuteCommand($"{commandWithoutToggle} 0");
+            else
+                Server.ExecuteCommand($"{commandWithoutToggle} 1");
+        }
+        else
+        {
+            Logger.LogError($"Couldn't toggle {commandWithoutToggle}. Please check if this command is toggleable");
+        }
+    }
+    /// <summary>
+    /// Checks if the player has the required permissions to execute the command
+    /// </summary>
+    /// <param name="player"></param>
+    /// <param name="permissions"></param>
+    /// <returns></returns>
     public bool RequiresPermissions(CCSPlayerController player, Permission permissions)
     {
         if (!permissions.RequiresAllPermissions)

CustomCommands/Services/ReplaceTagsFunction.cs

@@ -55,7 +55,6 @@ public string ReplaceLanguageTags(string input)
         {
             // Return the group captured in the regex, which is the string after "="
             string lang = match.Groups[1].Value;
-
             return input.Replace(match.Value, plugin.Localizer[lang] ?? "<LANG in CustomCommands/lang/<language.json> not found>");
         }
         else

CustomCommands/test.md

@@ -5,4 +5,7 @@
 * [ ] check if the string pattern check works
 * [ ] check cooldown funktion for normal int and than object
 * [ ] check if padleft color tag works now
+  * [ ] If this works remove all spaced in the example files with color tags
 * [ ] check if command args works
+  * [ ] check if duplicated commands still wont work with this feature
+* [ ] check if toggle feature works