Merge pull request #9 from HerrMagiic/dev

HerrMagiic · web-flow · commit 6c63b94ce62b · 2023-12-29T17:22:08.000+01:00
Update 1.0.7
diff --git a/CustomCommands/Commands.example.json b/CustomCommands/Commands.example.json
@@ -11,16 +11,19 @@
     "Description": "Command for SteamGroup",
     "Command": "steam,steamgroup,group",
     "Message": "SteamGroup: <link>",
-    "CenterElement": {
-      "CenterMessage": "<div>Steam Group</div><br><div><font color='#00ff00'>https...</font></div>",
-      "CenterMessageTime": 10
+    "CenterMessage": {
+      "Message": "<div>Steam Group</div><br><div><font color='#00ff00'>https...</font></div>",
+      "Time": 10
     },
     "PrintTo": 7
   },
   {
     "Title": "Enable Surf",
     "Command": "surf",
-    "Message": "Surf is now enabled",
+    "Message": [
+      "Surf is now:",
+      "{GREEN}Enabled"
+    ],
     "PrintTo": 0,
     "Description": "Command for Surf gamemode",
     "ServerCommands": [
diff --git a/CustomCommands/CustomCommands.cs b/CustomCommands/CustomCommands.cs
@@ -12,7 +12,7 @@ namespace CustomCommands;
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
-    public override string ModuleVersion => "1.0.6";
+    public override string ModuleVersion => "1.0.7";
     public override string ModuleAuthor => "HerrMagic";
     public override string ModuleDescription => "Create your own commands per config";
 
@@ -46,9 +46,13 @@ public override void Load(bool hotReload)
 
         RegisterListeners();
 
-        if (comms != null)
+        
+        if (comms != null) 
+        {
+            comms = CheckForDuplicateCommands(comms);
             foreach (var com in comms)
                 AddCommands(com);
+        }
 
         if (hotReload)
             InitializeLists();
diff --git a/CustomCommands/CustomCommands.csproj b/CustomCommands/CustomCommands.csproj
@@ -7,10 +7,17 @@
     <!--<OutputPath>.</OutputPath>-->
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CounterStrikeSharp.API" Version="1.0.98" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Commands.example.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/CustomCommands/Functions.cs b/CustomCommands/Functions.cs
@@ -1,12 +1,13 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Cvars;
 using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using CustomCommands.Model;
-
+using Microsoft.Extensions.Logging;
 namespace CustomCommands;
 public partial class CustomCommands
 {
@@ -31,7 +32,49 @@ private void RegisterListeners()
 
         });
     }
+    private List<Commands> CheckForDuplicateCommands(List<Commands> comms)
+    {
+        List<Commands> duplicateCommands = new();
+        List<Commands> commands = new();
+        List<string> commandNames = new();
+
+        foreach (var com in comms)
+        {
+            string[] aliases = com.Command.Split(',');
+
+            foreach (var alias in aliases)
+            {
+                if (commandNames.Contains(alias))
+                {
+                    duplicateCommands.Add(com);
+                    continue;
+                }
+                commandNames.Add(alias);
+            }
+        }
+        
+        if (duplicateCommands.Count == 0)
+            return comms;
 
+        Logger.LogError($"------------------------------------------------------------------------");
+        Logger.LogError($"{Config.LogPrefix} Duplicate commands found, removing them from the list. Please check your config file for duplicate commands and remove them.");
+        for (int i = 0; i < comms.Count; i++)
+        {
+            if(duplicateCommands.Contains(comms[i]))
+            {
+                Logger.LogError($"{Config.LogPrefix} Duplicate command found index {i+1}: ");
+                Logger.LogError($"{Config.LogPrefix} - {comms[i].Title} ");
+                Logger.LogError($"{Config.LogPrefix} - {comms[i].Description}");
+                Logger.LogError($"{Config.LogPrefix} - {comms[i].Command}");
+                continue;
+            }
+            
+            commands.Add(comms[i]);
+        }
+        Logger.LogError($"------------------------------------------------------------------------");
+
+        return commands;
+    }
     private void AddCommands(Commands com)
     {
         string[] aliases = com.Command.Split(',');
@@ -61,14 +104,14 @@ private bool RequiresPermissions(CCSPlayerController player, Permission permissi
                 if (AdminManager.PlayerHasPermissions(player, new string[]{permission})) 
                     return true;
             }
-            PrintToChat(Receiver.Client, player, "You don't have the required permissions to execute this command");
+            player.PrintToChat($"{PrefixCache}You don't have the required permissions to execute this command");
             return false;
         }
         else
         {
             if (!AdminManager.PlayerHasPermissions(player, permissions.PermissionList.ToArray()))
             {
-                PrintToChat(Receiver.Client, player, "You don't have the required permissions to execute this command");
+                player.PrintToChat($"{PrefixCache}You don't have the required permissions to execute this command");
                 return false;
             }
             return true;
@@ -116,14 +159,56 @@ private void TriggerMessage(CCSPlayerController player, Commands cmd)
                 break;
         }
     }
