Merge pull request #11 from HerrMagiic/dev

v1.0.8

Author: HerrMagiic

Diff for: .github/img/ColorsCS2.png

@@ -39,12 +39,12 @@
       "say hello"
     ],
     "Permission": {
-      "ReguiresAllPermissions": false,
+      "RequiresAllPermissions": false,
       "PermissionList": [
         "@css/cvar",
         "@custom/permission",
         "#css/simple-admin"
       ]
     }
   }
-]
+]

Diff for: CustomCommands/Commands.example.json

@@ -0,0 +1,20 @@
+[
+    {
+      "Title": "Discord",
+      "Description": "Command for Discord",
+      "Command": "discord",
+      "Message": "{PREFIX}{GREEN}Discord: \n <link>",
+      "PrintTo": 0
+    },
+    {
+      "Title": "Steam",
+      "Description": "Command for SteamGroup",
+      "Command": "steam,steamgroup,group",
+      "Message": "SteamGroup: <link>",
+      "CenterMessage": {
+        "Message": "<div>Steam Group</div><br><div><font color='#00ff00'>https...</font></div>",
+        "Time": 10
+      },
+      "PrintTo": 7
+    }
+  ]

Diff for: CustomCommands/Commands/Others.example.json

@@ -0,0 +1,22 @@
+[
+    {
+      "Title": "Fast restart",
+      "Command": "rg",
+      "Message": [
+        "Restarting game..."
+      ],
+      "PrintTo": 0,
+      "Description": "restarting game",
+      "ServerCommands": [
+        "mp_restartgame 1"
+      ],
+      "Permission": {
+        "RequiresAllPermissions": false,
+        "PermissionList": [
+          "@css/cvar",
+          "@custom/permission",
+          "#css/simple-admin"
+        ]
+      }
+    }
+  ]

Diff for: CustomCommands/Commands/ServerCommands.example.json

@@ -1,27 +1,33 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
-using CounterStrikeSharp.API.Modules.Utils;
-using CustomCommands.Model;
+using CustomCommands.Interfaces;
 using Microsoft.Extensions.Logging;
-using System.Text.Json;
 
 namespace CustomCommands;
 
-[MinimumApiVersion(98)]
+[MinimumApiVersion(142)]
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
-    public override string ModuleVersion => "1.0.7";
+    public override string ModuleVersion => "1.0.8";
     public override string ModuleAuthor => "HerrMagic";
     public override string ModuleDescription => "Create your own commands per config";
 
-    private List<CenterClientElement> centerClientOn = new();
-    private CenterServerElement centerServerOn = new();
-
-    private List<CCSPlayerController> PlayerList = new();
     public CustomCommandsConfig Config { get; set; } = new();
-    private string PrefixCache = "";
+    private readonly IRegisterCommands RegisterCommands;
+    private readonly IPluginGlobals PluginGlobals;
+    private readonly ILoadJson LoadJson;
+    private readonly IEventManager EventManager;
+
+    public CustomCommands(IRegisterCommands RegisterCommands, ILogger<CustomCommands> Logger, 
+                            IPluginGlobals PluginGlobals, ILoadJson LoadJson, IEventManager EventManager)
+    {
+        this.Logger = Logger;
+        this.RegisterCommands = RegisterCommands;
+        this.PluginGlobals = PluginGlobals;
+        this.LoadJson = LoadJson;
+        this.EventManager = EventManager;
+    }
 
     public void OnConfigParsed(CustomCommandsConfig config)
     {
@@ -32,52 +38,25 @@ public override void Load(bool hotReload)
     {
         if (!Config.IsPluginEnabled)
         {
-            Console.WriteLine($"{Config.LogPrefix} {ModuleName} is disabled");
+            Logger.LogInformation($"{Config.LogPrefix} {ModuleName} is disabled");
             return;
         }
-
-        Console.WriteLine(
+        
+        Logger.LogInformation(
             $"CustomCommands has been loaded, and the hot reload flag was {hotReload}, path is {ModulePath}");
 
-        if (Config.Prefix != PrefixCache)
-            PrefixCache = Config.Prefix;
+        PluginGlobals.Config = Config;
 
-        var comms = LoadCommandsFromJson();
+        var comms = LoadJson.LoadCommandsFromJson(ModuleDirectory);
 
-        RegisterListeners();
+        EventManager.RegisterListeners();
 
-        
         if (comms != null) 
         {
-            comms = CheckForDuplicateCommands(comms);
+            comms = RegisterCommands.CheckForDuplicateCommands(comms);
+            // Add commands from the JSON file to the server
             foreach (var com in comms)
-                AddCommands(com);
+                RegisterCommands.AddCommands(com);
         }
-
-        if (hotReload)
-            InitializeLists();
-    }
-
-    private List<Commands>? LoadCommandsFromJson()
-    {
-        string jsonPath = Path.Combine(ModuleDirectory, "Commands.json");
-        if (File.Exists(jsonPath))
-        {
-            var json = File.ReadAllText(jsonPath);
-            return JsonSerializer.Deserialize<List<Commands>>(json);
-        }
-        else
-        {
-            Logger.LogWarning("No Config file found. Please create one");
-            return null;
-        }
-    }
-
-    private void InitializeLists()
-    {
-        Utilities.GetPlayers().ForEach(controller =>
-        {
-            PlayerList.Add(controller);
-        });
     }
 }

Diff for: CustomCommands/CustomCommands.cs

@@ -4,14 +4,14 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <!--<OutputPath>.</OutputPath>-->
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.98" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.142" />
+    <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -20,4 +20,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+        <None Update="lang\**\*.*" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
 </Project>

Diff for: CustomCommands/CustomCommands.csproj

@@ -0,0 +1,19 @@
+
+using CounterStrikeSharp.API.Core;
+using CustomCommands.Interfaces;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CustomCommands;
+
+public class CustomCommandsServiceCollection : IPluginServiceCollection<CustomCommands>
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.Scan(scan => scan
+            .FromAssemblyOf<IPermissionsManager>()
+            .AddClasses()
+                .AsImplementedInterfaces()
+                .WithSingletonLifetime()
+        );
+    }
+}