From 8727f6150ed4791c81c784b1b3565ebec8aeb560 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 28 May 2024 14:04:20 +0000 Subject: [PATCH] primery-dependencies (!355) Co-authored-by: clodan Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/355 Co-authored-by: Alex Co-committed-by: Alex --- project/src/callbacks/ModCallbacks.ts | 2 +- project/src/controllers/AchievementController.ts | 2 +- project/src/controllers/BotController.ts | 4 ++-- project/src/controllers/BuildController.ts | 4 ++-- project/src/controllers/ClientLogController.ts | 2 +- project/src/controllers/CustomizationController.ts | 2 +- project/src/controllers/DialogueController.ts | 2 +- project/src/controllers/GameController.ts | 4 ++-- project/src/controllers/HealthController.ts | 4 ++-- project/src/controllers/HideoutController.ts | 4 ++-- project/src/controllers/InraidController.ts | 2 +- project/src/controllers/InsuranceController.ts | 4 ++-- project/src/controllers/InventoryController.ts | 4 ++-- project/src/controllers/LauncherController.ts | 2 +- project/src/controllers/LocationController.ts | 4 ++-- project/src/controllers/MatchController.ts | 2 +- project/src/controllers/PresetController.ts | 2 +- project/src/controllers/ProfileController.ts | 2 +- project/src/controllers/QuestController.ts | 4 ++-- project/src/controllers/RagfairController.ts | 2 +- project/src/controllers/RepairController.ts | 2 +- project/src/controllers/RepeatableQuestController.ts | 4 ++-- project/src/controllers/TradeController.ts | 2 +- project/src/controllers/TraderController.ts | 4 ++-- project/src/controllers/WeatherController.ts | 2 +- project/src/di/Container.ts | 11 +++++++++++ project/src/generators/BotEquipmentModGenerator.ts | 4 ++-- project/src/generators/BotGenerator.ts | 4 ++-- project/src/generators/BotInventoryGenerator.ts | 2 +- project/src/generators/BotLevelGenerator.ts | 2 +- project/src/generators/BotLootGenerator.ts | 4 ++-- project/src/generators/BotWeaponGenerator.ts | 4 ++-- project/src/generators/FenceBaseAssortGenerator.ts | 2 +- project/src/generators/LocationGenerator.ts | 4 ++-- project/src/generators/LootGenerator.ts | 2 +- project/src/generators/PlayerScavGenerator.ts | 4 ++-- project/src/generators/RagfairOfferGenerator.ts | 4 ++-- project/src/generators/RepeatableQuestGenerator.ts | 4 ++-- .../src/generators/RepeatableQuestRewardGenerator.ts | 4 ++-- project/src/generators/ScavCaseRewardGenerator.ts | 2 +- project/src/generators/WeatherGenerator.ts | 2 +- .../implementations/ExternalInventoryMagGen.ts | 2 +- project/src/helpers/AssortHelper.ts | 2 +- project/src/helpers/BotDifficultyHelper.ts | 4 ++-- project/src/helpers/BotGeneratorHelper.ts | 2 +- project/src/helpers/BotHelper.ts | 2 +- project/src/helpers/BotWeaponGeneratorHelper.ts | 2 +- .../SptCommands/GiveCommand/GiveSptCommand.ts | 4 ++-- .../SptCommands/ProfileCommand/ProfileSptCommand.ts | 2 +- .../SptCommands/TraderCommand/TraderSptCommand.ts | 2 +- .../src/helpers/Dialogue/CommandoDialogueChatBot.ts | 2 +- project/src/helpers/DialogueHelper.ts | 2 +- project/src/helpers/HandbookHelper.ts | 2 +- project/src/helpers/HealthHelper.ts | 4 ++-- project/src/helpers/HideoutHelper.ts | 4 ++-- project/src/helpers/InRaidHelper.ts | 4 ++-- project/src/helpers/InventoryHelper.ts | 4 ++-- project/src/helpers/ItemHelper.ts | 4 ++-- project/src/helpers/PresetHelper.ts | 2 +- project/src/helpers/ProbabilityHelper.ts | 2 +- project/src/helpers/ProfileHelper.ts | 4 ++-- project/src/helpers/QuestHelper.ts | 4 ++-- project/src/helpers/RagfairHelper.ts | 4 ++-- project/src/helpers/RagfairOfferHelper.ts | 2 +- project/src/helpers/RagfairSellHelper.ts | 2 +- project/src/helpers/RagfairServerHelper.ts | 4 ++-- project/src/helpers/RepairHelper.ts | 4 ++-- project/src/helpers/RepeatableQuestHelper.ts | 2 +- project/src/helpers/TradeHelper.ts | 4 ++-- project/src/helpers/TraderAssortHelper.ts | 4 ++-- project/src/helpers/TraderHelper.ts | 2 +- project/src/loaders/BundleLoader.ts | 2 +- project/src/loaders/ModLoadOrder.ts | 2 +- project/src/loaders/PostDBModLoader.ts | 2 +- project/src/loaders/PostSptModLoader.ts | 2 +- project/src/loaders/PreSptModLoader.ts | 2 +- project/src/routers/EventOutputHolder.ts | 2 +- project/src/routers/ItemEventRouter.ts | 4 ++-- .../src/routers/item_events/QuestItemEventRouter.ts | 2 +- project/src/routers/serializers/BundleSerializer.ts | 2 +- project/src/servers/ConfigServer.ts | 2 +- project/src/servers/HttpServer.ts | 2 +- project/src/servers/RagfairServer.ts | 2 +- project/src/servers/SaveServer.ts | 2 +- project/src/servers/WebSocketServer.ts | 2 +- project/src/servers/http/SptHttpListener.ts | 2 +- .../src/servers/ws/SptWebSocketConnectionHandler.ts | 2 +- .../ws/message/DefaultSptWebSocketMessageHandler.ts | 2 +- project/src/services/BotEquipmentFilterService.ts | 2 +- project/src/services/BotEquipmentModPoolService.ts | 2 +- project/src/services/BotGenerationCacheService.ts | 2 +- project/src/services/BotLootCacheService.ts | 4 ++-- project/src/services/BotWeaponModLimitService.ts | 2 +- project/src/services/CustomLocationWaveService.ts | 2 +- project/src/services/DatabaseService.ts | 2 +- project/src/services/FenceService.ts | 4 ++-- project/src/services/GiftService.ts | 2 +- project/src/services/InsuranceService.ts | 4 ++-- project/src/services/ItemBaseClassService.ts | 2 +- project/src/services/ItemFilterService.ts | 2 +- project/src/services/LocaleService.ts | 2 +- project/src/services/LocalisationService.ts | 4 ++-- project/src/services/MailSendService.ts | 2 +- project/src/services/MatchBotDetailsCacheService.ts | 2 +- project/src/services/ModCompilerService.ts | 2 +- project/src/services/OpenZoneService.ts | 2 +- project/src/services/PaymentService.ts | 2 +- project/src/services/PlayerService.ts | 2 +- project/src/services/PmcChatResponseService.ts | 2 +- project/src/services/ProfileFixerService.ts | 4 ++-- project/src/services/ProfileSnapshotService.ts | 2 +- project/src/services/RagfairCategoriesService.ts | 2 +- project/src/services/RagfairOfferService.ts | 2 +- project/src/services/RagfairPriceService.ts | 2 +- project/src/services/RagfairRequiredItemsService.ts | 2 +- project/src/services/RagfairTaxService.ts | 2 +- project/src/services/RaidTimeAdjustmentService.ts | 2 +- project/src/services/RepairService.ts | 2 +- project/src/services/SeasonalEventService.ts | 2 +- .../src/services/TraderPurchasePersisterService.ts | 2 +- project/src/services/TraderServicesService.ts | 4 ++-- project/src/services/cache/BundleHashCacheService.ts | 2 +- project/src/services/cache/ModHashCacheService.ts | 2 +- project/src/services/mod/CustomItemService.ts | 4 ++-- project/src/utils/App.ts | 2 +- project/src/utils/DatabaseImporter.ts | 2 +- project/src/utils/JsonUtil.ts | 2 +- project/src/utils/RandomUtil.ts | 4 ++-- project/src/utils/Watermark.ts | 2 +- 129 files changed, 182 insertions(+), 171 deletions(-) diff --git a/project/src/callbacks/ModCallbacks.ts b/project/src/callbacks/ModCallbacks.ts index f4ca96eb..3655902c 100644 --- a/project/src/callbacks/ModCallbacks.ts +++ b/project/src/callbacks/ModCallbacks.ts @@ -15,7 +15,7 @@ export class ModCallbacks implements OnLoad protected httpConfig: IHttpConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("HttpFileUtil") protected httpFileUtil: HttpFileUtil, @inject("PostSptModLoader") protected postSptModLoader: PostSptModLoader, diff --git a/project/src/controllers/AchievementController.ts b/project/src/controllers/AchievementController.ts index 1c44ef67..eb8e4de8 100644 --- a/project/src/controllers/AchievementController.ts +++ b/project/src/controllers/AchievementController.ts @@ -11,7 +11,7 @@ import { DatabaseService } from "@spt/services/DatabaseService"; export class AchievementController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, ) {} diff --git a/project/src/controllers/BotController.ts b/project/src/controllers/BotController.ts index b30e628a..062d0e28 100644 --- a/project/src/controllers/BotController.ts +++ b/project/src/controllers/BotController.ts @@ -34,7 +34,7 @@ export class BotController protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("BotGenerator") protected botGenerator: BotGenerator, @inject("BotHelper") protected botHelper: BotHelper, @@ -47,7 +47,7 @@ export class BotController @inject("ConfigServer") protected configServer: ConfigServer, @inject("ApplicationContext") protected applicationContext: ApplicationContext, @inject("RandomUtil") protected randomUtil: RandomUtil, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.botConfig = this.configServer.getConfig(ConfigTypes.BOT); diff --git a/project/src/controllers/BuildController.ts b/project/src/controllers/BuildController.ts index b7fbd12c..cca531f1 100644 --- a/project/src/controllers/BuildController.ts +++ b/project/src/controllers/BuildController.ts @@ -18,7 +18,7 @@ import { HashUtil } from "@spt/utils/HashUtil"; export class BuildController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("DatabaseService") protected databaseService: DatabaseService, @@ -26,7 +26,7 @@ export class BuildController @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("SaveServer") protected saveServer: SaveServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/controllers/ClientLogController.ts b/project/src/controllers/ClientLogController.ts index fc40412f..f00b5c51 100644 --- a/project/src/controllers/ClientLogController.ts +++ b/project/src/controllers/ClientLogController.ts @@ -8,7 +8,7 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; @injectable() export class ClientLogController { - constructor(@inject("WinstonLogger") protected logger: ILogger) + constructor(@inject("PrimaryLogger") protected logger: ILogger) {} /** diff --git a/project/src/controllers/CustomizationController.ts b/project/src/controllers/CustomizationController.ts index acee8c02..0f7b49b0 100644 --- a/project/src/controllers/CustomizationController.ts +++ b/project/src/controllers/CustomizationController.ts @@ -20,7 +20,7 @@ export class CustomizationController }; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("SaveServer") protected saveServer: SaveServer, diff --git a/project/src/controllers/DialogueController.ts b/project/src/controllers/DialogueController.ts index 7eeac9e5..5b0fb14d 100644 --- a/project/src/controllers/DialogueController.ts +++ b/project/src/controllers/DialogueController.ts @@ -23,7 +23,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export class DialogueController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("SaveServer") protected saveServer: SaveServer, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DialogueHelper") protected dialogueHelper: DialogueHelper, diff --git a/project/src/controllers/GameController.ts b/project/src/controllers/GameController.ts index ee6f6d28..d936ba12 100644 --- a/project/src/controllers/GameController.ts +++ b/project/src/controllers/GameController.ts @@ -61,7 +61,7 @@ export class GameController protected botConfig: IBotConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HashUtil") protected hashUtil: HashUtil, @@ -81,7 +81,7 @@ export class GameController @inject("ProfileActivityService") protected profileActivityService: ProfileActivityService, @inject("ApplicationContext") protected applicationContext: ApplicationContext, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.httpConfig = this.configServer.getConfig(ConfigTypes.HTTP); diff --git a/project/src/controllers/HealthController.ts b/project/src/controllers/HealthController.ts index e965fe0e..93d54d9d 100644 --- a/project/src/controllers/HealthController.ts +++ b/project/src/controllers/HealthController.ts @@ -22,7 +22,7 @@ import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; export class HealthController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("PaymentService") protected paymentService: PaymentService, @@ -30,7 +30,7 @@ export class HealthController @inject("LocalisationService") protected localisationService: LocalisationService, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("HealthHelper") protected healthHelper: HealthHelper, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts index 7eac0001..826b6dd2 100644 --- a/project/src/controllers/HideoutController.ts +++ b/project/src/controllers/HideoutController.ts @@ -61,7 +61,7 @@ export class HideoutController protected hideoutConfig: IHideoutConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseService") protected databaseService: DatabaseService, @@ -81,7 +81,7 @@ export class HideoutController @inject("ProfileActivityService") protected profileActivityService: ProfileActivityService, @inject("ConfigServer") protected configServer: ConfigServer, @inject("FenceService") protected fenceService: FenceService, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.hideoutConfig = this.configServer.getConfig(ConfigTypes.HIDEOUT); diff --git a/project/src/controllers/InraidController.ts b/project/src/controllers/InraidController.ts index da32d3a0..df1ea6de 100644 --- a/project/src/controllers/InraidController.ts +++ b/project/src/controllers/InraidController.ts @@ -56,7 +56,7 @@ export class InraidController protected hideoutConfig: IHideoutConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("SaveServer") protected saveServer: SaveServer, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseService") protected databaseService: DatabaseService, diff --git a/project/src/controllers/InsuranceController.ts b/project/src/controllers/InsuranceController.ts index 3fe32df7..94ff0225 100644 --- a/project/src/controllers/InsuranceController.ts +++ b/project/src/controllers/InsuranceController.ts @@ -38,7 +38,7 @@ export class InsuranceController protected roubleTpl = "5449016a4bdc2d6f028b456f"; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("MathUtil") protected mathUtil: MathUtil, @inject("HashUtil") protected hashUtil: HashUtil, @@ -57,7 +57,7 @@ export class InsuranceController @inject("RagfairPriceService") protected ragfairPriceService: RagfairPriceService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.insuranceConfig = this.configServer.getConfig(ConfigTypes.INSURANCE); diff --git a/project/src/controllers/InventoryController.ts b/project/src/controllers/InventoryController.ts index fb9a415d..b3afa448 100644 --- a/project/src/controllers/InventoryController.ts +++ b/project/src/controllers/InventoryController.ts @@ -52,7 +52,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; export class InventoryController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("RandomUtil") protected randomUtil: RandomUtil, @@ -71,7 +71,7 @@ export class InventoryController @inject("LootGenerator") protected lootGenerator: LootGenerator, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("HttpResponseUtil") protected httpResponseUtil: HttpResponseUtil, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/controllers/LauncherController.ts b/project/src/controllers/LauncherController.ts index 115e2f12..06dd210f 100644 --- a/project/src/controllers/LauncherController.ts +++ b/project/src/controllers/LauncherController.ts @@ -25,7 +25,7 @@ export class LauncherController protected coreConfig: ICoreConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, diff --git a/project/src/controllers/LocationController.ts b/project/src/controllers/LocationController.ts index 3dde896a..a4ee114a 100644 --- a/project/src/controllers/LocationController.ts +++ b/project/src/controllers/LocationController.ts @@ -38,7 +38,7 @@ export class LocationController @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("WeightedRandomHelper") protected weightedRandomHelper: WeightedRandomHelper, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("LocationGenerator") protected locationGenerator: LocationGenerator, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("RaidTimeAdjustmentService") protected raidTimeAdjustmentService: RaidTimeAdjustmentService, @@ -48,7 +48,7 @@ export class LocationController @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("ConfigServer") protected configServer: ConfigServer, @inject("ApplicationContext") protected applicationContext: ApplicationContext, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.airdropConfig = this.configServer.getConfig(ConfigTypes.AIRDROP); diff --git a/project/src/controllers/MatchController.ts b/project/src/controllers/MatchController.ts index 98e6ec13..816a7f04 100644 --- a/project/src/controllers/MatchController.ts +++ b/project/src/controllers/MatchController.ts @@ -40,7 +40,7 @@ export class MatchController protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("SaveServer") protected saveServer: SaveServer, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, diff --git a/project/src/controllers/PresetController.ts b/project/src/controllers/PresetController.ts index 646cf964..f4032479 100644 --- a/project/src/controllers/PresetController.ts +++ b/project/src/controllers/PresetController.ts @@ -8,7 +8,7 @@ import { DatabaseService } from "@spt/services/DatabaseService"; export class PresetController { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("DatabaseService") protected databaseService: DatabaseService, ) diff --git a/project/src/controllers/ProfileController.ts b/project/src/controllers/ProfileController.ts index cd375285..eb2da63a 100644 --- a/project/src/controllers/ProfileController.ts +++ b/project/src/controllers/ProfileController.ts @@ -38,7 +38,7 @@ export class ProfileController protected defaultInventoryTpl = "55d7217a4bdc2d86028b456d"; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SaveServer") protected saveServer: SaveServer, diff --git a/project/src/controllers/QuestController.ts b/project/src/controllers/QuestController.ts index 8962bc3a..e9b75397 100644 --- a/project/src/controllers/QuestController.ts +++ b/project/src/controllers/QuestController.ts @@ -39,7 +39,7 @@ export class QuestController protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HttpResponseUtil") protected httpResponseUtil: HttpResponseUtil, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @@ -56,7 +56,7 @@ export class QuestController @inject("SeasonalEventService") protected seasonalEventService: SeasonalEventService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/controllers/RagfairController.ts b/project/src/controllers/RagfairController.ts index 54893e9f..b77b2374 100644 --- a/project/src/controllers/RagfairController.ts +++ b/project/src/controllers/RagfairController.ts @@ -52,7 +52,7 @@ export class RagfairController protected ragfairConfig: IRagfairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, diff --git a/project/src/controllers/RepairController.ts b/project/src/controllers/RepairController.ts index 243dc419..d614afa2 100644 --- a/project/src/controllers/RepairController.ts +++ b/project/src/controllers/RepairController.ts @@ -20,7 +20,7 @@ export class RepairController protected repairConfig: IRepairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("QuestHelper") protected questHelper: QuestHelper, diff --git a/project/src/controllers/RepeatableQuestController.ts b/project/src/controllers/RepeatableQuestController.ts index c105bc7e..a1133822 100644 --- a/project/src/controllers/RepeatableQuestController.ts +++ b/project/src/controllers/RepeatableQuestController.ts @@ -38,7 +38,7 @@ export class RepeatableQuestController protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @@ -53,7 +53,7 @@ export class RepeatableQuestController @inject("RepeatableQuestHelper") protected repeatableQuestHelper: RepeatableQuestHelper, @inject("QuestHelper") protected questHelper: QuestHelper, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/controllers/TradeController.ts b/project/src/controllers/TradeController.ts index 4e13ae7f..0511be55 100644 --- a/project/src/controllers/TradeController.ts +++ b/project/src/controllers/TradeController.ts @@ -45,7 +45,7 @@ export class TradeController protected traderConfig: ITraderConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("TradeHelper") protected tradeHelper: TradeHelper, diff --git a/project/src/controllers/TraderController.ts b/project/src/controllers/TraderController.ts index 634c6022..a8c0d400 100644 --- a/project/src/controllers/TraderController.ts +++ b/project/src/controllers/TraderController.ts @@ -22,7 +22,7 @@ export class TraderController protected traderConfig: ITraderConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("TraderAssortHelper") protected traderAssortHelper: TraderAssortHelper, @@ -34,7 +34,7 @@ export class TraderController @inject("FenceService") protected fenceService: FenceService, @inject("FenceBaseAssortGenerator") protected fenceBaseAssortGenerator: FenceBaseAssortGenerator, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.traderConfig = this.configServer.getConfig(ConfigTypes.TRADER); diff --git a/project/src/controllers/WeatherController.ts b/project/src/controllers/WeatherController.ts index 2acae6e4..f3b28352 100644 --- a/project/src/controllers/WeatherController.ts +++ b/project/src/controllers/WeatherController.ts @@ -13,7 +13,7 @@ export class WeatherController constructor( @inject("WeatherGenerator") protected weatherGenerator: WeatherGenerator, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ConfigServer") protected configServer: ConfigServer, ) { diff --git a/project/src/di/Container.ts b/project/src/di/Container.ts index f8a60453..b112173e 100644 --- a/project/src/di/Container.ts +++ b/project/src/di/Container.ts @@ -132,6 +132,7 @@ import { PostDBModLoader } from "@spt/loaders/PostDBModLoader"; import { PostSptModLoader } from "@spt/loaders/PostSptModLoader"; import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; import { BotDynamicRouter } from "@spt/routers/dynamic/BotDynamicRouter"; import { BundleDynamicRouter } from "@spt/routers/dynamic/BundleDynamicRouter"; import { CustomizationDynamicRouter } from "@spt/routers/dynamic/CustomizationDynamicRouter"; @@ -297,6 +298,16 @@ export class Container Container.registerServices(depContainer); Container.registerControllers(depContainer); + + Container.registerPrimaryDependencies(depContainer); + } + + public static registerPrimaryDependencies(depContainer: DependencyContainer): void + { + depContainer.register("PrimaryLogger", { useToken: "WinstonLogger" }, + { lifecycle: Lifecycle.Singleton }); + depContainer.register("PrimaryCloner", { useToken: "RecursiveCloner" }, + { lifecycle: Lifecycle.Singleton }); } public static registerListTypes(depContainer: DependencyContainer): void diff --git a/project/src/generators/BotEquipmentModGenerator.ts b/project/src/generators/BotEquipmentModGenerator.ts index 8fbefbd2..9dc1dd2d 100644 --- a/project/src/generators/BotEquipmentModGenerator.ts +++ b/project/src/generators/BotEquipmentModGenerator.ts @@ -39,7 +39,7 @@ export class BotEquipmentModGenerator protected botConfig: IBotConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("ProbabilityHelper") protected probabilityHelper: ProbabilityHelper, @@ -57,7 +57,7 @@ export class BotEquipmentModGenerator @inject("LocalisationService") protected localisationService: LocalisationService, @inject("BotEquipmentModPoolService") protected botEquipmentModPoolService: BotEquipmentModPoolService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.botConfig = this.configServer.getConfig(ConfigTypes.BOT); diff --git a/project/src/generators/BotGenerator.ts b/project/src/generators/BotGenerator.ts index b39c67f9..e92e1edd 100644 --- a/project/src/generators/BotGenerator.ts +++ b/project/src/generators/BotGenerator.ts @@ -41,7 +41,7 @@ export class BotGenerator protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @@ -56,7 +56,7 @@ export class BotGenerator @inject("SeasonalEventService") protected seasonalEventService: SeasonalEventService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.botConfig = this.configServer.getConfig(ConfigTypes.BOT); diff --git a/project/src/generators/BotInventoryGenerator.ts b/project/src/generators/BotInventoryGenerator.ts index 87493308..2e3f0030 100644 --- a/project/src/generators/BotInventoryGenerator.ts +++ b/project/src/generators/BotInventoryGenerator.ts @@ -31,7 +31,7 @@ export class BotInventoryGenerator protected botConfig: IBotConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseService") protected databaseService: DatabaseService, diff --git a/project/src/generators/BotLevelGenerator.ts b/project/src/generators/BotLevelGenerator.ts index c43dacac..0e98fbd7 100644 --- a/project/src/generators/BotLevelGenerator.ts +++ b/project/src/generators/BotLevelGenerator.ts @@ -11,7 +11,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; export class BotLevelGenerator { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseService") protected databaseService: DatabaseService, ) diff --git a/project/src/generators/BotLootGenerator.ts b/project/src/generators/BotLootGenerator.ts index cf5cbad7..824e099b 100644 --- a/project/src/generators/BotLootGenerator.ts +++ b/project/src/generators/BotLootGenerator.ts @@ -34,7 +34,7 @@ export class BotLootGenerator protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("ItemHelper") protected itemHelper: ItemHelper, @@ -48,7 +48,7 @@ export class BotLootGenerator @inject("BotLootCacheService") protected botLootCacheService: BotLootCacheService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.botConfig = this.configServer.getConfig(ConfigTypes.BOT); diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index 99970704..9ba3ae1b 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -37,7 +37,7 @@ export class BotWeaponGenerator protected repairConfig: IRepairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("ItemHelper") protected itemHelper: ItemHelper, @@ -51,7 +51,7 @@ export class BotWeaponGenerator @inject("LocalisationService") protected localisationService: LocalisationService, @inject("RepairService") protected repairService: RepairService, @injectAll("InventoryMagGen") protected inventoryMagGenComponents: IInventoryMagGen[], - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.botConfig = this.configServer.getConfig(ConfigTypes.BOT); diff --git a/project/src/generators/FenceBaseAssortGenerator.ts b/project/src/generators/FenceBaseAssortGenerator.ts index b12b7ffa..efd4037d 100644 --- a/project/src/generators/FenceBaseAssortGenerator.ts +++ b/project/src/generators/FenceBaseAssortGenerator.ts @@ -25,7 +25,7 @@ export class FenceBaseAssortGenerator protected traderConfig: ITraderConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("HandbookHelper") protected handbookHelper: HandbookHelper, diff --git a/project/src/generators/LocationGenerator.ts b/project/src/generators/LocationGenerator.ts index ae9c1a97..696e759a 100644 --- a/project/src/generators/LocationGenerator.ts +++ b/project/src/generators/LocationGenerator.ts @@ -48,7 +48,7 @@ export class LocationGenerator protected locationConfig: ILocationConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("ObjectId") protected objectId: ObjectId, @inject("RandomUtil") protected randomUtil: RandomUtil, @@ -59,7 +59,7 @@ export class LocationGenerator @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.locationConfig = this.configServer.getConfig(ConfigTypes.LOCATION); diff --git a/project/src/generators/LootGenerator.ts b/project/src/generators/LootGenerator.ts index 01aa92f0..ab86e91b 100644 --- a/project/src/generators/LootGenerator.ts +++ b/project/src/generators/LootGenerator.ts @@ -24,7 +24,7 @@ type ItemLimit = { current: number, max: number }; export class LootGenerator { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("RandomUtil") protected randomUtil: RandomUtil, diff --git a/project/src/generators/PlayerScavGenerator.ts b/project/src/generators/PlayerScavGenerator.ts index 5ee88aff..76a5d472 100644 --- a/project/src/generators/PlayerScavGenerator.ts +++ b/project/src/generators/PlayerScavGenerator.ts @@ -32,7 +32,7 @@ export class PlayerScavGenerator protected playerScavConfig: IPlayerScavConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("HashUtil") protected hashUtil: HashUtil, @@ -46,7 +46,7 @@ export class PlayerScavGenerator @inject("LocalisationService") protected localisationService: LocalisationService, @inject("BotGenerator") protected botGenerator: BotGenerator, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.playerScavConfig = this.configServer.getConfig(ConfigTypes.PLAYERSCAV); diff --git a/project/src/generators/RagfairOfferGenerator.ts b/project/src/generators/RagfairOfferGenerator.ts index 31d8c349..259b8425 100644 --- a/project/src/generators/RagfairOfferGenerator.ts +++ b/project/src/generators/RagfairOfferGenerator.ts @@ -44,7 +44,7 @@ export class RagfairOfferGenerator protected offerCounter = 0; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @@ -63,7 +63,7 @@ export class RagfairOfferGenerator @inject("FenceService") protected fenceService: FenceService, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.ragfairConfig = this.configServer.getConfig(ConfigTypes.RAGFAIR); diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts index 26539823..5844d10b 100644 --- a/project/src/generators/RepeatableQuestGenerator.ts +++ b/project/src/generators/RepeatableQuestGenerator.ts @@ -31,7 +31,7 @@ export class RepeatableQuestGenerator protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("MathUtil") protected mathUtil: MathUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @@ -42,7 +42,7 @@ export class RepeatableQuestGenerator @inject("RepeatableQuestRewardGenerator") protected repeatableQuestRewardGenerator: RepeatableQuestRewardGenerator, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/generators/RepeatableQuestRewardGenerator.ts b/project/src/generators/RepeatableQuestRewardGenerator.ts index 965dd888..1abc65e1 100644 --- a/project/src/generators/RepeatableQuestRewardGenerator.ts +++ b/project/src/generators/RepeatableQuestRewardGenerator.ts @@ -30,7 +30,7 @@ export class RepeatableQuestRewardGenerator protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("MathUtil") protected mathUtil: MathUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @@ -42,7 +42,7 @@ export class RepeatableQuestRewardGenerator @inject("ItemFilterService") protected itemFilterService: ItemFilterService, @inject("SeasonalEventService") protected seasonalEventService: SeasonalEventService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/generators/ScavCaseRewardGenerator.ts b/project/src/generators/ScavCaseRewardGenerator.ts index 438bcc03..be623655 100644 --- a/project/src/generators/ScavCaseRewardGenerator.ts +++ b/project/src/generators/ScavCaseRewardGenerator.ts @@ -32,7 +32,7 @@ export class ScavCaseRewardGenerator protected dbAmmoItemsCache: ITemplateItem[]; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("HashUtil") protected hashUtil: HashUtil, @inject("ItemHelper") protected itemHelper: ItemHelper, diff --git a/project/src/generators/WeatherGenerator.ts b/project/src/generators/WeatherGenerator.ts index 17f0002d..f2e57f01 100644 --- a/project/src/generators/WeatherGenerator.ts +++ b/project/src/generators/WeatherGenerator.ts @@ -22,7 +22,7 @@ export class WeatherGenerator constructor( @inject("WeightedRandomHelper") protected weightedRandomHelper: WeightedRandomHelper, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SeasonalEventService") protected seasonalEventService: SeasonalEventService, diff --git a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts index 33938190..6bb6797c 100644 --- a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts @@ -15,7 +15,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; export class ExternalInventoryMagGen implements IInventoryMagGen { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("BotWeaponGeneratorHelper") protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper, diff --git a/project/src/helpers/AssortHelper.ts b/project/src/helpers/AssortHelper.ts index ffabeddf..c5d74b55 100644 --- a/project/src/helpers/AssortHelper.ts +++ b/project/src/helpers/AssortHelper.ts @@ -12,7 +12,7 @@ import { LocalisationService } from "@spt/services/LocalisationService"; export class AssortHelper { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/helpers/BotDifficultyHelper.ts b/project/src/helpers/BotDifficultyHelper.ts index 5b142737..d733737c 100644 --- a/project/src/helpers/BotDifficultyHelper.ts +++ b/project/src/helpers/BotDifficultyHelper.ts @@ -16,13 +16,13 @@ export class BotDifficultyHelper protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("BotHelper") protected botHelper: BotHelper, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.pmcConfig = this.configServer.getConfig(ConfigTypes.PMC); diff --git a/project/src/helpers/BotGeneratorHelper.ts b/project/src/helpers/BotGeneratorHelper.ts index f819d881..624e7f71 100644 --- a/project/src/helpers/BotGeneratorHelper.ts +++ b/project/src/helpers/BotGeneratorHelper.ts @@ -28,7 +28,7 @@ export class BotGeneratorHelper protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("DurabilityLimitsHelper") protected durabilityLimitsHelper: DurabilityLimitsHelper, diff --git a/project/src/helpers/BotHelper.ts b/project/src/helpers/BotHelper.ts index 7699e54e..9e00147a 100644 --- a/project/src/helpers/BotHelper.ts +++ b/project/src/helpers/BotHelper.ts @@ -16,7 +16,7 @@ export class BotHelper protected pmcConfig: IPmcConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("ConfigServer") protected configServer: ConfigServer, diff --git a/project/src/helpers/BotWeaponGeneratorHelper.ts b/project/src/helpers/BotWeaponGeneratorHelper.ts index 13500330..1ecd0af5 100644 --- a/project/src/helpers/BotWeaponGeneratorHelper.ts +++ b/project/src/helpers/BotWeaponGeneratorHelper.ts @@ -19,7 +19,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; export class BotWeaponGeneratorHelper { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("RandomUtil") protected randomUtil: RandomUtil, diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts index 9de6ffe2..28c444bb 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts @@ -40,7 +40,7 @@ export class GiveSptCommand implements ISptCommand protected savedCommand: Map = new Map(); public constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("HashUtil") protected hashUtil: HashUtil, @inject("PresetHelper") protected presetHelper: PresetHelper, @@ -48,7 +48,7 @@ export class GiveSptCommand implements ISptCommand @inject("LocaleService") protected localeService: LocaleService, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ItemFilterService") protected itemFilterService: ItemFilterService, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts index 25a708e2..5abe59c0 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts @@ -28,7 +28,7 @@ export class ProfileSptCommand implements ISptCommand protected savedCommand: SavedCommand; public constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("HashUtil") protected hashUtil: HashUtil, @inject("PresetHelper") protected presetHelper: PresetHelper, diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts index ac0c48c8..b139eae0 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts @@ -25,7 +25,7 @@ export class TraderSptCommand implements ISptCommand protected savedCommand: SavedCommand; public constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("HashUtil") protected hashUtil: HashUtil, @inject("PresetHelper") protected presetHelper: PresetHelper, diff --git a/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts b/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts index 58e52611..03497fd2 100644 --- a/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts +++ b/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts @@ -10,7 +10,7 @@ import { MailSendService } from "@spt/services/MailSendService"; export class CommandoDialogueChatBot extends AbstractDialogueChatBot { public constructor( - @inject("WinstonLogger") logger: ILogger, + @inject("PrimaryLogger") logger: ILogger, @inject("MailSendService") mailSendService: MailSendService, @injectAll("CommandoCommand") chatCommands: IChatCommand[], ) diff --git a/project/src/helpers/DialogueHelper.ts b/project/src/helpers/DialogueHelper.ts index a97c2b39..38c19a0c 100644 --- a/project/src/helpers/DialogueHelper.ts +++ b/project/src/helpers/DialogueHelper.ts @@ -14,7 +14,7 @@ import { HashUtil } from "@spt/utils/HashUtil"; export class DialogueHelper { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("SaveServer") protected saveServer: SaveServer, @inject("DatabaseServer") protected databaseServer: DatabaseServer, diff --git a/project/src/helpers/HandbookHelper.ts b/project/src/helpers/HandbookHelper.ts index 05abdd77..ef9c65fc 100644 --- a/project/src/helpers/HandbookHelper.ts +++ b/project/src/helpers/HandbookHelper.ts @@ -42,7 +42,7 @@ export class HandbookHelper constructor( @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.itemConfig = this.configServer.getConfig(ConfigTypes.ITEM); diff --git a/project/src/helpers/HealthHelper.ts b/project/src/helpers/HealthHelper.ts index 3e7a8b32..91a8d00d 100644 --- a/project/src/helpers/HealthHelper.ts +++ b/project/src/helpers/HealthHelper.ts @@ -16,11 +16,11 @@ export class HealthHelper protected healthConfig: IHealthConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SaveServer") protected saveServer: SaveServer, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.healthConfig = this.configServer.getConfig(ConfigTypes.HEALTH); diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts index 7cde0d51..7fc4e493 100644 --- a/project/src/helpers/HideoutHelper.ts +++ b/project/src/helpers/HideoutHelper.ts @@ -41,7 +41,7 @@ export class HideoutHelper protected hideoutConfig: IHideoutConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @@ -53,7 +53,7 @@ export class HideoutHelper @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.hideoutConfig = this.configServer.getConfig(ConfigTypes.HIDEOUT); diff --git a/project/src/helpers/InRaidHelper.ts b/project/src/helpers/InRaidHelper.ts index 50e8574a..e7c27b71 100644 --- a/project/src/helpers/InRaidHelper.ts +++ b/project/src/helpers/InRaidHelper.ts @@ -31,7 +31,7 @@ export class InRaidHelper protected inRaidConfig: IInRaidConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SaveServer") protected saveServer: SaveServer, @inject("ItemHelper") protected itemHelper: ItemHelper, @@ -44,7 +44,7 @@ export class InRaidHelper @inject("ProfileFixerService") protected profileFixerService: ProfileFixerService, @inject("ConfigServer") protected configServer: ConfigServer, @inject("RandomUtil") protected randomUtil: RandomUtil, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.lostOnDeathConfig = this.configServer.getConfig(ConfigTypes.LOST_ON_DEATH); diff --git a/project/src/helpers/InventoryHelper.ts b/project/src/helpers/InventoryHelper.ts index ed036a5e..e2a478ae 100644 --- a/project/src/helpers/InventoryHelper.ts +++ b/project/src/helpers/InventoryHelper.ts @@ -49,7 +49,7 @@ export class InventoryHelper protected inventoryConfig: IInventoryConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("FenceService") protected fenceService: FenceService, @@ -63,7 +63,7 @@ export class InventoryHelper @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.inventoryConfig = this.configServer.getConfig(ConfigTypes.INVENTORY); diff --git a/project/src/helpers/ItemHelper.ts b/project/src/helpers/ItemHelper.ts index cc9b8982..edfde3aa 100644 --- a/project/src/helpers/ItemHelper.ts +++ b/project/src/helpers/ItemHelper.ts @@ -35,7 +35,7 @@ export class ItemHelper ]; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @@ -48,7 +48,7 @@ export class ItemHelper @inject("LocalisationService") protected localisationService: LocalisationService, @inject("LocaleService") protected localeService: LocaleService, @inject("CompareUtil") protected compareUtil: CompareUtil, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/helpers/PresetHelper.ts b/project/src/helpers/PresetHelper.ts index 3d4e0c6e..1d94bd57 100644 --- a/project/src/helpers/PresetHelper.ts +++ b/project/src/helpers/PresetHelper.ts @@ -15,7 +15,7 @@ export class PresetHelper constructor( @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ItemHelper") protected itemHelper: ItemHelper, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/helpers/ProbabilityHelper.ts b/project/src/helpers/ProbabilityHelper.ts index 6d782f80..1e868332 100644 --- a/project/src/helpers/ProbabilityHelper.ts +++ b/project/src/helpers/ProbabilityHelper.ts @@ -6,7 +6,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; export class ProbabilityHelper { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, ) {} diff --git a/project/src/helpers/ProfileHelper.ts b/project/src/helpers/ProfileHelper.ts index 43c68b4f..33553de1 100644 --- a/project/src/helpers/ProfileHelper.ts +++ b/project/src/helpers/ProfileHelper.ts @@ -26,7 +26,7 @@ export class ProfileHelper protected inventoryConfig: IInventoryConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("Watermark") protected watermark: Watermark, @inject("TimeUtil") protected timeUtil: TimeUtil, @@ -36,7 +36,7 @@ export class ProfileHelper @inject("ProfileSnapshotService") protected profileSnapshotService: ProfileSnapshotService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.inventoryConfig = this.configServer.getConfig(ConfigTypes.INVENTORY); diff --git a/project/src/helpers/QuestHelper.ts b/project/src/helpers/QuestHelper.ts index 4f30e9ff..2231d024 100644 --- a/project/src/helpers/QuestHelper.ts +++ b/project/src/helpers/QuestHelper.ts @@ -37,7 +37,7 @@ export class QuestHelper protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HashUtil") protected hashUtil: HashUtil, @inject("ItemHelper") protected itemHelper: ItemHelper, @@ -54,7 +54,7 @@ export class QuestHelper @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("MailSendService") protected mailSendService: MailSendService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/helpers/RagfairHelper.ts b/project/src/helpers/RagfairHelper.ts index 65a98cd1..2d611b54 100644 --- a/project/src/helpers/RagfairHelper.ts +++ b/project/src/helpers/RagfairHelper.ts @@ -21,7 +21,7 @@ export class RagfairHelper protected ragfairConfig: IRagfairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TraderAssortHelper") protected traderAssortHelper: TraderAssortHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("HandbookHelper") protected handbookHelper: HandbookHelper, @@ -29,7 +29,7 @@ export class RagfairHelper @inject("RagfairLinkedItemService") protected ragfairLinkedItemService: RagfairLinkedItemService, @inject("UtilityHelper") protected utilityHelper: UtilityHelper, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.ragfairConfig = this.configServer.getConfig(ConfigTypes.RAGFAIR); diff --git a/project/src/helpers/RagfairOfferHelper.ts b/project/src/helpers/RagfairOfferHelper.ts index 0c5438ca..ff0b9dfa 100644 --- a/project/src/helpers/RagfairOfferHelper.ts +++ b/project/src/helpers/RagfairOfferHelper.ts @@ -44,7 +44,7 @@ export class RagfairOfferHelper protected questConfig: IQuestConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HashUtil") protected hashUtil: HashUtil, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, diff --git a/project/src/helpers/RagfairSellHelper.ts b/project/src/helpers/RagfairSellHelper.ts index a0361750..39285022 100644 --- a/project/src/helpers/RagfairSellHelper.ts +++ b/project/src/helpers/RagfairSellHelper.ts @@ -14,7 +14,7 @@ export class RagfairSellHelper protected ragfairConfig: IRagfairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, diff --git a/project/src/helpers/RagfairServerHelper.ts b/project/src/helpers/RagfairServerHelper.ts index b6b7bcfe..40044f41 100644 --- a/project/src/helpers/RagfairServerHelper.ts +++ b/project/src/helpers/RagfairServerHelper.ts @@ -32,7 +32,7 @@ export class RagfairServerHelper protected static goodsReturnedTemplate = "5bdabfe486f7743e1665df6e 0"; // Your item was not sold constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SaveServer") protected saveServer: SaveServer, @@ -44,7 +44,7 @@ export class RagfairServerHelper @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ItemFilterService") protected itemFilterService: ItemFilterService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.ragfairConfig = this.configServer.getConfig(ConfigTypes.RAGFAIR); diff --git a/project/src/helpers/RepairHelper.ts b/project/src/helpers/RepairHelper.ts index 291bb280..fd5e7fd6 100644 --- a/project/src/helpers/RepairHelper.ts +++ b/project/src/helpers/RepairHelper.ts @@ -15,11 +15,11 @@ export class RepairHelper protected repairConfig: IRepairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.repairConfig = this.configServer.getConfig(ConfigTypes.REPAIR); diff --git a/project/src/helpers/RepeatableQuestHelper.ts b/project/src/helpers/RepeatableQuestHelper.ts index 8508dc7b..e5e143ca 100644 --- a/project/src/helpers/RepeatableQuestHelper.ts +++ b/project/src/helpers/RepeatableQuestHelper.ts @@ -14,7 +14,7 @@ export class RepeatableQuestHelper constructor( @inject("MathUtil") protected mathUtil: MathUtil, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.questConfig = this.configServer.getConfig(ConfigTypes.QUEST); diff --git a/project/src/helpers/TradeHelper.ts b/project/src/helpers/TradeHelper.ts index eb4f652b..bfe7f2a2 100644 --- a/project/src/helpers/TradeHelper.ts +++ b/project/src/helpers/TradeHelper.ts @@ -32,7 +32,7 @@ export class TradeHelper protected inventoryConfig: IInventoryConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, @inject("TraderHelper") protected traderHelper: TraderHelper, @inject("ItemHelper") protected itemHelper: ItemHelper, @@ -46,7 +46,7 @@ export class TradeHelper @inject("TraderPurchasePersisterService") protected traderPurchasePersisterService: TraderPurchasePersisterService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.traderConfig = this.configServer.getConfig(ConfigTypes.TRADER); diff --git a/project/src/helpers/TraderAssortHelper.ts b/project/src/helpers/TraderAssortHelper.ts index 5c791286..cca9764d 100644 --- a/project/src/helpers/TraderAssortHelper.ts +++ b/project/src/helpers/TraderAssortHelper.ts @@ -29,7 +29,7 @@ export class TraderAssortHelper protected createdMergedQuestAssorts = false; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("MathUtil") protected mathUtil: MathUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @@ -45,7 +45,7 @@ export class TraderAssortHelper @inject("TraderHelper") protected traderHelper: TraderHelper, @inject("FenceService") protected fenceService: FenceService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.traderConfig = this.configServer.getConfig(ConfigTypes.TRADER); diff --git a/project/src/helpers/TraderHelper.ts b/project/src/helpers/TraderHelper.ts index 9d1b4127..c70887de 100644 --- a/project/src/helpers/TraderHelper.ts +++ b/project/src/helpers/TraderHelper.ts @@ -32,7 +32,7 @@ export class TraderHelper protected highestTraderBuyPriceItems?: Record = undefined; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("HandbookHelper") protected handbookHelper: HandbookHelper, diff --git a/project/src/loaders/BundleLoader.ts b/project/src/loaders/BundleLoader.ts index 64df8f19..db1f04d8 100644 --- a/project/src/loaders/BundleLoader.ts +++ b/project/src/loaders/BundleLoader.ts @@ -32,7 +32,7 @@ export class BundleLoader @inject("VFS") protected vfs: VFS, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("BundleHashCacheService") protected bundleHashCacheService: BundleHashCacheService, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/loaders/ModLoadOrder.ts b/project/src/loaders/ModLoadOrder.ts index 036d27bb..236eecf6 100644 --- a/project/src/loaders/ModLoadOrder.ts +++ b/project/src/loaders/ModLoadOrder.ts @@ -11,7 +11,7 @@ export class ModLoadOrder protected loadOrder = new Set(); constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("LocalisationService") protected localisationService: LocalisationService, ) {} diff --git a/project/src/loaders/PostDBModLoader.ts b/project/src/loaders/PostDBModLoader.ts index 071e3755..8215e1df 100644 --- a/project/src/loaders/PostDBModLoader.ts +++ b/project/src/loaders/PostDBModLoader.ts @@ -14,7 +14,7 @@ export class PostDBModLoader implements OnLoad protected container: DependencyContainer; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("BundleLoader") protected bundleLoader: BundleLoader, @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/loaders/PostSptModLoader.ts b/project/src/loaders/PostSptModLoader.ts index 5f11424c..db0e6ef1 100644 --- a/project/src/loaders/PostSptModLoader.ts +++ b/project/src/loaders/PostSptModLoader.ts @@ -13,7 +13,7 @@ export class PostSptModLoader implements IModLoader protected container: DependencyContainer; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ModTypeCheck") protected modTypeCheck: ModTypeCheck, diff --git a/project/src/loaders/PreSptModLoader.ts b/project/src/loaders/PreSptModLoader.ts index 7ee8aa84..92a8cf2f 100644 --- a/project/src/loaders/PreSptModLoader.ts +++ b/project/src/loaders/PreSptModLoader.ts @@ -33,7 +33,7 @@ export class PreSptModLoader implements IModLoader protected skippedMods: Set; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("VFS") protected vfs: VFS, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("ModCompilerService") protected modCompilerService: ModCompilerService, diff --git a/project/src/routers/EventOutputHolder.ts b/project/src/routers/EventOutputHolder.ts index bf3ac9e7..c9e0cb6a 100644 --- a/project/src/routers/EventOutputHolder.ts +++ b/project/src/routers/EventOutputHolder.ts @@ -16,7 +16,7 @@ export class EventOutputHolder constructor( @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("TimeUtil") protected timeUtil: TimeUtil, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/routers/ItemEventRouter.ts b/project/src/routers/ItemEventRouter.ts index b1d0b01c..1f323bd0 100644 --- a/project/src/routers/ItemEventRouter.ts +++ b/project/src/routers/ItemEventRouter.ts @@ -12,12 +12,12 @@ import { ICloner } from "@spt/utils/cloners/ICloner"; export class ItemEventRouter { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ProfileHelper") protected profileHelper: ProfileHelper, @injectAll("IERouters") protected itemEventRouters: ItemEventRouterDefinition[], @inject("LocalisationService") protected localisationService: LocalisationService, @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/routers/item_events/QuestItemEventRouter.ts b/project/src/routers/item_events/QuestItemEventRouter.ts index 366b407e..d50f028f 100644 --- a/project/src/routers/item_events/QuestItemEventRouter.ts +++ b/project/src/routers/item_events/QuestItemEventRouter.ts @@ -9,7 +9,7 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; export class QuestItemEventRouter extends ItemEventRouterDefinition { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("QuestCallbacks") protected questCallbacks: QuestCallbacks, ) { diff --git a/project/src/routers/serializers/BundleSerializer.ts b/project/src/routers/serializers/BundleSerializer.ts index b9e97e36..efc0bb00 100644 --- a/project/src/routers/serializers/BundleSerializer.ts +++ b/project/src/routers/serializers/BundleSerializer.ts @@ -9,7 +9,7 @@ import { HttpFileUtil } from "@spt/utils/HttpFileUtil"; export class BundleSerializer extends Serializer { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("BundleLoader") protected bundleLoader: BundleLoader, @inject("HttpFileUtil") protected httpFileUtil: HttpFileUtil, ) diff --git a/project/src/servers/ConfigServer.ts b/project/src/servers/ConfigServer.ts index ab10568c..03c8e1ec 100644 --- a/project/src/servers/ConfigServer.ts +++ b/project/src/servers/ConfigServer.ts @@ -11,7 +11,7 @@ export class ConfigServer protected readonly acceptableFileExtensions: string[] = ["json", "jsonc"]; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("VFS") protected vfs: VFS, @inject("JsonUtil") protected jsonUtil: JsonUtil, ) diff --git a/project/src/servers/HttpServer.ts b/project/src/servers/HttpServer.ts index 6ffca615..3f6acf4c 100644 --- a/project/src/servers/HttpServer.ts +++ b/project/src/servers/HttpServer.ts @@ -19,7 +19,7 @@ export class HttpServer protected started: boolean; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("HttpServerHelper") protected httpServerHelper: HttpServerHelper, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/servers/RagfairServer.ts b/project/src/servers/RagfairServer.ts index 5bdd50ae..30399b76 100644 --- a/project/src/servers/RagfairServer.ts +++ b/project/src/servers/RagfairServer.ts @@ -20,7 +20,7 @@ export class RagfairServer protected ragfairConfig: IRagfairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RagfairOfferGenerator") protected ragfairOfferGenerator: RagfairOfferGenerator, @inject("RagfairOfferService") protected ragfairOfferService: RagfairOfferService, @inject("RagfairCategoriesService") protected ragfairCategoriesService: RagfairCategoriesService, diff --git a/project/src/servers/SaveServer.ts b/project/src/servers/SaveServer.ts index ef689516..a8414270 100644 --- a/project/src/servers/SaveServer.ts +++ b/project/src/servers/SaveServer.ts @@ -25,7 +25,7 @@ export class SaveServer @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("HashUtil") protected hashUtil: HashUtil, @inject("LocalisationService") protected localisationService: LocalisationService, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ConfigServer") protected configServer: ConfigServer, ) {} diff --git a/project/src/servers/WebSocketServer.ts b/project/src/servers/WebSocketServer.ts index aaa7873f..b58e526d 100644 --- a/project/src/servers/WebSocketServer.ts +++ b/project/src/servers/WebSocketServer.ts @@ -14,7 +14,7 @@ export class WebSocketServer protected webSocketServer: Server; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/servers/http/SptHttpListener.ts b/project/src/servers/http/SptHttpListener.ts index 32651597..9253fd90 100644 --- a/project/src/servers/http/SptHttpListener.ts +++ b/project/src/servers/http/SptHttpListener.ts @@ -15,7 +15,7 @@ export class SptHttpListener implements IHttpListener constructor( @inject("HttpRouter") protected httpRouter: HttpRouter, // TODO: delay required @injectAll("Serializer") protected serializers: Serializer[], - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RequestsLogger") protected requestsLogger: ILogger, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, diff --git a/project/src/servers/ws/SptWebSocketConnectionHandler.ts b/project/src/servers/ws/SptWebSocketConnectionHandler.ts index 374a944f..0d238db2 100644 --- a/project/src/servers/ws/SptWebSocketConnectionHandler.ts +++ b/project/src/servers/ws/SptWebSocketConnectionHandler.ts @@ -22,7 +22,7 @@ export class SptWebSocketConnectionHandler implements IWebSocketConnectionHandle protected websocketPingHandler: NodeJS.Timeout | undefined; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, diff --git a/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts b/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts index 6e1f0d4b..a1ffdabe 100644 --- a/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts +++ b/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts @@ -6,7 +6,7 @@ import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSock @injectable() export class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler { - constructor(@inject("WinstonLogger") protected logger: ILogger) + constructor(@inject("PrimaryLogger") protected logger: ILogger) {} public onSptMessage(sessionId: string, client: WebSocket, message: RawData): void diff --git a/project/src/services/BotEquipmentFilterService.ts b/project/src/services/BotEquipmentFilterService.ts index 7410f49c..f0f7eaf8 100644 --- a/project/src/services/BotEquipmentFilterService.ts +++ b/project/src/services/BotEquipmentFilterService.ts @@ -27,7 +27,7 @@ export class BotEquipmentFilterService protected botEquipmentConfig: Record; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("BotHelper") protected botHelper: BotHelper, @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("ConfigServer") protected configServer: ConfigServer, diff --git a/project/src/services/BotEquipmentModPoolService.ts b/project/src/services/BotEquipmentModPoolService.ts index 709bdd6b..365d896a 100644 --- a/project/src/services/BotEquipmentModPoolService.ts +++ b/project/src/services/BotEquipmentModPoolService.ts @@ -22,7 +22,7 @@ export class BotEquipmentModPoolService protected armorPoolGenerated = false; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("VFS") protected vfs: VFS, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, diff --git a/project/src/services/BotGenerationCacheService.ts b/project/src/services/BotGenerationCacheService.ts index b2a671c9..d38fb877 100644 --- a/project/src/services/BotGenerationCacheService.ts +++ b/project/src/services/BotGenerationCacheService.ts @@ -12,7 +12,7 @@ export class BotGenerationCacheService protected activeBotsInRaid: IBotBase[] = []; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("BotHelper") protected botHelper: BotHelper, diff --git a/project/src/services/BotLootCacheService.ts b/project/src/services/BotLootCacheService.ts index 5132d81a..0846c5b0 100644 --- a/project/src/services/BotLootCacheService.ts +++ b/project/src/services/BotLootCacheService.ts @@ -17,13 +17,13 @@ export class BotLootCacheService protected lootCache: Record; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("PMCLootGenerator") protected pmcLootGenerator: PMCLootGenerator, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("RagfairPriceService") protected ragfairPriceService: RagfairPriceService, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.clearCache(); diff --git a/project/src/services/BotWeaponModLimitService.ts b/project/src/services/BotWeaponModLimitService.ts index b9b44602..8c712803 100644 --- a/project/src/services/BotWeaponModLimitService.ts +++ b/project/src/services/BotWeaponModLimitService.ts @@ -29,7 +29,7 @@ export class BotWeaponModLimitService protected botConfig: IBotConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ConfigServer") protected configServer: ConfigServer, @inject("ItemHelper") protected itemHelper: ItemHelper, ) diff --git a/project/src/services/CustomLocationWaveService.ts b/project/src/services/CustomLocationWaveService.ts index 5a917499..d7265dae 100644 --- a/project/src/services/CustomLocationWaveService.ts +++ b/project/src/services/CustomLocationWaveService.ts @@ -13,7 +13,7 @@ export class CustomLocationWaveService protected locationConfig: ILocationConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ConfigServer") protected configServer: ConfigServer, diff --git a/project/src/services/DatabaseService.ts b/project/src/services/DatabaseService.ts index 8abe0088..7dec5417 100644 --- a/project/src/services/DatabaseService.ts +++ b/project/src/services/DatabaseService.ts @@ -28,7 +28,7 @@ export class DatabaseService protected locationConfig: ILocationConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("LocalisationService") protected localisationService: LocalisationService, ) diff --git a/project/src/services/FenceService.ts b/project/src/services/FenceService.ts index 2a152058..4d4b9752 100644 --- a/project/src/services/FenceService.ts +++ b/project/src/services/FenceService.ts @@ -59,7 +59,7 @@ export class FenceService ]); constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @@ -68,7 +68,7 @@ export class FenceService @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.traderConfig = this.configServer.getConfig(ConfigTypes.TRADER); diff --git a/project/src/services/GiftService.ts b/project/src/services/GiftService.ts index 75e0bf9a..a785acaa 100644 --- a/project/src/services/GiftService.ts +++ b/project/src/services/GiftService.ts @@ -20,7 +20,7 @@ export class GiftService protected giftConfig: IGiftsConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("MailSendService") protected mailSendService: MailSendService, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("HashUtil") protected hashUtil: HashUtil, diff --git a/project/src/services/InsuranceService.ts b/project/src/services/InsuranceService.ts index 89e937cb..02bb2248 100644 --- a/project/src/services/InsuranceService.ts +++ b/project/src/services/InsuranceService.ts @@ -35,7 +35,7 @@ export class InsuranceService protected lostOnDeathConfig: ILostOnDeathConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("SecureContainerHelper") protected secureContainerHelper: SecureContainerHelper, @inject("RandomUtil") protected randomUtil: RandomUtil, @@ -50,7 +50,7 @@ export class InsuranceService @inject("LocaleService") protected localeService: LocaleService, @inject("MailSendService") protected mailSendService: MailSendService, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.insuranceConfig = this.configServer.getConfig(ConfigTypes.INSURANCE); diff --git a/project/src/services/ItemBaseClassService.ts b/project/src/services/ItemBaseClassService.ts index 814f90c5..e1af1487 100644 --- a/project/src/services/ItemBaseClassService.ts +++ b/project/src/services/ItemBaseClassService.ts @@ -15,7 +15,7 @@ export class ItemBaseClassService protected cacheGenerated = false; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("DatabaseServer") protected databaseServer: DatabaseServer, ) diff --git a/project/src/services/ItemFilterService.ts b/project/src/services/ItemFilterService.ts index a7ca508d..8700f888 100644 --- a/project/src/services/ItemFilterService.ts +++ b/project/src/services/ItemFilterService.ts @@ -12,7 +12,7 @@ export class ItemFilterService protected itemConfig: IItemConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ConfigServer") protected configServer: ConfigServer, ) diff --git a/project/src/services/LocaleService.ts b/project/src/services/LocaleService.ts index 1af8a032..93109a1b 100644 --- a/project/src/services/LocaleService.ts +++ b/project/src/services/LocaleService.ts @@ -14,7 +14,7 @@ export class LocaleService protected localeConfig: ILocaleConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ConfigServer") protected configServer: ConfigServer, ) diff --git a/project/src/services/LocalisationService.ts b/project/src/services/LocalisationService.ts index d3add320..14707660 100644 --- a/project/src/services/LocalisationService.ts +++ b/project/src/services/LocalisationService.ts @@ -15,7 +15,7 @@ export class LocalisationService protected i18n: I18n; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("LocaleService") protected localeService: LocaleService, @@ -46,7 +46,7 @@ export class LocalisationService */ public getText(key: string, args?: any): string { - return args ? this.i18n.__(key.toLowerCase(), args) : this.i18n.__(key.toLowerCase()); + return args === undefined ? this.i18n.__(key.toLowerCase()) : this.i18n.__(key.toLowerCase(), args); } /** diff --git a/project/src/services/MailSendService.ts b/project/src/services/MailSendService.ts index b083f0c4..2c94ddc7 100644 --- a/project/src/services/MailSendService.ts +++ b/project/src/services/MailSendService.ts @@ -23,7 +23,7 @@ export class MailSendService protected readonly systemSenderId = "59e7125688a45068a6249071"; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("SaveServer") protected saveServer: SaveServer, diff --git a/project/src/services/MatchBotDetailsCacheService.ts b/project/src/services/MatchBotDetailsCacheService.ts index 33e5515c..fd1ca1a4 100644 --- a/project/src/services/MatchBotDetailsCacheService.ts +++ b/project/src/services/MatchBotDetailsCacheService.ts @@ -10,7 +10,7 @@ export class MatchBotDetailsCacheService protected botDetailsCache: Record = {}; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("LocalisationService") protected localisationService: LocalisationService, ) {} diff --git a/project/src/services/ModCompilerService.ts b/project/src/services/ModCompilerService.ts index e392cdec..a066661e 100644 --- a/project/src/services/ModCompilerService.ts +++ b/project/src/services/ModCompilerService.ts @@ -13,7 +13,7 @@ export class ModCompilerService protected serverDependencies: string[]; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ModHashCacheService") protected modHashCacheService: ModHashCacheService, @inject("VFS") protected vfs: VFS, ) diff --git a/project/src/services/OpenZoneService.ts b/project/src/services/OpenZoneService.ts index e5d66342..28e1b4c3 100644 --- a/project/src/services/OpenZoneService.ts +++ b/project/src/services/OpenZoneService.ts @@ -15,7 +15,7 @@ export class OpenZoneService protected locationConfig: ILocationConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/services/PaymentService.ts b/project/src/services/PaymentService.ts index 498a8a6f..d3b16be9 100644 --- a/project/src/services/PaymentService.ts +++ b/project/src/services/PaymentService.ts @@ -21,7 +21,7 @@ import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; export class PaymentService { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, diff --git a/project/src/services/PlayerService.ts b/project/src/services/PlayerService.ts index de930e55..73c739b5 100644 --- a/project/src/services/PlayerService.ts +++ b/project/src/services/PlayerService.ts @@ -9,7 +9,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export class PlayerService { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("DatabaseServer") protected databaseServer: DatabaseServer, diff --git a/project/src/services/PmcChatResponseService.ts b/project/src/services/PmcChatResponseService.ts index 21eb00b2..6ec158ab 100644 --- a/project/src/services/PmcChatResponseService.ts +++ b/project/src/services/PmcChatResponseService.ts @@ -21,7 +21,7 @@ export class PmcChatResponseService protected pmcResponsesConfig: IPmcChatResponse; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("NotificationSendHelper") protected notificationSendHelper: NotificationSendHelper, diff --git a/project/src/services/ProfileFixerService.ts b/project/src/services/ProfileFixerService.ts index 7019eb6c..431d8125 100644 --- a/project/src/services/ProfileFixerService.ts +++ b/project/src/services/ProfileFixerService.ts @@ -34,7 +34,7 @@ export class ProfileFixerService protected ragfairConfig: IRagfairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("Watermark") protected watermark: Watermark, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("HideoutHelper") protected hideoutHelper: HideoutHelper, @@ -47,7 +47,7 @@ export class ProfileFixerService @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("HashUtil") protected hashUtil: HashUtil, @inject("ConfigServer") protected configServer: ConfigServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { this.coreConfig = this.configServer.getConfig(ConfigTypes.CORE); diff --git a/project/src/services/ProfileSnapshotService.ts b/project/src/services/ProfileSnapshotService.ts index 33932075..f911f922 100644 --- a/project/src/services/ProfileSnapshotService.ts +++ b/project/src/services/ProfileSnapshotService.ts @@ -7,7 +7,7 @@ export class ProfileSnapshotService { protected storedProfileSnapshots: Record = {}; - constructor(@inject("RecursiveCloner") protected cloner: ICloner) + constructor(@inject("PrimaryCloner") protected cloner: ICloner) {} /** diff --git a/project/src/services/RagfairCategoriesService.ts b/project/src/services/RagfairCategoriesService.ts index 4df0ac74..4d6651cb 100644 --- a/project/src/services/RagfairCategoriesService.ts +++ b/project/src/services/RagfairCategoriesService.ts @@ -9,7 +9,7 @@ import { ILogger } from "@spt/models/spt/utils/ILogger"; export class RagfairCategoriesService { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("PaymentHelper") protected paymentHelper: PaymentHelper, ) {} diff --git a/project/src/services/RagfairOfferService.ts b/project/src/services/RagfairOfferService.ts index 867c2eb0..7f1dbc57 100644 --- a/project/src/services/RagfairOfferService.ts +++ b/project/src/services/RagfairOfferService.ts @@ -26,7 +26,7 @@ export class RagfairOfferService protected ragfairOfferHandler: RagfairOfferHolder; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("SaveServer") protected saveServer: SaveServer, diff --git a/project/src/services/RagfairPriceService.ts b/project/src/services/RagfairPriceService.ts index ac85f11e..fd521902 100644 --- a/project/src/services/RagfairPriceService.ts +++ b/project/src/services/RagfairPriceService.ts @@ -33,7 +33,7 @@ export class RagfairPriceService implements OnLoad constructor( @inject("HandbookHelper") protected handbookHelper: HandbookHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("PresetHelper") protected presetHelper: PresetHelper, @inject("TraderHelper") protected traderHelper: TraderHelper, diff --git a/project/src/services/RagfairRequiredItemsService.ts b/project/src/services/RagfairRequiredItemsService.ts index c76dc784..7e67d1c3 100644 --- a/project/src/services/RagfairRequiredItemsService.ts +++ b/project/src/services/RagfairRequiredItemsService.ts @@ -10,7 +10,7 @@ export class RagfairRequiredItemsService protected requiredItemsCache = {}; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("PaymentHelper") protected paymentHelper: PaymentHelper, @inject("RagfairOfferService") protected ragfairOfferService: RagfairOfferService, ) diff --git a/project/src/services/RagfairTaxService.ts b/project/src/services/RagfairTaxService.ts index 07832422..d52f160f 100644 --- a/project/src/services/RagfairTaxService.ts +++ b/project/src/services/RagfairTaxService.ts @@ -15,7 +15,7 @@ export class RagfairTaxService protected playerOfferTaxCache: Record = {}; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("RagfairPriceService") protected ragfairPriceService: RagfairPriceService, @inject("ItemHelper") protected itemHelper: ItemHelper, diff --git a/project/src/services/RaidTimeAdjustmentService.ts b/project/src/services/RaidTimeAdjustmentService.ts index bf5a52d1..d00b7359 100644 --- a/project/src/services/RaidTimeAdjustmentService.ts +++ b/project/src/services/RaidTimeAdjustmentService.ts @@ -23,7 +23,7 @@ export class RaidTimeAdjustmentService protected locationConfig: ILocationConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("WeightedRandomHelper") protected weightedRandomHelper: WeightedRandomHelper, diff --git a/project/src/services/RepairService.ts b/project/src/services/RepairService.ts index c203bb7e..b913a8cf 100644 --- a/project/src/services/RepairService.ts +++ b/project/src/services/RepairService.ts @@ -29,7 +29,7 @@ export class RepairService { protected repairConfig: IRepairConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("RandomUtil") protected randomUtil: RandomUtil, diff --git a/project/src/services/SeasonalEventService.ts b/project/src/services/SeasonalEventService.ts index 7c6988bc..0417a967 100644 --- a/project/src/services/SeasonalEventService.ts +++ b/project/src/services/SeasonalEventService.ts @@ -34,7 +34,7 @@ export class SeasonalEventService protected currentlyActiveEvents: SeasonalEventType[] = []; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseService") protected databaseService: DatabaseService, @inject("DatabaseImporter") protected databaseImporter: DatabaseImporter, @inject("GiftService") protected giftService: GiftService, diff --git a/project/src/services/TraderPurchasePersisterService.ts b/project/src/services/TraderPurchasePersisterService.ts index d348585a..1ef96ab3 100644 --- a/project/src/services/TraderPurchasePersisterService.ts +++ b/project/src/services/TraderPurchasePersisterService.ts @@ -18,7 +18,7 @@ export class TraderPurchasePersisterService protected traderConfig: ITraderConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("ProfileHelper") protected profileHelper: ProfileHelper, diff --git a/project/src/services/TraderServicesService.ts b/project/src/services/TraderServicesService.ts index d8ad4a17..a8e63ddf 100644 --- a/project/src/services/TraderServicesService.ts +++ b/project/src/services/TraderServicesService.ts @@ -12,9 +12,9 @@ export class TraderServicesService { constructor( @inject("ProfileHelper") protected profileHelper: ProfileHelper, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("DatabaseServer") protected databaseServer: DatabaseServer, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) {} diff --git a/project/src/services/cache/BundleHashCacheService.ts b/project/src/services/cache/BundleHashCacheService.ts index 2cc7421b..b33e3b42 100644 --- a/project/src/services/cache/BundleHashCacheService.ts +++ b/project/src/services/cache/BundleHashCacheService.ts @@ -14,7 +14,7 @@ export class BundleHashCacheService @inject("VFS") protected vfs: VFS, @inject("HashUtil") protected hashUtil: HashUtil, @inject("JsonUtil") protected jsonUtil: JsonUtil, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, ) { if (!this.vfs.exists(this.bundleHashCachePath)) diff --git a/project/src/services/cache/ModHashCacheService.ts b/project/src/services/cache/ModHashCacheService.ts index cd11d3cf..12b57530 100644 --- a/project/src/services/cache/ModHashCacheService.ts +++ b/project/src/services/cache/ModHashCacheService.ts @@ -14,7 +14,7 @@ export class ModHashCacheService @inject("VFS") protected vfs: VFS, @inject("HashUtil") protected hashUtil: HashUtil, @inject("JsonUtil") protected jsonUtil: JsonUtil, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, ) { if (!this.vfs.exists(this.modCachePath)) diff --git a/project/src/services/mod/CustomItemService.ts b/project/src/services/mod/CustomItemService.ts index 146b5a54..74a22416 100644 --- a/project/src/services/mod/CustomItemService.ts +++ b/project/src/services/mod/CustomItemService.ts @@ -18,12 +18,12 @@ import { HashUtil } from "@spt/utils/HashUtil"; export class CustomItemService { constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("HashUtil") protected hashUtil: HashUtil, @inject("DatabaseService") protected databaseServer: DatabaseService, @inject("ItemHelper") protected itemHelper: ItemHelper, @inject("ItemBaseClassService") protected itemBaseClassService: ItemBaseClassService, - @inject("RecursiveCloner") protected cloner: ICloner, + @inject("PrimaryCloner") protected cloner: ICloner, ) { } diff --git a/project/src/utils/App.ts b/project/src/utils/App.ts index 8730ba0b..5248d058 100644 --- a/project/src/utils/App.ts +++ b/project/src/utils/App.ts @@ -18,7 +18,7 @@ export class App protected coreConfig: ICoreConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, diff --git a/project/src/utils/DatabaseImporter.ts b/project/src/utils/DatabaseImporter.ts index 1b056712..2c1e154c 100644 --- a/project/src/utils/DatabaseImporter.ts +++ b/project/src/utils/DatabaseImporter.ts @@ -23,7 +23,7 @@ export class DatabaseImporter implements OnLoad protected httpConfig: IHttpConfig; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("VFS") protected vfs: VFS, @inject("JsonUtil") protected jsonUtil: JsonUtil, @inject("LocalisationService") protected localisationService: LocalisationService, diff --git a/project/src/utils/JsonUtil.ts b/project/src/utils/JsonUtil.ts index a1d31897..8fc34db0 100644 --- a/project/src/utils/JsonUtil.ts +++ b/project/src/utils/JsonUtil.ts @@ -17,7 +17,7 @@ export class JsonUtil constructor( @inject("VFS") protected vfs: VFS, @inject("HashUtil") protected hashUtil: HashUtil, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, ) {} diff --git a/project/src/utils/RandomUtil.ts b/project/src/utils/RandomUtil.ts index 3538f267..b26ba032 100644 --- a/project/src/utils/RandomUtil.ts +++ b/project/src/utils/RandomUtil.ts @@ -212,8 +212,8 @@ export class ProbabilityObject export class RandomUtil { constructor( - @inject("RecursiveCloner") protected cloner: ICloner, - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryCloner") protected cloner: ICloner, + @inject("PrimaryLogger") protected logger: ILogger, ) {} diff --git a/project/src/utils/Watermark.ts b/project/src/utils/Watermark.ts index 1359fb55..cb8a02af 100644 --- a/project/src/utils/Watermark.ts +++ b/project/src/utils/Watermark.ts @@ -65,7 +65,7 @@ export class Watermark protected versionLabel = ""; constructor( - @inject("WinstonLogger") protected logger: ILogger, + @inject("PrimaryLogger") protected logger: ILogger, @inject("ConfigServer") protected configServer: ConfigServer, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("WatermarkLocale") protected watermarkLocale: WatermarkLocale,