-    private string[] WrappedLine(string input)
+    private string[] WrappedLine(dynamic input)
     {
-        return input.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+        List<string> output = new List<string>();
+
+        if (input is JsonElement jsonElement)
+        {
+            switch (jsonElement.ValueKind)
+            {
+                case JsonValueKind.String:
+                    string result = jsonElement.GetString()!;
+                    return result?.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None) ?? Array.Empty<string>();
+
+                case JsonValueKind.Array:
+                    foreach (var arrayElement in jsonElement.EnumerateArray())
+                    {
+                        string[] lines = arrayElement.GetString()?.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None) ?? Array.Empty<string>();
+                        output.AddRange(lines);
+                    }
+                    break;
+
+                default:
+                    Logger.LogError($"{Config.LogPrefix} Message is not a string or array");
+                    return Array.Empty<string>();
+            }
+        }
+        else
+        {
+            Logger.LogError($"{Config.LogPrefix} Invalid input type");
+            return Array.Empty<string>();
+        }
+
+        return output.ToArray();
+    }
+
+    private string[] ReplaceTags(string[] input, CCSPlayerController player)
+    {
+        string[] output = new string[input.Length];
+
+        for (int i = 0; i < input.Length; i++)
+        {
+            output[i] = ReplaceMessageTags(input[i], player);
+            output[i] = ReplaceColorTags(output[i]);
+        }
+
+        return output;
     }
 
     private string ReplaceMessageTags(string input, CCSPlayerController player)
     {
-        SteamID steamId = new SteamID((ulong?)player.UserId!.Value ?? 0);
+        SteamID steamId = new SteamID(player.SteamID);
 
         Dictionary<string, string> replacements = new()
         {
diff --git a/CustomCommands/Model/CommandsConfig.cs b/CustomCommands/Model/CommandsConfig.cs
@@ -5,7 +5,7 @@ public class Commands
     public required string Title { get; set; } = "";
     public string Description { get; set; } = "Description";
     public required string Command { get; set; } = "testtesttest";
-    public string Message { get; set; } = "";
+    public dynamic Message { get; set; } = "";
     public CenterElement CenterMessage { get; set; } = new();
     public required Sender PrintTo { get; set; } = Sender.ClientChat;
     public List<string> ServerCommands { get; set; } = new();
@@ -32,4 +32,3 @@ public enum Sender
     AllChatClientCenter = 6,
     AllChatAllCenter = 7
 }
-
diff --git a/CustomCommands/PrintFunctions.cs b/CustomCommands/PrintFunctions.cs
@@ -37,11 +37,10 @@ private void PrintToChatAndAllCenter(Receiver receiver, CCSPlayerController play
         PrintToAllCenter(cmd);
     }
     
-    private void PrintToChat(Receiver printToChat, CCSPlayerController player, string message)
+    private void PrintToChat(Receiver printToChat, CCSPlayerController player, dynamic message)
     {
-        string replaceTags = ReplaceMessageTags(message, player);
-        string replaceColorTags = ReplaceColorTags(replaceTags);
-        string[] msg = WrappedLine(replaceColorTags);
+        string[] msg = WrappedLine(message);
+        msg = ReplaceTags(msg, player);
 
         switch (printToChat)
         {
diff --git a/Examples/CenterMessageWithColor.json b/Examples/CenterMessageWithColor.json
@@ -3,9 +3,9 @@
         "Title": "Center Message with color",
         "Description": "Center Message with color",
         "Command": "colorcenter",
-        "CenterElement": {
-            "CenterMessage": "<font color='#00ff00'>Cool color here</font>",
-            "CenterMessageTime": 5 // Seconds
+        "CenterMessage": {
+            "Message": "<font color='#00ff00'>Cool color here</font>",
+            "Time": 5 // Seconds
         },
         "PrintTo": 2
     },
@@ -14,9 +14,9 @@
         "Title": "With html",
         "Description": "With html",
         "Command": "htmlcenter",
-        "CenterElement": {
-            "CenterMessage": "<div>Steam Group</div><br><div><font color='#00ff00'>https...</font></div>",
-            "CenterMessageTime": 5 // Seconds
+        "CenterMessage": {
+            "Message": "<div>Steam Group</div><br><div><font color='#00ff00'>https...</font></div>",
+            "Time": 5 // Seconds
         },
         "PrintTo": 2
     }
diff --git a/Examples/NewLines.json b/Examples/NewLines.json
@@ -12,5 +12,23 @@
         "Command": "numbers",
         "Message": "1\n2\n3\n4\n5\n6\n7\n8\n9\r\n10", // \n or \r is a new line
         "PrintTo": 0
+    },
+    {
+        "Title": "Numbers",
+        "Description": "From one to ten with arrays as new lines",
+        "Command": "numbers2",
+        "Message": [ // If you want to use arrays as new lines, do this
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "10"
+        ],
+        "PrintTo": 0
     }
 ]
diff --git a/Examples/PrintTo.json b/Examples/PrintTo.json
@@ -17,19 +17,19 @@
         "Title": "Client Center",
         "Description": "Client Center message",
         "Command": "clientcenter",
-        "CenterElement": {
-            "CenterMessage": "Client Center",
-            "CenterMessageTime": 5 // Seconds
+        "CenterMessage": {
+            "Message": "Client Center",
+            "Time": 5 // Seconds
         },
         "PrintTo": 2
     },
     {
         "Title": "All Center",
         "Description": "All players Center message",
         "Command": "allcenter",
-        "CenterElement": {
-            "CenterMessage": "All Center",
-            "CenterMessageTime": 7
+        "CenterMessage": {
+            "Message": "All Center",
+            "Time": 7
         },
         "PrintTo": 3
     },
@@ -38,9 +38,9 @@
         "Description": "Client Chat & Client Center message",
         "Command": "CCCC",
         "Message": "Client Chat",
-        "CenterElement": {
-            "CenterMessage": "Client Center",
-            "CenterMessageTime": 10
+        "CenterMessage": {
+            "Message": "Client Center",
+            "Time": 10
         },
         "PrintTo": 4
     },
@@ -49,9 +49,9 @@
         "Description": "Client Chat & All Center",
         "Command": "CCAC",
         "Message": "Client Chat",
-        "CenterElement": {
-            "CenterMessage": "All Center",
-            "CenterMessageTime": 3
+        "CenterMessage": {
+            "Message": "All Center",
+            "Time": 3
         },
         "PrintTo": 5
     },
@@ -60,9 +60,9 @@
         "Description": "All Chat & Client Center",
         "Command": "ACCC",
         "Message": "All Chat",
-        "CenterElement": {
-            "CenterMessage": "Client Center",
-            "CenterMessageTime": 4
+        "CenterMessage": {
+            "Message": "Client Center",
+            "Time": 4
         },
         "PrintTo": 6
     },
@@ -71,9 +71,9 @@
         "Description": "All Chat & All Center",
         "Command": "ACAC",
         "Message": "All Chat",
-        "CenterElement": {
-            "CenterMessage": "All Center",
-            "CenterMessageTime": 10
+        "CenterMessage": {
+            "Message": "All Center",
+            "Time": 10
         },
         "PrintTo": 7
     }
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,10 @@ private void PrintToChatAndAllCenter(Receiver receiver, CCSPlayerController play`
`37`	`37`	`PrintToAllCenter(cmd);`
`38`	`38`	`}`
`39`	`39`
`40`		`- private void PrintToChat(Receiver printToChat, CCSPlayerController player, string message)`
	`40`	`+ private void PrintToChat(Receiver printToChat, CCSPlayerController player, dynamic message)`
`41`	`41`	`{`
`42`		`- string replaceTags = ReplaceMessageTags(message, player);`
`43`		`- string replaceColorTags = ReplaceColorTags(replaceTags);`
`44`		`- string[] msg = WrappedLine(replaceColorTags);`
	`42`	`+ string[] msg = WrappedLine(message);`
	`43`	`+ msg = ReplaceTags(msg, player);`
`45`	`44`
`46`	`45`	`switch (printToChat)`
`47`	`46`	`{`