470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

primery-dependencies (!355)

Browse Source 
Co-authored-by: clodan <clodan@clodan.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/355
Co-authored-by: Alex <clodan@noreply.dev.sp-tarkov.com>
Co-committed-by: Alex <clodan@noreply.dev.sp-tarkov.com>
This commit is contained in:
Alex 2024-05-28 14:04:20 +00:00 committed by chomp
parent f56da3c1a8
commit 8727f6150e
129 changed files with 182 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/callbacks/ModCallbacks.ts
View File

@ -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,

2
project/src/controllers/AchievementController.ts
View File

@ -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,
)
{}

4
project/src/controllers/BotController.ts
View File

@ -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);

4
project/src/controllers/BuildController.ts
View File

@ -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,
)
{}

2
project/src/controllers/ClientLogController.ts
View File

@ -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)
{}
/**

2
project/src/controllers/CustomizationController.ts
View File

@ -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,

2
project/src/controllers/DialogueController.ts
View File

@ -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,

4
project/src/controllers/GameController.ts
View File

@ -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);

4
project/src/controllers/HealthController.ts
View File

@ -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,
)
{}

4
project/src/controllers/HideoutController.ts
View File

@ -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);

2
project/src/controllers/InraidController.ts
View File

@ -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,

4
project/src/controllers/InsuranceController.ts
View File

@ -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);

4
project/src/controllers/InventoryController.ts
View File

@ -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,
)
{}

2
project/src/controllers/LauncherController.ts
View File

@ -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,

4
project/src/controllers/LocationController.ts
View File

@ -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);

2
project/src/controllers/MatchController.ts
View File

@ -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,

2
project/src/controllers/PresetController.ts
View File

@ -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,
)

2
project/src/controllers/ProfileController.ts
View File

@ -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,

4
project/src/controllers/QuestController.ts
View File

@ -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);

2
project/src/controllers/RagfairController.ts
View File

@ -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,

2
project/src/controllers/RepairController.ts
View File

@ -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,

4
project/src/controllers/RepeatableQuestController.ts
View File

@ -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);

2
project/src/controllers/TradeController.ts
View File

@ -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,

4
project/src/controllers/TraderController.ts
View File

@ -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);

2
project/src/controllers/WeatherController.ts
View File

@ -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,
)
{

11
project/src/di/Container.ts
View File

@ -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<ILogger>("PrimaryLogger", { useToken: "WinstonLogger" },
{ lifecycle: Lifecycle.Singleton });
depContainer.register<ICloner>("PrimaryCloner", { useToken: "RecursiveCloner" },
{ lifecycle: Lifecycle.Singleton });
}
public static registerListTypes(depContainer: DependencyContainer): void

4
project/src/generators/BotEquipmentModGenerator.ts
View File

@ -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);

4
project/src/generators/BotGenerator.ts
View File

@ -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);

2
project/src/generators/BotInventoryGenerator.ts
View File

@ -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,

2
project/src/generators/BotLevelGenerator.ts
View File

@ -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,
)

4
project/src/generators/BotLootGenerator.ts
View File

@ -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);

4
project/src/generators/BotWeaponGenerator.ts
View File

@ -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);

2
project/src/generators/FenceBaseAssortGenerator.ts
View File

@ -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,

4
project/src/generators/LocationGenerator.ts
View File

@ -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);

2
project/src/generators/LootGenerator.ts
View File

@ -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,

4
project/src/generators/PlayerScavGenerator.ts
View File

@ -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);

4
project/src/generators/RagfairOfferGenerator.ts
View File

@ -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);

4
project/src/generators/RepeatableQuestGenerator.ts
View File

@ -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);

4
project/src/generators/RepeatableQuestRewardGenerator.ts
View File

@ -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);

2
project/src/generators/ScavCaseRewardGenerator.ts
View File

@ -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,

2
project/src/generators/WeatherGenerator.ts
View File

@ -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,

2
project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts
View File

@ -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,

2
project/src/helpers/AssortHelper.ts
View File

@ -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,

4
project/src/helpers/BotDifficultyHelper.ts
View File

@ -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);

2
project/src/helpers/BotGeneratorHelper.ts
View File

@ -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,

2
project/src/helpers/BotHelper.ts
View File

@ -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,

2
project/src/helpers/BotWeaponGeneratorHelper.ts
View File

@ -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,

4
project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts
View File

@ -40,7 +40,7 @@ export class GiveSptCommand implements ISptCommand
protected savedCommand: Map<string, SavedCommand> = new Map<string, 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,
@ -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,
)
{}

2
project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts
View File

@ -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,

2
project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts
View File

@ -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,

2
project/src/helpers/Dialogue/CommandoDialogueChatBot.ts
View File

@ -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[],
)

2
project/src/helpers/DialogueHelper.ts
View File

@ -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,

2
project/src/helpers/HandbookHelper.ts
View File

@ -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);

4
project/src/helpers/HealthHelper.ts
View File

@ -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);

4
project/src/helpers/HideoutHelper.ts
View File

@ -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);

4
project/src/helpers/InRaidHelper.ts
View File

@ -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);

4
project/src/helpers/InventoryHelper.ts
View File

@ -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);

4
project/src/helpers/ItemHelper.ts
View File

@ -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,
)
{}

2
project/src/helpers/PresetHelper.ts
View File

@ -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,
)
{}

2
project/src/helpers/ProbabilityHelper.ts
View File

@ -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,
)
{}

4
project/src/helpers/ProfileHelper.ts
View File

@ -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);

4
project/src/helpers/QuestHelper.ts
View File

@ -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);

4
project/src/helpers/RagfairHelper.ts
View File

@ -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);

2
project/src/helpers/RagfairOfferHelper.ts
View File

@ -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,

2
project/src/helpers/RagfairSellHelper.ts
View File

@ -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,

4
project/src/helpers/RagfairServerHelper.ts
View File

@ -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);

4
project/src/helpers/RepairHelper.ts
View File

@ -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);

2
project/src/helpers/RepeatableQuestHelper.ts
View File

@ -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);

4
project/src/helpers/TradeHelper.ts
View File

@ -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);

4
project/src/helpers/TraderAssortHelper.ts
View File

@ -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);

2
project/src/helpers/TraderHelper.ts
View File

@ -32,7 +32,7 @@ export class TraderHelper
protected highestTraderBuyPriceItems?: Record<string, number> = 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,

2
project/src/loaders/BundleLoader.ts
View File

@ -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,
)
{}

2
project/src/loaders/ModLoadOrder.ts
View File

@ -11,7 +11,7 @@ export class ModLoadOrder
protected loadOrder = new Set<string>();
constructor(
@inject("WinstonLogger") protected logger: ILogger,
@inject("PrimaryLogger") protected logger: ILogger,
@inject("LocalisationService") protected localisationService: LocalisationService,
)
{}

2
project/src/loaders/PostDBModLoader.ts
View File

@ -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,

2
project/src/loaders/PostSptModLoader.ts
View File

@ -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,

2
project/src/loaders/PreSptModLoader.ts
View File

@ -33,7 +33,7 @@ export class PreSptModLoader implements IModLoader
protected skippedMods: Set<string>;
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,

2
project/src/routers/EventOutputHolder.ts
View File

@ -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,
)
{}

4
project/src/routers/ItemEventRouter.ts
View File

@ -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,
)
{}

2
project/src/routers/item_events/QuestItemEventRouter.ts
View File

@ -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,
)
{

2
project/src/routers/serializers/BundleSerializer.ts
View File

@ -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,
)

2
project/src/servers/ConfigServer.ts
View File

@ -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,
)

2
project/src/servers/HttpServer.ts
View File

@ -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,

2
project/src/servers/RagfairServer.ts
View File

@ -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,

2
project/src/servers/SaveServer.ts
View File

@ -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,
)
{}

2
project/src/servers/WebSocketServer.ts
View File

@ -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,

2
project/src/servers/http/SptHttpListener.ts
View File

@ -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,

2
project/src/servers/ws/SptWebSocketConnectionHandler.ts
View File

@ -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,

2
project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts
View File

@ -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

2
project/src/services/BotEquipmentFilterService.ts
View File

@ -27,7 +27,7 @@ export class BotEquipmentFilterService
protected botEquipmentConfig: Record<string, EquipmentFilters>;
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,

2
project/src/services/BotEquipmentModPoolService.ts
View File

@ -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,

2
project/src/services/BotGenerationCacheService.ts
View File

@ -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,

4
project/src/services/BotLootCacheService.ts
View File

@ -17,13 +17,13 @@ export class BotLootCacheService
protected lootCache: Record<string, IBotLootCache>;
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();

2
project/src/services/BotWeaponModLimitService.ts
View File

@ -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,
)

2
project/src/services/CustomLocationWaveService.ts
View File

@ -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,

2
project/src/services/DatabaseService.ts
View File

@ -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,
)

4
project/src/services/FenceService.ts
View File

@ -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);

2
project/src/services/GiftService.ts
View File

@ -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,

4
project/src/services/InsuranceService.ts
View File

@ -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);

2
project/src/services/ItemBaseClassService.ts
View File

@ -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,
)

2
project/src/services/ItemFilterService.ts
View File

@ -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,
)

2
project/src/services/LocaleService.ts
View File

@ -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,
)

4
project/src/services/LocalisationService.ts
View File

@ -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);
}
/**

2
project/src/services/MailSendService.ts
View File

@ -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,

2
project/src/services/MatchBotDetailsCacheService.ts
View File

@ -10,7 +10,7 @@ export class MatchBotDetailsCacheService
protected botDetailsCache: Record<string, IBotBase> = {};
constructor(
@inject("WinstonLogger") protected logger: ILogger,
@inject("PrimaryLogger") protected logger: ILogger,
@inject("LocalisationService") protected localisationService: LocalisationService,
)
{}

2
project/src/services/ModCompilerService.ts
View File

@ -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,
)

2
project/src/services/OpenZoneService.ts
View File

@ -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,

2
project/src/services/PaymentService.ts
View File

@ -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,

2
project/src/services/PlayerService.ts
View File

@ -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,

2
project/src/services/PmcChatResponseService.ts
View File

@ -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,

4
project/src/services/ProfileFixerService.ts
View File

@ -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);

2
project/src/services/ProfileSnapshotService.ts
View File

@ -7,7 +7,7 @@ export class ProfileSnapshotService
{
protected storedProfileSnapshots: Record<string, ISptProfile> = {};
constructor(@inject("RecursiveCloner") protected cloner: ICloner)
constructor(@inject("PrimaryCloner") protected cloner: ICloner)
{}
/**

2
project/src/services/RagfairCategoriesService.ts
View File

@ -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,
)
{}

2
project/src/services/RagfairOfferService.ts
View File

@ -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,

2
project/src/services/RagfairPriceService.ts
View File

@ -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,

2
project/src/services/RagfairRequiredItemsService.ts
View File

@ -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,
)

2
project/src/services/RagfairTaxService.ts
View File

@ -15,7 +15,7 @@ export class RagfairTaxService
protected playerOfferTaxCache: Record<string, IStorePlayerOfferTaxAmountRequestData> = {};
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,

2
project/src/services/RaidTimeAdjustmentService.ts
View File

@ -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,

2
project/src/services/RepairService.ts
View File

@ -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,

2
project/src/services/SeasonalEventService.ts
View File

@ -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,

2
project/src/services/TraderPurchasePersisterService.ts
View File

@ -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,

4
project/src/services/TraderServicesService.ts
View File

@ -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,
)
{}

2
project/src/services/cache/BundleHashCacheService.ts vendored
View File

@ -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))

2
project/src/services/cache/ModHashCacheService.ts vendored
View File

@ -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))

4
project/src/services/mod/CustomItemService.ts
View File

@ -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,
)
{
}

2
project/src/utils/App.ts
View File

@ -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,

2
project/src/utils/DatabaseImporter.ts
View File

@ -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,

2
project/src/utils/JsonUtil.ts
View File

@ -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,
)
{}

4
project/src/utils/RandomUtil.ts
View File

@ -212,8 +212,8 @@ export class ProbabilityObject<K, V = undefined>
export class RandomUtil
{
constructor(
@inject("RecursiveCloner") protected cloner: ICloner,
@inject("WinstonLogger") protected logger: ILogger,
@inject("PrimaryCloner") protected cloner: ICloner,
@inject("PrimaryLogger") protected logger: ILogger,
)
{}

2
project/src/utils/Watermark.ts
View File

@ -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,