Cleanup

Commands/CommandManager.cs

@@ -9,20 +9,20 @@
 
 namespace Commands;
 
-public class CommandManager(IGangManager gangMgr, IPlayerManager playerMgr)
+public class CommandManager(IGangManager gangMgr)
   : MockCommandManager, IPluginBehavior {
   private BasePlugin? plugin;
 
   public void Start(BasePlugin? basePlugin, bool hotReload) {
     plugin = basePlugin;
 
-    RegisterCommand(new GangCommand(gangMgr, playerMgr));
+    RegisterCommand(new GangCommand(gangMgr));
   }
 
   public override bool RegisterCommand(ICommand command) {
     var result = base.RegisterCommand(command);
     if (result == false) return false;
-    foreach (var alias in command.Aliases) {
+    foreach (var alias in command.Aliases)
       plugin?.AddCommand(alias, command.Description ?? string.Empty,
         (player, info) => {
           var wrapper     = player == null ? null : new PlayerWrapper(player);
@@ -31,7 +31,6 @@ public override bool RegisterCommand(ICommand command) {
             await ProcessCommand(wrapper, wrappedInfo);
           });
         });
-    }
 
     return true;
   }

Commands/GangCommand.cs

@@ -7,7 +7,7 @@
 
 namespace Commands;
 
