T type logging

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,