Merge pull request #33 from HerrMagiic/feature/commandargs

Feature/commandargs

Author: HerrMagiic

CustomCommands/CustomCommands.cs

@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CustomCommands.Interfaces;
-using CustomCommands.Services;
 using Microsoft.Extensions.Logging;
 
 namespace CustomCommands;
@@ -10,7 +9,7 @@ namespace CustomCommands;
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
-    public override string ModuleVersion => "1.0.9";
+    public override string ModuleVersion => "1.1.0";
     public override string ModuleAuthor => "HerrMagic";
     public override string ModuleDescription => "Create your own commands per config";
 
@@ -60,6 +59,8 @@ public override void Load(bool hotReload)
 
         if (comms != null) 
         {
+            PluginGlobals.CustomCommands = comms;
+
             comms = RegisterCommands.CheckForDuplicateCommands(comms);
             // Add commands from the JSON file to the server
             foreach (var com in comms)

CustomCommands/Interfaces/IPluginGlobals.cs

@@ -8,4 +8,5 @@ public interface IPluginGlobals
     CenterServerElement centerServerOn { get; set; }
     CustomCommandsConfig Config { get; set; }
     List<CooldownTimer> CooldownTimer { get; set; }
+    List<Commands> CustomCommands { get; set; }
 }

CustomCommands/Services/PluginGlobals.cs

@@ -8,4 +8,5 @@ public class PluginGlobals : IPluginGlobals
     public CenterServerElement centerServerOn { get; set; } = new();
     public CustomCommandsConfig Config { get; set; } = new();
     public List<CooldownTimer> CooldownTimer { get; set; } = new();
+    public List<Commands> CustomCommands { get; set; } = new();
 }

CustomCommands/Services/RegisterCommands.cs

@@ -37,17 +37,23 @@ public void AddCommands(Commands com)
             {
                 if (player == null) return;
 
-                if (com.Permission.PermissionList.Count > 0 && com.Permission != null)
-                    if (!PluginUtilities.RequiresPermissions(player, com.Permission)) 
+                var command = com;
+                if (info.ArgCount > 0)
+                {
+                    command = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(aliases[i])) ?? com;
+                }
+
+                if (command.Permission.PermissionList.Count > 0 && command.Permission != null)
+                    if (!PluginUtilities.RequiresPermissions(player, command.Permission)) 
                         return;
 
-                if(CooldownManager.IsCommandOnCooldown(player, com)) return;
+                if(CooldownManager.IsCommandOnCooldown(player, command)) return;
 
-                CooldownManager.SetCooldown(player, com);
+                CooldownManager.SetCooldown(player, command);
 
-                MessageManager.SendMessage(player, com);
+                MessageManager.SendMessage(player, command);
 
-                PluginUtilities.ExecuteServerCommands(com, player);
+                PluginUtilities.ExecuteServerCommands(command, player);
             });
         }
     }

CustomCommands/test.md

@@ -5,3 +5,4 @@
 * [ ] check if the string pattern check works
 * [ ] check cooldown funktion for normal int and than object
 * [ ] check if padleft color tag works now
+* [ ] check if command args works