T type logging

Core/Callbacks/HideoutCallbacks.cs

@@ -14,9 +14,9 @@ namespace Core.Callbacks;
 [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.HideoutCallbacks)]
 public class HideoutCallbacks : OnUpdate
 {
-    private readonly HideoutController _hideoutController;
-    private readonly ConfigServer _configServer;
-    private readonly HideoutConfig _hideoutConfig;
+    protected HideoutController _hideoutController;
+    protected ConfigServer _configServer;
+    protected HideoutConfig _hideoutConfig;
 
     public HideoutCallbacks
     (

Core/Callbacks/HttpCallbacks.cs

@@ -8,8 +8,8 @@ namespace Core.Callbacks;
 [Injectable(InjectionType.Singleton, InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.HttpCallbacks)]
 public class HttpCallbacks : OnLoad
 {
-    private readonly HttpServer _httpServer;
-    private readonly ApplicationContext _applicationContext;
+    protected HttpServer _httpServer;
+    protected ApplicationContext _applicationContext;
     public HttpCallbacks(HttpServer httpServer, ApplicationContext applicationContext)
     {
         _httpServer = httpServer;

Core/Context/ApplicationContext.cs

@@ -6,8 +6,8 @@ namespace Core.Context;
 public class ApplicationContext
 {
     private const short MaxSavedValues = 10;
-    private readonly Dictionary<ContextVariableType, LinkedList<ContextVariable>> variables = new();
-    private readonly object variablesLock = new();
+    protected Dictionary<ContextVariableType, LinkedList<ContextVariable>> variables = new();
+    protected object variablesLock = new();
 
     public ContextVariable? GetLatestValue(ContextVariableType type)
     {
@@ -58,4 +58,4 @@ public class ApplicationContext
             variables.Remove(type);
         }
     }
-}
+}

Core/Context/ContextVariable.cs

@@ -2,9 +2,9 @@ namespace Core.Context;
 
 public class ContextVariable
 {
-    private readonly object _value;
-    private readonly ContextVariableType _internalType;
-    private readonly DateTime _timestamp;
+    protected object _value;
+    protected ContextVariableType _internalType;
+    protected DateTime _timestamp;
 
     public ContextVariable(object value, ContextVariableType contextVariableInternalType)
     {

Core/Controllers/AchievementController.cs

@@ -1,19 +1,19 @@
 using Core.Annotations;
 using Core.Models.Eft.Profile;
+using Core.Models.Utils;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Controllers;
 
 [Injectable]
 public class AchievementController
 {
-    protected ILogger _logger;
+    protected ISptLogger<AchievementController> _logger;
     protected DatabaseService _databaseService;
     
     public AchievementController
     (
-        ILogger logger,
+        ISptLogger<AchievementController> logger,
         DatabaseService databaseService
     )
     {

Core/Controllers/BotController.cs

@@ -7,21 +7,20 @@ using Core.Models.Eft.Bot;
 using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Match;
-using Core.Models.Enums;
 using Core.Models.Spt.Bots;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Controllers;
 
 [Injectable]
 public class BotController
 {
-    protected ILogger _logger;
+    protected ISptLogger<BotController> _logger;
 
     protected DatabaseService _databaseService;
     protected BotGenerator _botGenerator;
@@ -32,7 +31,7 @@ public class BotController
     protected MatchBotDeatilsCacheService _matchBotDeatilsCacheService;
     protected LocalisationService _localisationService;
     protected SeasonalEventService _seasonalEventService;
-    private readonly MatchBotDetailsCacheService _matchBotDetailsCacheService;
+    protected MatchBotDetailsCacheService _matchBotDetailsCacheService;
     protected ProfileHelper _profileHelper;
     protected ConfigServer _configServer;
     protected ApplicationContext _applicationContext;
@@ -44,7 +43,7 @@ public class BotController
 
     public BotController
     (
-        ILogger logger,
+        ISptLogger<BotController> logger,
         DatabaseService databaseService,
         BotGenerator botGenerator,
         BotHelper botHelper,

Core/Controllers/ClientLogController.cs

@@ -1,7 +1,6 @@
 using Core.Annotations;
-using Core.Models.Logging;
 using Core.Models.Spt.Logging;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 using LogLevel = Core.Models.Spt.Logging.LogLevel;
 
 namespace Core.Controllers;
@@ -9,10 +8,11 @@ namespace Core.Controllers;
 [Injectable]
 public class ClientLogController
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<ClientLogController> _logger;
 
     public ClientLogController(
-        ILogger logger)
+        ISptLogger<ClientLogController> logger
+    )
     {
         _logger = logger;
     }
@@ -45,7 +45,7 @@ public class ClientLogController
                 this._logger.Info(message);
                 break;
             case LogLevel.CUSTOM:
-                this._logger.Info(message/* TODO: , color.ToString(), backgroundColor.ToString()*/);
+                this._logger.Info(message /* TODO: , color.ToString(), backgroundColor.ToString()*/);
                 break;
             case LogLevel.DEBUG:
                 this._logger.Debug(message);

Core/Controllers/CustomizationController.cs

@@ -7,11 +7,12 @@ using Core.Models.Eft.Hideout;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Services;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 using Product = Core.Models.Eft.ItemEvent.Product;
 
 namespace Core.Controllers;
@@ -19,7 +20,7 @@ namespace Core.Controllers;
 [Injectable]
 public class CustomizationController
 {
-    protected ILogger _logger;
+    protected ISptLogger<CustomizationController> _logger;
     protected EventOutputHolder _eventOutputHolder;
     protected DatabaseService _databaseService;
     protected SaveServer _saveServer;
@@ -29,7 +30,7 @@ public class CustomizationController
 
     public CustomizationController
     (
-        ILogger logger,
+        ISptLogger<CustomizationController> logger,
         EventOutputHolder eventOutputHolder,
         DatabaseService databaseService,
         SaveServer saveServer,

Core/Controllers/DialogueController.cs

@@ -13,12 +13,12 @@ namespace Core.Controllers;
 [Injectable]
 public class DialogueController
 {
-    private readonly DialogueHelper _dialogueHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly ConfigServer _configServer;
-    private readonly SaveServer _saveServer;
-    private readonly List<IDialogueChatBot> _dialogueChatBots;
-    private readonly CoreConfig _coreConfig;
+    protected DialogueHelper _dialogueHelper;
+    protected ProfileHelper _profileHelper;
+    protected ConfigServer _configServer;
+    protected SaveServer _saveServer;
+    protected List<IDialogueChatBot> _dialogueChatBots;
+    protected CoreConfig _coreConfig;
 
     public DialogueController(
         DialogueHelper dialogueHelper,

Core/Controllers/GameController.cs

@@ -7,51 +7,52 @@ using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.External;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class GameController
 {
-    private readonly ILogger _logger;
-    private readonly ConfigServer _configServer;
-    private readonly DatabaseService _databaseService;
+    protected ISptLogger<GameController> _logger;
+    protected ConfigServer _configServer;
+    protected DatabaseService _databaseService;
 
-    private readonly TimeUtil _timeUtil;
+    protected TimeUtil _timeUtil;
 
-    // private readonly PreSptModLoader _preSptModLoader;
-    private readonly HttpServerHelper _httpServerHelper;
-    private readonly InventoryHelper _inventoryHelper;
-    private readonly RandomUtil _randomUtil;
-    private readonly HideoutHelper _hideoutHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly ProfileFixerService _profileFixerService;
-    private readonly LocalisationService _localisationService;
-    private readonly PostDbLoadService _postDbLoadService;
-    private readonly CustomLocationWaveService _customLocationWaveService;
-    private readonly OpenZoneService _openZoneService;
-    private readonly SeasonalEventService _seasonalEventService;
-    private readonly ItemBaseClassService _itemBaseClassService;
-    private readonly GiftService _giftService;
-    private readonly RaidTimeAdjustmentService _raidTimeAdjustmentService;
-    private readonly ProfileActivityService _profileActivityService;
-    private readonly ApplicationContext _applicationContext;
-    //private readonly PreSptModLoader preSptModLoader
-    private readonly ICloner _cloner;
+    // protected PreSptModLoader _preSptModLoader;
+    protected HttpServerHelper _httpServerHelper;
+    protected InventoryHelper _inventoryHelper;
+    protected RandomUtil _randomUtil;
+    protected HideoutHelper _hideoutHelper;
+    protected ProfileHelper _profileHelper;
+    protected ProfileFixerService _profileFixerService;
+    protected LocalisationService _localisationService;
+    protected PostDbLoadService _postDbLoadService;
+    protected CustomLocationWaveService _customLocationWaveService;
+    protected OpenZoneService _openZoneService;
+    protected SeasonalEventService _seasonalEventService;
+    protected ItemBaseClassService _itemBaseClassService;
+    protected GiftService _giftService;
+    protected RaidTimeAdjustmentService _raidTimeAdjustmentService;
+    protected ProfileActivityService _profileActivityService;
+    protected ApplicationContext _applicationContext;
+    //protected PreSptModLoader preSptModLoader
+    protected ICloner _cloner;
 
-    private readonly CoreConfig _coreConfig;
-    private readonly HttpConfig _httpConfig;
-    private readonly RagfairConfig _ragfairConfig;
-    private readonly HideoutConfig _hideoutConfig;
-    private readonly BotConfig _botConfig;
+    protected CoreConfig _coreConfig;
+    protected HttpConfig _httpConfig;
+    protected RagfairConfig _ragfairConfig;
+    protected HideoutConfig _hideoutConfig;
+    protected BotConfig _botConfig;
 
     public GameController(
-        ILogger logger,
+        ISptLogger<GameController> logger,
         ConfigServer configServer,
         DatabaseService databaseService,
         TimeUtil timeUtil,

Core/Controllers/HideoutController.cs

@@ -6,44 +6,45 @@ using Core.Models.Eft.Hideout;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class HideoutController
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly RandomUtil _randomUtil;
-    private readonly InventoryHelper _inventoryHelper;
-    private readonly ItemHelper _itemHelper;
-    private readonly SaveServer _saveServer;
-    private readonly PlayerService _playerService;
-    private readonly PresetHelper _presetHelper;
-    private readonly PaymentHelper _paymentHelper;
-    private readonly EventOutputHolder _eventOutputHolder;
-    private readonly HttpResponseUtil _httpResponseUtil;
-    private readonly ProfileHelper _profileHelper;
-    private readonly HideoutHelper _hideoutHelper;
-    private readonly ScavCaseRewardGenerator _scavCaseRewardGenerator;
-    private readonly LocalisationService _localisationService;
-    private readonly ProfileActivityService _profileActivityService;
-    private readonly FenceService _fenceService;
-    private readonly CircleOfCultistService _circleOfCultistService;
-    private readonly ICloner _cloner;
-    private readonly ConfigServer _configServer;
-    private readonly HideoutConfig _hideoutConfig;
+    protected ISptLogger<HideoutController> _logger;
+    protected HashUtil _hashUtil;
+    protected TimeUtil _timeUtil;
+    protected DatabaseService _databaseService;
+    protected RandomUtil _randomUtil;
+    protected InventoryHelper _inventoryHelper;
+    protected ItemHelper _itemHelper;
+    protected SaveServer _saveServer;
+    protected PlayerService _playerService;
+    protected PresetHelper _presetHelper;
+    protected PaymentHelper _paymentHelper;
+    protected EventOutputHolder _eventOutputHolder;
+    protected HttpResponseUtil _httpResponseUtil;
+    protected ProfileHelper _profileHelper;
+    protected HideoutHelper _hideoutHelper;
+    protected ScavCaseRewardGenerator _scavCaseRewardGenerator;
+    protected LocalisationService _localisationService;
+    protected ProfileActivityService _profileActivityService;
+    protected FenceService _fenceService;
+    protected CircleOfCultistService _circleOfCultistService;
+    protected ICloner _cloner;
+    protected ConfigServer _configServer;
+    protected HideoutConfig _hideoutConfig;
 
     public HideoutController(
-        ILogger logger,
+        ISptLogger<HideoutController> logger,
         HashUtil hashUtil,
         TimeUtil timeUtil,
         DatabaseService databaseService,

Core/Controllers/InRaidController.cs

@@ -4,16 +4,17 @@ using Core.Helpers;
 using Core.Models.Eft.InRaid;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class InRaidController
 {
-    protected ILogger _logger;
+    protected ISptLogger<InRaidController> _logger;
     protected SaveServer _saveServer;
     protected ProfileHelper _profileHelper;
     protected LocalisationService _localisationService;
@@ -25,7 +26,7 @@ public class InRaidController
 
     public InRaidController
     (
-        ILogger logger,
+        ISptLogger<InRaidController> logger,
         SaveServer saveServer,
         ProfileHelper profileHelper,
         LocalisationService localisationService,

Core/Controllers/LauncherController.cs

@@ -7,11 +7,12 @@ using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Models.Spt.Mod;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Extensions;
-using ILogger = Core.Models.Utils.ILogger;
+
 using Info = Core.Models.Eft.Profile.Info;
 
 namespace Core.Controllers;
@@ -21,7 +22,7 @@ public class LauncherController
 {
  protected CoreConfig _coreConfig;
 
- protected ILogger _logger;
+ protected ISptLogger<LauncherController> _logger;
  protected HashUtil _hashUtil;
  protected TimeUtil _timeUtil;
  protected RandomUtil _randomUtil;
@@ -33,7 +34,7 @@ public class LauncherController
  
 
  public LauncherController(
-        Models.Utils.ILogger logger,
+        ISptLogger<LauncherController> logger,
         HashUtil hashUtil,
         TimeUtil timeUtil,
         RandomUtil randomUtil,

Core/Controllers/LocationController.cs

@@ -2,22 +2,23 @@ using Core.Annotations;
 using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Location;
+using Core.Models.Utils;
 using Core.Services;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class LocationController
 {
-    private readonly ILogger _logger;
-    private readonly DatabaseService _databaseService;
-    private readonly AirdropService _airdropService;
-    private readonly ICloner _cloner;
+    protected ISptLogger<LocationController> _logger;
+    protected DatabaseService _databaseService;
+    protected AirdropService _airdropService;
+    protected ICloner _cloner;
 
     public LocationController(
-        ILogger logger,
+        ISptLogger<LocationController> logger,
         DatabaseService databaseService,
         AirdropService airdropService,
         ICloner cloner)

Core/Controllers/NoteController.cs

@@ -9,7 +9,7 @@ namespace Core.Controllers;
 [Injectable]
 public class NoteController
 {
-    private readonly EventOutputHolder _eventOutputHolder;
+    protected EventOutputHolder _eventOutputHolder;
 
     public NoteController(
         EventOutputHolder eventOutputHolder)

Core/Controllers/NotifierController.cs

@@ -7,8 +7,8 @@ namespace Core.Controllers;
 [Injectable]
 public class NotifierController
 {
-    private readonly HttpServerHelper _httpServerHelper;
-    private readonly NotifierHelper _notifierHelper;
+    protected HttpServerHelper _httpServerHelper;
+    protected NotifierHelper _notifierHelper;
 
     public NotifierController(
         HttpServerHelper httpServerHelper,

Core/Controllers/PresetController.cs

@@ -1,20 +1,21 @@
 using Core.Annotations;
 using Core.Helpers;
 using Core.Models.Eft.Common;
+using Core.Models.Utils;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class PresetController
 {
-    private readonly ILogger _logger;
-    private readonly PresetHelper _presetHelper;
-    private readonly DatabaseService _databaseService;
+    protected ISptLogger<PresetController> _logger;
+    protected PresetHelper _presetHelper;
+    protected DatabaseService _databaseService;
 
     public PresetController(
-        ILogger logger,
+        ISptLogger<PresetController> logger,
         PresetHelper presetHelper,
         DatabaseService databaseService
         )

Core/Controllers/PrestigeController.cs

@@ -5,29 +5,30 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Inventory;
 using Core.Models.Eft.Prestige;
 using Core.Models.Eft.Profile;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class PrestigeController
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly InventoryHelper _inventoryHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly EventOutputHolder _eventOutputHolder;
-    private readonly CreateProfileService _createProfileService;
+    protected ISptLogger<PrestigeController> _logger;
+    protected TimeUtil _timeUtil;
+    protected InventoryHelper _inventoryHelper;
+    protected ProfileHelper _profileHelper;
+    protected EventOutputHolder _eventOutputHolder;
+    protected CreateProfileService _createProfileService;
     private DatabaseService _databaseService;
-    private readonly ICloner _cloner;
+    protected ICloner _cloner;
 
     public PrestigeController
     (
-        ILogger logger,
+        ISptLogger<PrestigeController> logger,
         TimeUtil timeUtil,
         InventoryHelper inventoryHelper,
         ProfileHelper profileHelper,

Core/Controllers/ProfileController.cs

@@ -5,6 +5,7 @@ using Core.Models.Eft.Common;
 using Core.Models.Eft.Launcher;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Services;
@@ -16,7 +17,7 @@ namespace Core.Controllers;
 [Injectable]
 public class ProfileController
 {
-    protected Models.Utils.ILogger _logger;
+    protected ISptLogger<ProfileController> _logger;
 
     protected HashUtil _hashUtil;
     protected ICloner _cloner;
@@ -26,22 +27,22 @@ public class ProfileController
     protected ItemHelper _itemHelper;
     protected ProfileFixerService _profileFixerService;
     protected LocalisationService _localisationService;
-    private readonly CreateProfileService _createProfileService;
+    protected CreateProfileService _createProfileService;
 
     protected SeasonalEventService _seasonalEventService;
 
     // TODO: MailSendService mailSendService: MailSendService
     protected PlayerScavGenerator _playerScavGenerator;
-    private readonly EventOutputHolder _eventOutputHolder;
+    protected EventOutputHolder _eventOutputHolder;
 
     protected TraderHelper _traderHelper;
     protected DialogueHelper _dialogueHelper;
     protected QuestHelper _questHelper;
-    private readonly QuestRewardHelper _questRewardHelper;
+    protected QuestRewardHelper _questRewardHelper;
     protected ProfileHelper _profileHelper;
 
     public ProfileController(
-        Models.Utils.ILogger logger,
+        ISptLogger<ProfileController> logger,
         HashUtil hashUtil,
         ICloner cloner,
         TimeUtil timeUtil,

Core/Controllers/QuestController.cs

@@ -4,22 +4,23 @@ using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Eft.Quests;
+using Core.Models.Utils;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class QuestController
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly HttpResponseUtil _httpResponseUtil;
-    private readonly QuestHelper _questHelper;
-    private readonly QuestRewardHelper _questRewardHelper;
+    protected ISptLogger<QuestController> _logger;
+    protected TimeUtil _timeUtil;
+    protected HttpResponseUtil _httpResponseUtil;
+    protected QuestHelper _questHelper;
+    protected QuestRewardHelper _questRewardHelper;
 
     public QuestController(
-        ILogger logger,
+        ISptLogger<QuestController> logger,
         TimeUtil timeUtil,
         HttpResponseUtil httpResponseUtil,
         QuestHelper questHelper,

Core/Controllers/TradeController.cs

@@ -7,40 +7,41 @@ using Core.Models.Eft.Ragfair;
 using Core.Models.Eft.Trade;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class TradeController
 {
-    private readonly ILogger _logger;
-    private readonly DatabaseService _databaseService;
-    private readonly EventOutputHolder _eventOutputHolder;
-    private readonly TradeHelper _tradeHelper;
-    private readonly TimeUtil _timeUtil;
-    private readonly HashUtil _hashUtil;
-    private readonly ItemHelper _itemHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly RagfairOfferHelper _ragfairOfferHelper;
-    private readonly TraderHelper _traderHelper;
-    // private readonly RagfairServer _ragfairServer;
-    private readonly HttpResponseUtil _httpResponseUtil;
-    private readonly LocalisationService _localisationService;
-    private readonly RagfairPriceService _ragfairPriceService;
-    // private readonly MailSendService _mailSendService;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<TradeController> _logger;
+    protected DatabaseService _databaseService;
+    protected EventOutputHolder _eventOutputHolder;
+    protected TradeHelper _tradeHelper;
+    protected TimeUtil _timeUtil;
+    protected HashUtil _hashUtil;
+    protected ItemHelper _itemHelper;
+    protected ProfileHelper _profileHelper;
+    protected RagfairOfferHelper _ragfairOfferHelper;
+    protected TraderHelper _traderHelper;
+    // protected RagfairServer _ragfairServer;
+    protected HttpResponseUtil _httpResponseUtil;
+    protected LocalisationService _localisationService;
+    protected RagfairPriceService _ragfairPriceService;
+    // protected MailSendService _mailSendService;
+    protected ConfigServer _configServer;
     
-    private readonly RagfairConfig _ragfairConfig;
-    private readonly TraderConfig _traderConfig;
+    protected RagfairConfig _ragfairConfig;
+    protected TraderConfig _traderConfig;
 
     public TradeController
     (
-        ILogger logger,
+        ISptLogger<TradeController> logger,
         DatabaseService databaseService,
         EventOutputHolder eventOutputHolder,
         TradeHelper tradeHelper,

Core/Controllers/TraderController.cs

@@ -6,18 +6,19 @@ using Core.Models.Eft.Game;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class TraderController
 {
-    private ILogger _logger;
+    private ISptLogger<TraderController> _logger;
     private TimeUtil _timeUtil;
     private DatabaseService _databaseService;
     private TraderAssortHelper _traderAssortHelper;
@@ -36,7 +37,7 @@ public class TraderController
 
     public TraderController
     (
-        ILogger logger,
+        ISptLogger<TraderController> logger,
         TimeUtil timeUtil,
         DatabaseService databaseService,
         TraderAssortHelper traderAssortHelper,

Core/Controllers/WeatherController.cs

@@ -5,26 +5,27 @@ using Core.Models.Eft.Weather;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Models.Spt.Weather;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Controllers;
 
 [Injectable]
 public class WeatherController
 {
-    private readonly ILogger _logger;
-    private readonly WeatherGenerator _weatherGenerator;
-    private readonly SeasonalEventService _seasonalEventService;
-    private readonly RaidWeatherService _raidWeatherService;
-    private readonly WeatherHelper _weatherHelper;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<WeatherController> _logger;
+    protected WeatherGenerator _weatherGenerator;
+    protected SeasonalEventService _seasonalEventService;
+    protected RaidWeatherService _raidWeatherService;
+    protected WeatherHelper _weatherHelper;
+    protected ConfigServer _configServer;
 
-    private readonly WeatherConfig _weatherConfig;
+    protected WeatherConfig _weatherConfig;
 
     public WeatherController(
-        ILogger logger,
+        ISptLogger<WeatherController> logger,
         WeatherGenerator weatherGenerator,
         SeasonalEventService seasonalEventService,
         RaidWeatherService raidWeatherService,

Core/Controllers/WishlistController.cs

@@ -9,7 +9,7 @@ namespace Core.Controllers;
 [Injectable]
 public class WishlistController
 {
-    private readonly EventOutputHolder _eventOutputHolder;
+    protected EventOutputHolder _eventOutputHolder;
 
     public WishlistController(
         EventOutputHolder eventOutputHolder)

Core/Generators/BotGenerator.cs

@@ -7,40 +7,41 @@ using Core.Models.Enums;
 using Core.Models.Enums.RaidSettings;
 using Core.Models.Spt.Bots;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
 using BodyPart = Core.Models.Eft.Common.Tables.BodyPart;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Generators;
 
 [Injectable]
 public class BotGenerator
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly RandomUtil _randomUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly ProfileHelper _profileHelper;
-    private readonly DatabaseService _databaseService;
-    private readonly BotInventoryGenerator _botInventoryGenerator;
-    private readonly BotLevelGenerator _botLevelGenerator;
-    private readonly BotEquipmentFilterService _botEquipmentFilterService;
-    private readonly WeightedRandomHelper _weightedRandomHelper;
-    private readonly BotHelper _botHelper;
-    private readonly BotGeneratorHelper _botGeneratorHelper;
-    private readonly SeasonalEventService _seasonalEventService;
-    private readonly ItemFilterService _itemFilterService;
-    private readonly BotNameService _botNameService;
-    private readonly ConfigServer _configServer;
-    private readonly ICloner _cloner;
+    protected ISptLogger<BotGenerator> _logger;
+    protected HashUtil _hashUtil;
+    protected RandomUtil _randomUtil;
+    protected TimeUtil _timeUtil;
+    protected ProfileHelper _profileHelper;
+    protected DatabaseService _databaseService;
+    protected BotInventoryGenerator _botInventoryGenerator;
+    protected BotLevelGenerator _botLevelGenerator;
+    protected BotEquipmentFilterService _botEquipmentFilterService;
+    protected WeightedRandomHelper _weightedRandomHelper;
+    protected BotHelper _botHelper;
+    protected BotGeneratorHelper _botGeneratorHelper;
+    protected SeasonalEventService _seasonalEventService;
+    protected ItemFilterService _itemFilterService;
+    protected BotNameService _botNameService;
+    protected ConfigServer _configServer;
+    protected ICloner _cloner;
     private BotConfig _botConfig;
     private PmcConfig _pmcConfig;
 
     public BotGenerator(
-        ILogger logger,
+        ISptLogger<BotGenerator> logger,
         HashUtil hashUtil,
         RandomUtil randomUtil,
         TimeUtil timeUtil,

Core/Generators/BotInventoryGenerator.cs

@@ -6,39 +6,41 @@ using Core.Models.Eft.Match;
 using Core.Models.Enums;
 using Core.Models.Spt.Bots;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
+using Core.Services;
 using Core.Utils;
 using Equipment = Core.Models.Eft.Common.Tables.Equipment;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Generators;
 
 [Injectable]
 public class BotInventoryGenerator
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly RandomUtil _randomUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly ApplicationContext _applicationContext;
-    private readonly BotWeaponGenerator _botWeaponGenerator;
-    private readonly BotLootGenerator _botLootGenerator;
-    private readonly BotGeneratorHelper _botGeneratorHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly BotHelper _botHelper;
-    private readonly WeightedRandomHelper _weightedRandomHelper;
-    private readonly ItemHelper _itemHelper;
-    private readonly WeatherHelper _weatherHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly BotEquipmentFilterService _botEquipmentFilterService;
-    private readonly BotEquipmentModPoolService _botEquipmentModPoolService;
-    private readonly BotEquipmentModGenerator _botEquipmentModGenerator;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<BotInventoryGenerator> _logger;
+    protected HashUtil _hashUtil;
+    protected RandomUtil _randomUtil;
+    protected DatabaseService _databaseService;
+    protected ApplicationContext _applicationContext;
+    protected BotWeaponGenerator _botWeaponGenerator;
+    protected BotLootGenerator _botLootGenerator;
+    protected BotGeneratorHelper _botGeneratorHelper;
+    protected ProfileHelper _profileHelper;
+    protected BotHelper _botHelper;
+    protected WeightedRandomHelper _weightedRandomHelper;
+    protected ItemHelper _itemHelper;
+    protected WeatherHelper _weatherHelper;
+    protected LocalisationService _localisationService;
+    protected BotEquipmentFilterService _botEquipmentFilterService;
+    protected BotEquipmentModPoolService _botEquipmentModPoolService;
+    protected BotEquipmentModGenerator _botEquipmentModGenerator;
+    protected ConfigServer _configServer;
 
     private BotConfig _botConfig;
 
     public BotInventoryGenerator(
-        ILogger logger,
+        ISptLogger<BotInventoryGenerator> logger,
         HashUtil hashUtil,
         RandomUtil randomUtil,
         DatabaseService databaseService,

Core/Generators/BotLevelGenerator.cs

@@ -3,22 +3,23 @@ using Core.Models.Common;
 using Core.Models.Eft.Bot;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Spt.Bots;
+using Core.Models.Utils;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Generators;
 
 [Injectable]
 public class BotLevelGenerator
 {
-    private readonly ILogger _logger;
-    private readonly RandomUtil _randomUtil;
-    private readonly MathUtil _mathUtil;
-    private readonly DatabaseService _databaseService;
+    protected ISptLogger<BotLevelGenerator> _logger;
+    protected RandomUtil _randomUtil;
+    protected MathUtil _mathUtil;
+    protected DatabaseService _databaseService;
 
     public BotLevelGenerator(
-        ILogger logger,
+        ISptLogger<BotLevelGenerator> logger,
         RandomUtil randomUtil,
         MathUtil mathUtil,
         DatabaseService databaseService)

Core/Generators/PlayerScavGenerator.cs

@@ -4,39 +4,40 @@ using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Generators;
 
 [Injectable]
 public class PlayerScavGenerator
 {
-    private readonly ILogger _logger;
-    private readonly RandomUtil _randomUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly HashUtil _hashUtil;
-    private readonly ItemHelper _itemHelper;
-    private readonly BotGeneratorHelper _botGeneratorHelper;
-    private readonly SaveServer _saveServer;
-    private readonly ProfileHelper _profileHelper;
-    private readonly BotHelper _botHelper;
-    private readonly FenceService _fenceService;
-    private readonly BotLootCacheService _botLootCacheService;
-    private readonly LocalisationService _localisationService;
-    private readonly BotGenerator _botGenerator;
-    private readonly ConfigServer _configServer;
-    private readonly ICloner _cloner;
-    private readonly TimeUtil _timeUtil;
+    protected ISptLogger<PlayerScavGenerator> _logger;
+    protected RandomUtil _randomUtil;
+    protected DatabaseService _databaseService;
+    protected HashUtil _hashUtil;
+    protected ItemHelper _itemHelper;
+    protected BotGeneratorHelper _botGeneratorHelper;
+    protected SaveServer _saveServer;
+    protected ProfileHelper _profileHelper;
+    protected BotHelper _botHelper;
+    protected FenceService _fenceService;
+    protected BotLootCacheService _botLootCacheService;
+    protected LocalisationService _localisationService;
+    protected BotGenerator _botGenerator;
+    protected ConfigServer _configServer;
+    protected ICloner _cloner;
+    protected TimeUtil _timeUtil;
 
     private PlayerScavConfig _playerScavConfig;
 
     public PlayerScavGenerator
     (
-        ILogger logger,
+        ISptLogger<PlayerScavGenerator> logger,
         RandomUtil randomUtil,
         DatabaseService databaseService,
         HashUtil hashUtil,

Core/Generators/WeatherGenerator.cs

@@ -12,13 +12,13 @@ namespace Core.Generators;
 [Injectable]
 public class WeatherGenerator
 {
-    private readonly TimeUtil _timeUtil;
-    private readonly SeasonalEventService _seasonalEventService;
-    private readonly WeatherHelper _weatherHelper;
-    private readonly ConfigServer _configServer;
-    private readonly WeightedRandomHelper _weightedRandomHelper;
-    private readonly RandomUtil _randomUtil;
-    private readonly WeatherConfig _weatherConfig;
+    protected TimeUtil _timeUtil;
+    protected SeasonalEventService _seasonalEventService;
+    protected WeatherHelper _weatherHelper;
+    protected ConfigServer _configServer;
+    protected WeightedRandomHelper _weightedRandomHelper;
+    protected RandomUtil _randomUtil;
+    protected WeatherConfig _weatherConfig;
 
     public WeatherGenerator(
     TimeUtil timeUtil,

Core/Helpers/BotGeneratorHelper.cs

@@ -9,8 +9,8 @@ namespace Core.Helpers;
 [Injectable]
 public class BotGeneratorHelper
 {
-    private readonly ConfigServer _configServer;
-    private readonly PmcConfig _pmcConfig;
+    protected ConfigServer _configServer;
+    protected PmcConfig _pmcConfig;
 
     public BotGeneratorHelper(
         ConfigServer configServer

Core/Helpers/BotHelper.cs

@@ -4,29 +4,30 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Match;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class BotHelper
 {
-    private readonly ILogger _logger;
-    private readonly DatabaseService _databaseService;
-    private readonly RandomUtil _randomUtil;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<BotHelper> _logger;
+    protected DatabaseService _databaseService;
+    protected RandomUtil _randomUtil;
+    protected ConfigServer _configServer;
 
-    private readonly BotConfig _botConfig;
-    private readonly PmcConfig _pmcConfig;
+    protected BotConfig _botConfig;
+    protected PmcConfig _pmcConfig;
 
-    private readonly List<string> _pmcNames = ["usec", "bear", "pmc", "pmcbear", "pmcusec"];
+    protected List<string> _pmcNames = ["usec", "bear", "pmc", "pmcbear", "pmcusec"];
 
     public BotHelper
     (
-        ILogger logger,
+        ISptLogger<BotHelper> logger,
         DatabaseService databaseService,
         RandomUtil randomUtil,
         ConfigServer configServer

Core/Helpers/DialogueHelper.cs

@@ -1,28 +1,29 @@
 using Core.Annotations;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Profile;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class DialogueHelper
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly SaveServer _saveServer;
-    private readonly DatabaseServer _databaseServer;
-    private readonly NotifierHelper _notifierHelper;
-    private readonly NotificationSendHelper _notificationSendHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly ItemHelper _itemHelper;
+    protected ISptLogger<DialogueHelper> _logger;
+    protected HashUtil _hashUtil;
+    protected SaveServer _saveServer;
+    protected DatabaseServer _databaseServer;
+    protected NotifierHelper _notifierHelper;
+    protected NotificationSendHelper _notificationSendHelper;
+    protected LocalisationService _localisationService;
+    protected ItemHelper _itemHelper;
 
     public DialogueHelper
     (
-        ILogger logger,
+        ISptLogger<DialogueHelper> logger,
         HashUtil hashUtil,
         SaveServer saveServer,
         DatabaseServer databaseServer,

Core/Helpers/ItemHelper.cs

@@ -3,31 +3,32 @@ using Core.Annotations;
 using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Enums;
+using Core.Models.Utils;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class ItemHelper
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly JsonUtil _jsonUtil;
-    private readonly RandomUtil _randomUtil;
-    private readonly MathUtil _mathUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly HandbookHelper _handbookHelper;
-    private readonly ItemBaseClassService _itemBaseClassService;
-    private readonly ItemFilterService _itemFilterService;
-    private readonly LocalisationService _localisationService;
-    private readonly LocaleService _localeService;
-    private readonly CompareUtil _compareUtil;
-    private readonly ICloner _cloner;
+    protected ISptLogger<ItemHelper> _logger;
+    protected HashUtil _hashUtil;
+    protected JsonUtil _jsonUtil;
+    protected RandomUtil _randomUtil;
+    protected MathUtil _mathUtil;
+    protected DatabaseService _databaseService;
+    protected HandbookHelper _handbookHelper;
+    protected ItemBaseClassService _itemBaseClassService;
+    protected ItemFilterService _itemFilterService;
+    protected LocalisationService _localisationService;
+    protected LocaleService _localeService;
+    protected CompareUtil _compareUtil;
+    protected ICloner _cloner;
 
-    private readonly List<string> _defaultInvalidBaseTypes =
+    protected List<string> _defaultInvalidBaseTypes =
     [
         BaseClasses.LOOT_CONTAINER,
         BaseClasses.MOB_CONTAINER,
@@ -40,7 +41,7 @@ public class ItemHelper
 
     public ItemHelper
     (
-        ILogger logger,
+        ISptLogger<ItemHelper> logger,
         HashUtil hashUtil,
         JsonUtil jsonUtil,
         RandomUtil randomUtil,

Core/Helpers/PaymentHelper.cs

@@ -8,8 +8,8 @@ namespace Core.Helpers;
 [Injectable]
 public class PaymentHelper
 {
-    private readonly ConfigServer _configServer;
-    private readonly InventoryConfig _inventoryConfig;
+    protected ConfigServer _configServer;
+    protected InventoryConfig _inventoryConfig;
 
     public PaymentHelper(
         ConfigServer configServer)

Core/Helpers/ProfileHelper.cs

@@ -4,6 +4,7 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
@@ -14,7 +15,7 @@ namespace Core.Helpers;
 [Injectable]
 public class ProfileHelper
 {
-    protected Models.Utils.ILogger _logger;
+    protected ISptLogger<ProfileHelper> _logger;
 
     protected ICloner _cloner;
     protected SaveServer _saveServer;
@@ -27,6 +28,7 @@ public class ProfileHelper
     protected HashUtil _hashUtil;
 
     public ProfileHelper(
+        ISptLogger<ProfileHelper> logger,
         ICloner cloner,
         SaveServer saveServer,
         DatabaseService databaseService,
@@ -38,6 +40,7 @@ public class ProfileHelper
         ConfigServer configServer
     )
     {
+        _logger = logger;
         _cloner = cloner;
         _saveServer = saveServer;
         _databaseService = databaseService;

Core/Helpers/QuestHelper.cs

@@ -5,11 +5,12 @@ using Core.Models.Eft.ItemEvent;
 using Core.Models.Eft.Quests;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 using Product = Core.Models.Eft.ItemEvent.Product;
 
 namespace Core.Helpers;
@@ -17,18 +18,18 @@ namespace Core.Helpers;
 [Injectable]
 public class QuestHelper
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly QuestConditionHelper _questConditionHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly LocaleService _localeService;
-    private readonly ICloner _cloner;
-    private readonly QuestConfig _questConfig;
+    protected ISptLogger<QuestHelper> _logger;
+    protected TimeUtil _timeUtil;
+    protected DatabaseService _databaseService;
+    protected QuestConditionHelper _questConditionHelper;
+    protected ProfileHelper _profileHelper;
+    protected LocalisationService _localisationService;
+    protected LocaleService _localeService;
+    protected ICloner _cloner;
+    protected QuestConfig _questConfig;
 
     public QuestHelper(
-        ILogger logger,
+        ISptLogger<QuestHelper> logger,
         TimeUtil timeUtil,
         DatabaseService databaseService,
         QuestConditionHelper questConditionHelper,

Core/Helpers/QuestRewardHelper.cs

@@ -5,33 +5,34 @@ using Core.Models.Eft.Hideout;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class QuestRewardHelper
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly ItemHelper _itemHelper;
-    private readonly PaymentHelper _paymentHelper;
-    private readonly TraderHelper _traderHelper;
-    private readonly DatabaseService _databaseService;
-    private readonly QuestConditionHelper _questConditionHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly PresetHelper _presetHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly QuestConfig _questConfig;
-    private readonly ICloner _cloner;
+    protected ISptLogger<QuestRewardHelper> _logger;
+    protected HashUtil _hashUtil;
+    protected TimeUtil _timeUtil;
+    protected ItemHelper _itemHelper;
+    protected PaymentHelper _paymentHelper;
+    protected TraderHelper _traderHelper;
+    protected DatabaseService _databaseService;
+    protected QuestConditionHelper _questConditionHelper;
+    protected ProfileHelper _profileHelper;
+    protected PresetHelper _presetHelper;
+    protected LocalisationService _localisationService;
+    protected QuestConfig _questConfig;
+    protected ICloner _cloner;
 
     public QuestRewardHelper(
-        ILogger logger,
+        ISptLogger<QuestRewardHelper> logger,
         HashUtil hashUtil,
         TimeUtil timeUtil,
         ItemHelper itemHelper,

Core/Helpers/TraderHelper.cs

@@ -5,29 +5,30 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class TraderHelper
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly RandomUtil _randomUtil;
-    private readonly LocalisationService _localisationService;
-    private readonly ConfigServer _configServer;
-    private readonly TraderConfig _traderConfig;
-    private readonly ProfileHelper _profileHelper;
-    private readonly DatabaseService _databaseService;
+    protected ISptLogger<TraderHelper> _logger;
+    protected TimeUtil _timeUtil;
+    protected RandomUtil _randomUtil;
+    protected LocalisationService _localisationService;
+    protected ConfigServer _configServer;
+    protected TraderConfig _traderConfig;
+    protected ProfileHelper _profileHelper;
+    protected DatabaseService _databaseService;
 
     private Dictionary<string, int> _highestTraderPriceItems = new();
 
     public TraderHelper(
-        ILogger logger,
+        ISptLogger<TraderHelper> logger,
         TimeUtil timeUtil,
         RandomUtil randomUtil,
         LocalisationService localisationService,

Core/Helpers/WeatherHelper.cs

@@ -1,24 +1,25 @@
 using Core.Annotations;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class WeatherHelper
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<WeatherHelper> _logger;
+    protected TimeUtil _timeUtil;
+    protected ConfigServer _configServer;
 
-    private readonly WeatherConfig _weatherConfig;
+    protected WeatherConfig _weatherConfig;
 
     public WeatherHelper
     (
-        ILogger logger,
+        ISptLogger<WeatherHelper> logger,
         TimeUtil timeUtil,
         ConfigServer configServer
     )

Core/Helpers/WeightedRandomHelper.cs

@@ -1,16 +1,18 @@
 using Core.Annotations;
 using Core.Models.Spt.Helper;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
+
 
 namespace Core.Helpers;
 
 [Injectable]
 public class WeightedRandomHelper
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<WeightedRandomHelper> _logger;
 
     public WeightedRandomHelper(
-        ILogger logger)
+        ISptLogger<WeightedRandomHelper> logger
+    )
     {
         _logger = logger;
     }

Core/Loaders/PostDBModLoader.cs

@@ -1,18 +1,19 @@
 using Core.Annotations;
 using Core.DI;
 using Core.Models.External;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
+
 
 namespace Core.Loaders;
 
 [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.PostDBModLoader)]
 public class PostDBModLoader : OnLoad
 {
-    private readonly ILogger _logger;
-    private readonly IEnumerable<IPostDBLoadMod> _postDbLoadMods;
+    protected ISptLogger<PostDBModLoader> _logger;
+    protected IEnumerable<IPostDBLoadMod> _postDbLoadMods;
 
     public PostDBModLoader(
-        ILogger logger,
+        ISptLogger<PostDBModLoader> logger,
         IEnumerable<IPostDBLoadMod> postDbLoadMods
     )
     {

Core/Loaders/PostSptModLoader.cs

@@ -1,18 +1,19 @@
 using Core.Annotations;
 using Core.DI;
 using Core.Models.External;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
+
 
 namespace Core.Loaders;
 
 [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.PostSptModLoader)]
 public class PostSptModLoader : OnLoad
 {
-    private readonly ILogger _logger;
-    private readonly IEnumerable<IPostSptLoadMod> _postSptLoadMods;
+    protected ISptLogger<PostSptModLoader> _logger;
+    protected IEnumerable<IPostSptLoadMod> _postSptLoadMods;
 
     public PostSptModLoader(
-        ILogger logger,
+        ISptLogger<PostSptModLoader> logger,
         IEnumerable<IPostSptLoadMod> postSptLoadMods
     )
     {

Core/Models/Eft/Ws/NotificationEventType.cs

@@ -0,0 +1,43 @@
+namespace Core.Models.Eft.Ws;
+
+public enum NotificationEventType
+{
+    AssortmentUnlockRule,
+    ExamineItems,
+    ExamineAllItems,
+    ForceLogout,
+    RagfairOfferSold,
+    RagfairNewRating,
+    RagfairRatingChange,
+    new_message,
+    ping,
+    TraderSalesSum,
+    trader_supply,
+    TraderStanding,
+    UnlockTrader,
+    groupMatchRaidSettings,
+    groupMatchRaidNotReady,
+    groupMatchRaidReady,
+    groupMatchInviteAccept,
+    groupMatchInviteDecline,
+    groupMatchInviteSend,
+    groupMatchLeaderChanged,
+    groupMatchStartGame,
+    groupMatchUserLeave,
+    groupMatchWasRemoved,
+    groupMatchUserHasBadVersion,
+    userConfirmed,
+    UserMatched,
+    userMatchOver,
+    channel_deleted,
+    friendListRequestAccept,
+    friendListRequestDecline,
+    friendListNewRequest,
+    youAreRemovedFromFriendList,
+    YouWereAddedToIgnoreList,
+    youAreRemoveFromIgnoreList,
+    ProfileLockTimer,
+    StashRows,
+    SkillPoints,
+    tournamentWarning,
+}

Core/Models/Eft/Ws/WsNotificationEvent.cs

@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Ws;
 public class WsNotificationEvent
 {
     [JsonPropertyName("type")]
-    public string? EventType { get; set; }
+    public NotificationEventType? EventType { get; set; }
 
     [JsonPropertyName("eventId")]
     public string? EventIdentifier { get; set; }
-}
+}

Core/Models/Eft/Ws/WsPing.cs

@@ -2,4 +2,9 @@ namespace Core.Models.Eft.Ws;
 
 public class WsPing : WsNotificationEvent
 {
-}
+    public WsPing()
+    {
+        EventType = NotificationEventType.ping;
+        EventIdentifier = "ping";
+    }
+}

Core/Models/Utils/ILogger.cs

@@ -1,17 +0,0 @@
-using Core.Models.Logging;
-
-namespace Core.Models.Utils;
-
-public interface ILogger
-{
-    // TODO: Removing these 4 methods for now, revisit in the future
-    // void WriteToLogFile(string data);
-    // void Log(string data, LogTextColor? color, string? backgroundColor = null);
-    void LogWithColor(string data, LogTextColor? textColor = null, LogBackgroundColor? backgroundColor = null);
-    void Success(string data);
-    void Error(string data);
-    void Warning(string data);
-    void Info(string data);
-    void Debug(string data);
-    void Critical(string data);
-}

Core/Models/Utils/ISptLogger.cs

@@ -0,0 +1,17 @@
+using Core.Models.Logging;
+
+namespace Core.Models.Utils;
+
+public interface ISptLogger<T>
+{
+    // TODO: Removing these 4 methods for now, revisit in the future
+    // void WriteToLogFile(string data);
+    // void Log(string data, LogTextColor? color, string? backgroundColor = null);
+    void LogWithColor(string data, Exception? ex = null, LogTextColor? textColor = null, LogBackgroundColor? backgroundColor = null);
+    void Success(string data, Exception? ex = null);
+    void Error(string data, Exception? ex = null);
+    void Warning(string data, Exception? ex = null);
+    void Info(string data, Exception? ex = null);
+    void Debug(string data, Exception? ex = null);
+    void Critical(string data, Exception? ex = null);
+}

Core/Routers/EventOutputHolder.cs

@@ -11,11 +11,11 @@ namespace Core.Routers;
 [Injectable]
 public class EventOutputHolder
 {
-    private readonly ProfileHelper _profileHelper;
-    private readonly TimeUtil _timeUtil;
-    private readonly ICloner _cloner;
+    protected ProfileHelper _profileHelper;
+    protected TimeUtil _timeUtil;
+    protected ICloner _cloner;
 
-    private readonly Dictionary<string, ItemEventRouterResponse> _outputStore = new();
+    protected Dictionary<string, ItemEventRouterResponse> _outputStore = new();
 
     public EventOutputHolder(
         ProfileHelper profileHelper,

Core/Routers/HttpRouter.cs

@@ -7,8 +7,8 @@ namespace Core.Routers;
 [Injectable]
 public class HttpRouter
 {
-    private readonly IEnumerable<StaticRouter> _staticRouters;
-    private readonly IEnumerable<DynamicRouter> _dynamicRoutes;
+    protected IEnumerable<StaticRouter> _staticRouters;
+    protected IEnumerable<DynamicRouter> _dynamicRoutes;
 
     public HttpRouter(
         IEnumerable<StaticRouter> staticRouters,

Core/Routers/ItemEvents/HideoutItemEventRouter.cs

@@ -11,7 +11,7 @@ namespace Core.Routers.ItemEvents;
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class HideoutItemEventRouter : ItemEventRouterDefinition
 {
-    private readonly HideoutCallbacks _hideoutCallbacks;
+    protected HideoutCallbacks _hideoutCallbacks;
 
     public HideoutItemEventRouter
     (

Core/Routers/ItemEvents/QuestItemEventRouter.cs

@@ -4,7 +4,7 @@ using Core.DI;
 using Core.Models.Eft.Common;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Eft.Quests;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Routers.ItemEvents;
 

Core/Servers/ConfigServer.cs

@@ -1,22 +1,23 @@
 using Core.Annotations;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class ConfigServer
 {
-    protected ILogger _logger;
+    protected ISptLogger<ConfigServer> _logger;
     protected JsonUtil _jsonUtil;
     protected FileUtil _fileUtil;
     protected Dictionary<string, object> configs = new();
     protected readonly string[] acceptableFileExtensions = ["json", "jsonc"];
 
     public ConfigServer(
-        ILogger logger,
+        ISptLogger<ConfigServer> logger,
         JsonUtil jsonUtil,
         FileUtil fileUtil
     )

Core/Servers/Http/SptHttpListener.cs

@@ -4,10 +4,11 @@ using System.Text;
 using System.Text.Json;
 using Core.Annotations;
 using Core.DI;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Servers.Http;
 
@@ -16,15 +17,15 @@ public class SptHttpListener : IHttpListener
 {
     protected readonly HttpRouter _router;
     protected readonly IEnumerable<ISerializer> _serializers;
-    protected readonly ILogger _logger;
+    protected readonly ISptLogger<SptHttpListener> _logger;
     protected readonly HttpResponseUtil _httpResponseUtil;
     protected readonly LocalisationService _localisationService;
     protected readonly JsonUtil _jsonUtil;
     public SptHttpListener(
         HttpRouter httpRouter, // TODO: delay required
         IEnumerable<ISerializer> serializers,
-        ILogger logger,
-        // TODO: requestsLogger: ILogger,
+        ISptLogger<SptHttpListener> logger,
+        // TODO: requestsLogger: ISptLogger,
         JsonUtil jsonUtil,
         HttpResponseUtil httpHttpResponseUtil,
         LocalisationService localisationService

Core/Servers/HttpServer.cs

@@ -6,7 +6,8 @@ using Microsoft.Extensions.Primitives;
 using Core.Annotations;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
+
 
 namespace Core.Servers;
 
@@ -16,15 +17,15 @@ public class HttpServer
     protected HttpConfig httpConfig;
     protected bool started;
 
-    private readonly ILogger _logger;
-    private readonly LocalisationService _localisationService;
-    private readonly ConfigServer _configServer;
-    private readonly ApplicationContext _applicationContext;
-    private readonly WebSocketServer _webSocketServer;
-    private readonly IEnumerable<IHttpListener> _httpListeners;
+    protected ISptLogger<HttpServer> _logger;
+    protected LocalisationService _localisationService;
+    protected ConfigServer _configServer;
+    protected ApplicationContext _applicationContext;
+    protected WebSocketServer _webSocketServer;
+    protected IEnumerable<IHttpListener> _httpListeners;
 
     public HttpServer(
-        ILogger logger,
+        ISptLogger<HttpServer> logger,
         LocalisationService localisationService,
         ConfigServer configServer,
         ApplicationContext applicationContext,
@@ -66,8 +67,7 @@ public class HttpServer
     {
         if (context.WebSockets.IsWebSocketRequest)
         {
-            return context.WebSockets.AcceptWebSocketAsync()
-                .ContinueWith(task => Converse(task.Result));
+            return _webSocketServer.OnConnection(context);
         }
         else
         {
@@ -130,34 +130,6 @@ public class HttpServer
         return found;
     }
 
-    private void Converse(WebSocket connection)
-    {
-        var buffer = new byte[1024 * 4];
-        var receive = connection.ReceiveAsync(
-            new ArraySegment<byte>(buffer), CancellationToken.None);
-        receive.Wait();
-        var receiveResult = receive.Result;
-
-        while (!receiveResult.CloseStatus.HasValue)
-        {
-            connection.SendAsync(
-                new ArraySegment<byte>(buffer, 0, receiveResult.Count),
-                receiveResult.MessageType,
-                receiveResult.EndOfMessage,
-                CancellationToken.None);
-
-            receive = connection.ReceiveAsync(
-                new ArraySegment<byte>(buffer), CancellationToken.None);
-            receive.Wait();
-            receiveResult = receive.Result;
-        }
-
-        connection.CloseAsync(
-            receiveResult.CloseStatus.Value,
-            receiveResult.CloseStatusDescription,
-            CancellationToken.None);
-    }
-
     public bool IsStarted()
     {
         return started;

Core/Servers/SaveServer.cs

@@ -6,9 +6,10 @@ using Core.Models.Eft.Common;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Servers;
 
@@ -28,7 +29,7 @@ public class SaveServer
     protected readonly JsonUtil _jsonUtil;
     protected readonly HashUtil _hashUtil;
     protected readonly LocalisationService _localisationService;
-    protected readonly ILogger _logger;
+    protected readonly ISptLogger<SaveServer> _logger;
     protected readonly ConfigServer _configServer;
 
     public SaveServer(
@@ -37,7 +38,7 @@ public class SaveServer
         JsonUtil jsonUtil,
         HashUtil hashUtil,
         LocalisationService localisationService,
-        ILogger logger,
+        ISptLogger<SaveServer> logger,
         ConfigServer configServer
     )
     {

Core/Servers/WebSocketServer.cs

@@ -1,8 +1,60 @@
-using Core.Annotations;
+using System.Net.WebSockets;
+using System.Text;
+using Core.Annotations;
+using Core.Models.Utils;
+using Core.Servers.Ws;
+using Core.Utils;
 
 namespace Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class WebSocketServer
 {
-}
+    protected IEnumerable<IWebSocketConnectionHandler> _webSocketConnectionHandler;
+    protected ISptLogger<WebSocketServer> _logger;
+    protected JsonUtil _jsonUtil;
+
+    public WebSocketServer(
+        IEnumerable<IWebSocketConnectionHandler> webSocketConnectionHandlers,
+        ISptLogger<WebSocketServer> logger,
+        JsonUtil jsonUtil
+    )
+    {
+        _webSocketConnectionHandler = webSocketConnectionHandlers;
+        _logger = logger;
+        _jsonUtil = jsonUtil;
+    }
+
+    public Task OnConnection(HttpContext httpContext)
+    {
+        return httpContext.WebSockets.AcceptWebSocketAsync()
+            .ContinueWith(task => HandleCommunication(httpContext, task.Result));
+    }
+
+    private void HandleCommunication(HttpContext context, WebSocket webSocket)
+    {
+        var socketHandlers = _webSocketConnectionHandler
+            .Where(wsh => context.Request.Path.Value.Contains(wsh.GetHookUrl()))
+            .ToList();
+        if (socketHandlers.Count == 0)
+        {
+            var message =
+                $"Socket connection received for url {context.Request.Path.Value}, but there is not websocket handler configured for it";
+            _logger.Warning(message);
+            webSocket.SendAsync(
+                    Encoding.UTF8.GetBytes(_jsonUtil.Serialize(new { error = message })),
+                    WebSocketMessageType.Text,
+                    true,
+                    CancellationToken.None
+                )
+                .Wait();
+            webSocket.CloseAsync(WebSocketCloseStatus.ProtocolError, message, CancellationToken.None).Wait();
+        }
+
+        foreach (var wsh in socketHandlers)
+        {
+            wsh.OnConnection(webSocket, context).Wait();
+            _logger.Info($"WebSocketHandler \"{wsh.GetSocketId()}\" connected");
+        }
+    }
+}

Core/Servers/Ws/IWebSocketConnectionHandler.cs

@@ -0,0 +1,10 @@
+using System.Net.WebSockets;
+
+namespace Core.Servers.Ws;
+
+public interface IWebSocketConnectionHandler
+{
+    string GetHookUrl();
+    string GetSocketId();
+    Task OnConnection(WebSocket ws, HttpContext context);
+}

Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs

@@ -0,0 +1,23 @@
+using System.Net.WebSockets;
+using System.Text;
+using Core.Annotations;
+
+namespace Core.Servers.Ws.Message;
+
+[Injectable]
+public class DefaultSptWebSocketMessageHandler : ISptWebSocketMessageHandler
+{
+    protected Models.Utils.ISptLogger<DefaultSptWebSocketMessageHandler> _logger;
+
+    public DefaultSptWebSocketMessageHandler(
+        Models.Utils.ISptLogger<DefaultSptWebSocketMessageHandler> logger
+    )
+    {
+        _logger = logger;
+    }
+
+    public async Task OnSptMessage(string sessionID, WebSocket client, byte[] rawData)
+    {
+        _logger.Debug($"[{sessionID}] SPT message received: {Encoding.UTF8.GetString(rawData)}");
+    }
+}

Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs

@@ -0,0 +1,8 @@
+using System.Net.WebSockets;
+
+namespace Core.Servers.Ws.Message;
+
+public interface ISptWebSocketMessageHandler
+{
+    Task OnSptMessage(string sessionID, WebSocket client, byte[] rawData);
+}

Core/Servers/Ws/SptWebSocketConnectionHandler.cs

@@ -0,0 +1,174 @@
+using System.Net.WebSockets;
+using System.Text;
+using Core.Annotations;
+using Core.Helpers;
+using Core.Models.Eft.Ws;
+using Core.Models.Spt.Config;
+using Core.Models.Utils;
+using Core.Servers.Ws.Message;
+using Core.Services;
+using Core.Utils;
+
+namespace Core.Servers.Ws;
+
+[Injectable(InjectionType.Singleton)]
+public class SptWebSocketConnectionHandler : IWebSocketConnectionHandler
+{
+    protected Dictionary<string, WebSocket> _sockets = new();
+    protected Dictionary<string, Timer> _socketAliveTimers = new();
+    protected Dictionary<string, CancellationTokenSource> _receiveTasks = new();
+    protected ISptLogger<SptWebSocketConnectionHandler> _logger;
+    protected LocalisationService _localisationService;
+    protected JsonUtil _jsonUtil;
+    protected ProfileHelper _profileHelper;
+    protected HttpConfig _httpConfig;
+    protected IEnumerable<ISptWebSocketMessageHandler> _messageHandlers;
+
+    protected WsPing _defaultNotification = new();
+
+    public SptWebSocketConnectionHandler(
+        ISptLogger<SptWebSocketConnectionHandler> logger,
+        LocalisationService localisationService,
+        JsonUtil jsonUtil,
+        ProfileHelper profileHelper,
+        ConfigServer configServer,
+        IEnumerable<ISptWebSocketMessageHandler> messageHandlers
+    )
+    {
+        _logger = logger;
+        _localisationService = localisationService;
+        _jsonUtil = jsonUtil;
+        _profileHelper = profileHelper;
+        _messageHandlers = messageHandlers;
+        _httpConfig = configServer.GetConfig<HttpConfig>();
+    }
+
+    public string GetHookUrl() => "/notifierServer/getwebsocket/";
+    public string GetSocketId() => "SPT WebSocket Handler";
+
+    public Task OnConnection(WebSocket ws, HttpContext context)
+    {
+        var splitUrl = context.Request.Path.Value.Substring(0, context.Request.Path.Value.IndexOf("?")).Split("/");
+        var sessionID = splitUrl.First();
+        var playerProfile = _profileHelper.GetFullProfile(sessionID);
+        var playerInfoText = $"{playerProfile.ProfileInfo.Username} ({sessionID})";
+
+        _logger.Info(_localisationService.GetText("websocket-player_connected", playerInfoText));
+
+        _sockets.Add(sessionID, ws);
+
+        _socketAliveTimers.Add(
+            sessionID,
+            new Timer(
+                async (_) =>
+                {
+                    _logger.Debug(_localisationService.GetText("websocket-pinging_player", sessionID));
+
+                    if (ws.State == WebSocketState.Open)
+                    {
+                        await ws.SendAsync(
+                            Encoding.UTF8.GetBytes(_jsonUtil.Serialize(_defaultNotification)),
+                            WebSocketMessageType.Text,
+                            true,
+                            CancellationToken.None
+                        );
+                    }
+                    else
+                    {
+                        _logger.Debug(_localisationService.GetText("websocket-socket_lost_deleting_handle"));
+                        var timer = _socketAliveTimers[sessionID];
+                        timer.Change(Timeout.Infinite, Timeout.Infinite);
+                        _socketAliveTimers.Remove(sessionID);
+                        _sockets.Remove(sessionID);
+                        var receiveTask = _receiveTasks[sessionID];
+                        await receiveTask.CancelAsync();
+                    }
+                },
+                null,
+                TimeSpan.Zero,
+                TimeSpan.FromMilliseconds(_httpConfig.WebSocketPingDelayMs)
+            )
+        );
+
+        _receiveTasks.Add(sessionID, new());
+        var cancelToken = _receiveTasks[sessionID].Token;
+        Task.Factory.StartNew((_) => ReceiveTask(sessionID, ws, cancelToken), null, cancelToken);
+
+        return Task.CompletedTask;
+    }
+
+    public async Task SendMessageAsync(string sessionID, WsNotificationEvent output)
+    {
+        try
+        {
+            if (IsWebSocketConnected(sessionID))
+            {
+                var ws = GetSessionWebSocket(sessionID);
+
+                await ws.SendAsync(
+                    Encoding.UTF8.GetBytes(_jsonUtil.Serialize(output)),
+                    WebSocketMessageType.Text,
+                    true,
+                    CancellationToken.None
+                );
+                _logger.Debug(_localisationService.GetText("websocket-message_sent"));
+            }
+            else
+            {
+                _logger.Debug(_localisationService.GetText("websocket-not_ready_message_not_sent", sessionID));
+            }
+        }
+        catch (Exception err)
+        {
+            _logger.Error(_localisationService.GetText("websocket-message_send_failed_with_error", err));
+        }
+    }
+
+    private void ReceiveTask(string sessionID, WebSocket ws, CancellationToken cancelToken)
+    {
+        List<byte> readBytes = new();
+        while (ws.State == WebSocketState.Open)
+        {
+            try
+            {
+                if (cancelToken.IsCancellationRequested)
+                    break;
+                var isEndOfMessage = false;
+                while (!isEndOfMessage)
+                {
+                    var buffer = new ArraySegment<byte>(new byte[1024 * 4]);
+                    var readTask = ws.ReceiveAsync(buffer, cancelToken);
+                    readTask.Wait(cancelToken);
+                    readBytes.AddRange(buffer);
+                    isEndOfMessage = readTask.Result.EndOfMessage;
+                }
+                foreach (var sptWebSocketMessageHandler in _messageHandlers)
+                {
+                    sptWebSocketMessageHandler.OnSptMessage(sessionID, ws, readBytes.ToArray()).Wait();
+                }
+            }
+            catch (OperationCanceledException e)
+            {
+                _logger.Info("WebSocket disconnecting, receive task finalized...");
+            }
+            catch (Exception e)
+            {
+                _logger.Error("Error reading data from WebSocket", e);
+            }
+            finally
+            {
+                readBytes.Clear();
+            }
+        }
+    }
+
+    public bool IsWebSocketConnected(string sessionID)
+    {
+        return _sockets.TryGetValue(sessionID, out var socket) && socket.State == WebSocketState.Open;
+    }
+
+    public WebSocket GetSessionWebSocket(string sessionID)
+    {
+        return _sockets[sessionID];
+    }
+}

Core/Services/BotEquipmentFilterService.cs

@@ -10,8 +10,8 @@ namespace Core.Services;
 [Injectable(InjectionType.Singleton)]
 public class BotEquipmentFilterService
 {
-    private readonly ConfigServer _configServer;
-    private readonly BotConfig _botConfig;
+    protected ConfigServer _configServer;
+    protected BotConfig _botConfig;
 
     public BotEquipmentFilterService(
         ConfigServer configServer)

Core/Services/BotLootCacheService.cs

@@ -3,24 +3,25 @@ using Core.Generators;
 using Core.Helpers;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Spt.Bots;
+using Core.Models.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotLootCacheService
 {
-    private readonly ILogger _logger;
-    private readonly ItemHelper _itemHelper;
-    private readonly PMCLootGenerator _pmcLootGenerator;
-    private readonly RagfairPriceService _ragfairPriceService;
-    private readonly ICloner _cloner;
+    protected ISptLogger<BotLootCacheService> _logger;
+    protected ItemHelper _itemHelper;
+    protected PMCLootGenerator _pmcLootGenerator;
+    protected RagfairPriceService _ragfairPriceService;
+    protected ICloner _cloner;
 
-    private readonly Dictionary<string, BotLootCache> _lootCache = new();
+    protected Dictionary<string, BotLootCache> _lootCache = new();
 
     public BotLootCacheService(
-        ILogger logger,
+        ISptLogger<BotLootCacheService> logger,
         ItemHelper itemHelper,
         PMCLootGenerator pmcLootGenerator,
         RagfairPriceService ragfairPriceService,

Core/Services/BotNameService.cs

@@ -4,8 +4,9 @@ using Core.Models.Spt.Bots;
 using Core.Helpers;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
-using ILogger = Core.Models.Utils.ILogger;
+
 using Core.Utils;
 
 namespace Core.Services;
@@ -13,18 +14,18 @@ namespace Core.Services;
 [Injectable(InjectionType.Singleton)]
 public class BotNameService
 {
-    private readonly ILogger _logger;
-    private readonly BotHelper _botHelper;
-    private readonly RandomUtil _randomUtil;
-    private readonly LocalisationService _localisationService;
-    private readonly DatabaseService _databaseService;
-    private readonly ConfigServer _configServer;
-    private readonly BotConfig _botConfig;
+    protected ISptLogger<BotNameService> _logger;
+    protected BotHelper _botHelper;
+    protected RandomUtil _randomUtil;
+    protected LocalisationService _localisationService;
+    protected DatabaseService _databaseService;
+    protected ConfigServer _configServer;
+    protected BotConfig _botConfig;
 
-    private readonly HashSet<string> _usedNameCache;
+    protected HashSet<string> _usedNameCache;
 
     public BotNameService(
-        ILogger logger,
+        ISptLogger<BotNameService> logger,
         BotHelper botHelper,
         RandomUtil randomUtil,
         LocalisationService localisationService,

Core/Services/CreateProfileService.cs

@@ -6,35 +6,36 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.ItemEvent;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Utils;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
+
 
 namespace Core.Services;
 
 [Injectable]
 public class CreateProfileService
 {
-    private readonly ILogger _logger;
-    private readonly TimeUtil _timeUtil;
-    private readonly HashUtil _hashUtil;
-    private readonly DatabaseService _databaseService;
-    private readonly LocalisationService _localisationService;
-    private readonly ProfileHelper _profileHelper;
-    private readonly ItemHelper _itemHelper;
-    private readonly TraderHelper _traderHelper;
-    private readonly QuestHelper _questHelper;
-    private readonly QuestRewardHelper _questRewardHelper;
-    private readonly ProfileFixerService _profileFixerService;
-    private readonly SaveServer _saveServer;
-    private readonly EventOutputHolder _eventOutputHolder;
-    private readonly PlayerScavGenerator _playerScavGenerator;
-    private readonly ICloner _cloner;
+    protected ISptLogger<CreateProfileService> _logger;
+    protected TimeUtil _timeUtil;
+    protected HashUtil _hashUtil;
+    protected DatabaseService _databaseService;
+    protected LocalisationService _localisationService;
+    protected ProfileHelper _profileHelper;
+    protected ItemHelper _itemHelper;
+    protected TraderHelper _traderHelper;
+    protected QuestHelper _questHelper;
+    protected QuestRewardHelper _questRewardHelper;
+    protected ProfileFixerService _profileFixerService;
+    protected SaveServer _saveServer;
+    protected EventOutputHolder _eventOutputHolder;
+    protected PlayerScavGenerator _playerScavGenerator;
+    protected ICloner _cloner;
 
     public CreateProfileService(
-        ILogger logger,
+        ISptLogger<CreateProfileService> logger,
         TimeUtil timeUtil,
         HashUtil hashUtil,
         DatabaseService databaseService,

Core/Services/DatabaseService.cs

@@ -6,10 +6,11 @@ using Core.Models.Spt.Bots;
 using Core.Models.Spt.Config;
 using Core.Models.Spt.Server;
 using Core.Models.Spt.Templates;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
 using Hideout = Core.Models.Spt.Hideout.Hideout;
-using ILogger = Core.Models.Utils.ILogger;
+
 using Locations = Core.Models.Spt.Server.Locations;
 
 namespace Core.Services;
@@ -20,13 +21,13 @@ public class DatabaseService
     protected LocationConfig locationConfig;
     protected bool isDataValid;
 
-    private readonly ILogger _logger;
-    private readonly DatabaseServer _databaseServer;
-    private readonly LocalisationService _localisationService;
-    private readonly HashUtil _hashUtil;
+    protected ISptLogger<DatabaseService> _logger;
+    protected DatabaseServer _databaseServer;
+    protected LocalisationService _localisationService;
+    protected HashUtil _hashUtil;
 
     public DatabaseService(
-        ILogger logger,
+        ISptLogger<DatabaseService> logger,
         DatabaseServer databaseServer,
         LocalisationService localisationService,
         HashUtil hashUtil

Core/Services/FenceService.cs

@@ -9,7 +9,7 @@ namespace Core.Services;
 [Injectable(InjectionType.Singleton)]
 public class FenceService
 {
-    private readonly DatabaseService _databaseService;
+    protected DatabaseService _databaseService;
 
     public FenceService(
         DatabaseService databaseService)

Core/Services/GiftService.cs

@@ -3,29 +3,29 @@ using Core.Helpers;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Models.Spt.Dialog;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class GiftService
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<GiftService> _logger;
 
-    private readonly MailSendService _mailSendService;
-    private readonly LocalisationService _localisationService;
-    private readonly HashUtil _hashUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly ProfileHelper _profileHelper;
-    private readonly ConfigServer _configServer;
+    protected MailSendService _mailSendService;
+    protected LocalisationService _localisationService;
+    protected HashUtil _hashUtil;
+    protected TimeUtil _timeUtil;
+    protected ProfileHelper _profileHelper;
+    protected ConfigServer _configServer;
 
-    private readonly GiftsConfig _giftConfig;
+    protected GiftsConfig _giftConfig;
 
     public GiftService
     (
-        ILogger logger,
+        ISptLogger<GiftService> logger,
         MailSendService mailSendService,
         LocalisationService localisationService,
         HashUtil hashUtil,

Core/Services/ItemFilterService.cs

@@ -1,25 +1,25 @@
 using Core.Annotations;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils.Cloners;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ItemFilterService
 {
-    private readonly ILogger _logger;
-    private readonly ICloner _cloner;
-    private readonly DatabaseServer _databaseServer;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<ItemFilterService> _logger;
+    protected ICloner _cloner;
+    protected DatabaseServer _databaseServer;
+    protected ConfigServer _configServer;
 
-    private readonly HashSet<string> _lootableItemBlacklistCache = [];
-    private readonly ItemConfig _itemConfig;
+    protected HashSet<string> _lootableItemBlacklistCache = [];
+    protected ItemConfig _itemConfig;
 
     public ItemFilterService(
-        ILogger logger,
+        ISptLogger<ItemFilterService> logger,
         ICloner cloner,
         DatabaseServer databaseServer,
         ConfigServer configServer

Core/Services/LocaleService.cs

@@ -1,21 +1,20 @@
 using System.Globalization;
 using Core.Annotations;
-using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocaleService
 {
-    private readonly LocaleConfig _localeConfig;
-    private readonly ILogger _logger;
-    private readonly DatabaseServer _databaseServer;
-    private readonly ConfigServer _configServer;
+    protected LocaleConfig _localeConfig;
+    protected ISptLogger<LocaleService> _logger;
+    protected DatabaseServer _databaseServer;
+    protected ConfigServer _configServer;
 
-    public LocaleService(ILogger logger, DatabaseServer databaseServer, ConfigServer configServer)
+    public LocaleService(ISptLogger<LocaleService> logger, DatabaseServer databaseServer, ConfigServer configServer)
     {
         _logger = logger;
         _databaseServer = databaseServer;

Core/Services/LocalisationService.cs

@@ -1,21 +1,21 @@
 using Core.Utils;
 using Core.Annotations;
+using Core.Models.Utils;
 using Core.Servers;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocalisationService
 {
-    private readonly ILogger _logger;
-    private readonly RandomUtil _randomUtil;
-    private readonly DatabaseServer _databaseServer;
-    private readonly LocaleService _localeService;
-    private readonly I18nService _i18nService;
+    protected ISptLogger<LocalisationService> _logger;
+    protected RandomUtil _randomUtil;
+    protected DatabaseServer _databaseServer;
+    protected LocaleService _localeService;
+    protected I18nService _i18nService;
 
     public LocalisationService(
-        ILogger logger,
+        ISptLogger<LocalisationService> logger,
         RandomUtil randomUtil,
         DatabaseServer databaseServer,
         LocaleService localeService,

Core/Services/MailSendService.cs

@@ -4,34 +4,34 @@ using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Dialog;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable]
 public class MailSendService
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly SaveServer _saveServer;
-    private readonly DatabaseService _databaseService;
-    private readonly NotifierHelper _notifierHelper;
-    private readonly DialogueHelper _dialogueHelper;
-    private readonly NotificationSendHelper _notificationSendHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly ItemHelper _itemHelper;
-    private readonly TraderHelper _traderHelper;
+    protected ISptLogger<MailSendService> _logger;
+    protected HashUtil _hashUtil;
+    protected TimeUtil _timeUtil;
+    protected SaveServer _saveServer;
+    protected DatabaseService _databaseService;
+    protected NotifierHelper _notifierHelper;
+    protected DialogueHelper _dialogueHelper;
+    protected NotificationSendHelper _notificationSendHelper;
+    protected LocalisationService _localisationService;
+    protected ItemHelper _itemHelper;
+    protected TraderHelper _traderHelper;
 
     private const string _systemSenderId = "59e7125688a45068a6249071";
-    private readonly List<MessageType> _messageTypes = [MessageType.NPC_TRADER, MessageType.FLEAMARKET_MESSAGE];
-    private readonly List<string> _slotNames = ["hideout", "main"];
+    protected List<MessageType> _messageTypes = [MessageType.NPC_TRADER, MessageType.FLEAMARKET_MESSAGE];
+    protected List<string> _slotNames = ["hideout", "main"];
 
     public MailSendService
     (
-        ILogger logger,
+        ISptLogger<MailSendService> logger,
         HashUtil hashUtil,
         TimeUtil timeUtil,
         SaveServer saveServer,

Core/Services/MapMarkerService.cs

@@ -3,22 +3,18 @@ using Core.Annotations;
 using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Inventory;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using ILogger = Core.Models.Utils.ILogger;
-using MapMarker = Core.Models.Eft.Common.Tables.MapMarker;
+using Core.Models.Utils;
 
 namespace Core.Services;
 
 [Injectable]
 public class MapMarkerService
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<MapMarkerService> _logger;
 
     public MapMarkerService
     (
-        ILogger logger
+        ISptLogger<MapMarkerService> logger
     )
     {
         _logger = logger;

Core/Services/MatchBotDetailsCacheService.cs

@@ -1,21 +1,19 @@
 using Core.Annotations;
 using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Bots;
-using System.Text.RegularExpressions;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 
 namespace Core.Services
 {
     [Injectable(InjectionType.Singleton)]
     public class MatchBotDetailsCacheService
     {
-        private readonly ILogger _logger;
-        private readonly LocalisationService _localisationService;
+        protected ISptLogger<MatchBotDetailsCacheService> _logger;
+        protected LocalisationService _localisationService;
 
-        private readonly Dictionary<string, BotBase> _botDetailsCache;
+        protected Dictionary<string, BotBase> _botDetailsCache;
 
         public MatchBotDetailsCacheService(
-            ILogger logger,
+            ISptLogger<MatchBotDetailsCacheService> logger,
             LocalisationService localisationService)
         {
             _logger = logger;

Core/Services/ProfileFixerService.cs

@@ -10,27 +10,27 @@ using Core.Servers;
 using Core.Utils;
 using System.Text.RegularExpressions;
 using Core.Models.Spt.Config;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ProfileFixerService
 {
-    private readonly ILogger _logger;
-    private readonly HashUtil _hashUtil;
-    private readonly JsonUtil _jsonUtil;
-    private readonly ItemHelper _itemHelper;
-    private readonly QuestRewardHelper _questRewardHelper;
-    private readonly TraderHelper _traderHelper;
-    private readonly DatabaseService _databaseService;
-    private readonly LocalisationService _localisationService;
-    private readonly ConfigServer _configServer;
-    private readonly CoreConfig _coreConfig;
-    private readonly InventoryHelper _inventoryHelper;
+    protected ISptLogger<ProfileFixerService> _logger;
+    protected HashUtil _hashUtil;
+    protected JsonUtil _jsonUtil;
+    protected ItemHelper _itemHelper;
+    protected QuestRewardHelper _questRewardHelper;
+    protected TraderHelper _traderHelper;
+    protected DatabaseService _databaseService;
+    protected LocalisationService _localisationService;
+    protected ConfigServer _configServer;
+    protected CoreConfig _coreConfig;
+    protected InventoryHelper _inventoryHelper;
 
     public ProfileFixerService(
-        ILogger logger,
+        ISptLogger<ProfileFixerService> logger,
         HashUtil hashUtil,
         JsonUtil jsonUtil,
         ItemHelper itemHelper,
@@ -464,7 +464,7 @@ public class ProfileFixerService
         }
     }
 
-    private readonly List<string> _areas = ["hideout", "main"];
+    protected List<string> _areas = ["hideout", "main"];
 
     /**
      * Checks profile inventory for items that do not exist inside the items db

Core/Services/RaidWeatherService.cs

@@ -4,29 +4,29 @@ using Core.Helpers;
 using Core.Models.Eft.Weather;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RaidWeatherService
 {
-    private readonly ILogger _logger;
-    private readonly DatabaseService _databaseService;
-    private readonly TimeUtil _timeUtil;
-    private readonly WeatherGenerator _weatherGenerator;
-    private readonly SeasonalEventService _seasonalEventService;
-    private readonly WeightedRandomHelper _weightedRandomHelper;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<RaidWeatherService> _logger;
+    protected DatabaseService _databaseService;
+    protected TimeUtil _timeUtil;
+    protected WeatherGenerator _weatherGenerator;
+    protected SeasonalEventService _seasonalEventService;
+    protected WeightedRandomHelper _weightedRandomHelper;
+    protected ConfigServer _configServer;
 
-    private readonly List<Weather> _weatherForecast = [];
+    protected List<Weather> _weatherForecast = [];
 
-    private readonly WeatherConfig _weatherConfig;
+    protected WeatherConfig _weatherConfig;
 
     public RaidWeatherService(
-        ILogger logger,
+        ISptLogger<RaidWeatherService> logger,
         DatabaseService databaseService,
         TimeUtil timeUtil,
         WeatherGenerator weatherGenerator,

Core/Services/SeasonalEventService.cs

@@ -4,37 +4,37 @@ using Core.Models.Eft.Common;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class SeasonalEventService
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<SeasonalEventService> _logger;
 
-    private readonly DatabaseService _databaseService;
+    protected DatabaseService _databaseService;
 
-    //private readonly DatabaseImporter _databaseImporter;
-    private readonly GiftService _giftService;
-    private readonly LocalisationService _localisationService;
-    private readonly BotHelper _botHelper;
-    private readonly ProfileHelper _profileHelper;
-    private readonly ConfigServer _configServer;
+    //protected DatabaseImporter _databaseImporter;
+    protected GiftService _giftService;
+    protected LocalisationService _localisationService;
+    protected BotHelper _botHelper;
+    protected ProfileHelper _profileHelper;
+    protected ConfigServer _configServer;
 
     private bool _christmasEventActive = false;
     private bool _halloweenEventActive = false;
 
-    private readonly SeasonalEventConfig _seasonalEventConfig;
-    private readonly QuestConfig _questConfig;
-    private readonly HttpConfig _httpConfig;
-    private readonly WeatherConfig _weatherConfig;
-    private readonly LocationConfig _locationConfig;
+    protected SeasonalEventConfig _seasonalEventConfig;
+    protected QuestConfig _questConfig;
+    protected HttpConfig _httpConfig;
+    protected WeatherConfig _weatherConfig;
+    protected LocationConfig _locationConfig;
 
     private List<SeasonalEvent> _currentlyActiveEvents = [];
 
-    private readonly IReadOnlyList<string> _christmasEventItems =
+    protected IReadOnlyList<string> _christmasEventItems =
     [
         ItemTpl.FACECOVER_FAKE_WHITE_BEARD,
         ItemTpl.BARTER_CHRISTMAS_TREE_ORNAMENT_RED,
@@ -48,7 +48,7 @@ public class SeasonalEventService
         ItemTpl.RANDOMLOOTCONTAINER_NEW_YEAR_GIFT_SMALL
     ];
 
-    private readonly IReadOnlyList<string> _halloweenEventItems =
+    protected IReadOnlyList<string> _halloweenEventItems =
     [
         ItemTpl.FACECOVER_SPOOKY_SKULL_MASK,
         ItemTpl.RANDOMLOOTCONTAINER_PUMPKIN_RAND_LOOT_CONTAINER,
@@ -65,7 +65,7 @@ public class SeasonalEventService
 
     public SeasonalEventService
     (
-        ILogger logger,
+        ISptLogger<SeasonalEventService> logger,
         DatabaseService databaseService,
         //DatabaseImporter databaseImporter,
         GiftService giftService,

Core/Services/TraderPurchasePersisterService.cs

@@ -3,26 +3,26 @@ using Core.Helpers;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class TraderPurchasePersisterService
 {
-    private readonly ILogger _logger;
-    private readonly RandomUtil _randomUtil;
-    private readonly TimeUtil _timeUtil;
-    private readonly ProfileHelper _profileHelper;
-    private readonly LocalisationService _localisationService;
-    private readonly ConfigServer _configServer;
+    protected ISptLogger<TraderPurchasePersisterService> _logger;
+    protected RandomUtil _randomUtil;
+    protected TimeUtil _timeUtil;
+    protected ProfileHelper _profileHelper;
+    protected LocalisationService _localisationService;
+    protected ConfigServer _configServer;
 
-    private readonly TraderConfig _traderConfig;
+    protected TraderConfig _traderConfig;
 
     public TraderPurchasePersisterService(
-        ILogger logger,
+        ISptLogger<TraderPurchasePersisterService> logger,
         RandomUtil randomUtil,
         TimeUtil timeUtil,
         ProfileHelper profileHelper,

Core/Utils/App.cs

@@ -2,9 +2,9 @@ using Core.Annotations;
 using Core.DI;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace Core.Utils;
 
@@ -14,7 +14,7 @@ public class App
     protected Dictionary<string, long> _onUpdateLastRun;
     protected CoreConfig _coreConfig;
 
-    private ILogger _logger;
+    private ISptLogger<App> _logger;
     private TimeUtil _timeUtil;
     private LocalisationService _localisationService;
     private ConfigServer _configServer;
@@ -25,7 +25,7 @@ public class App
     private IEnumerable<OnUpdate> _onUpdate;
 
     public App(
-        ILogger logger,
+        ISptLogger<App> logger,
         TimeUtil timeUtil,
         LocalisationService localisationService,
         ConfigServer configServer,

Core/Utils/DatabaseImporter.cs

@@ -1,14 +1,12 @@
 using Core.Annotations;
 using Core.DI;
 using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Models.Spt.Server;
+using Core.Models.Utils;
 using Core.Routers;
 using Core.Servers;
 using Core.Services;
-using ILogger = Core.Models.Utils.ILogger;
-using Path = System.IO.Path;
 
 namespace Core.Utils;
 
@@ -20,20 +18,20 @@ public class DatabaseImporter : OnLoad
     private string filepath;
     private HttpConfig httpConfig;
 
-    private readonly ILogger _logger;
-    private readonly LocalisationService _localisationService;
+    protected ISptLogger<DatabaseImporter> _logger;
+    protected LocalisationService _localisationService;
 
-    private readonly DatabaseServer _databaseServer;
+    protected DatabaseServer _databaseServer;
 
-    private readonly ImageRouter _imageRouter;
-    private readonly EncodingUtil _encodingUtil;
-    private readonly HashUtil _hashUtil;
-    private readonly ImporterUtil _importerUtil;
-    private readonly ConfigServer _configServer;
-    private readonly FileUtil _fileUtil;
+    protected ImageRouter _imageRouter;
+    protected EncodingUtil _encodingUtil;
+    protected HashUtil _hashUtil;
+    protected ImporterUtil _importerUtil;
+    protected ConfigServer _configServer;
+    protected FileUtil _fileUtil;
 
     public DatabaseImporter(
-        ILogger logger,
+        ISptLogger<DatabaseImporter> logger,
         // TODO: are we gonna use this? @inject("JsonUtil") protected jsonUtil: JsonUtil,
         FileUtil fileUtil,
         LocalisationService localisationService,

Core/Utils/HashUtil.cs

@@ -8,9 +8,9 @@ namespace Core.Utils;
 [Injectable(InjectionType.Singleton)]
 public class HashUtil
 {
-    private readonly Regex MongoIdRegex = new("^[a-fA-F0-9]{24}$");
+    protected Regex MongoIdRegex = new("^[a-fA-F0-9]{24}$");
 
-    private readonly RandomUtil _randomUtil;
+    protected RandomUtil _randomUtil;
 
     public HashUtil(RandomUtil randomUtil)
     {
@@ -114,4 +114,4 @@ public enum HashingAlgorithm
 {
     MD5,
     SHA1
-}
+}

Core/Utils/HttpResponseUtil.cs

@@ -24,7 +24,7 @@ public class HttpResponseUtil
         _jsonUtil = jsonUtil;
     }
 
-    private readonly ImmutableList<Regex> _cleanupRegexList =
+    protected ImmutableList<Regex> _cleanupRegexList =
     [
         new("[\\b]"),
         new("[\\f]"),

Core/Utils/ImporterUtil.cs

@@ -1,22 +1,19 @@
 using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using Core.Annotations;
-using Core.Utils.Json.Converters;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 
 namespace Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class ImporterUtil
 {
-    private readonly FileUtil _fileUtil;
-    private readonly JsonUtil _jsonUtil;
-    private readonly Models.Utils.ILogger _logger;
+    protected FileUtil _fileUtil;
+    protected JsonUtil _jsonUtil;
+    protected ISptLogger<ImporterUtil> _logger;
 
-    private readonly HashSet<string> filesToIgnore = ["bearsuits.json", "usecsuits.json", "archivedquests.json"];
-    
-    public ImporterUtil(ILogger logger, FileUtil fileUtil, JsonUtil jsonUtil)
+    protected HashSet<string> filesToIgnore = ["bearsuits.json", "usecsuits.json", "archivedquests.json"];
+
+    public ImporterUtil(ISptLogger<ImporterUtil> logger, FileUtil fileUtil, JsonUtil jsonUtil)
     {
         _logger = logger;
         _fileUtil = fileUtil;
@@ -49,35 +46,41 @@ public class ImporterUtil
             if (_fileUtil.GetFileExtension(file) != "json") continue;
             if (filesToIgnore.Contains(_fileUtil.GetFileName(file).ToLower())) continue;
             tasks.Add(
-                Task.Factory.StartNew(() =>
-                {
-                    var fileData = _fileUtil.ReadFile(file);
-                    if (onReadCallback != null)
-                        onReadCallback(file, fileData);
-
-                    var setMethod = GetSetMethod(
-                        _fileUtil.StripExtension(file).ToLower(),
-                        loadedType,
-                        out var propertyType,
-                        out var isDictionary
-                    );
-                    try
+                Task.Factory.StartNew(
+                    () =>
                     {
-                        var fileDeserialized = _jsonUtil.Deserialize(fileData, propertyType);
-                        if (onObjectDeserialized != null)
-                            onObjectDeserialized(file, fileDeserialized);
+                        var fileData = _fileUtil.ReadFile(file);
+                        if (onReadCallback != null)
+                            onReadCallback(file, fileData);
 
-                        lock (dictionaryLock)
+                        var setMethod = GetSetMethod(
+                            _fileUtil.StripExtension(file).ToLower(),
+                            loadedType,
+                            out var propertyType,
+                            out var isDictionary
+                        );
+                        try
                         {
-                            setMethod.Invoke(result,
-                                isDictionary ? [_fileUtil.StripExtension(file), fileDeserialized] : [fileDeserialized]);
+                            var fileDeserialized = _jsonUtil.Deserialize(fileData, propertyType);
+                            if (onObjectDeserialized != null)
+                                onObjectDeserialized(file, fileDeserialized);
+
+                            lock (dictionaryLock)
+                            {
+                                setMethod.Invoke(
+                                    result,
+                                    isDictionary
+                                        ? [_fileUtil.StripExtension(file), fileDeserialized]
+                                        : [fileDeserialized]
+                                );
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            throw new Exception($"Unable to deserialize or set properties for file '{file}'", e);
                         }
                     }
-                    catch (Exception e)
-                    {
-                        throw new Exception($"Unable to deserialize or set properties for file '{file}'", e);
-                    }
-                })
+                )
             );
         }
 
@@ -85,33 +88,51 @@ public class ImporterUtil
         foreach (var directory in directories)
         {
             tasks.Add(
-                Task.Factory.StartNew(() =>
-                {
-                    var setMethod = GetSetMethod(directory.Split("/").Last().Replace("_", ""), loadedType, out var matchedProperty, out var isDictionary);
-                    var loadTask = LoadRecursiveAsync($"{directory}/", matchedProperty);
-                    loadTask.Wait();
-                    lock (dictionaryLock)
+                Task.Factory.StartNew(
+                    () =>
                     {
-                        setMethod.Invoke(result, isDictionary ? [directory, loadTask.Result] : [loadTask.Result]);
+                        var setMethod = GetSetMethod(
+                            directory.Split("/").Last().Replace("_", ""),
+                            loadedType,
+                            out var matchedProperty,
+                            out var isDictionary
+                        );
+                        var loadTask = LoadRecursiveAsync($"{directory}/", matchedProperty);
+                        loadTask.Wait();
+                        lock (dictionaryLock)
+                        {
+                            setMethod.Invoke(result, isDictionary ? [directory, loadTask.Result] : [loadTask.Result]);
+                        }
                     }
-                })
+                )
             );
         }
 
         // return the result of all async fetch
-        return Task.WhenAll(tasks).ContinueWith((t) =>
-        {
-            if (t.IsCanceled || t.IsFaulted)
-            {
-                var exceptionList = tasks.Where(t => t.IsFaulted || t.IsCanceled).Select(t => t.Exception!).ToList();
-                throw new Exception("Error processing one or more DatabaseFiles", new AggregateException(exceptionList));
-            }
-        }).ContinueWith(t =>
-        {
-            if (t.IsFaulted || t.IsCanceled)
-                throw t.Exception!;
-            return result;
-        });
+        return Task.WhenAll(tasks)
+            .ContinueWith(
+                (t) =>
+                {
+                    if (t.IsCanceled || t.IsFaulted)
+                    {
+                        var exceptionList = tasks.Where(t => t.IsFaulted || t.IsCanceled)
+                            .Select(t => t.Exception!)
+                            .ToList();
+                        throw new Exception(
+                            "Error processing one or more DatabaseFiles",
+                            new AggregateException(exceptionList)
+                        );
+                    }
+                }
+            )
+            .ContinueWith(
+                t =>
+                {
+                    if (t.IsFaulted || t.IsCanceled)
+                        throw t.Exception!;
+                    return result;
+                }
+            );
     }
 
     public MethodInfo GetSetMethod(string propertyName, Type type, out Type propertyType, out bool isDictionary)
@@ -127,15 +148,22 @@ public class ImporterUtil
         else
         {
             var matchedProperty = type.GetProperties()
-                .FirstOrDefault(prop =>
-                    string.Equals(prop.Name.ToLower(), _fileUtil.StripExtension(propertyName).ToLower(),
-                        StringComparison.Ordinal));
+                .FirstOrDefault(
+                    prop =>
+                        string.Equals(
+                            prop.Name.ToLower(),
+                            _fileUtil.StripExtension(propertyName).ToLower(),
+                            StringComparison.Ordinal
+                        )
+                );
             if (matchedProperty == null)
                 throw new Exception(
-                    $"Unable to find property '{_fileUtil.StripExtension(propertyName)}' for type '{type.Name}'");
+                    $"Unable to find property '{_fileUtil.StripExtension(propertyName)}' for type '{type.Name}'"
+                );
             propertyType = matchedProperty.PropertyType;
             setMethod = matchedProperty.GetSetMethod();
         }
+
         return setMethod;
     }
 }

Core/Utils/JsonUtil.cs

@@ -3,6 +3,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
 using Core.Annotations;
+using Core.Models.Eft.Ws;
 using Core.Models.Enums;
 using Core.Models.Spt.Dialog;
 using Core.Utils.Json.Converters;
@@ -29,7 +30,8 @@ public class JsonUtil
             new EftEnumConverter<QuestStatusEnum>(),
             new EftEnumConverter<QuestRewardType>(),
             new EftEnumConverter<SideType>(),
-            new EftEnumConverter<BonusSkillType>()
+            new EftEnumConverter<BonusSkillType>(),
+            new EftEnumConverter<NotificationEventType>()
         }
     };
     private static readonly JsonSerializerOptions jsonSerializerOptionsIndented = new(jsonSerializerOptionsNoIndent)

Core/Utils/ProgressWriter.cs

@@ -2,10 +2,10 @@ namespace Core.Utils
 {
     public class ProgressWriter
     {
-        private readonly int _total;
-        private readonly int? _maxBarLength;
-        private readonly string? _barFillChar;
-        private readonly string? _barEmptyChar;
+        protected int _total;
+        protected int? _maxBarLength;
+        protected string? _barFillChar;
+        protected string? _barEmptyChar;
 
         public ProgressWriter(int total, int maxBarLength, string barFillChar, string barEmptyChar)
         {

Core/Utils/RandomUtil.cs

@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 using Core.Annotations;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 
 namespace Core.Utils;
 
@@ -8,11 +8,11 @@ namespace Core.Utils;
 [Injectable(InjectionType.Singleton)]
 public class RandomUtil
 {
-    private readonly ILogger _logger;
+    protected ISptLogger<RandomUtil> _logger;
 
     public RandomUtil
     (
-        ILogger logger
+        ISptLogger<RandomUtil> logger
     )
     {
         _logger = logger;

Core/Utils/TimerUtil.cs

@@ -6,7 +6,7 @@ namespace Core.Utils
     [Injectable]
     public class TimerUtil
     {
-        private readonly Stopwatch _stopwatch;
+        protected Stopwatch _stopwatch;
 
         public TimerUtil()
         {

Core/Utils/Watermark.cs

@@ -1,7 +1,7 @@
 using Core.Annotations;
-using Core.Models.Enums;
 using Core.Models.Logging;
 using Core.Models.Spt.Config;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 
@@ -51,12 +51,12 @@ public class Watermark {
     protected List<string> text = [];
     protected string versionLabel = "";
 
-    protected Models.Utils.ILogger _logger;
+    protected ISptLogger<Watermark> _logger;
     protected ConfigServer _configServer;
     protected LocalisationService _localisationService;
     protected WatermarkLocale _watermarkLocale;
     public Watermark(
-        Models.Utils.ILogger logger,
+        ISptLogger<Watermark> logger,
         ConfigServer configServer,
         LocalisationService localisationService,
         WatermarkLocale watermarkLocale
@@ -182,7 +182,7 @@ public class Watermark {
 
         // Log watermark to screen
         foreach (var text in result) {
-            _logger.LogWithColor(text, LogTextColor.Yellow);
+            _logger.LogWithColor(text, textColor: LogTextColor.Yellow);
         }
     }
 }

ExampleMods/Mods/Override/WatermarkOverride.cs

@@ -1,8 +1,8 @@
 using Core.Annotations;
+using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
 using Core.Utils;
-using ILogger = Core.Models.Utils.ILogger;
 
 namespace ExampleMods.Mods.Override;
 
@@ -10,7 +10,7 @@ namespace ExampleMods.Mods.Override;
 public class WatermarkOverride : Watermark
 {
     public WatermarkOverride(
-        ILogger logger,
+        ISptLogger<Watermark> logger,
         ConfigServer configServer,
         LocalisationService localisationService,
         WatermarkLocale watermarkLocale

Server/DependencyInjectionRegistrator.cs

@@ -0,0 +1,158 @@
+using System.Reflection;
+using Core.Annotations;
+using Core.Utils;
+
+namespace Server;
+
+public static class DependencyInjectionRegistrator
+{
+    public static void RegisterModOverrideComponents(IServiceCollection builderServices, List<Assembly> assemblies)
+    {
+        // We get all the services from this assembly first, since mods will override them later
+        RegisterComponents(
+            builderServices,
+            assemblies.SelectMany(a => a.GetTypes())
+                .Where(type => Attribute.IsDefined(type, typeof(Injectable)))
+        );
+    }
+
+    public static void RegisterComponents(IServiceCollection builderServices, IEnumerable<Type> types)
+    {
+        var groupedTypes = types.SelectMany(
+                t =>
+                {
+                    var attributes = (Injectable[])Attribute.GetCustomAttributes(t, typeof(Injectable))!;
+                    var registerableType = t;
+                    var registerableComponents = new List<RegisterableType>();
+                    foreach (var attribute in attributes)
+                    {
+                        // if we have a type override this takes priority
+                        if (attribute.InjectableTypeOverride != null)
+                        {
+                            registerableType = attribute.InjectableTypeOverride;
+                        }
+                        // if this class only has 1 interface we register it on that interface
+                        else if (registerableType.GetInterfaces().Length == 1)
+                        {
+                            registerableType = registerableType.GetInterfaces()[0];
+                        }
+
+                        registerableComponents.Add(new(registerableType, t, attribute));
+                    }
+
+                    return registerableComponents;
+                }
+            )
+            .GroupBy(t => t.RegisterableInterface.FullName);
+        // We get all injectable services to register them on our services
+        foreach (var groupedInjectables in groupedTypes)
+        {
+            foreach (var valueTuple in groupedInjectables.OrderBy(t => t.InjectableAttribute.TypePriority))
+            {
+                if (valueTuple.TypeToRegister.IsGenericType)
+                    RegisterGenericComponents(builderServices, valueTuple);
+                else
+                    RegisterComponent(
+                        builderServices,
+                        valueTuple.InjectableAttribute.InjectionType,
+                        valueTuple.RegisterableInterface,
+                        valueTuple.TypeToRegister
+                    );
+            }
+        }
+    }
+
+    private static List<Type> AllLoadedTypes;
+    private static List<ConstructorInfo> AllConstructors;
+
+    private static void RegisterGenericComponents(IServiceCollection builderServices, RegisterableType valueTuple)
+    {
+        if (AllLoadedTypes == null)
+            AllLoadedTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(t => t.GetTypes()).ToList();
+        if (AllConstructors == null)
+            AllConstructors = AllLoadedTypes.SelectMany(t => t.GetConstructors()).ToList();
+        var typeName = $"{valueTuple.RegisterableInterface.Namespace}.{valueTuple.RegisterableInterface.Name}";
+        try
+        {
+            var matchedConstructors = AllConstructors.Where(
+                c => c.GetParameters()
+                    .Any(
+                        p => p.ParameterType.IsGenericType &&
+                             p.ParameterType.GetGenericTypeDefinition().FullName == typeName
+                    )
+            );
+
+            if (matchedConstructors.Any())
+            {
+                foreach (var matchedConstructor in matchedConstructors)
+                {
+                    foreach (var parameterInfo in matchedConstructor.GetParameters()
+                                 .Where(
+                                     p => p.ParameterType.IsGenericType &&
+                                          p.ParameterType.GetGenericTypeDefinition().FullName == typeName
+                                 ))
+                    {
+                        var parameters = parameterInfo.ParameterType.GetGenericArguments();
+                        var typedGeneric = valueTuple.TypeToRegister.MakeGenericType(parameters);
+                        RegisterComponent(
+                            builderServices,
+                            valueTuple.InjectableAttribute.InjectionType,
+                            parameterInfo.ParameterType,
+                            typedGeneric
+                        );
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
+    }
+
+    private static void RegisterComponent(
+        IServiceCollection builderServices,
+        InjectionType injectionType,
+        Type registerableInterface,
+        Type imlementationType
+    )
+    {
+        switch (injectionType)
+        {
+            case InjectionType.Singleton:
+                builderServices.AddSingleton(registerableInterface, imlementationType);
+                break;
+            case InjectionType.Transient:
+                builderServices.AddTransient(registerableInterface, imlementationType);
+                break;
+            case InjectionType.Scoped:
+                builderServices.AddScoped(registerableInterface, imlementationType);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+
+    public static void RegisterSptComponents(IServiceCollection builderServices)
+    {
+        // We get all the services from this assembly first, since mods will override them later
+        RegisterComponents(
+            builderServices,
+            typeof(Program).Assembly.GetTypes()
+                .Where(type => Attribute.IsDefined(type, typeof(Injectable)))
+        );
+        RegisterComponents(
+            builderServices,
+            typeof(App).Assembly.GetTypes()
+                .Where(type => Attribute.IsDefined(type, typeof(Injectable)))
+        );
+    }
+
+    class RegisterableType(Type registerableInterface, Type typeToRegister, Injectable injectableAttribute)
+    {
+        public Type RegisterableInterface { get; } = registerableInterface;
+        public Type TypeToRegister { get; } = typeToRegister;
+        public Injectable InjectableAttribute { get; } = injectableAttribute;
+    }
+}

Server/Logger/AbstractFormatter.cs

@@ -6,16 +6,21 @@ namespace Server.Logger;
 public abstract class AbstractFormatter : ITextFormatter
 {
     protected abstract string ProcessText(string text);
+
+    protected virtual string GetFormattedText(string timestamp, string logLevel, string sourceContext, string message)
+    {
+        return $"[{timestamp} {logLevel}][{sourceContext}] {message}";
+    }
     
     public void Format(LogEvent logEvent, TextWriter output)
     {
         var newLine = Environment.NewLine;
-        var timestamp = logEvent.Timestamp.ToString("HH:mm:ss");
+        var timestamp = logEvent.Timestamp.ToString("HH:mm:ss.fff");
         var logLevel = logEvent.Level.ToString().ToUpper().Substring(0, 4);
         var message = logEvent.RenderMessage();
         var exception = logEvent.Exception != null ? $"{newLine}{logEvent.Exception}{newLine}{logEvent.Exception.StackTrace}" : "";
         var sourceContext = logEvent.Properties["SourceContext"].ToString().Replace("\"", "");
-        var logMessage = ProcessText($"[{timestamp} {logLevel}][{sourceContext}] {message}{exception}");
+        var logMessage = ProcessText(GetFormattedText(timestamp, logLevel, sourceContext, $"{message}{exception}"));
         output.WriteLine(logMessage);
     }
 }

Server/Logger/ConsoleFormatter.cs

@@ -7,5 +7,10 @@ public class ConsoleFormatter : AbstractFormatter
         return text;
     }
 
-    public static ConsoleFormatter Default { get; } = new ConsoleFormatter();
+    protected override string GetFormattedText(string timestamp, string logLevel, string sourceContext, string message)
+    {
+        return message;
+    }
+
+    public static ConsoleFormatter Default { get; } = new();
 }

Server/Logger/WebApplicationLogger.cs

@@ -1,69 +1,79 @@
 using Core.Annotations;
 using Core.Models.Logging;
-using ILogger = Core.Models.Utils.ILogger;
+using Core.Models.Utils;
 
 namespace Server.Logger;
 
 [Injectable]
-public class WebApplicationLogger : ILogger
+public class SptWebApplicationLogger<T> : ISptLogger<T>
 {
-    private Microsoft.Extensions.Logging.ILogger _logger;
-    public WebApplicationLogger(ILoggerProvider provider)
+    private ILogger _logger;
+
+    public SptWebApplicationLogger(ILoggerProvider provider)
     {
-        _logger = provider.CreateLogger("SptLogger");
+        _logger = provider.CreateLogger(typeof(T).FullName);
     }
 
-    public void LogWithColor(string data, LogTextColor? textColor = null, LogBackgroundColor? backgroundColor = null)
+    public void LogWithColor(
+        string data,
+        Exception? ex = null,
+        LogTextColor? textColor = null,
+        LogBackgroundColor? backgroundColor = null
+    )
     {
         if (textColor != null || backgroundColor != null)
         {
-            _logger.LogInformation(GetColorizedText(data, textColor, backgroundColor));
+            _logger.LogInformation(ex, GetColorizedText(data, textColor, backgroundColor));
         }
-        else 
-            _logger.LogInformation(data);
+        else
+            _logger.LogInformation(ex, data);
     }
 
-    private string GetColorizedText(string data, LogTextColor? textColor = null, LogBackgroundColor? backgroundColor = null)
+    private string GetColorizedText(
+        string data,
+        LogTextColor? textColor = null,
+        LogBackgroundColor? backgroundColor = null
+    )
     {
         var colorString = string.Empty;
         if (textColor != null)
             colorString += ((int)textColor.Value).ToString();
-            
+
         if (backgroundColor != null)
             colorString += string.IsNullOrEmpty(colorString)
                 ? ((int)backgroundColor.Value).ToString()
                 : $";{((int)backgroundColor.Value).ToString()}";
-        
+
         return $"\x1b[{colorString}m{data}\x1b[0m";
     }
 
-    public void Success(string data)
+    public void Success(string data, Exception? ex = null)
     {
-        _logger.LogInformation(GetColorizedText(data, LogTextColor.Green));
+        _logger.LogInformation(ex, GetColorizedText(data, LogTextColor.Green));
     }
 
-    public void Error(string data)
+    public void Error(string data, Exception? ex = null)
     {
-        _logger.LogError(GetColorizedText(data, LogTextColor.Red));
+        _logger.LogError(ex, GetColorizedText(data, LogTextColor.Red));
     }
 
-    public void Warning(string data)
+    public void Warning(string data, Exception? ex = null)
     {
-        _logger.LogWarning(GetColorizedText(data, LogTextColor.Yellow));
-    }
-    
-    public void Info(string data)
-    {
-        _logger.LogInformation(data);
+        _logger.LogWarning(ex, GetColorizedText(data, LogTextColor.Yellow));
     }
 
-    public void Debug(string data)
+    public void Info(string data, Exception? ex = null)
     {
-        _logger.LogDebug(data);
+        _logger.LogInformation(ex, data);
     }
 
-    public void Critical(string data)
+    public void Debug(string data, Exception? ex = null)
     {
-        _logger.LogCritical(GetColorizedText(data, LogTextColor.Black, LogBackgroundColor.Red));
+        _logger.LogDebug(ex, data);
+    }
+
+    public void Critical(string data, Exception? ex = null)
+    {
+        _logger.LogCritical(ex, GetColorizedText(data, LogTextColor.Black, LogBackgroundColor.Red));
     }
 }

Server/Program.cs

@@ -27,8 +27,8 @@ public static class Program
 
         ProgramStatics.Initialize();
 
-        RegisterSptComponents(builder.Services);
-        RegisterModOverrideComponents(builder.Services, assemblies);
+        DependencyInjectionRegistrator.RegisterSptComponents(builder.Services);
+        DependencyInjectionRegistrator.RegisterModOverrideComponents(builder.Services, assemblies);
         ILogger logger = new SerilogLoggerProvider(registeredLogger).CreateLogger("Server");
         try
         {
@@ -64,8 +64,8 @@ public static class Program
             // throw ex;
         }
     }
-
-    private static void CreateAndRegisterLogger(WebApplicationBuilder builder, out Serilog.Core.Logger logger)
+    
+    public static void CreateAndRegisterLogger(WebApplicationBuilder builder, out Serilog.Core.Logger logger)
     {
         builder.Logging.ClearProviders();
         logger = new LoggerConfiguration()
@@ -77,73 +77,4 @@ public static class Program
             .CreateLogger();
         builder.Logging.AddSerilog(logger);
     }
-
-    private static void RegisterModOverrideComponents(IServiceCollection builderServices, List<Assembly> assemblies)
-    {
-        // We get all the services from this assembly first, since mods will override them later
-        RegisterComponents(builderServices, assemblies.SelectMany(a => a.GetTypes())
-            .Where(type => Attribute.IsDefined(type, typeof(Injectable))));
-    }
-
-    private static void RegisterComponents(IServiceCollection builderServices, IEnumerable<Type> types)
-    {
-        var groupedTypes = types.SelectMany(t =>
-        {
-            var attributes = (Injectable[]) Attribute.GetCustomAttributes(t, typeof(Injectable))!;
-            var registerableType = t;
-            var registerableComponents = new List<RegisterableType>();
-            foreach (var attribute in attributes)
-            {
-                // if we have a type override this takes priority
-                if (attribute.InjectableTypeOverride != null)
-                {
-                    registerableType = attribute.InjectableTypeOverride;
-                }
-                // if this class only has 1 interface we register it on that interface
-                else if (registerableType.GetInterfaces().Length == 1)
-                {
-                    registerableType = registerableType.GetInterfaces()[0];
-                }
-                registerableComponents.Add(new(registerableType, t, attribute));
-            }
-            return registerableComponents;
-        }).GroupBy(t => t.RegisterableInterface.FullName);
-        // We get all injectable services to register them on our services
-        foreach (var groupedInjectables in groupedTypes)
-        {
-            foreach (var valueTuple in groupedInjectables.OrderBy(t => t.InjectableAttribute.TypePriority))
-            {
-                switch (valueTuple.InjectableAttribute.InjectionType)
-                {
-                    case InjectionType.Singleton:
-                        builderServices.AddSingleton(valueTuple.RegisterableInterface, valueTuple.TypeToRegister);
-                        break;
-                    case InjectionType.Transient:
-                        builderServices.AddTransient(valueTuple.RegisterableInterface, valueTuple.TypeToRegister);
-                        break;
-                    case InjectionType.Scoped:
-                        builderServices.AddScoped(valueTuple.RegisterableInterface, valueTuple.TypeToRegister);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-            }
-        }
-    }
-
-    private static void RegisterSptComponents(IServiceCollection builderServices)
-    {
-        // We get all the services from this assembly first, since mods will override them later
-        RegisterComponents(builderServices, typeof(Program).Assembly.GetTypes()
-            .Where(type => Attribute.IsDefined(type, typeof(Injectable))));
-        RegisterComponents(builderServices, typeof(App).Assembly.GetTypes()
-            .Where(type => Attribute.IsDefined(type, typeof(Injectable))));
-    }
-
-    class RegisterableType(Type registerableInterface, Type typeToRegister, Injectable injectableAttribute)
-    {
-        public Type RegisterableInterface { get; } = registerableInterface;
-        public Type TypeToRegister { get; } = typeToRegister;
-        public Injectable InjectableAttribute { get; } = injectableAttribute;
-    }
 }

Server/Server.csproj

@@ -36,4 +36,8 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="user\mods\" />
+    </ItemGroup>
+
 </Project>

UnitTests/Tests/Utils/HashUtilTests.cs

@@ -5,7 +5,7 @@ namespace UnitTests.Tests.Utils;
 [TestClass]
 public class HashUtilTests
 {
-	// private readonly HashUtil _hashUtil = new(new RandomUtil());
+	// protected HashUtil _hashUtil = new(new RandomUtil());
 	//
 	// [TestMethod]
 	// public void GenerateTest()

UnitTests/Tests/Utils/JsonUtilTests.cs

@@ -6,7 +6,7 @@ namespace UnitTests.Tests.Utils;
 [TestClass]
 public class JsonUtilTests
 {
-    private readonly JsonUtil _jsonUtil = new();
+    protected JsonUtil _jsonUtil = new();
     [TestMethod]
     public void SerializeAndDeserialize_WithDictionaryOfETFEnum_ExpectCorrectParsing()
     {

UnitTests/Tests/Utils/MathUtilTests.cs

@@ -5,7 +5,7 @@ namespace UnitTests.Tests.Utils;
 [TestClass]
 public class MathUtilTests
 {
-	private readonly MathUtil _mathUtil = new();
+	protected MathUtil _mathUtil = new();
 	
 	[TestMethod]
 	public void ListSumTest()
@@ -80,4 +80,4 @@ public class MathUtilTests
 		Assert.AreEqual(expected, actual, 
 			$"MapToRange() Expected: {expected}, Actual: {actual}");
 	}
-}
+}

UnitTests/Tests/Utils/RandomUtilTests.cs

@@ -5,7 +5,7 @@ namespace UnitTests.Tests.Utils;
 [TestClass]
 public sealed class RandomUtilTests
 {
-	// private readonly RandomUtil _randomUtil = new();
+	// protected RandomUtil _randomUtil = new();
 	//
 	// [TestMethod]
 	// public void GetIntTest()

server-csharp.sln.DotSettings

@@ -1,8 +1,17 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_ATTRIBUTE_ARRANGEMENT/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_PRIMARY_CONSTRUCTOR_PARAMETERS_ON_LINE/@EntryValue">10000</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_EXPRESSIONS/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_PATTERNS/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIST_PATTERN/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>