fixed infinite depnc loop, fixed example file error message

Author: HerrMagiic

CustomCommands/.gitignore

@@ -1,3 +1,5 @@
 /.vs
 /bin
-/obj
+/obj
+
+TestingCommands.json

CustomCommands/Interfaces/IPluginUtilities.cs

@@ -8,5 +8,4 @@ public interface IPluginUtilities
     string[] SplitStringByCommaOrSemicolon(string str);
     void ExecuteServerCommands(Commands cmd, CCSPlayerController player);
     bool RequiresPermissions(CCSPlayerController player, Permission permissions);
-    string PadLeftColorTag(string input);
 }

CustomCommands/Services/LoadJson.cs

@@ -18,10 +18,11 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
     {
         var comms = new List<Commands>();
 
+        string defaultconfigpath = Path.Combine(path, "Commands.json");
+
         CheckForExampleFile(path);
 
         var pathofcommands = Path.Combine(path, "Commands");
-        var defaultconfigpath = Path.Combine(path, "Commands.json");
 
         var files = new List<string>();
 
@@ -34,7 +35,6 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
             files.Add(defaultconfigpath);
             Logger.LogInformation("Found default config file.");
         }
-        //
         else if (!File.Exists(defaultconfigpath) && files.Count == 0)
         {
             Logger.LogWarning("No Config file found. Please create plugins/CustomCommands/Commands.json or in plugins/CustomCommands/Commands/<name>.json");
@@ -58,14 +58,20 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
     // Check if the Command.json file exists. If not replace it with the example file
     public void CheckForExampleFile(string path)
     {
+        if (Directory.Exists(Path.Combine(path, "Commands")))
+        {
+            var files = Directory.GetFiles(Path.Combine(path, "Commands"), "*.json", SearchOption.AllDirectories);
+            if (files.Length > 0)
+                return;
+        }
+
         var defaultconfigpath = Path.Combine(path, "Commands.json");
         var exampleconfigpath = Path.Combine(path, "Commands.example.json");
         if (!File.Exists(defaultconfigpath))
         {
             File.Copy(exampleconfigpath, defaultconfigpath);
             Logger.LogInformation("Created default config file.");
         }
-        
     }
     public bool IsValidJsonSyntax(string path)
     {

CustomCommands/Services/PluginUtilities.cs

@@ -98,41 +98,4 @@ public bool RequiresPermissions(CCSPlayerController player, Permission permissio
             return true;
         }
     }
-    /// <summary>
-    /// Moves the color tag one space the the left if it's not already there.
-    /// Because the game doesn't support color tags at the start of a string.
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public string PadLeftColorTag(string input)
-    {
-        string[] colorTagList = new string[] {
-            "{DEFAULT}",
-            "{WHITE}",
-            "{DARKRED}",
-            "{RED}",
-            "{LIGHTRED}",
-            "{GREEN}",
-            "{LIME}",
-            "{OLIVE}",
-            "{ORANGE}",
-            "{GOLD}",
-            "{YELLOW}",
-            "{BLUE}",
-            "{DARKBLUE}",
-            "{LIGHTPURPLE}",
-            "{PURPLE}",
-            "{SILVER}",
-            "{BLUEGREY}",
-            "{GREY}",
-        };
-        foreach (var colorTag in colorTagList)
-        {
-            if (input.StartsWith(colorTag))
-            {
-                return " " + input;
-            }
-        }
-        return input;
-    }
 }

CustomCommands/Services/RegisterCommands.cs

@@ -38,10 +38,10 @@ public void AddCommands(Commands com)
                 if (player == null) return;
 
                 var command = com;
+                
+                Logger.LogInformation(info.ArgCount.ToString());
                 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)) 

CustomCommands/Services/ReplaceTagsFunction.cs

@@ -15,15 +15,13 @@ public class ReplaceTagsFunctions : IReplaceTagsFunctions
     private readonly IPluginGlobals PluginGlobals;
     private readonly PluginContext PluginContext;
     private readonly ILogger<CustomCommands> Logger;
-    private readonly IPluginUtilities PluginUtilities;
 
     public ReplaceTagsFunctions(IPluginGlobals PluginGlobals, IPluginContext PluginContext, 
-                                    ILogger<CustomCommands> Logger, IPluginUtilities PluginUtilities)
+                                    ILogger<CustomCommands> Logger)
     {
         this.PluginGlobals = PluginGlobals;
         this.PluginContext = (PluginContext as PluginContext)!;
         this.Logger = Logger;
-        this.PluginUtilities = PluginUtilities;
     }
 
     public string[] ReplaceTags(string[] input, CCSPlayerController player)
@@ -96,7 +94,7 @@ public string ReplaceMessageTags(string input, CCSPlayerController player)
     public string ReplaceColorTags(string input)
     {
         // PadLeft the color tag if it's not already there because the game doesn't support color tags at the start of a string.
-        input = PluginUtilities.PadLeftColorTag(input);
+        input = PadLeftColorTag(input);
 
         Dictionary<string, string> replacements = new()
         {
@@ -164,4 +162,42 @@ public string[] WrappedLine(dynamic input)
 
         return output.ToArray();
     }
+
+    /// <summary>
+    /// Moves the color tag one space the the left if it's not already there.
+    /// Because the game doesn't support color tags at the start of a string.
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private string PadLeftColorTag(string input)
+    {
+        string[] colorTagList = new string[] {
+            "{DEFAULT}",
+            "{WHITE}",
+            "{DARKRED}",
+            "{RED}",
+            "{LIGHTRED}",
+            "{GREEN}",
+            "{LIME}",
+            "{OLIVE}",
+            "{ORANGE}",
+            "{GOLD}",
+            "{YELLOW}",
+            "{BLUE}",
+            "{DARKBLUE}",
+            "{LIGHTPURPLE}",
+            "{PURPLE}",
+            "{SILVER}",
+            "{BLUEGREY}",
+            "{GREY}",
+        };
+        foreach (var colorTag in colorTagList)
+        {
+            if (input.StartsWith(colorTag))
+            {
+                return " " + input;
+            }
+        }
+        return input;
+    }
 }

CustomCommands/test.md

@@ -9,7 +9,3 @@
 * [ ] check if command args works
   * [ ] check if duplicated commands still wont work with this feature
 * [ ] check if toggle feature works
-
-
-
-test