NullReferenceException

HerrMagiic · HerrMagiic · commit 3ac9273e45df · 2024-01-07T02:54:08.000+01:00
diff --git a/CustomCommands/Commands.example.json b/CustomCommands/Commands.example.json
@@ -39,7 +39,7 @@
       "say hello"
     ],
     "Permission": {
-      "ReguiresAllPermissions": false,
+      "RequiresAllPermissions": false,
       "PermissionList": [
         "@css/cvar",
         "@custom/permission",
diff --git a/CustomCommands/Commands/Others.example.json b/CustomCommands/Commands/Others.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 --git a/CustomCommands/Commands/ServerCommands.example.json b/CustomCommands/Commands/ServerCommands.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 --git a/CustomCommands/CustomCommands.cs b/CustomCommands/CustomCommands.cs
@@ -1,11 +1,11 @@
 ﻿using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
-using CustomCommands.Services;
+using CustomCommands.Interfaces;
 using Microsoft.Extensions.Logging;
 
 namespace CustomCommands;
 
-[MinimumApiVersion(98)]
+[MinimumApiVersion(142)]
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
diff --git a/CustomCommands/CustomCommands.csproj b/CustomCommands/CustomCommands.csproj
@@ -10,7 +10,8 @@
   </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>
diff --git a/CustomCommands/CustomCommandsServiceCollection.cs b/CustomCommands/CustomCommandsServiceCollection.cs
@@ -1,6 +1,5 @@
 
 using CounterStrikeSharp.API.Core;
-using CustomCommands.Services;
 using CustomCommands.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -10,12 +9,11 @@ public class CustomCommandsServiceCollection : IPluginServiceCollection<CustomCo
 {
     public void ConfigureServices(IServiceCollection services)
     {
-        services.AddSingleton<IMessageManager, MessageManager>();
-        services.AddSingleton<IReplaceTagsFunctions, ReplaceTagsFunctions>();
-        services.AddSingleton<IRegisterCommands, RegisterCommands>();
-        services.AddSingleton<IPluginGlobals, PluginGlobals>();
-        services.AddSingleton<ILoadJson, LoadJson>();
-        services.AddSingleton<IPermissionsManager, PermissionsManager>();
-        services.AddSingleton<IEventManager, EventManager>();
+        services.Scan(scan => scan
+            .FromAssemblyOf<IPermissionsManager>()
+            .AddClasses()
+                .AsImplementedInterfaces()
+                .WithSingletonLifetime()
+        );
     }
 }
diff --git a/CustomCommands/Model/CommandsConfig.cs b/CustomCommands/Model/CommandsConfig.cs
@@ -13,7 +13,7 @@ public class Commands
 }
 public class Permission
 {
-    public bool ReguiresAllPermissions { get; set; } = false;
+    public bool RequiresAllPermissions { get; set; } = false;
     public List<string> PermissionList { get; set; } = new();
 }
 public class CenterElement
diff --git a/CustomCommands/Services/EventManager.cs b/CustomCommands/Services/EventManager.cs
@@ -4,19 +4,20 @@
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Plugin;
 using CustomCommands.Interfaces;
+using Microsoft.Extensions.Logging;
 
 namespace CustomCommands.Services;
 
 public class EventManager : IEventManager
 {
     private readonly IPluginGlobals PluginGlobals;
-    private readonly CustomCommands PluginContext;
+    private readonly PluginContext PluginContext;
     private readonly IReplaceTagsFunctions ReplaceTagsFunctions;
     
     public EventManager(IPluginGlobals PluginGlobals, IPluginContext PluginContext, IReplaceTagsFunctions ReplaceTagsFunctions)
     {
         this.PluginGlobals = PluginGlobals;
-        this.PluginContext = ((PluginContext as PluginContext)!.Plugin as CustomCommands)!;
+        this.PluginContext = (PluginContext as PluginContext)!;
         this.ReplaceTagsFunctions = ReplaceTagsFunctions;
     }
 
@@ -30,7 +31,8 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo
 
     public void RegisterListeners()
     {
-        PluginContext.RegisterListener<Listeners.OnTick>(() =>
+        CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
+        plugin.RegisterListener<Listeners.OnTick>(() =>
         {
             // Client Print To Center
             if(PluginGlobals.centerClientOn != null && PluginGlobals.centerClientOn.Count !> 0 )
diff --git a/CustomCommands/Services/LoadJson.cs b/CustomCommands/Services/LoadJson.cs
@@ -32,4 +32,6 @@ public LoadJson(ILogger<CustomCommands> Logger)
             return null;
         }
     }
+
+    
 }
diff --git a/CustomCommands/Services/MessageManager.cs b/CustomCommands/Services/MessageManager.cs
@@ -3,19 +3,20 @@
 using CounterStrikeSharp.API.Core.Plugin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
+using Microsoft.Extensions.Logging;
 
 namespace CustomCommands.Services;
 public class MessageManager : IMessageManager
 {
     private readonly IPluginGlobals PluginGlobals;
     private readonly IReplaceTagsFunctions ReplaceTagsFunctions;
-    private readonly CustomCommands PluginContext;
+    private readonly PluginContext PluginContext;
 
     public MessageManager(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions, IPluginContext PluginContext)
     {
         this.PluginGlobals = PluginGlobals;
         this.ReplaceTagsFunctions = ReplaceTagsFunctions;
-        this.PluginContext = ((PluginContext as PluginContext)!.Plugin as CustomCommands)!;
+        this.PluginContext = (PluginContext as PluginContext)!;
     }
 
     public void SendMessage(CCSPlayerController player, Commands cmd) 
@@ -53,6 +54,8 @@ public void SendMessage(CCSPlayerController player, Commands cmd)
 
     public void PrintToCenterClient(CCSPlayerController player, Commands cmd)
     {
+        CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
+        
         string message = ReplaceTagsFunctions.ReplaceMessageTags(cmd.CenterMessage.Message, player);
 
         var CenterClientElement = new CenterClientElement
@@ -61,15 +64,17 @@ public void PrintToCenterClient(CCSPlayerController player, Commands cmd)
             Message = message
         };
         PluginGlobals.centerClientOn.Add(CenterClientElement);
-        PluginContext.AddTimer(cmd.CenterMessage.Time, () => PluginGlobals.centerClientOn.Remove(CenterClientElement));
+        plugin.AddTimer(cmd.CenterMessage.Time, () => PluginGlobals.centerClientOn.Remove(CenterClientElement));
     }
 
     public void PrintToAllCenter(Commands cmd)
     {
+        CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
+
         PluginGlobals.centerServerOn.Message = cmd.CenterMessage.Message;
         PluginGlobals.centerServerOn.IsRunning = true;
         
-        PluginContext.AddTimer(cmd.CenterMessage.Time, () =>
+        plugin.AddTimer(cmd.CenterMessage.Time, () =>
         {
             PluginGlobals.centerServerOn.IsRunning = false;
         });
diff --git a/CustomCommands/Services/PermissionsManager.cs b/CustomCommands/Services/PermissionsManager.cs
@@ -2,6 +2,8 @@
 using CounterStrikeSharp.API.Modules.Admin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
+using Microsoft.Extensions.Logging;
+using Serilog;
 
 namespace CustomCommands.Services;
 
@@ -16,7 +18,7 @@ public PermissionsManager(IPluginGlobals PluginGlobals)
 
     public bool RequiresPermissions(CCSPlayerController player, Permission permissions)
     {
-        if (!permissions.ReguiresAllPermissions)
+        if (!permissions.RequiresAllPermissions)
         {
             foreach (var permission in permissions.PermissionList)
             {
diff --git a/CustomCommands/Services/RegisterCommands.cs b/CustomCommands/Services/RegisterCommands.cs
@@ -11,7 +11,7 @@ public class RegisterCommands : IRegisterCommands
     private readonly IMessageManager MessageManager;
     private readonly IPluginGlobals PluginGlobals;
     private readonly IPermissionsManager PermissionsManager;
-    private readonly CustomCommands PluginContext;
+    private readonly PluginContext PluginContext;
 
     public RegisterCommands(ILogger<CustomCommands> Logger, IMessageManager MessageManager, 
                                 IPluginGlobals PluginGlobals, IPermissionsManager PermissionsManager, IPluginContext PluginContext)
@@ -20,16 +20,18 @@ public RegisterCommands(ILogger<CustomCommands> Logger, IMessageManager MessageM
         this.MessageManager = MessageManager;
         this.PluginGlobals = PluginGlobals;
         this.PermissionsManager = PermissionsManager;
-        this.PluginContext = ((PluginContext as PluginContext)!.Plugin as CustomCommands)!;
+        this.PluginContext = (PluginContext as PluginContext)!;
     }
 
     public void AddCommands(Commands com)
     {
+        CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
+        
         string[] aliases = com.Command.Split(',');
 
         for (int i = 0; i < aliases.Length; i++)
         {
-            PluginContext.AddCommand(aliases[i], com.Description, (player, info) =>
+            plugin.AddCommand(aliases[i], com.Description, (player, info) =>
             {
                 if (player == null) return;
                 
diff --git a/CustomCommands/Services/ReplaceTagsFunction.cs b/CustomCommands/Services/ReplaceTagsFunction.cs
@@ -91,6 +91,11 @@ public string ReplaceColorTags(string input)
         return input;
     }
 
+    /// <summary>
+    /// Splits the input into an array of strings. If the input is a string, it will be split by newlines. If the input is an array, each element will be split by newlines.
+    /// </summary>
+    /// <param name="input">This should be a string[] or a string</param>
+    /// <returns>An array of strings representing the lines of the input.</returns>
     public string[] WrappedLine(dynamic input)
     {
         List<string> output = new List<string>();
diff --git a/CustomCommands/lang/en.json b/CustomCommands/lang/en.json
@@ -0,0 +1,3 @@
+{
+    
+}
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ For more examples look here: [Examples](https://github.com/HerrMagiic/CSS-Create
       "say hello"
     ],
     "Permission": {
-      "ReguiresAllPermissions": false,
+      "RequiresAllPermissions": false,
       "PermissionList": [
         "@css/cvar",
         "@custom/permission",
@@ -104,7 +104,7 @@ An array of server commands to be executed when the command is triggered. Useful
 
 Defines if the command requires specific permissions to execute:
 
-- **ReguiresAllPermissions**
+- **RequiresAllPermissions**
   - Set to true 	= The player needs all permissions in PermissionsList
   - Set to false 	= The player only needs one of the permissions in PermissionsList
 - **PermissionList**: A list of permission flags or groups required to execute the command. [More Explenation](https://docs.cssharp.dev/docs/admin-framework/defining-admins.html)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`using CounterStrikeSharp.API.Core;`
`3`		`-using CustomCommands.Services;`
`4`	`3`	`using CustomCommands.Interfaces;`
`5`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`6`	`5`
`@@ -10,12 +9,11 @@ public class CustomCommandsServiceCollection : IPluginServiceCollection<CustomCo`
`10`	`9`	`{`
`11`	`10`	`public void ConfigureServices(IServiceCollection services)`
`12`	`11`	`{`
`13`		`- services.AddSingleton<IMessageManager, MessageManager>();`
`14`		`- services.AddSingleton<IReplaceTagsFunctions, ReplaceTagsFunctions>();`
`15`		`- services.AddSingleton<IRegisterCommands, RegisterCommands>();`
`16`		`- services.AddSingleton<IPluginGlobals, PluginGlobals>();`
`17`		`- services.AddSingleton<ILoadJson, LoadJson>();`
`18`		`- services.AddSingleton<IPermissionsManager, PermissionsManager>();`
`19`		`- services.AddSingleton<IEventManager, EventManager>();`
	`12`	`+ services.Scan(scan => scan`
	`13`	`+ .FromAssemblyOf<IPermissionsManager>()`
	`14`	`+ .AddClasses()`
	`15`	`+ .AsImplementedInterfaces()`
	`16`	`+ .WithSingletonLifetime()`
	`17`	`+ );`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class Commands`
`13`	`13`	`}`
`14`	`14`	`public class Permission`
`15`	`15`	`{`
`16`		`- public bool ReguiresAllPermissions { get; set; } = false;`
	`16`	`+ public bool RequiresAllPermissions { get; set; } = false;`
`17`	`17`	`public List<string> PermissionList { get; set; } = new();`
`18`	`18`	`}`
`19`	`19`	`public class CenterElement`
Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,20 @@`
`4`	`4`	`using CounterStrikeSharp.API.Core.Attributes.Registration;`
`5`	`5`	`using CounterStrikeSharp.API.Core.Plugin;`
`6`	`6`	`using CustomCommands.Interfaces;`
	`7`	`+using Microsoft.Extensions.Logging;`
`7`	`8`
`8`	`9`	`namespace CustomCommands.Services;`
`9`	`10`
`10`	`11`	`public class EventManager : IEventManager`
`11`	`12`	`{`
`12`	`13`	`private readonly IPluginGlobals PluginGlobals;`
`13`		`- private readonly CustomCommands PluginContext;`
	`14`	`+ private readonly PluginContext PluginContext;`
`14`	`15`	`private readonly IReplaceTagsFunctions ReplaceTagsFunctions;`
`15`	`16`
`16`	`17`	`public EventManager(IPluginGlobals PluginGlobals, IPluginContext PluginContext, IReplaceTagsFunctions ReplaceTagsFunctions)`
`17`	`18`	`{`
`18`	`19`	`this.PluginGlobals = PluginGlobals;`
`19`		`- this.PluginContext = ((PluginContext as PluginContext)!.Plugin as CustomCommands)!;`
	`20`	`+ this.PluginContext = (PluginContext as PluginContext)!;`
`20`	`21`	`this.ReplaceTagsFunctions = ReplaceTagsFunctions;`
`21`	`22`	`}`
`22`	`23`
`@@ -30,7 +31,8 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo`
`30`	`31`
`31`	`32`	`public void RegisterListeners()`
`32`	`33`	`{`
`33`		`- PluginContext.RegisterListener<Listeners.OnTick>(() =>`
	`34`	`+ CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;`
	`35`	`+ plugin.RegisterListener<Listeners.OnTick>(() =>`
`34`	`36`	`{`
`35`	`37`	`// Client Print To Center`
`36`	`38`	`if(PluginGlobals.centerClientOn != null && PluginGlobals.centerClientOn.Count !> 0 )`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ public LoadJson(ILogger<CustomCommands> Logger)`
`32`	`32`	`return null;`
`33`	`33`	`}`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+`
`35`	`37`	`}`