-public class GangCommand(IGangManager gangMgr, IPlayerManager playerMgr) : ICommand {
+public class GangCommand(IGangManager gangMgr) : ICommand {
   private readonly Dictionary<string, ICommand> sub = new() {
     // ["delete"] = new DeleteGangCommand(),
     // ["invite"] = new InviteGangCommand(),

Commands/gang/CreateCommand.cs

@@ -8,7 +8,7 @@ namespace Commands.gang;
 // create [name]
 public class CreateCommand(IGangManager gangs) : ICommand {
   public string Name => "create";
-  public string? Description => "Creates a new gang";
+  public string Description => "Creates a new gang";
   public string Usage => "[name]";
 
   public async Task<CommandResult> Execute(PlayerWrapper? executor,

Commands/gang/HelpCommand.cs

@@ -6,7 +6,7 @@ namespace Commands.gang;
 
 public class HelpCommand : ICommand {
   public string Name => "help";
-  public string? Description => "Displays help for gangs";
+  public string Description => "Displays help for gangs";
 
   public Task<CommandResult> Execute(PlayerWrapper? executor,
     CommandInfoWrapper info) {

Gangs/GangServiceCollection.cs

@@ -5,7 +5,6 @@
 using GangsAPI.Services.Commands;
 using Microsoft.Extensions.DependencyInjection;
 using Mock;
-using SQLImpl;
 
 namespace GangsImpl;
 

GangsAPI/Data/Command/CommandInfoWrapper.cs

@@ -1,15 +1,15 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Commands;
 
 namespace GangsAPI.Data.Command;
 
 public class CommandInfoWrapper(PlayerWrapper? executor, int offset = 0,
   params string[] args) {
+  private readonly string[] args = args;
+
   public readonly CommandCallingContext CallingContext =
     CommandCallingContext.Console;
 
   public readonly PlayerWrapper? CallingPlayer = executor;
-  private readonly string[] args = args;
 
   public CommandInfoWrapper(CommandInfo info, int offset = 0) : this(
     info.CallingPlayer == null ? null : new PlayerWrapper(info.CallingPlayer),

GangsAPI/Data/Gang/IGang.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using GangsAPI.Permissions;
-
-namespace GangsAPI.Data.Gang;
+namespace GangsAPI.Data.Gang;
 
 /// <summary>
 ///   Represents an instance of a gang.

GangsAPI/Data/Gang/IGangPlayer.cs

@@ -1,6 +1,4 @@
-using GangsAPI.Permissions;
-
-namespace GangsAPI.Data.Gang;
+namespace GangsAPI.Data.Gang;
 
 /// <summary>
 ///   A gang player is a player tracked by the gangs plugin.

GangsAPI/Services/IGangStatManager.cs

@@ -13,8 +13,9 @@ public interface IGangStatManager : ICacher {
 
   #region Get
 
-  Task<bool> GetForGang<TV>(IGang gang, string statId, out TV? holder)
-    => GetForGang(gang.GangId, statId, out holder);
+  Task<bool> GetForGang<TV>(IGang gang, string statId, out TV? holder) {
+    return GetForGang(gang.GangId, statId, out holder);
+  }
 
   async Task<bool> GetForGang<TV>(IGang gang, IStat<TV> holder) {
     var success = await GetForGang(gang, holder.StatId, out TV? tmp);
@@ -23,34 +24,41 @@ async Task<bool> GetForGang<TV>(IGang gang, IStat<TV> holder) {
     return true;
   }
 
-  Task<bool> GetForGang<TV>(IGang gang, IStat<TV> stat, out TV? holder)
-    => GetForGang(gang, stat.StatId, out holder);
+  Task<bool> GetForGang<TV>(IGang gang, IStat<TV> stat, out TV? holder) {
+    return GetForGang(gang, stat.StatId, out holder);
+  }
 
   #endregion
 
   #region Set
 
-  Task<bool> SetForGang<TV>(int gangId, IStat<TV> stat)
-    => SetForGang(gangId, stat.StatId, stat.Value);
+  Task<bool> SetForGang<TV>(int gangId, IStat<TV> stat) {
+    return SetForGang(gangId, stat.StatId, stat.Value);
+  }
 
-  Task<bool> SetForGang<TV>(IGang gang, IStat<TV> stat)
-    => SetForGang(gang.GangId, stat);
+  Task<bool> SetForGang<TV>(IGang gang, IStat<TV> stat) {
+    return SetForGang(gang.GangId, stat);
+  }
 
-  Task<bool> SetForGang<TV>(IGang gang, string statId, TV value)
-    => SetForGang(gang.GangId, statId, value);
+  Task<bool> SetForGang<TV>(IGang gang, string statId, TV value) {
+    return SetForGang(gang.GangId, statId, value);
+  }
 
   #endregion
 
   #region Remove
 
-  Task<bool> RemoveFromGang(int gangId, IStat stat)
-    => RemoveFromGang(gangId, stat.StatId);
+  Task<bool> RemoveFromGang(int gangId, IStat stat) {
+    return RemoveFromGang(gangId, stat.StatId);
+  }
 
-  Task<bool> RemoveFromGang(IGang gang, string statId)
-    => RemoveFromGang(gang.GangId, statId);
+  Task<bool> RemoveFromGang(IGang gang, string statId) {
+    return RemoveFromGang(gang.GangId, statId);
+  }
 
-  Task<bool> RemoveFromGang(IGang gang, IStat stat)
-    => RemoveFromGang(gang, stat.StatId);
+  Task<bool> RemoveFromGang(IGang gang, IStat stat) {
+    return RemoveFromGang(gang, stat.StatId);
+  }
 
   #endregion
 

GangsAPI/Services/IPlayerManager.cs

@@ -37,7 +37,7 @@ public interface IPlayerManager : IPluginBehavior, ICacher {
   /// <param name="name">The name of the player.</param>
   /// <returns>The new player.</returns>
   Task<IGangPlayer> CreatePlayer(ulong steamId, string? name = null);
-  
+
   Task<bool> UpdatePlayer(IGangPlayer player);
 
   /// <summary>

GangsAPI/Services/IPlayerStatManager.cs

@@ -13,8 +13,9 @@ public interface IPlayerStatManager : IPluginBehavior, ICacher {
   #region Get
 
   Task<bool> GetForPlayer<TV>(PlayerWrapper wrapper, string statId,
-    out TV? holder)
-    => GetForPlayer(wrapper.Steam, statId, out holder);
+    out TV? holder) {
+    return GetForPlayer(wrapper.Steam, statId, out holder);
+  }
 
   async Task<bool> GetForPlayer<TV>(ulong steam, IStat<TV> holder) {
     var success = await GetForPlayer(steam, holder.StatId, out TV? tmp);
@@ -23,34 +24,41 @@ async Task<bool> GetForPlayer<TV>(ulong steam, IStat<TV> holder) {
     return true;
   }
 
-  Task<bool> GetForPlayer<TV>(PlayerWrapper wrapper, IStat<TV> holder)
-    => GetForPlayer(wrapper.Steam, holder);
+  Task<bool> GetForPlayer<TV>(PlayerWrapper wrapper, IStat<TV> holder) {
+    return GetForPlayer(wrapper.Steam, holder);
+  }
 
   #endregion
 
   #region Set
 
-  Task<bool> SetForPlayer<TV>(ulong steam, IStat<TV> stat)
-    => SetForPlayer(steam, stat.StatId, stat.Value);
+  Task<bool> SetForPlayer<TV>(ulong steam, IStat<TV> stat) {
+    return SetForPlayer(steam, stat.StatId, stat.Value);
+  }
 
-  Task<bool> SetForPlayer<TV>(PlayerWrapper wrapper, IStat<TV> stat)
-    => SetForPlayer(wrapper.Steam, stat);
+  Task<bool> SetForPlayer<TV>(PlayerWrapper wrapper, IStat<TV> stat) {
+    return SetForPlayer(wrapper.Steam, stat);
+  }
 
-  Task<bool> SetForPlayer<TV>(PlayerWrapper wrapper, string statId, TV value)
-    => SetForPlayer(wrapper.Steam, statId, value);
+  Task<bool> SetForPlayer<TV>(PlayerWrapper wrapper, string statId, TV value) {
+    return SetForPlayer(wrapper.Steam, statId, value);
+  }
 
   #endregion
 
   #region Remove
 
-  Task<bool> RemoveFromPlayer(ulong steam, IStat stat)
-    => RemoveFromPlayer(steam, stat.StatId);
+  Task<bool> RemoveFromPlayer(ulong steam, IStat stat) {
+    return RemoveFromPlayer(steam, stat.StatId);
+  }
 
-  Task<bool> RemoveFromPlayer(PlayerWrapper wrapper, string statId)
-    => RemoveFromPlayer(wrapper.Steam, statId);
+  Task<bool> RemoveFromPlayer(PlayerWrapper wrapper, string statId) {
+    return RemoveFromPlayer(wrapper.Steam, statId);
+  }
 
-  Task<bool> RemoveFromPlayer(PlayerWrapper wrapper, IStat stat)
-    => RemoveFromPlayer(wrapper, stat.StatId);
+  Task<bool> RemoveFromPlayer(PlayerWrapper wrapper, IStat stat) {
+    return RemoveFromPlayer(wrapper, stat.StatId);
+  }
 
   #endregion
 

GangsImpl/AbstractDB/AbstractDBGangManager.cs

@@ -4,12 +4,12 @@
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
 using Mock;
-using Xunit;
 
 namespace GenericDB;
 
-public abstract class AbstractDBGangManager(IPlayerManager playerMgr, string connectionString,
-  string table = "gang_gangs", bool testing = false) : MockGangManager(playerMgr) {
+public abstract class AbstractDBGangManager(IPlayerManager playerMgr,
+  string connectionString, string table = "gang_gangs", bool testing = false)
+  : MockGangManager(playerMgr) {
   protected DbConnection Connection = null!;
   protected DbTransaction? Transaction;
   public override void ClearCache() { CachedGangs.Clear(); }
@@ -49,7 +49,7 @@ public override async Task<bool> UpdateGang(IGang gang) {
     var result = await base.UpdateGang(gang);
     var query  = $"UPDATE {table} SET Name = @Name WHERE GangId = @GangId";
     await Connection.ExecuteAsync(query, new { gang.Name, gang.GangId },
-      transaction: Transaction);
+      Transaction);
     return result;
   }
 

GangsImpl/AbstractDB/DBGang.cs

@@ -1,5 +1,4 @@
 using GangsAPI.Data.Gang;
-using GangsAPI.Permissions;
 using Mock;
 
 namespace GenericDB;

GangsImpl/Mock/MockCommandManager.cs

@@ -16,6 +16,12 @@ public bool UnregisterCommand(ICommand command) {
     return command.Aliases.All(alias => commands.Remove(alias));
   }
 
+  public async Task<CommandResult> ProcessCommand(PlayerWrapper? executor,
+    params string[] args) {
+    var info = new CommandInfoWrapper(executor, 0, args);
+    return await ProcessCommand(executor, info);
+  }
+
   public async Task<CommandResult> ProcessCommand(PlayerWrapper? executor,
     CommandInfo sourceInfo) {
     var info = new CommandInfoWrapper(sourceInfo);
@@ -44,10 +50,4 @@ await Task.Run(async () => {
 
     return result;
   }
-
-  public async Task<CommandResult> ProcessCommand(PlayerWrapper? executor,
-    params string[] args) {
-    var info = new CommandInfoWrapper(executor, 0, args);
-    return await ProcessCommand(executor, info);
-  }
 }

GangsImpl/Mock/MockGang.cs

@@ -1,6 +1,4 @@
 using GangsAPI.Data.Gang;
-using GangsAPI.Data.Stat;
-using GangsAPI.Permissions;
 
 namespace Mock;
 

GangsImpl/Mock/MockInstanceStatManager.cs

@@ -1,15 +1,30 @@
-using GangsAPI.Data.Stat;
-using GangsAPI.Services;
+using GangsAPI.Services;
 
 namespace Mock;
 
 public class MockInstanceStatManager : IPlayerStatManager, IGangStatManager {
+  public void ClearCache() {
+    cachedGangValues.Clear();
+    cachedPlayerValues.Clear();
+  }
+
+  public Task Load() {
+    cachedGangValues.Clear();
+    cachedPlayerValues.Clear();
+    foreach (var (gangId, gangStatMap) in backendGangValues)
+      cachedGangValues[gangId] = new Dictionary<string, object>(gangStatMap);
+    foreach (var (steam, playerStatMap) in backendPlayerValues)
+      cachedPlayerValues[steam] = new Dictionary<string, object>(playerStatMap);
+    return Task.CompletedTask;
+  }
+
   #region Player
 
   private readonly Dictionary<ulong, Dictionary<string, object>>
     cachedPlayerValues = [], backendPlayerValues = [];
 
-  public Task<bool> GetForPlayer<TV>(ulong steam, string statId, out TV? result) {
+  public Task<bool>
+    GetForPlayer<TV>(ulong steam, string statId, out TV? result) {
     result = default;
     if (!cachedPlayerValues.TryGetValue(steam, out var playerStatMap))
       return Task.FromResult(false);
@@ -79,19 +94,4 @@ public Task<bool> RemoveFromGang(int gangId, string statId) {
   }
 
   #endregion
-
-  public void ClearCache() {
-    cachedGangValues.Clear();
-    cachedPlayerValues.Clear();
-  }
-
-  public Task Load() {
-    cachedGangValues.Clear();
-    cachedPlayerValues.Clear();
-    foreach (var (gangId, gangStatMap) in backendGangValues)
-      cachedGangValues[gangId] = new Dictionary<string, object>(gangStatMap);
-    foreach (var (steam, playerStatMap) in backendPlayerValues)
-      cachedPlayerValues[steam] = new Dictionary<string, object>(playerStatMap);
-    return Task.CompletedTask;
-  }
 }

GangsImpl/Mock/MockPlayer.cs

@@ -1,6 +1,4 @@
 using GangsAPI.Data.Gang;
-using GangsAPI.Data.Stat;
-using GangsAPI.Permissions;
 
 namespace Mock;
 

GangsImpl/Mock/MockStat.cs

@@ -3,17 +3,18 @@
 namespace Mock;
 
 public class MockStat(string statId, string name, string? desc = null) : IStat {
-  public bool Equals(MockStat? other) {
-    return other is not null && ((IStat)this).Equals(other);
-  }
-
   public string StatId { get; } = statId;
   public string Name { get; } = name;
   public string? Description { get; } = desc;
 
   public bool Equals(IStat? other) {
     return other is not null && StatId == other.StatId;
   }
+
+  public bool Equals(MockStat? other) {
+    return other is not null && ((IStat)this).Equals(other);
+  }
+
   public override bool Equals(object? obj) { return Equals(obj as MockStat); }
 
   public override int GetHashCode() { return HashCode.Combine(StatId); }