Merge branch 'dev' of https://github.com/HerrMagiic/CSS-CreateCustomCommands into dev

Author: NilsSchucka

CustomCommands/Interfaces/IPluginUtilities.cs

@@ -18,7 +18,7 @@ public interface IPluginUtilities
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    string[] AddCSSTagsToAliases(string[] input);
+    string[] AddCSSTagsToAliases(List<string> input);
 
     /// <summary>
     /// Splits a string by comma, semicolon, or whitespace characters.

CustomCommands/Services/MessageManager.cs

@@ -60,7 +60,7 @@ public void PrintToCenterClient(CCSPlayerController player, Commands cmd)
     {
         CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
 
-        string message  = ReplaceTagsFunctions.ReplaceLanguageTags(cmd.Message);
+        string message  = ReplaceTagsFunctions.ReplaceLanguageTags(cmd.CenterMessage.Message);
         message         = ReplaceTagsFunctions.ReplaceMessageTags(message, player);
 
         var CenterClientElement = new CenterClientElement

CustomCommands/Services/PluginUtilities.cs

@@ -26,26 +26,63 @@ public PluginUtilities(IPluginGlobals PluginGlobals, IReplaceTagsFunctions Repla
     public string[] GettingCommandsFromString(string commands)
     {
         string[] splitCommands = SplitStringByCommaOrSemicolon(commands);
+        List<string> commandsList = new List<string>();
+        // Removes arguments from the command when spaces are present
+        for (int i = 0; i < splitCommands.Length; i++)
+        {
+            if (splitCommands[i].Contains(' '))
+            {
+                Logger.LogInformation($"Contains space!");
+                if (splitCommands[i].IndexOf(' ') == 0)
+                {
+                    commandsList.Add(splitCommands[i]);
+                    continue;
+                }
+                Logger.LogInformation($"Is multiple args");
+                string sub = splitCommands[i].Substring(0, splitCommands[i].IndexOf(' '));
+                Logger.LogInformation($"Sub: {sub}");
+                if (commandsList.Contains(sub))
+                {
+                    Logger.LogInformation("In IF");
+                    continue;
+                }
+                
+                if (!contains)
+                    commandsList.Add(sub);
+            }
+            else
+            {
+                if (!commandsList.Contains(splitCommands[i]))
+                    commandsList.Add(splitCommands[i]);
+            }
+        }
+
+
+        foreach (var command in commandsList)
+        {
+            Logger.LogInformation($"Command: {command}");
+        }
 
         if (PluginGlobals.Config.RegisterCommandsAsCSSFramework)
-            return AddCSSTagsToAliases(splitCommands);
+            return AddCSSTagsToAliases(commandsList);
 
-        return splitCommands;
+        
+        return commandsList.ToArray();
     }
 
-    public string[] AddCSSTagsToAliases(string[] input)
+    public string[] AddCSSTagsToAliases(List<string> input)
     {
-        for (int i = 0; i < input.Length; i++)
+        for (int i = 0; i < input.Count; i++)
         {
             if (!input[i].StartsWith("css_"))
                 input[i] = "css_" + input[i];
         }
-        return input;
+        return input.ToArray();
     }
 
     public string[] SplitStringByCommaOrSemicolon(string str)
     {
-        return Regex.Split(str, ",|;|\\s")
+        return Regex.Split(str, "[,;]")
                         .Where(s => !string.IsNullOrEmpty(s))
                         .ToArray();
     }

CustomCommands/Services/RegisterCommands.cs

@@ -38,16 +38,19 @@ public void AddCommands(Commands cmd)
 
         for (int i = 0; i < aliases.Length; i++)
         {
-            plugin.AddCommand(aliases[i], cmd.Description, 
+            string alias = aliases[i];
+            // System.Console.WriteLine($"Pre Command: {alias}.");
+            plugin.AddCommand(alias, cmd.Description, 
                 [CommandHelper(whoCanExecute: CommandUsage.CLIENT_ONLY)]
                 (player, info) =>
             {
                 if (player == null) 
                     return;
-                    
-                if (info.ArgCount < aliases[i].Split(' ').Length)
+                System.Console.WriteLine($"Post Command: {alias}.");
+
+                if (info.ArgCount < alias.Split(' ').Length)
                 {
-                    player.PrintToChat($"This command requires at least {aliases[i].Split(' ').Length-1} arguments.");
+                    player.PrintToChat($"This command requires at least {alias.Split(' ').Length-1} arguments.");
                     return;
                 }
 
@@ -56,7 +59,7 @@ public void AddCommands(Commands cmd)
                 // Check if the command has arguments and if it does, check if the command really exists in the list
                 if (info.ArgCount > 1)
                 {
-                    var findcommand = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(aliases[i] + $" {info.ArgString}"));
+                    var findcommand = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(alias + $" {info.ArgString}"));
                     // Check if the command is equal to the found command
                     if (findcommand! != command)
                         return;

CustomCommands/Services/ReplaceTagsFunction.cs

@@ -37,7 +37,7 @@ public string[] ReplaceTags(dynamic input, CCSPlayerController player)
         List<string> output = WrappedLine(input);
 
         for (int i = 0; i < output.Count; i++)
-            output[i] = ReplaceLanguageTags(input[i]);
+            output[i] = ReplaceLanguageTags(output[i]);
 
         output = WrappedLine(output.ToArray());
 
@@ -184,6 +184,13 @@ public List<string> WrappedLine(dynamic input)
                     Logger.LogError($"{PluginGlobals.Config.LogPrefix} Message is not a string or array");
                     break;
             }
+        } else if (input is Array inputArray)
+        {
+            foreach (string arrayElement in inputArray)
+            {
+                string[] lines = arrayElement.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None) ?? Array.Empty<string>();
+                output.AddRange(lines);
+            }
         }
         else
         {

Examples/Cooldown.md

@@ -26,7 +26,7 @@ In the Advanced command example you can add a "IsGlobal" flag so the whole serve
         "Cooldown": {
             "CooldownTime": 5, // required, Cooldown in seconds
             "IsGlobal": false, // If true, cooldown will be global for all users
-            "CooldownMessage": "This command is on cooldown for {TIME} more seconds!"
+            "CooldownMessage": "This command is on cooldown for {TIMELEFT} more seconds!"
         },
         "Message": "Cool cooldown message!",
         "PrintTo": 0

Examples/ServerCommands.md

@@ -59,7 +59,7 @@ Its always recommended to Permission to the command so not every player can use
         "Message": "Getting Kicked",
         "PrintTo": 0,
         "ServerCommands": [
-            "kick {USERID}" // Tags work for commands as well
+            "css_kick #{USERID}" // Tags work for commands as well. This command works with Simple Admin
         ]
     }
 ]