diff --git a/project/.swcrc b/project/.swcrc index 81603a4f..466d5cfc 100644 --- a/project/.swcrc +++ b/project/.swcrc @@ -13,7 +13,13 @@ "loose": true, "externalHelpers": false, // Requires v1.2.50 or upper and requires target to be es2016 or upper. - "keepClassNames": true + "keepClassNames": true, + "baseUrl": "./", + "paths": { + "@spt-aki/*": [ + "src/*" + ] + } }, "exclude": [ "node_modules/" diff --git a/project/src/ErrorHandler.ts b/project/src/ErrorHandler.ts index c5e3ccdd..1d0f1363 100644 --- a/project/src/ErrorHandler.ts +++ b/project/src/ErrorHandler.ts @@ -1,8 +1,9 @@ import readline from "readline"; -import { ILogger } from "./models/spt/utils/ILogger"; -import { AsyncQueue } from "./utils/AsyncQueue"; -import { WinstonMainLogger } from "./utils/logging/WinstonMainLogger"; -import { UUidGenerator } from "./utils/UUidGenerator"; + +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { AsyncQueue } from "@spt-aki/utils/AsyncQueue"; +import { UUidGenerator } from "@spt-aki/utils/UUidGenerator"; +import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; export class ErrorHandler { diff --git a/project/src/Program.ts b/project/src/Program.ts index 7e76d553..b92a46e2 100644 --- a/project/src/Program.ts +++ b/project/src/Program.ts @@ -1,9 +1,10 @@ import { container } from "tsyringe"; -import { App } from "./utils/App"; -import { Container } from "./di/Container"; -import type { PreAkiModLoader } from "./loaders/PreAkiModLoader"; -import { Watermark } from "./utils/Watermark"; -import { ErrorHandler } from "./ErrorHandler"; + +import { ErrorHandler } from "@spt-aki/ErrorHandler"; +import { Container } from "@spt-aki/di/Container"; +import type { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { App } from "@spt-aki/utils/App"; +import { Watermark } from "@spt-aki/utils/Watermark"; export class Program { diff --git a/project/src/callbacks/BotCallbacks.ts b/project/src/callbacks/BotCallbacks.ts index 0c9e7a32..52a5d674 100644 --- a/project/src/callbacks/BotCallbacks.ts +++ b/project/src/callbacks/BotCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { BotController } from "../controllers/BotController"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { BotController } from "@spt-aki/controllers/BotController"; +import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class BotCallbacks diff --git a/project/src/callbacks/BundleCallbacks.ts b/project/src/callbacks/BundleCallbacks.ts index f5d2d9c9..20f23b8b 100644 --- a/project/src/callbacks/BundleCallbacks.ts +++ b/project/src/callbacks/BundleCallbacks.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { BundleLoader } from "../loaders/BundleLoader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HttpFileUtil } from "../utils/HttpFileUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class BundleCallbacks diff --git a/project/src/callbacks/CustomizationCallbacks.ts b/project/src/callbacks/CustomizationCallbacks.ts index 06698b91..048fceb6 100644 --- a/project/src/callbacks/CustomizationCallbacks.ts +++ b/project/src/callbacks/CustomizationCallbacks.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationController } from "../controllers/CustomizationController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; -import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData"; -import { IGetSuitsResponse } from "../models/eft/customization/IGetSuitsResponse"; -import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { SaveServer } from "../servers/SaveServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { CustomizationController } from "@spt-aki/controllers/CustomizationController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; +import { IGetSuitsResponse } from "@spt-aki/models/eft/customization/IGetSuitsResponse"; +import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class CustomizationCallbacks diff --git a/project/src/callbacks/DataCallbacks.ts b/project/src/callbacks/DataCallbacks.ts index c3aa959f..c8ba02f0 100644 --- a/project/src/callbacks/DataCallbacks.ts +++ b/project/src/callbacks/DataCallbacks.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { HideoutController } from "../controllers/HideoutController"; -import { RagfairController } from "../controllers/RagfairController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGlobals } from "../models/eft/common/IGlobals"; -import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem"; -import { IHandbookBase } from "../models/eft/common/tables/IHandbookBase"; -import { IGetItemPricesResponse } from "../models/eft/game/IGetItemPricesResponse"; -import { IHideoutArea } from "../models/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { Money } from "../models/enums/Money"; -import { ISettingsBase } from "../models/spt/server/ISettingsBase"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { HideoutController } from "@spt-aki/controllers/HideoutController"; +import { RagfairController } from "@spt-aki/controllers/RagfairController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; +import { ICustomizationItem } from "@spt-aki/models/eft/common/tables/ICustomizationItem"; +import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; +import { IGetItemPricesResponse } from "@spt-aki/models/eft/game/IGetItemPricesResponse"; +import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { Money } from "@spt-aki/models/enums/Money"; +import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; /** * Handle client requests diff --git a/project/src/callbacks/DialogueCallbacks.ts b/project/src/callbacks/DialogueCallbacks.ts index 7bb5531f..63d15257 100644 --- a/project/src/callbacks/DialogueCallbacks.ts +++ b/project/src/callbacks/DialogueCallbacks.ts @@ -1,35 +1,33 @@ import { inject, injectable } from "tsyringe"; -import { DialogueController } from "../controllers/DialogueController"; -import { OnUpdate } from "../di/OnUpdate"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IAcceptFriendRequestData, ICancelFriendRequestData } from "../models/eft/dialog/IAcceptFriendRequestData"; -import { IChatServer } from "../models/eft/dialog/IChatServer"; -import { IClearMailMessageRequest } from "../models/eft/dialog/IClearMailMessageRequest"; -import { IDeleteFriendRequest } from "../models/eft/dialog/IDeleteFriendRequest"; -import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData"; -import { IFriendRequestSendResponse } from "../models/eft/dialog/IFriendRequestSendResponse"; -import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { - IGetMailDialogViewResponseData -} from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData"; -import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData"; -import { IRemoveMailMessageRequest } from "../models/eft/dialog/IRemoveMailMessageRequest"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; -import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueController } from "@spt-aki/controllers/DialogueController"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IAcceptFriendRequestData, ICancelFriendRequestData } from "@spt-aki/models/eft/dialog/IAcceptFriendRequestData"; +import { IChatServer } from "@spt-aki/models/eft/dialog/IChatServer"; +import { IClearMailMessageRequest } from "@spt-aki/models/eft/dialog/IClearMailMessageRequest"; +import { IDeleteFriendRequest } from "@spt-aki/models/eft/dialog/IDeleteFriendRequest"; +import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; +import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; +import { IGetAllAttachmentsRequestData } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetChatServerListRequestData } from "@spt-aki/models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogInfoRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IPinDialogRequestData } from "@spt-aki/models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "@spt-aki/models/eft/dialog/IRemoveDialogRequestData"; +import { IRemoveMailMessageRequest } from "@spt-aki/models/eft/dialog/IRemoveMailMessageRequest"; +import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "@spt-aki/models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class DialogueCallbacks implements OnUpdate diff --git a/project/src/callbacks/GameCallbacks.ts b/project/src/callbacks/GameCallbacks.ts index 9c5b56ba..24c3131b 100644 --- a/project/src/callbacks/GameCallbacks.ts +++ b/project/src/callbacks/GameCallbacks.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { GameController } from "../controllers/GameController"; -import { OnLoad } from "../di/OnLoad"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse"; -import { ICurrentGroupResponse } from "../models/eft/game/ICurrentGroupResponse"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; -import { IGameKeepAliveResponse } from "../models/eft/game/IGameKeepAliveResponse"; -import { IGameLogoutResponseData } from "../models/eft/game/IGameLogoutResponseData"; -import { IGameStartResponse } from "../models/eft/game/IGameStartResponse"; -import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; -import { IServerDetails } from "../models/eft/game/IServerDetails"; -import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { SaveServer } from "../servers/SaveServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { Watermark } from "../utils/Watermark"; +import { GameController } from "@spt-aki/controllers/GameController"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; +import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; +import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; +import { IGameEmptyCrcRequestData } from "@spt-aki/models/eft/game/IGameEmptyCrcRequestData"; +import { IGameKeepAliveResponse } from "@spt-aki/models/eft/game/IGameKeepAliveResponse"; +import { IGameLogoutResponseData } from "@spt-aki/models/eft/game/IGameLogoutResponseData"; +import { IGameStartResponse } from "@spt-aki/models/eft/game/IGameStartResponse"; +import { IReportNicknameRequestData } from "@spt-aki/models/eft/game/IReportNicknameRequestData"; +import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; +import { IVersionValidateRequestData } from "@spt-aki/models/eft/game/IVersionValidateRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { Watermark } from "@spt-aki/utils/Watermark"; @injectable() class GameCallbacks implements OnLoad diff --git a/project/src/callbacks/HandbookCallbacks.ts b/project/src/callbacks/HandbookCallbacks.ts index 4d53fee2..602f2bda 100644 --- a/project/src/callbacks/HandbookCallbacks.ts +++ b/project/src/callbacks/HandbookCallbacks.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { HandbookController } from "../controllers/HandbookController"; -import { OnLoad } from "../di/OnLoad"; +import { HandbookController } from "@spt-aki/controllers/HandbookController"; +import { OnLoad } from "@spt-aki/di/OnLoad"; @injectable() export class HandbookCallbacks implements OnLoad diff --git a/project/src/callbacks/HealthCallbacks.ts b/project/src/callbacks/HealthCallbacks.ts index 4ae953e9..7d8fdf5c 100644 --- a/project/src/callbacks/HealthCallbacks.ts +++ b/project/src/callbacks/HealthCallbacks.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { HealthController } from "../controllers/HealthController"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IWorkoutData } from "../models/eft/health/IWorkoutData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { HealthController } from "@spt-aki/controllers/HealthController"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; +import { IWorkoutData } from "@spt-aki/models/eft/health/IWorkoutData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class HealthCallbacks diff --git a/project/src/callbacks/HideoutCallbacks.ts b/project/src/callbacks/HideoutCallbacks.ts index 539f76a2..bf9023a8 100644 --- a/project/src/callbacks/HideoutCallbacks.ts +++ b/project/src/callbacks/HideoutCallbacks.ts @@ -1,38 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { HideoutController } from "../controllers/HideoutController"; -import { OnUpdate } from "../di/OnUpdate"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData"; -import { - IHideoutContinuousProductionStartRequestData -} from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { - IHideoutImproveAreaRequestData -} from "../models/eft/hideout/IHideoutImproveAreaRequestData"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { - IHideoutScavCaseStartRequestData -} from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { - IHideoutSingleProductionStartRequestData -} from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { - IHideoutTakeItemOutRequestData -} from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { - IHideoutTakeProductionRequestData -} from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { - IHideoutUpgradeCompleteRequestData -} from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; -import { ConfigServer } from "../servers/ConfigServer"; +import { HideoutController } from "@spt-aki/controllers/HideoutController"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IHandleQTEEventRequestData } from "@spt-aki/models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutImproveAreaRequestData"; +import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IRecordShootingRangePoints } from "@spt-aki/models/eft/hideout/IRecordShootingRangePoints"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; @injectable() export class HideoutCallbacks implements OnUpdate diff --git a/project/src/callbacks/HttpCallbacks.ts b/project/src/callbacks/HttpCallbacks.ts index 13f83c7c..b0c18e19 100644 --- a/project/src/callbacks/HttpCallbacks.ts +++ b/project/src/callbacks/HttpCallbacks.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { HttpServer } from "../servers/HttpServer"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { HttpServer } from "@spt-aki/servers/HttpServer"; @injectable() export class HttpCallbacks implements OnLoad diff --git a/project/src/callbacks/InraidCallbacks.ts b/project/src/callbacks/InraidCallbacks.ts index bfb9980a..a4d935cd 100644 --- a/project/src/callbacks/InraidCallbacks.ts +++ b/project/src/callbacks/InraidCallbacks.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { InraidController } from "../controllers/InraidController"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { InraidController } from "@spt-aki/controllers/InraidController"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; /** * Handle client requests diff --git a/project/src/callbacks/InsuranceCallbacks.ts b/project/src/callbacks/InsuranceCallbacks.ts index 4ce40a71..ec79c625 100644 --- a/project/src/callbacks/InsuranceCallbacks.ts +++ b/project/src/callbacks/InsuranceCallbacks.ts @@ -1,20 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceController } from "../controllers/InsuranceController"; -import { OnUpdate } from "../di/OnUpdate"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; -import { - IGetInsuranceCostResponseData -} from "../models/eft/insurance/IGetInsuranceCostResponseData"; -import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { InsuranceController } from "@spt-aki/controllers/InsuranceController"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; +import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { InsuranceService } from "@spt-aki/services/InsuranceService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class InsuranceCallbacks implements OnUpdate diff --git a/project/src/callbacks/InventoryCallbacks.ts b/project/src/callbacks/InventoryCallbacks.ts index 12d556ec..f40d800d 100644 --- a/project/src/callbacks/InventoryCallbacks.ts +++ b/project/src/callbacks/InventoryCallbacks.ts @@ -1,37 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { InventoryController } from "../controllers/InventoryController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { - IInventoryCreateMarkerRequestData -} from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; -import { - IInventoryDeleteMarkerRequestData -} from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { - IInventoryEditMarkerRequestData -} from "../models/eft/inventory/IInventoryEditMarkerRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { - IInventoryReadEncyclopediaRequestData -} from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { - IInventoryTransferRequestData -} from "../models/eft/inventory/IInventoryTransferRequestData"; -import { - IOpenRandomLootContainerRequestData -} from "../models/eft/inventory/IOpenRandomLootContainerRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { InventoryController } from "@spt-aki/controllers/InventoryController"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; +import { IOpenRandomLootContainerRequestData } from "@spt-aki/models/eft/inventory/IOpenRandomLootContainerRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class InventoryCallbacks diff --git a/project/src/callbacks/ItemEventCallbacks.ts b/project/src/callbacks/ItemEventCallbacks.ts index f0881ac8..448cffaa 100644 --- a/project/src/callbacks/ItemEventCallbacks.ts +++ b/project/src/callbacks/ItemEventCallbacks.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { Warning } from "../models/eft/itemEvent/IItemEventRouterBase"; -import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "../models/enums/BackendErrorCodes"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { Warning } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; +import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class ItemEventCallbacks diff --git a/project/src/callbacks/LauncherCallbacks.ts b/project/src/callbacks/LauncherCallbacks.ts index 2400f8d0..14bd5b57 100644 --- a/project/src/callbacks/LauncherCallbacks.ts +++ b/project/src/callbacks/LauncherCallbacks.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { LauncherController } from "../controllers/LauncherController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IRegisterData } from "../models/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData"; -import { SaveServer } from "../servers/SaveServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { Watermark } from "../utils/Watermark"; +import { LauncherController } from "@spt-aki/controllers/LauncherController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; +import { IRemoveProfileData } from "@spt-aki/models/eft/launcher/IRemoveProfileData"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { Watermark } from "@spt-aki/utils/Watermark"; @injectable() class LauncherCallbacks diff --git a/project/src/callbacks/LocationCallbacks.ts b/project/src/callbacks/LocationCallbacks.ts index 15bd7648..79c77155 100644 --- a/project/src/callbacks/LocationCallbacks.ts +++ b/project/src/callbacks/LocationCallbacks.ts @@ -1,14 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { LocationController } from "../controllers/LocationController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ILocationBase } from "../models/eft/common/ILocationBase"; -import { - ILocationsGenerateAllResponse -} from "../models/eft/common/ILocationsSourceDestinationBase"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { LocationController } from "@spt-aki/controllers/LocationController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class LocationCallbacks diff --git a/project/src/callbacks/MatchCallbacks.ts b/project/src/callbacks/MatchCallbacks.ts index 21203f2a..35e67fb2 100644 --- a/project/src/callbacks/MatchCallbacks.ts +++ b/project/src/callbacks/MatchCallbacks.ts @@ -1,30 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { MatchController } from "../controllers/MatchController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IAcceptGroupInviteRequest } from "../models/eft/match/IAcceptGroupInviteRequest"; -import { IAcceptGroupInviteResponse } from "../models/eft/match/IAcceptGroupInviteResponse"; -import { ICancelGroupInviteRequest } from "../models/eft/match/ICancelGroupInviteRequest"; -import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { - IGetRaidConfigurationRequestData -} from "../models/eft/match/IGetRaidConfigurationRequestData"; -import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; -import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; -import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; -import { IRemovePlayerFromGroupRequest } from "../models/eft/match/IRemovePlayerFromGroupRequest"; -import { ISendGroupInviteRequest } from "../models/eft/match/ISendGroupInviteRequest"; -import { ITransferGroupRequest } from "../models/eft/match/ITransferGroupRequest"; -import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { MatchController } from "@spt-aki/controllers/MatchController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IAcceptGroupInviteRequest } from "@spt-aki/models/eft/match/IAcceptGroupInviteRequest"; +import { IAcceptGroupInviteResponse } from "@spt-aki/models/eft/match/IAcceptGroupInviteResponse"; +import { ICancelGroupInviteRequest } from "@spt-aki/models/eft/match/ICancelGroupInviteRequest"; +import { ICreateGroupRequestData } from "@spt-aki/models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "@spt-aki/models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "@spt-aki/models/eft/match/IGetProfileRequestData"; +import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; +import { IJoinMatchRequestData } from "@spt-aki/models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "@spt-aki/models/eft/match/IPutMetricsRequestData"; +import { IRemovePlayerFromGroupRequest } from "@spt-aki/models/eft/match/IRemovePlayerFromGroupRequest"; +import { ISendGroupInviteRequest } from "@spt-aki/models/eft/match/ISendGroupInviteRequest"; +import { ITransferGroupRequest } from "@spt-aki/models/eft/match/ITransferGroupRequest"; +import { IUpdatePingRequestData } from "@spt-aki/models/eft/match/IUpdatePingRequestData"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class MatchCallbacks diff --git a/project/src/callbacks/ModCallbacks.ts b/project/src/callbacks/ModCallbacks.ts index 3acf3200..2ce67a72 100644 --- a/project/src/callbacks/ModCallbacks.ts +++ b/project/src/callbacks/ModCallbacks.ts @@ -1,13 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { HttpFileUtil } from "../utils/HttpFileUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; + +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { PostAkiModLoader } from "@spt-aki/loaders/PostAkiModLoader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() class ModCallbacks implements OnLoad diff --git a/project/src/callbacks/NoteCallbacks.ts b/project/src/callbacks/NoteCallbacks.ts index d297bee2..b781e62b 100644 --- a/project/src/callbacks/NoteCallbacks.ts +++ b/project/src/callbacks/NoteCallbacks.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { NoteController } from "../controllers/NoteController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; +import { NoteController } from "@spt-aki/controllers/NoteController"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; @injectable() export class NoteCallbacks diff --git a/project/src/callbacks/NotifierCallbacks.ts b/project/src/callbacks/NotifierCallbacks.ts index ae2d3bf6..361cb2ae 100644 --- a/project/src/callbacks/NotifierCallbacks.ts +++ b/project/src/callbacks/NotifierCallbacks.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { NotifierController } from "../controllers/NotifierController"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../models/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; -import { ISelectProfileResponse } from "../models/eft/notifier/ISelectProfileResponse"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { NotifierController } from "@spt-aki/controllers/NotifierController"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; +import { ISelectProfileRequestData } from "@spt-aki/models/eft/notifier/ISelectProfileRequestData"; +import { ISelectProfileResponse } from "@spt-aki/models/eft/notifier/ISelectProfileResponse"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class NotifierCallbacks diff --git a/project/src/callbacks/PresetBuildCallbacks.ts b/project/src/callbacks/PresetBuildCallbacks.ts index 1a262fca..bda577e1 100644 --- a/project/src/callbacks/PresetBuildCallbacks.ts +++ b/project/src/callbacks/PresetBuildCallbacks.ts @@ -1,16 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { PresetBuildController } from "../controllers/PresetBuildController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { - IPresetBuildActionRequestData -} from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IRemoveBuildRequestData } from "../models/eft/presetBuild/IRemoveBuildRequestData"; -import { IUserBuilds } from "../models/eft/profile/IAkiProfile"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { PresetBuildController } from "@spt-aki/controllers/PresetBuildController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IRemoveBuildRequestData } from "@spt-aki/models/eft/presetBuild/IRemoveBuildRequestData"; +import { IUserBuilds } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class PresetBuildCallbacks diff --git a/project/src/callbacks/PresetCallbacks.ts b/project/src/callbacks/PresetCallbacks.ts index fc4e4c2d..288c0399 100644 --- a/project/src/callbacks/PresetCallbacks.ts +++ b/project/src/callbacks/PresetCallbacks.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { PresetController } from "../controllers/PresetController"; -import { OnLoad } from "../di/OnLoad"; +import { PresetController } from "@spt-aki/controllers/PresetController"; +import { OnLoad } from "@spt-aki/di/OnLoad"; @injectable() export class PresetCallbacks implements OnLoad diff --git a/project/src/callbacks/ProfileCallbacks.ts b/project/src/callbacks/ProfileCallbacks.ts index 48a55445..0aba65d6 100644 --- a/project/src/callbacks/ProfileCallbacks.ts +++ b/project/src/callbacks/ProfileCallbacks.ts @@ -1,25 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { ProfileController } from "../controllers/ProfileController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; -import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; -import { IGetProfileSettingsRequest } from "../models/eft/profile/IGetProfileSettingsRequest"; -import { - IProfileChangeNicknameRequestData -} from "../models/eft/profile/IProfileChangeNicknameRequestData"; -import { - IProfileChangeVoiceRequestData -} from "../models/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileController } from "@spt-aki/controllers/ProfileController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "@spt-aki/models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "@spt-aki/models/eft/profile/GetProfileStatusResponseData"; +import { IGetProfileSettingsRequest } from "@spt-aki/models/eft/profile/IGetProfileSettingsRequest"; +import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; +import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** Handle profile related client events */ @injectable() diff --git a/project/src/callbacks/QuestCallbacks.ts b/project/src/callbacks/QuestCallbacks.ts index fc49cf45..a97a93f9 100644 --- a/project/src/callbacks/QuestCallbacks.ts +++ b/project/src/callbacks/QuestCallbacks.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { QuestController } from "../controllers/QuestController"; -import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { QuestController } from "@spt-aki/controllers/QuestController"; +import { RepeatableQuestController } from "@spt-aki/controllers/RepeatableQuestController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "@spt-aki/models/eft/quests/IListQuestsRequestData"; +import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class QuestCallbacks diff --git a/project/src/callbacks/RagfairCallbacks.ts b/project/src/callbacks/RagfairCallbacks.ts index 73d24eee..6b95a323 100644 --- a/project/src/callbacks/RagfairCallbacks.ts +++ b/project/src/callbacks/RagfairCallbacks.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { OnUpdate } from "../di/OnUpdate"; -import { RagfairController } from "../controllers/RagfairController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; -import { IStorePlayerOfferTaxAmountRequestData } from "../models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServer } from "../servers/RagfairServer"; -import { RagfairTaxService } from "../services/RagfairTaxService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairController } from "@spt-aki/controllers/RagfairController"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; +import { IRemoveOfferRequestData } from "@spt-aki/models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "@spt-aki/models/eft/ragfair/ISendRagfairReportRequestData"; +import { IStorePlayerOfferTaxAmountRequestData } from "@spt-aki/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RagfairServer } from "@spt-aki/servers/RagfairServer"; +import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; /** * Handle ragfair related callback events diff --git a/project/src/callbacks/RepairCallbacks.ts b/project/src/callbacks/RepairCallbacks.ts index 7354db15..85f5c5ea 100644 --- a/project/src/callbacks/RepairCallbacks.ts +++ b/project/src/callbacks/RepairCallbacks.ts @@ -1,12 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { RepairController } from "../controllers/RepairController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; -import { - ITraderRepairActionDataRequest -} from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { RepairController } from "@spt-aki/controllers/RepairController"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; @injectable() export class RepairCallbacks diff --git a/project/src/callbacks/SaveCallbacks.ts b/project/src/callbacks/SaveCallbacks.ts index b07d22c7..86e0dbd0 100644 --- a/project/src/callbacks/SaveCallbacks.ts +++ b/project/src/callbacks/SaveCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { OnUpdate } from "../di/OnUpdate"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; @injectable() export class SaveCallbacks implements OnLoad, OnUpdate diff --git a/project/src/callbacks/TradeCallbacks.ts b/project/src/callbacks/TradeCallbacks.ts index 3c4c4e9e..1c39e280 100644 --- a/project/src/callbacks/TradeCallbacks.ts +++ b/project/src/callbacks/TradeCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { TradeController } from "../controllers/TradeController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; -import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; -import { ISellScavItemsToFenceRequestData } from "../models/eft/trade/ISellScavItemsToFenceRequestData"; +import { TradeController } from "@spt-aki/controllers/TradeController"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; +import { ISellScavItemsToFenceRequestData } from "@spt-aki/models/eft/trade/ISellScavItemsToFenceRequestData"; @injectable() export class TradeCallbacks diff --git a/project/src/callbacks/TraderCallbacks.ts b/project/src/callbacks/TraderCallbacks.ts index fc7f3dbe..8d271616 100644 --- a/project/src/callbacks/TraderCallbacks.ts +++ b/project/src/callbacks/TraderCallbacks.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { OnUpdate } from "../di/OnUpdate"; -import { TraderController } from "../controllers/TraderController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { TraderController } from "@spt-aki/controllers/TraderController"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class TraderCallbacks implements OnLoad, OnUpdate diff --git a/project/src/callbacks/WeatherCallbacks.ts b/project/src/callbacks/WeatherCallbacks.ts index 7d0aa32c..0067db90 100644 --- a/project/src/callbacks/WeatherCallbacks.ts +++ b/project/src/callbacks/WeatherCallbacks.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { WeatherController } from "../controllers/WeatherController"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { IWeatherData } from "../models/eft/weather/IWeatherData"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { WeatherController } from "@spt-aki/controllers/WeatherController"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class WeatherCallbacks diff --git a/project/src/callbacks/WishlistCallbacks.ts b/project/src/callbacks/WishlistCallbacks.ts index 42adf86f..a13402d3 100644 --- a/project/src/callbacks/WishlistCallbacks.ts +++ b/project/src/callbacks/WishlistCallbacks.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { WishlistController } from "../controllers/WishlistController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; +import { WishlistController } from "@spt-aki/controllers/WishlistController"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; @injectable() export class WishlistCallbacks diff --git a/project/src/context/ApplicationContext.ts b/project/src/context/ApplicationContext.ts index 951b2ed2..bd8dc12f 100644 --- a/project/src/context/ApplicationContext.ts +++ b/project/src/context/ApplicationContext.ts @@ -1,7 +1,8 @@ import { injectable } from "tsyringe"; -import { LinkedList } from "../utils/collections/lists/LinkedList"; -import { ContextVariable } from "./ContextVariable"; -import { ContextVariableType } from "./ContextVariableType"; + +import { ContextVariable } from "@spt-aki/context/ContextVariable"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { LinkedList } from "@spt-aki/utils/collections/lists/LinkedList"; @injectable() export class ApplicationContext diff --git a/project/src/context/ContextVariable.ts b/project/src/context/ContextVariable.ts index 5240ac87..8abc00d7 100644 --- a/project/src/context/ContextVariable.ts +++ b/project/src/context/ContextVariable.ts @@ -1,4 +1,4 @@ -import { ContextVariableType } from "./ContextVariableType"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; export class ContextVariable { diff --git a/project/src/controllers/BotController.ts b/project/src/controllers/BotController.ts index 6cb2a9c4..c758c580 100644 --- a/project/src/controllers/BotController.ts +++ b/project/src/controllers/BotController.ts @@ -1,29 +1,27 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { BotGenerator } from "../generators/BotGenerator"; -import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { IBotCore } from "../models/eft/common/tables/IBotCore"; -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { - IGetRaidConfigurationRequestData -} from "../models/eft/match/IGetRaidConfigurationRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotGenerationCacheService } from "../services/BotGenerationCacheService"; -import { LocalisationService } from "../services/LocalisationService"; -import { MatchBotDetailsCacheService } from "../services/MatchBotDetailsCacheService"; -import { JsonUtil } from "../utils/JsonUtil"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { BotGenerator } from "@spt-aki/generators/BotGenerator"; +import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; +import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; +import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class BotController diff --git a/project/src/controllers/CustomizationController.ts b/project/src/controllers/CustomizationController.ts index 449851a7..4cf18ea9 100644 --- a/project/src/controllers/CustomizationController.ts +++ b/project/src/controllers/CustomizationController.ts @@ -1,18 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISuit } from "../models/eft/common/tables/ITrader"; -import { - ClothingItem, IBuyClothingRequestData -} from "../models/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ClothingItem, IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; +import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class CustomizationController diff --git a/project/src/controllers/DialogueController.ts b/project/src/controllers/DialogueController.ts index c331516c..21c3a2f4 100644 --- a/project/src/controllers/DialogueController.ts +++ b/project/src/controllers/DialogueController.ts @@ -1,28 +1,26 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData"; -import { - IGetMailDialogViewResponseData -} from "../models/eft/dialog/IGetMailDialogViewResponseData"; -import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest"; -import { Dialogue, DialogueInfo, IAkiProfile, IUserDialogInfo, Message } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { GiftSentResult } from "../models/enums/GiftSentResult"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { MessageType } from "../models/enums/MessageType"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { GiftService } from "../services/GiftService"; -import { MailSendService } from "../services/MailSendService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; +import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; +import { Dialogue, DialogueInfo, IAkiProfile, IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { GiftSentResult } from "@spt-aki/models/enums/GiftSentResult"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { GiftService } from "@spt-aki/services/GiftService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class DialogueController diff --git a/project/src/controllers/GameController.ts b/project/src/controllers/GameController.ts index ebaaf869..58d410bf 100644 --- a/project/src/controllers/GameController.ts +++ b/project/src/controllers/GameController.ts @@ -1,44 +1,44 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { HideoutHelper } from "../helpers/HideoutHelper"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PreAkiModLoader } from "../loaders/PreAkiModLoader"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { ILooseLoot } from "../models/eft/common/ILooseLoot"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { BodyPartHealth } from "../models/eft/common/tables/IBotBase"; -import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse"; -import { ICurrentGroupResponse } from "../models/eft/game/ICurrentGroupResponse"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { IGameKeepAliveResponse } from "../models/eft/game/IGameKeepAliveResponse"; -import { IServerDetails } from "../models/eft/game/IServerDetails"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { AccountTypes } from "../models/enums/AccountTypes"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ILocationConfig } from "../models/spt/config/ILocationConfig"; -import { ILootConfig } from "../models/spt/config/ILootConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILocationData } from "../models/spt/server/ILocations"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { CustomLocationWaveService } from "../services/CustomLocationWaveService"; -import { GiftService } from "../services/GiftService"; -import { ItemBaseClassService } from "../services/ItemBaseClassService"; -import { LocalisationService } from "../services/LocalisationService"; -import { OpenZoneService } from "../services/OpenZoneService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { BodyPartHealth } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; +import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; +import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; +import { IGameKeepAliveResponse } from "@spt-aki/models/eft/game/IGameKeepAliveResponse"; +import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { AccountTypes } from "@spt-aki/models/enums/AccountTypes"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; +import { ILootConfig } from "@spt-aki/models/spt/config/ILootConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILocationData } from "@spt-aki/models/spt/server/ILocations"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { CustomLocationWaveService } from "@spt-aki/services/CustomLocationWaveService"; +import { GiftService } from "@spt-aki/services/GiftService"; +import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { OpenZoneService } from "@spt-aki/services/OpenZoneService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class GameController diff --git a/project/src/controllers/HandbookController.ts b/project/src/controllers/HandbookController.ts index 6ba410e4..96fdcdb2 100644 --- a/project/src/controllers/HandbookController.ts +++ b/project/src/controllers/HandbookController.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; @injectable() export class HandbookController diff --git a/project/src/controllers/HealthController.ts b/project/src/controllers/HealthController.ts index 8ab674b5..3060f102 100644 --- a/project/src/controllers/HealthController.ts +++ b/project/src/controllers/HealthController.ts @@ -1,25 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { HealthHelper } from "../helpers/HealthHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { - BodyPart, IHealthTreatmentRequestData -} from "../models/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IWorkoutData } from "../models/eft/health/IWorkoutData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { Traders } from "../models/enums/Traders"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { LocalisationService } from "../services/LocalisationService"; -import { PaymentService } from "../services/PaymentService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { BodyPart, IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; +import { IWorkoutData } from "@spt-aki/models/eft/health/IWorkoutData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class HealthController diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts index 55de4926..1e6474ba 100644 --- a/project/src/controllers/HideoutController.ts +++ b/project/src/controllers/HideoutController.ts @@ -1,61 +1,47 @@ import { inject, injectable } from "tsyringe"; -import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; -import { HideoutHelper } from "../helpers/HideoutHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { HideoutArea, Product, Production, ScavCase } from "../models/eft/common/tables/IBotBase"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { - HideoutUpgradeCompleteRequestData -} from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHandleQTEEventRequestData } from "../models/eft/hideout/IHandleQTEEventRequestData"; -import { IHideoutArea, Stage } from "../models/eft/hideout/IHideoutArea"; -import { - IHideoutContinuousProductionStartRequestData -} from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { - IHideoutImproveAreaRequestData -} from "../models/eft/hideout/IHideoutImproveAreaRequestData"; -import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; -import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { - IHideoutScavCaseStartRequestData -} from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { - IHideoutSingleProductionStartRequestData -} from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { - IHideoutTakeItemOutRequestData -} from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { - IHideoutTakeProductionRequestData -} from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; -import { IQteData } from "../models/eft/hideout/IQteData"; -import { IRecordShootingRangePoints } from "../models/eft/hideout/IRecordShootingRangePoints"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { HideoutAreas } from "../models/enums/HideoutAreas"; -import { SkillTypes } from "../models/enums/SkillTypes"; -import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { PlayerService } from "../services/PlayerService"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ScavCaseRewardGenerator } from "@spt-aki/generators/ScavCaseRewardGenerator"; +import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { HideoutArea, Product, Production, ScavCase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { HideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/HideoutUpgradeCompleteRequestData"; +import { IHandleQTEEventRequestData } from "@spt-aki/models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutArea, Stage } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutImproveAreaRequestData"; +import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; +import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IQteData } from "@spt-aki/models/eft/hideout/IQteData"; +import { IRecordShootingRangePoints } from "@spt-aki/models/eft/hideout/IRecordShootingRangePoints"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; +import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PlayerService } from "@spt-aki/services/PlayerService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class HideoutController diff --git a/project/src/controllers/InraidController.ts b/project/src/controllers/InraidController.ts index c7db8dc7..5fb495f6 100644 --- a/project/src/controllers/InraidController.ts +++ b/project/src/controllers/InraidController.ts @@ -1,35 +1,35 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; -import { HealthHelper } from "../helpers/HealthHelper"; -import { InRaidHelper } from "../helpers/InRaidHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ILocationBase } from "../models/eft/common/ILocationBase"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { BodyPartHealth } from "../models/eft/common/tables/IBotBase"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { PlayerRaidEndState } from "../models/enums/PlayerRaidEndState"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { Traders } from "../models/enums/Traders"; -import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; -import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { MatchBotDetailsCacheService } from "../services/MatchBotDetailsCacheService"; -import { PmcChatResponseService } from "../services/PmcChatResponseService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; +import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; +import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { BodyPartHealth } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { InsuranceService } from "@spt-aki/services/InsuranceService"; +import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; +import { PmcChatResponseService } from "@spt-aki/services/PmcChatResponseService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** * Logic for handling In Raid callbacks diff --git a/project/src/controllers/InsuranceController.ts b/project/src/controllers/InsuranceController.ts index f3175210..0b40e7d7 100644 --- a/project/src/controllers/InsuranceController.ts +++ b/project/src/controllers/InsuranceController.ts @@ -1,32 +1,30 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; -import { - IGetInsuranceCostResponseData -} from "../models/eft/insurance/IGetInsuranceCostResponseData"; -import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { Insurance, ISystemData } from "../models/eft/profile/IAkiProfile"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MessageType } from "../models/enums/MessageType"; -import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { MailSendService } from "../services/MailSendService"; -import { PaymentService } from "../services/PaymentService"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; +import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { Insurance, ISystemData } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { InsuranceService } from "@spt-aki/services/InsuranceService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class InsuranceController diff --git a/project/src/controllers/InventoryController.ts b/project/src/controllers/InventoryController.ts index b2516ed4..715ec150 100644 --- a/project/src/controllers/InventoryController.ts +++ b/project/src/controllers/InventoryController.ts @@ -1,58 +1,46 @@ import { inject, injectable } from "tsyringe"; -import { LootGenerator } from "../generators/LootGenerator"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; -import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData"; -import { - IInventoryCreateMarkerRequestData -} from "../models/eft/inventory/IInventoryCreateMarkerRequestData"; -import { - IInventoryDeleteMarkerRequestData -} from "../models/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { - IInventoryEditMarkerRequestData -} from "../models/eft/inventory/IInventoryEditMarkerRequestData"; -import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { - IInventoryReadEncyclopediaRequestData -} from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData"; -import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData"; -import { - IInventoryTransferRequestData -} from "../models/eft/inventory/IInventoryTransferRequestData"; -import { - IOpenRandomLootContainerRequestData -} from "../models/eft/inventory/IOpenRandomLootContainerRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "../models/enums/BackendErrorCodes"; -import { SkillTypes } from "../models/enums/SkillTypes"; -import { Traders } from "../models/enums/Traders"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { LootGenerator } from "@spt-aki/generators/LootGenerator"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IAddItemRequestData } from "@spt-aki/models/eft/inventory/IAddItemRequestData"; +import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; +import { IOpenRandomLootContainerRequestData } from "@spt-aki/models/eft/inventory/IOpenRandomLootContainerRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; +import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class InventoryController diff --git a/project/src/controllers/LauncherController.ts b/project/src/controllers/LauncherController.ts index 93b1839b..0e7bd5fb 100644 --- a/project/src/controllers/LauncherController.ts +++ b/project/src/controllers/LauncherController.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { PreAkiModLoader } from "../loaders/PreAkiModLoader"; -import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; -import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; -import { IRegisterData } from "../models/eft/launcher/IRegisterData"; -import { Info, ModDetails } from "../models/eft/profile/IAkiProfile"; -import { IConnectResponse } from "../models/eft/profile/IConnectResponse"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; +import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; @injectable() export class LauncherController diff --git a/project/src/controllers/LocationController.ts b/project/src/controllers/LocationController.ts index 2107debd..c46e6a43 100644 --- a/project/src/controllers/LocationController.ts +++ b/project/src/controllers/LocationController.ts @@ -1,30 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { LocationGenerator } from "../generators/LocationGenerator"; -import { LootGenerator } from "../generators/LootGenerator"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { ILocation } from "../models/eft/common/ILocation"; -import { ILocationBase } from "../models/eft/common/ILocationBase"; -import { - ILocationsGenerateAllResponse -} from "../models/eft/common/ILocationsSourceDestinationBase"; -import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; -import { IAirdropLootResult } from "../models/eft/location/IAirdropLootResult"; -import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; -import { AirdropTypeEnum } from "../models/enums/AirdropType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; -import { ILocationConfig } from "../models/spt/config/ILocationConfig"; -import { ILocations } from "../models/spt/server/ILocations"; -import { LootRequest } from "../models/spt/services/LootRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { LocationGenerator } from "@spt-aki/generators/LocationGenerator"; +import { LootGenerator } from "@spt-aki/generators/LootGenerator"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { ILocation } from "@spt-aki/models/eft/common/ILocation"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; +import { ILooseLoot, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot"; +import { IAirdropLootResult } from "@spt-aki/models/eft/location/IAirdropLootResult"; +import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; +import { AirdropTypeEnum } from "@spt-aki/models/enums/AirdropType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig"; +import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; +import { ILocations } from "@spt-aki/models/spt/server/ILocations"; +import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class LocationController diff --git a/project/src/controllers/MatchController.ts b/project/src/controllers/MatchController.ts index 4823d77e..5d389b8c 100644 --- a/project/src/controllers/MatchController.ts +++ b/project/src/controllers/MatchController.ts @@ -1,39 +1,37 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { LootGenerator } from "../generators/LootGenerator"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { - IGetRaidConfigurationRequestData -} from "../models/eft/match/IGetRaidConfigurationRequestData"; -import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; -import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MessageType } from "../models/enums/MessageType"; -import { Traders } from "../models/enums/Traders"; -import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; -import { IMatchConfig } from "../models/spt/config/IMatchConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { BotGenerationCacheService } from "../services/BotGenerationCacheService"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { MailSendService } from "../services/MailSendService"; -import { MatchLocationService } from "../services/MatchLocationService"; -import { ProfileSnapshotService } from "../services/ProfileSnapshotService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { LootGenerator } from "@spt-aki/generators/LootGenerator"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ICreateGroupRequestData } from "@spt-aki/models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "@spt-aki/models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "@spt-aki/models/eft/match/IGetProfileRequestData"; +import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; +import { IJoinMatchRequestData } from "@spt-aki/models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "@spt-aki/models/spt/config/IMatchConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; +import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { MatchLocationService } from "@spt-aki/services/MatchLocationService"; +import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class MatchController diff --git a/project/src/controllers/NoteController.ts b/project/src/controllers/NoteController.ts index c768a361..8b0c37b1 100644 --- a/project/src/controllers/NoteController.ts +++ b/project/src/controllers/NoteController.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Note } from "../models/eft/common/tables/IBotBase"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "../models/eft/notes/INoteActionData"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Note } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; @injectable() export class NoteController diff --git a/project/src/controllers/NotifierController.ts b/project/src/controllers/NotifierController.ts index 510dd2f5..ab4d9bdd 100644 --- a/project/src/controllers/NotifierController.ts +++ b/project/src/controllers/NotifierController.ts @@ -1,10 +1,9 @@ -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { NotificationService } from "../services/NotificationService"; - -import { INotifierChannel } from "../models/eft/notifier/INotifier"; - import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; + +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; +import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; +import { NotificationService } from "@spt-aki/services/NotificationService"; @injectable() export class NotifierController diff --git a/project/src/controllers/PresetBuildController.ts b/project/src/controllers/PresetBuildController.ts index 595bbb91..e3f4ca9d 100644 --- a/project/src/controllers/PresetBuildController.ts +++ b/project/src/controllers/PresetBuildController.ts @@ -1,19 +1,17 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { - IPresetBuildActionRequestData -} from "../models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IRemoveBuildRequestData } from "../models/eft/presetBuild/IRemoveBuildRequestData"; -import { IUserBuilds, IWeaponBuild } from "../models/eft/profile/IAkiProfile"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IRemoveBuildRequestData } from "@spt-aki/models/eft/presetBuild/IRemoveBuildRequestData"; +import { IUserBuilds, IWeaponBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class PresetBuildController diff --git a/project/src/controllers/PresetController.ts b/project/src/controllers/PresetController.ts index b34e72c5..0ab8f8ed 100644 --- a/project/src/controllers/PresetController.ts +++ b/project/src/controllers/PresetController.ts @@ -1,7 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { DatabaseServer } from "../servers/DatabaseServer"; + +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; @injectable() export class PresetController diff --git a/project/src/controllers/ProfileController.ts b/project/src/controllers/ProfileController.ts index b1e2d374..e5b1adc5 100644 --- a/project/src/controllers/ProfileController.ts +++ b/project/src/controllers/ProfileController.ts @@ -1,37 +1,33 @@ import { inject, injectable } from "tsyringe"; -import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { TemplateSide } from "../models/eft/common/tables/IProfileTemplate"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; -import { IAkiProfile, Inraid, Vitality } from "../models/eft/profile/IAkiProfile"; -import { - IProfileChangeNicknameRequestData -} from "../models/eft/profile/IProfileChangeNicknameRequestData"; -import { - IProfileChangeVoiceRequestData -} from "../models/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; -import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; -import { MessageType } from "../models/enums/MessageType"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { MailSendService } from "../services/MailSendService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { TemplateSide } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IMiniProfile } from "@spt-aki/models/eft/launcher/IMiniProfile"; +import { IAkiProfile, Inraid, Vitality } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; +import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class ProfileController diff --git a/project/src/controllers/QuestController.ts b/project/src/controllers/QuestController.ts index f8d3461a..b61eced1 100644 --- a/project/src/controllers/QuestController.ts +++ b/project/src/controllers/QuestController.ts @@ -1,38 +1,38 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuestStatus } from "../models/eft/common/tables/IBotBase"; -import { Item } from "../models/eft/common/tables/IItem"; -import { AvailableForConditions, IQuest, Reward } from "../models/eft/common/tables/IQuest"; -import { IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IFailQuestRequestData } from "../models/eft/quests/IFailQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MessageType } from "../models/enums/MessageType"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { SeasonalEventType } from "../models/enums/SeasonalEventType"; -import { IQuestConfig } from "../models/spt/config/IQuestConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocaleService } from "../services/LocaleService"; -import { LocalisationService } from "../services/LocalisationService"; -import { MailSendService } from "../services/MailSendService"; -import { PlayerService } from "../services/PlayerService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { AvailableForConditions, IQuest, Reward } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; +import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; +import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { PlayerService } from "@spt-aki/services/PlayerService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class QuestController diff --git a/project/src/controllers/RagfairController.ts b/project/src/controllers/RagfairController.ts index e7a09ad2..0fd7c298 100644 --- a/project/src/controllers/RagfairController.ts +++ b/project/src/controllers/RagfairController.ts @@ -1,47 +1,47 @@ import { inject, injectable } from "tsyringe"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IBarterScheme, ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; -import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; -import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { RagfairSort } from "../models/enums/RagfairSort"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { PaymentService } from "../services/PaymentService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { RagfairTaxService } from "../services/RagfairTaxService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; +import { RagfairOfferHelper } from "@spt-aki/helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "@spt-aki/helpers/RagfairSellHelper"; +import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IAddOfferRequestData, Requirement } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { RagfairServer } from "@spt-aki/servers/RagfairServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; +import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** * Handle RagfairCallback events diff --git a/project/src/controllers/RepairController.ts b/project/src/controllers/RepairController.ts index 3d9a78e4..37fc25a6 100644 --- a/project/src/controllers/RepairController.ts +++ b/project/src/controllers/RepairController.ts @@ -1,20 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { RepairHelper } from "../helpers/RepairHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; -import { - ITraderRepairActionDataRequest -} from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IRepairConfig } from "../models/spt/config/IRepairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PaymentService } from "../services/PaymentService"; -import { RepairService } from "../services/RepairService"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { RepairService } from "@spt-aki/services/RepairService"; @injectable() export class RepairController diff --git a/project/src/controllers/RepeatableQuestController.ts b/project/src/controllers/RepeatableQuestController.ts index b7f131a2..59e1856c 100644 --- a/project/src/controllers/RepeatableQuestController.ts +++ b/project/src/controllers/RepeatableQuestController.ts @@ -1,36 +1,30 @@ import { inject, injectable } from "tsyringe"; -import { RepeatableQuestGenerator } from "../generators/RepeatableQuestGenerator"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { RepeatableQuestHelper } from "../helpers/RepeatableQuestHelper"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { - IChangeRequirement, - IPmcDataRepeatableQuest, - IRepeatableQuest -} from "../models/eft/common/tables/IRepeatableQuests"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ELocationName } from "../models/enums/ELocationName"; -import { HideoutAreas } from "../models/enums/HideoutAreas"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { - IQuestConfig, IRepeatableQuestConfig -} from "../models/spt/config/IQuestConfig"; -import { IQuestTypePool } from "../models/spt/repeatable/IQuestTypePool"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { PaymentService } from "../services/PaymentService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { RepeatableQuestGenerator } from "@spt-aki/generators/RepeatableQuestGenerator"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IChangeRequirement, IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ELocationName } from "@spt-aki/models/enums/ELocationName"; +import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { IQuestTypePool } from "@spt-aki/models/spt/repeatable/IQuestTypePool"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { ObjectId } from "@spt-aki/utils/ObjectId"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RepeatableQuestController diff --git a/project/src/controllers/TradeController.ts b/project/src/controllers/TradeController.ts index 384ed51b..c891fd97 100644 --- a/project/src/controllers/TradeController.ts +++ b/project/src/controllers/TradeController.ts @@ -1,34 +1,32 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TradeHelper } from "../helpers/TradeHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITraderBase } from "../models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { - IProcessRagfairTradeRequestData -} from "../models/eft/trade/IProcessRagfairTradeRequestData"; -import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { ISellScavItemsToFenceRequestData } from "../models/eft/trade/ISellScavItemsToFenceRequestData"; -import { BackendErrorCodes } from "../models/enums/BackendErrorCodes"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { Traders } from "../models/enums/Traders"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServer } from "../servers/RagfairServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TradeHelper } from "@spt-aki/helpers/TradeHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; +import { ISellScavItemsToFenceRequestData } from "@spt-aki/models/eft/trade/ISellScavItemsToFenceRequestData"; +import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RagfairServer } from "@spt-aki/servers/RagfairServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() class TradeController diff --git a/project/src/controllers/TraderController.ts b/project/src/controllers/TraderController.ts index 015c720f..de7fc77d 100644 --- a/project/src/controllers/TraderController.ts +++ b/project/src/controllers/TraderController.ts @@ -1,17 +1,17 @@ import { inject, injectable } from "tsyringe"; -import { FenceBaseAssortGenerator } from "../generators/FenceBaseAssortGenerator"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader"; -import { Traders } from "../models/enums/Traders"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { TraderAssortService } from "../services/TraderAssortService"; -import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService"; -import { JsonUtil } from "../utils/JsonUtil"; +import { FenceBaseAssortGenerator } from "@spt-aki/generators/FenceBaseAssortGenerator"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class TraderController diff --git a/project/src/controllers/WeatherController.ts b/project/src/controllers/WeatherController.ts index 264fc3a3..216424f6 100644 --- a/project/src/controllers/WeatherController.ts +++ b/project/src/controllers/WeatherController.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { IWeatherData } from "../models/eft/weather/IWeatherData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; +import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; +import { IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; @injectable() export class WeatherController diff --git a/project/src/controllers/WishlistController.ts b/project/src/controllers/WishlistController.ts index 177c01b5..eaa7d8e4 100644 --- a/project/src/controllers/WishlistController.ts +++ b/project/src/controllers/WishlistController.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; @injectable() export class WishlistController diff --git a/project/src/di/Container.ts b/project/src/di/Container.ts index 1f6cbf57..1c4645ce 100644 --- a/project/src/di/Container.ts +++ b/project/src/di/Container.ts @@ -1,254 +1,248 @@ import { DependencyContainer, Lifecycle } from "tsyringe"; -import { BotCallbacks } from "../callbacks/BotCallbacks"; -import { BundleCallbacks } from "../callbacks/BundleCallbacks"; -import { CustomizationCallbacks } from "../callbacks/CustomizationCallbacks"; -import { DataCallbacks } from "../callbacks/DataCallbacks"; -import { DialogueCallbacks } from "../callbacks/DialogueCallbacks"; -import { GameCallbacks } from "../callbacks/GameCallbacks"; -import { HandbookCallbacks } from "../callbacks/HandbookCallbacks"; -import { HealthCallbacks } from "../callbacks/HealthCallbacks"; -import { HideoutCallbacks } from "../callbacks/HideoutCallbacks"; -import { HttpCallbacks } from "../callbacks/HttpCallbacks"; -import { InraidCallbacks } from "../callbacks/InraidCallbacks"; -import { InsuranceCallbacks } from "../callbacks/InsuranceCallbacks"; -import { InventoryCallbacks } from "../callbacks/InventoryCallbacks"; -import { ItemEventCallbacks } from "../callbacks/ItemEventCallbacks"; -import { LauncherCallbacks } from "../callbacks/LauncherCallbacks"; -import { LocationCallbacks } from "../callbacks/LocationCallbacks"; -import { MatchCallbacks } from "../callbacks/MatchCallbacks"; -import { ModCallbacks } from "../callbacks/ModCallbacks"; -import { NoteCallbacks } from "../callbacks/NoteCallbacks"; -import { NotifierCallbacks } from "../callbacks/NotifierCallbacks"; -import { PresetBuildCallbacks } from "../callbacks/PresetBuildCallbacks"; -import { PresetCallbacks } from "../callbacks/PresetCallbacks"; -import { ProfileCallbacks } from "../callbacks/ProfileCallbacks"; -import { QuestCallbacks } from "../callbacks/QuestCallbacks"; -import { RagfairCallbacks } from "../callbacks/RagfairCallbacks"; -import { RepairCallbacks } from "../callbacks/RepairCallbacks"; -import { SaveCallbacks } from "../callbacks/SaveCallbacks"; -import { TradeCallbacks } from "../callbacks/TradeCallbacks"; -import { TraderCallbacks } from "../callbacks/TraderCallbacks"; -import { WeatherCallbacks } from "../callbacks/WeatherCallbacks"; -import { WishlistCallbacks } from "../callbacks/WishlistCallbacks"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { BotController } from "../controllers/BotController"; -import { CustomizationController } from "../controllers/CustomizationController"; -import { DialogueController } from "../controllers/DialogueController"; -import { GameController } from "../controllers/GameController"; -import { HandbookController } from "../controllers/HandbookController"; -import { HealthController } from "../controllers/HealthController"; -import { HideoutController } from "../controllers/HideoutController"; -import { InraidController } from "../controllers/InraidController"; -import { InsuranceController } from "../controllers/InsuranceController"; -import { InventoryController } from "../controllers/InventoryController"; -import { LauncherController } from "../controllers/LauncherController"; -import { LocationController } from "../controllers/LocationController"; -import { MatchController } from "../controllers/MatchController"; -import { NoteController } from "../controllers/NoteController"; -import { NotifierController } from "../controllers/NotifierController"; -import { PresetBuildController } from "../controllers/PresetBuildController"; -import { PresetController } from "../controllers/PresetController"; -import { ProfileController } from "../controllers/ProfileController"; -import { QuestController } from "../controllers/QuestController"; -import { RagfairController } from "../controllers/RagfairController"; -import { RepairController } from "../controllers/RepairController"; -import { RepeatableQuestController } from "../controllers/RepeatableQuestController"; -import { TradeController } from "../controllers/TradeController"; -import { TraderController } from "../controllers/TraderController"; -import { WeatherController } from "../controllers/WeatherController"; -import { WishlistController } from "../controllers/WishlistController"; -import { BotEquipmentModGenerator } from "../generators/BotEquipmentModGenerator"; -import { BotGenerator } from "../generators/BotGenerator"; -import { BotInventoryGenerator } from "../generators/BotInventoryGenerator"; -import { BotLevelGenerator } from "../generators/BotLevelGenerator"; -import { BotLootGenerator } from "../generators/BotLootGenerator"; -import { BotWeaponGenerator } from "../generators/BotWeaponGenerator"; -import { FenceBaseAssortGenerator } from "../generators/FenceBaseAssortGenerator"; -import { LocationGenerator } from "../generators/LocationGenerator"; -import { LootGenerator } from "../generators/LootGenerator"; -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; -import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { RepeatableQuestGenerator } from "../generators/RepeatableQuestGenerator"; -import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; -import { WeatherGenerator } from "../generators/WeatherGenerator"; -import { - BarrelInventoryMagGen -} from "../generators/weapongen/implementations/BarrelInventoryMagGen"; -import { - ExternalInventoryMagGen -} from "../generators/weapongen/implementations/ExternalInventoryMagGen"; -import { - InternalMagazineInventoryMagGen -} from "../generators/weapongen/implementations/InternalMagazineInventoryMagGen"; -import { UbglExternalMagGen } from "../generators/weapongen/implementations/UbglExternalMagGen"; -import { AssortHelper } from "../helpers/AssortHelper"; -import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; -import { ContainerHelper } from "../helpers/ContainerHelper"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { GameEventHelper } from "../helpers/GameEventHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { HealthHelper } from "../helpers/HealthHelper"; -import { HideoutHelper } from "../helpers/HideoutHelper"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { InRaidHelper } from "../helpers/InRaidHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { NotificationSendHelper } from "../helpers/NotificationSendHelper"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { ProbabilityHelper } from "../helpers/ProbabilityHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { RagfairHelper } from "../helpers/RagfairHelper"; -import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper"; -import { RagfairSellHelper } from "../helpers/RagfairSellHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { RagfairSortHelper } from "../helpers/RagfairSortHelper"; -import { RepairHelper } from "../helpers/RepairHelper"; -import { RepeatableQuestHelper } from "../helpers/RepeatableQuestHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TradeHelper } from "../helpers/TradeHelper"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { UtilityHelper } from "../helpers/UtilityHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { BundleLoader } from "../loaders/BundleLoader"; -import { ModLoadOrder } from "../loaders/ModLoadOrder"; -import { ModTypeCheck } from "../loaders/ModTypeCheck"; -import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; -import { PostDBModLoader } from "../loaders/PostDBModLoader"; -import { PreAkiModLoader } from "../loaders/PreAkiModLoader"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { HttpRouter } from "../routers/HttpRouter"; -import { ImageRouter } from "../routers/ImageRouter"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { BotDynamicRouter } from "../routers/dynamic/BotDynamicRouter"; -import { BundleDynamicRouter } from "../routers/dynamic/BundleDynamicRouter"; -import { CustomizationDynamicRouter } from "../routers/dynamic/CustomizationDynamicRouter"; -import { DataDynamicRouter } from "../routers/dynamic/DataDynamicRouter"; -import { HttpDynamicRouter } from "../routers/dynamic/HttpDynamicRouter"; -import { InraidDynamicRouter } from "../routers/dynamic/InraidDynamicRouter"; -import { LocationDynamicRouter } from "../routers/dynamic/LocationDynamicRouter"; -import { NotifierDynamicRouter } from "../routers/dynamic/NotifierDynamicRouter"; -import { TraderDynamicRouter } from "../routers/dynamic/TraderDynamicRouter"; -import { CustomizationItemEventRouter } from "../routers/item_events/CustomizationItemEventRouter"; -import { HealthItemEventRouter } from "../routers/item_events/HealthItemEventRouter"; -import { HideoutItemEventRouter } from "../routers/item_events/HideoutItemEventRouter"; -import { InsuranceItemEventRouter } from "../routers/item_events/InsuranceItemEventRouter"; -import { InventoryItemEventRouter } from "../routers/item_events/InventoryItemEventRouter"; -import { NoteItemEventRouter } from "../routers/item_events/NoteItemEventRouter"; -import { PresetBuildItemEventRouter } from "../routers/item_events/PresetBuildItemEventRouter"; -import { QuestItemEventRouter } from "../routers/item_events/QuestItemEventRouter"; -import { RagfairItemEventRouter } from "../routers/item_events/RagfairItemEventRouter"; -import { RepairItemEventRouter } from "../routers/item_events/RepairItemEventRouter"; -import { TradeItemEventRouter } from "../routers/item_events/TradeItemEventRouter"; -import { WishlistItemEventRouter } from "../routers/item_events/WishlistItemEventRouter"; -import { HealthSaveLoadRouter } from "../routers/save_load/HealthSaveLoadRouter"; -import { InraidSaveLoadRouter } from "../routers/save_load/InraidSaveLoadRouter"; -import { InsuranceSaveLoadRouter } from "../routers/save_load/InsuranceSaveLoadRouter"; -import { ProfileSaveLoadRouter } from "../routers/save_load/ProfileSaveLoadRouter"; -import { BundleSerializer } from "../routers/serializers/BundleSerializer"; -import { ImageSerializer } from "../routers/serializers/ImageSerializer"; -import { NotifySerializer } from "../routers/serializers/NotifySerializer"; -import { BotStaticRouter } from "../routers/static/BotStaticRouter"; -import { BundleStaticRouter } from "../routers/static/BundleStaticRouter"; -import { CustomizationStaticRouter } from "../routers/static/CustomizationStaticRouter"; -import { DataStaticRouter } from "../routers/static/DataStaticRouter"; -import { DialogStaticRouter } from "../routers/static/DialogStaticRouter"; -import { GameStaticRouter } from "../routers/static/GameStaticRouter"; -import { HealthStaticRouter } from "../routers/static/HealthStaticRouter"; -import { InraidStaticRouter } from "../routers/static/InraidStaticRouter"; -import { InsuranceStaticRouter } from "../routers/static/InsuranceStaticRouter"; -import { ItemEventStaticRouter } from "../routers/static/ItemEventStaticRouter"; -import { LauncherStaticRouter } from "../routers/static/LauncherStaticRouter"; -import { LocationStaticRouter } from "../routers/static/LocationStaticRouter"; -import { MatchStaticRouter } from "../routers/static/MatchStaticRouter"; -import { NotifierStaticRouter } from "../routers/static/NotifierStaticRouter"; -import { PresetStaticRouter } from "../routers/static/PresetStaticRouter"; -import { ProfileStaticRouter } from "../routers/static/ProfileStaticRouter"; -import { QuestStaticRouter } from "../routers/static/QuestStaticRouter"; -import { RagfairStaticRouter } from "../routers/static/RagfairStaticRouter"; -import { TraderStaticRouter } from "../routers/static/TraderStaticRouter"; -import { WeatherStaticRouter } from "../routers/static/WeatherStaticRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpServer } from "../servers/HttpServer"; -import { RagfairServer } from "../servers/RagfairServer"; -import { SaveServer } from "../servers/SaveServer"; -import { WebSocketServer } from "../servers/WebSocketServer"; -import { AkiHttpListener } from "../servers/http/AkiHttpListener"; -import { HttpBufferHandler } from "../servers/http/HttpBufferHandler"; -import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; -import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService"; -import { BotGenerationCacheService } from "../services/BotGenerationCacheService"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { BotWeaponModLimitService } from "../services/BotWeaponModLimitService"; -import { CustomLocationWaveService } from "../services/CustomLocationWaveService"; -import { FenceService } from "../services/FenceService"; -import { GiftService } from "../services/GiftService"; -import { HashCacheService } from "../services/HashCacheService"; -import { InsuranceService } from "../services/InsuranceService"; -import { ItemBaseClassService } from "../services/ItemBaseClassService"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { LocaleService } from "../services/LocaleService"; -import { LocalisationService } from "../services/LocalisationService"; -import { MailSendService } from "../services/MailSendService"; -import { MatchBotDetailsCacheService } from "../services/MatchBotDetailsCacheService"; -import { MatchLocationService } from "../services/MatchLocationService"; -import { ModCompilerService } from "../services/ModCompilerService"; -import { NotificationService } from "../services/NotificationService"; -import { OpenZoneService } from "../services/OpenZoneService"; -import { PaymentService } from "../services/PaymentService"; -import { PlayerService } from "../services/PlayerService"; -import { PmcChatResponseService } from "../services/PmcChatResponseService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { ProfileSnapshotService } from "../services/ProfileSnapshotService"; -import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { RagfairTaxService } from "../services/RagfairTaxService"; -import { RepairService } from "../services/RepairService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { TraderAssortService } from "../services/TraderAssortService"; -import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService"; -import { CustomItemService } from "../services/mod/CustomItemService"; -import { DynamicRouterModService } from "../services/mod/dynamicRouter/DynamicRouterModService"; -import { HttpListenerModService } from "../services/mod/httpListener/HttpListenerModService"; -import { ImageRouteService } from "../services/mod/image/ImageRouteService"; -import { OnLoadModService } from "../services/mod/onLoad/OnLoadModService"; -import { OnUpdateModService } from "../services/mod/onUpdate/OnUpdateModService"; -import { StaticRouterModService } from "../services/mod/staticRouter/StaticRouterModService"; -import { App } from "../utils/App"; -import { AsyncQueue } from "../utils/AsyncQueue"; -import { DatabaseImporter } from "../utils/DatabaseImporter"; -import { EncodingUtil } from "../utils/EncodingUtil"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpFileUtil } from "../utils/HttpFileUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { ImporterUtil } from "../utils/ImporterUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { UUidGenerator } from "../utils/UUidGenerator"; -import { VFS } from "../utils/VFS"; -import { Watermark, WatermarkLocale } from "../utils/Watermark"; -import { WinstonMainLogger } from "../utils/logging/WinstonMainLogger"; -import { WinstonRequestLogger } from "../utils/logging/WinstonRequestLogger"; +import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; +import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; +import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; +import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; +import { DialogueCallbacks } from "@spt-aki/callbacks/DialogueCallbacks"; +import { GameCallbacks } from "@spt-aki/callbacks/GameCallbacks"; +import { HandbookCallbacks } from "@spt-aki/callbacks/HandbookCallbacks"; +import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; +import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; +import { HttpCallbacks } from "@spt-aki/callbacks/HttpCallbacks"; +import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; +import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; +import { InventoryCallbacks } from "@spt-aki/callbacks/InventoryCallbacks"; +import { ItemEventCallbacks } from "@spt-aki/callbacks/ItemEventCallbacks"; +import { LauncherCallbacks } from "@spt-aki/callbacks/LauncherCallbacks"; +import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; +import { MatchCallbacks } from "@spt-aki/callbacks/MatchCallbacks"; +import { ModCallbacks } from "@spt-aki/callbacks/ModCallbacks"; +import { NoteCallbacks } from "@spt-aki/callbacks/NoteCallbacks"; +import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; +import { PresetBuildCallbacks } from "@spt-aki/callbacks/PresetBuildCallbacks"; +import { PresetCallbacks } from "@spt-aki/callbacks/PresetCallbacks"; +import { ProfileCallbacks } from "@spt-aki/callbacks/ProfileCallbacks"; +import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; +import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; +import { RepairCallbacks } from "@spt-aki/callbacks/RepairCallbacks"; +import { SaveCallbacks } from "@spt-aki/callbacks/SaveCallbacks"; +import { TradeCallbacks } from "@spt-aki/callbacks/TradeCallbacks"; +import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; +import { WeatherCallbacks } from "@spt-aki/callbacks/WeatherCallbacks"; +import { WishlistCallbacks } from "@spt-aki/callbacks/WishlistCallbacks"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { BotController } from "@spt-aki/controllers/BotController"; +import { CustomizationController } from "@spt-aki/controllers/CustomizationController"; +import { DialogueController } from "@spt-aki/controllers/DialogueController"; +import { GameController } from "@spt-aki/controllers/GameController"; +import { HandbookController } from "@spt-aki/controllers/HandbookController"; +import { HealthController } from "@spt-aki/controllers/HealthController"; +import { HideoutController } from "@spt-aki/controllers/HideoutController"; +import { InraidController } from "@spt-aki/controllers/InraidController"; +import { InsuranceController } from "@spt-aki/controllers/InsuranceController"; +import { InventoryController } from "@spt-aki/controllers/InventoryController"; +import { LauncherController } from "@spt-aki/controllers/LauncherController"; +import { LocationController } from "@spt-aki/controllers/LocationController"; +import { MatchController } from "@spt-aki/controllers/MatchController"; +import { NoteController } from "@spt-aki/controllers/NoteController"; +import { NotifierController } from "@spt-aki/controllers/NotifierController"; +import { PresetBuildController } from "@spt-aki/controllers/PresetBuildController"; +import { PresetController } from "@spt-aki/controllers/PresetController"; +import { ProfileController } from "@spt-aki/controllers/ProfileController"; +import { QuestController } from "@spt-aki/controllers/QuestController"; +import { RagfairController } from "@spt-aki/controllers/RagfairController"; +import { RepairController } from "@spt-aki/controllers/RepairController"; +import { RepeatableQuestController } from "@spt-aki/controllers/RepeatableQuestController"; +import { TradeController } from "@spt-aki/controllers/TradeController"; +import { TraderController } from "@spt-aki/controllers/TraderController"; +import { WeatherController } from "@spt-aki/controllers/WeatherController"; +import { WishlistController } from "@spt-aki/controllers/WishlistController"; +import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; +import { BotGenerator } from "@spt-aki/generators/BotGenerator"; +import { BotInventoryGenerator } from "@spt-aki/generators/BotInventoryGenerator"; +import { BotLevelGenerator } from "@spt-aki/generators/BotLevelGenerator"; +import { BotLootGenerator } from "@spt-aki/generators/BotLootGenerator"; +import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; +import { FenceBaseAssortGenerator } from "@spt-aki/generators/FenceBaseAssortGenerator"; +import { LocationGenerator } from "@spt-aki/generators/LocationGenerator"; +import { LootGenerator } from "@spt-aki/generators/LootGenerator"; +import { PMCLootGenerator } from "@spt-aki/generators/PMCLootGenerator"; +import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; +import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; +import { RepeatableQuestGenerator } from "@spt-aki/generators/RepeatableQuestGenerator"; +import { ScavCaseRewardGenerator } from "@spt-aki/generators/ScavCaseRewardGenerator"; +import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; +import { BarrelInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/BarrelInventoryMagGen"; +import { ExternalInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/ExternalInventoryMagGen"; +import { InternalMagazineInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/InternalMagazineInventoryMagGen"; +import { UbglExternalMagGen } from "@spt-aki/generators/weapongen/implementations/UbglExternalMagGen"; +import { AssortHelper } from "@spt-aki/helpers/AssortHelper"; +import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; +import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { DurabilityLimitsHelper } from "@spt-aki/helpers/DurabilityLimitsHelper"; +import { GameEventHelper } from "@spt-aki/helpers/GameEventHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; +import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ProbabilityHelper } from "@spt-aki/helpers/ProbabilityHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; +import { RagfairOfferHelper } from "@spt-aki/helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "@spt-aki/helpers/RagfairSellHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; +import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; +import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; +import { SecureContainerHelper } from "@spt-aki/helpers/SecureContainerHelper"; +import { TradeHelper } from "@spt-aki/helpers/TradeHelper"; +import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { UtilityHelper } from "@spt-aki/helpers/UtilityHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; +import { ModLoadOrder } from "@spt-aki/loaders/ModLoadOrder"; +import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; +import { PostAkiModLoader } from "@spt-aki/loaders/PostAkiModLoader"; +import { PostDBModLoader } from "@spt-aki/loaders/PostDBModLoader"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { HttpRouter } from "@spt-aki/routers/HttpRouter"; +import { ImageRouter } from "@spt-aki/routers/ImageRouter"; +import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; +import { BotDynamicRouter } from "@spt-aki/routers/dynamic/BotDynamicRouter"; +import { BundleDynamicRouter } from "@spt-aki/routers/dynamic/BundleDynamicRouter"; +import { CustomizationDynamicRouter } from "@spt-aki/routers/dynamic/CustomizationDynamicRouter"; +import { DataDynamicRouter } from "@spt-aki/routers/dynamic/DataDynamicRouter"; +import { HttpDynamicRouter } from "@spt-aki/routers/dynamic/HttpDynamicRouter"; +import { InraidDynamicRouter } from "@spt-aki/routers/dynamic/InraidDynamicRouter"; +import { LocationDynamicRouter } from "@spt-aki/routers/dynamic/LocationDynamicRouter"; +import { NotifierDynamicRouter } from "@spt-aki/routers/dynamic/NotifierDynamicRouter"; +import { TraderDynamicRouter } from "@spt-aki/routers/dynamic/TraderDynamicRouter"; +import { CustomizationItemEventRouter } from "@spt-aki/routers/item_events/CustomizationItemEventRouter"; +import { HealthItemEventRouter } from "@spt-aki/routers/item_events/HealthItemEventRouter"; +import { HideoutItemEventRouter } from "@spt-aki/routers/item_events/HideoutItemEventRouter"; +import { InsuranceItemEventRouter } from "@spt-aki/routers/item_events/InsuranceItemEventRouter"; +import { InventoryItemEventRouter } from "@spt-aki/routers/item_events/InventoryItemEventRouter"; +import { NoteItemEventRouter } from "@spt-aki/routers/item_events/NoteItemEventRouter"; +import { PresetBuildItemEventRouter } from "@spt-aki/routers/item_events/PresetBuildItemEventRouter"; +import { QuestItemEventRouter } from "@spt-aki/routers/item_events/QuestItemEventRouter"; +import { RagfairItemEventRouter } from "@spt-aki/routers/item_events/RagfairItemEventRouter"; +import { RepairItemEventRouter } from "@spt-aki/routers/item_events/RepairItemEventRouter"; +import { TradeItemEventRouter } from "@spt-aki/routers/item_events/TradeItemEventRouter"; +import { WishlistItemEventRouter } from "@spt-aki/routers/item_events/WishlistItemEventRouter"; +import { HealthSaveLoadRouter } from "@spt-aki/routers/save_load/HealthSaveLoadRouter"; +import { InraidSaveLoadRouter } from "@spt-aki/routers/save_load/InraidSaveLoadRouter"; +import { InsuranceSaveLoadRouter } from "@spt-aki/routers/save_load/InsuranceSaveLoadRouter"; +import { ProfileSaveLoadRouter } from "@spt-aki/routers/save_load/ProfileSaveLoadRouter"; +import { BundleSerializer } from "@spt-aki/routers/serializers/BundleSerializer"; +import { ImageSerializer } from "@spt-aki/routers/serializers/ImageSerializer"; +import { NotifySerializer } from "@spt-aki/routers/serializers/NotifySerializer"; +import { BotStaticRouter } from "@spt-aki/routers/static/BotStaticRouter"; +import { BundleStaticRouter } from "@spt-aki/routers/static/BundleStaticRouter"; +import { CustomizationStaticRouter } from "@spt-aki/routers/static/CustomizationStaticRouter"; +import { DataStaticRouter } from "@spt-aki/routers/static/DataStaticRouter"; +import { DialogStaticRouter } from "@spt-aki/routers/static/DialogStaticRouter"; +import { GameStaticRouter } from "@spt-aki/routers/static/GameStaticRouter"; +import { HealthStaticRouter } from "@spt-aki/routers/static/HealthStaticRouter"; +import { InraidStaticRouter } from "@spt-aki/routers/static/InraidStaticRouter"; +import { InsuranceStaticRouter } from "@spt-aki/routers/static/InsuranceStaticRouter"; +import { ItemEventStaticRouter } from "@spt-aki/routers/static/ItemEventStaticRouter"; +import { LauncherStaticRouter } from "@spt-aki/routers/static/LauncherStaticRouter"; +import { LocationStaticRouter } from "@spt-aki/routers/static/LocationStaticRouter"; +import { MatchStaticRouter } from "@spt-aki/routers/static/MatchStaticRouter"; +import { NotifierStaticRouter } from "@spt-aki/routers/static/NotifierStaticRouter"; +import { PresetStaticRouter } from "@spt-aki/routers/static/PresetStaticRouter"; +import { ProfileStaticRouter } from "@spt-aki/routers/static/ProfileStaticRouter"; +import { QuestStaticRouter } from "@spt-aki/routers/static/QuestStaticRouter"; +import { RagfairStaticRouter } from "@spt-aki/routers/static/RagfairStaticRouter"; +import { TraderStaticRouter } from "@spt-aki/routers/static/TraderStaticRouter"; +import { WeatherStaticRouter } from "@spt-aki/routers/static/WeatherStaticRouter"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { HttpServer } from "@spt-aki/servers/HttpServer"; +import { RagfairServer } from "@spt-aki/servers/RagfairServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; +import { AkiHttpListener } from "@spt-aki/servers/http/AkiHttpListener"; +import { HttpBufferHandler } from "@spt-aki/servers/http/HttpBufferHandler"; +import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; +import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; +import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; +import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; +import { BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; +import { CustomLocationWaveService } from "@spt-aki/services/CustomLocationWaveService"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { GiftService } from "@spt-aki/services/GiftService"; +import { HashCacheService } from "@spt-aki/services/HashCacheService"; +import { InsuranceService } from "@spt-aki/services/InsuranceService"; +import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; +import { MatchLocationService } from "@spt-aki/services/MatchLocationService"; +import { ModCompilerService } from "@spt-aki/services/ModCompilerService"; +import { NotificationService } from "@spt-aki/services/NotificationService"; +import { OpenZoneService } from "@spt-aki/services/OpenZoneService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { PlayerService } from "@spt-aki/services/PlayerService"; +import { PmcChatResponseService } from "@spt-aki/services/PmcChatResponseService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; +import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; +import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; +import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; +import { RepairService } from "@spt-aki/services/RepairService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; +import { CustomItemService } from "@spt-aki/services/mod/CustomItemService"; +import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService"; +import { HttpListenerModService } from "@spt-aki/services/mod/httpListener/HttpListenerModService"; +import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; +import { OnLoadModService } from "@spt-aki/services/mod/onLoad/OnLoadModService"; +import { OnUpdateModService } from "@spt-aki/services/mod/onUpdate/OnUpdateModService"; +import { StaticRouterModService } from "@spt-aki/services/mod/staticRouter/StaticRouterModService"; +import { App } from "@spt-aki/utils/App"; +import { AsyncQueue } from "@spt-aki/utils/AsyncQueue"; +import { DatabaseImporter } from "@spt-aki/utils/DatabaseImporter"; +import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ObjectId } from "@spt-aki/utils/ObjectId"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { UUidGenerator } from "@spt-aki/utils/UUidGenerator"; +import { VFS } from "@spt-aki/utils/VFS"; +import { Watermark, WatermarkLocale } from "@spt-aki/utils/Watermark"; +import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; +import { WinstonRequestLogger } from "@spt-aki/utils/logging/WinstonRequestLogger"; /** * Handle the registration of classes to be used by the Dependency Injection code diff --git a/project/src/di/Router.ts b/project/src/di/Router.ts index aa461696..3db0e32d 100644 --- a/project/src/di/Router.ts +++ b/project/src/di/Router.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; export class Router { diff --git a/project/src/generators/BotEquipmentModGenerator.ts b/project/src/generators/BotEquipmentModGenerator.ts index 7f9a583d..62cc1893 100644 --- a/project/src/generators/BotEquipmentModGenerator.ts +++ b/project/src/generators/BotEquipmentModGenerator.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper, ExhaustableArray } from "../helpers/BotGeneratorHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProbabilityHelper } from "../helpers/ProbabilityHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; -import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService"; -import { BotModLimits, BotWeaponModLimitService } from "../services/BotWeaponModLimitService"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { BotGeneratorHelper, ExhaustableArray } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProbabilityHelper } from "@spt-aki/helpers/ProbabilityHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { Mods, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem, Slot } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentFilterDetails, IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; +import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; +import { BotModLimits, BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotEquipmentModGenerator diff --git a/project/src/generators/BotGenerator.ts b/project/src/generators/BotGenerator.ts index e975826c..15f99a65 100644 --- a/project/src/generators/BotGenerator.ts +++ b/project/src/generators/BotGenerator.ts @@ -1,35 +1,35 @@ import { inject, injectable } from "tsyringe"; -import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { BotInventoryGenerator } from "@spt-aki/generators/BotInventoryGenerator"; +import { BotLevelGenerator } from "@spt-aki/generators/BotLevelGenerator"; +import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; import { Common, IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills -} from "../models/eft/common/tables/IBotBase"; -import { Appearance, Health, IBotType } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; -import { LocalisationService } from "../services/LocalisationService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { BotInventoryGenerator } from "./BotInventoryGenerator"; -import { BotLevelGenerator } from "./BotLevelGenerator"; +} from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class BotGenerator diff --git a/project/src/generators/BotInventoryGenerator.ts b/project/src/generators/BotInventoryGenerator.ts index c24a47ea..7ff178ba 100644 --- a/project/src/generators/BotInventoryGenerator.ts +++ b/project/src/generators/BotInventoryGenerator.ts @@ -1,28 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; -import { - Chances, Generation, IBotType, Inventory, Mods -} from "../models/eft/common/tables/IBotType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { EquipmentSlots } from "../models/enums/EquipmentSlots"; -import { - EquipmentFilterDetails, IBotConfig, RandomisationDetails -} from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator"; -import { BotLootGenerator } from "./BotLootGenerator"; -import { BotWeaponGenerator } from "./BotWeaponGenerator"; +import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; +import { BotLootGenerator } from "@spt-aki/generators/BotLootGenerator"; +import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; +import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Chances, Generation, IBotType, Inventory, Mods } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { EquipmentFilterDetails, IBotConfig, RandomisationDetails } from "@spt-aki/models/spt/config/IBotConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotInventoryGenerator diff --git a/project/src/generators/BotLevelGenerator.ts b/project/src/generators/BotLevelGenerator.ts index 585652bb..cc205912 100644 --- a/project/src/generators/BotLevelGenerator.ts +++ b/project/src/generators/BotLevelGenerator.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { MinMax } from "../models/common/MinMax"; -import { IRandomisedBotLevelResult } from "../models/eft/bot/IRandomisedBotLevelResult"; -import { IExpTable } from "../models/eft/common/IGlobals"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IRandomisedBotLevelResult } from "@spt-aki/models/eft/bot/IRandomisedBotLevelResult"; +import { IExpTable } from "@spt-aki/models/eft/common/IGlobals"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotLevelGenerator diff --git a/project/src/generators/BotLootGenerator.ts b/project/src/generators/BotLootGenerator.ts index aeadd7a3..2515f441 100644 --- a/project/src/generators/BotLootGenerator.ts +++ b/project/src/generators/BotLootGenerator.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; -import { IBotType, Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { EquipmentSlots } from "../models/enums/EquipmentSlots"; -import { ItemAddedResult } from "../models/enums/ItemAddedResult"; -import { LootCacheType } from "../models/spt/bots/IBotLootCache"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotWeaponGenerator } from "./BotWeaponGenerator"; +import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; +import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotType, Inventory, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; +import { LootCacheType } from "@spt-aki/models/spt/bots/IBotLootCache"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotLootGenerator diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index 84f89d08..1de23548 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -1,32 +1,32 @@ import { inject, injectable, injectAll } from "tsyringe"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; -import { GenerationData, Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { EquipmentSlots } from "../models/enums/EquipmentSlots"; -import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { IRepairConfig } from "../models/spt/config/IRepairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotWeaponModLimitService } from "../services/BotWeaponModLimitService"; -import { LocalisationService } from "../services/LocalisationService"; -import { RepairService } from "../services/RepairService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator"; -import { IInventoryMagGen } from "./weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "./weapongen/InventoryMagGen"; +import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; +import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { GenerationData, Inventory, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { GenerateWeaponResult } from "@spt-aki/models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RepairService } from "@spt-aki/services/RepairService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotWeaponGenerator diff --git a/project/src/generators/FenceBaseAssortGenerator.ts b/project/src/generators/FenceBaseAssortGenerator.ts index dc3aca38..8a3b4810 100644 --- a/project/src/generators/FenceBaseAssortGenerator.ts +++ b/project/src/generators/FenceBaseAssortGenerator.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { Money } from "../models/enums/Money"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IBarterScheme } from "../models/eft/common/tables/ITrader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; @injectable() export class FenceBaseAssortGenerator diff --git a/project/src/generators/LocationGenerator.ts b/project/src/generators/LocationGenerator.ts index 67687f9e..f6b4dc3d 100644 --- a/project/src/generators/LocationGenerator.ts +++ b/project/src/generators/LocationGenerator.ts @@ -1,32 +1,27 @@ import { inject, injectable } from "tsyringe"; -import { ContainerHelper } from "../helpers/ContainerHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { IContainerMinMax, IStaticContainer } from "../models/eft/common/ILocation"; -import { ILocationBase } from "../models/eft/common/ILocationBase"; -import { - ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced -} from "../models/eft/common/ILooseLoot"; -import { Item } from "../models/eft/common/tables/IItem"; -import { - IStaticAmmoDetails, IStaticContainerData, - IStaticForcedProps, IStaticLootDetails -} from "../models/eft/common/tables/ILootBase"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { ILocationConfig } from "../models/spt/config/ILocationConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; +import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { IContainerMinMax, IStaticContainer } from "@spt-aki/models/eft/common/ILocation"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "@spt-aki/models/eft/common/ILooseLoot"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IStaticAmmoDetails, IStaticContainerData, IStaticForcedProps, IStaticLootDetails } from "@spt-aki/models/eft/common/tables/ILootBase"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ObjectId } from "@spt-aki/utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; export interface IContainerItem { diff --git a/project/src/generators/LootGenerator.ts b/project/src/generators/LootGenerator.ts index 63f379e3..f013c7d9 100644 --- a/project/src/generators/LootGenerator.ts +++ b/project/src/generators/LootGenerator.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { AddItem } from "../models/eft/inventory/IAddItemRequestData"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ISealedAirdropContainerSettings, RewardDetails } from "../models/spt/config/IInventoryConfig"; -import { LootItem } from "../models/spt/services/LootItem"; -import { LootRequest } from "../models/spt/services/LootRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { LocalisationService } from "../services/LocalisationService"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { AddItem } from "@spt-aki/models/eft/inventory/IAddItemRequestData"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ISealedAirdropContainerSettings, RewardDetails } from "@spt-aki/models/spt/config/IInventoryConfig"; +import { LootItem } from "@spt-aki/models/spt/services/LootItem"; +import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; type ItemLimit = { current: number, diff --git a/project/src/generators/PMCLootGenerator.ts b/project/src/generators/PMCLootGenerator.ts index e02e89ec..52b48f40 100644 --- a/project/src/generators/PMCLootGenerator.ts +++ b/project/src/generators/PMCLootGenerator.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { SeasonalEventService } from "../services/SeasonalEventService"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; /** * Handle the generation of dynamic PMC loot in pockets and backpacks diff --git a/project/src/generators/PlayerScavGenerator.ts b/project/src/generators/PlayerScavGenerator.ts index 01d69388..879a78f8 100644 --- a/project/src/generators/PlayerScavGenerator.ts +++ b/project/src/generators/PlayerScavGenerator.ts @@ -1,30 +1,30 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { BotHelper } from "../helpers/BotHelper"; -import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Settings, Skills, Stats } from "../models/eft/common/tables/IBotBase"; -import { IBotType } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { AccountTypes } from "../models/enums/AccountTypes"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { Traders } from "../models/enums/Traders"; -import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotGenerator } from "./BotGenerator"; +import { BotGenerator } from "@spt-aki/generators/BotGenerator"; +import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Settings, Skills, Stats } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { AccountTypes } from "@spt-aki/models/enums/AccountTypes"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IPlayerScavConfig, KarmaLevel } from "@spt-aki/models/spt/config/IPlayerScavConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class PlayerScavGenerator diff --git a/project/src/generators/RagfairAssortGenerator.ts b/project/src/generators/RagfairAssortGenerator.ts index 873babb7..19855ebb 100644 --- a/project/src/generators/RagfairAssortGenerator.ts +++ b/project/src/generators/RagfairAssortGenerator.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { Item } from "../models/eft/common/tables/IItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SeasonalEventService } from "../services/SeasonalEventService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class RagfairAssortGenerator diff --git a/project/src/generators/RagfairOfferGenerator.ts b/project/src/generators/RagfairOfferGenerator.ts index 868db5d0..6cf20278 100644 --- a/project/src/generators/RagfairOfferGenerator.ts +++ b/project/src/generators/RagfairOfferGenerator.ts @@ -1,33 +1,33 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IBarterScheme } from "../models/eft/common/tables/ITrader"; -import { IRagfairOffer, OfferRequirement } from "../models/eft/ragfair/IRagfairOffer"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { Money } from "../models/enums/Money"; -import { Dynamic, IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; +import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IRagfairOffer, OfferRequirement } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { Money } from "@spt-aki/models/enums/Money"; +import { Dynamic, IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RagfairOfferGenerator diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts index 38a97c6b..89577b9d 100644 --- a/project/src/generators/RepeatableQuestGenerator.ts +++ b/project/src/generators/RepeatableQuestGenerator.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { RepeatableQuestHelper } from "../helpers/RepeatableQuestHelper"; -import { Exit, ILocationBase } from "../models/eft/common/ILocationBase"; -import { TraderInfo } from "../models/eft/common/tables/IBotBase"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; +import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, @@ -18,30 +18,28 @@ import { IExplorationCondition, IKillConditionProps, IPickup, IRepeatableQuest, IReward, IRewards -} from "../models/eft/common/tables/IRepeatableQuests"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { Traders } from "../models/enums/Traders"; -import { - IQuestConfig, IRepeatableQuestConfig -} from "../models/spt/config/IQuestConfig"; -import { IQuestTypePool } from "../models/spt/repeatable/IQuestTypePool"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { LocalisationService } from "../services/LocalisationService"; -import { PaymentService } from "../services/PaymentService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +} from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { IQuestTypePool } from "@spt-aki/models/spt/repeatable/IQuestTypePool"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ObjectId } from "@spt-aki/utils/ObjectId"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RepeatableQuestGenerator diff --git a/project/src/generators/ScavCaseRewardGenerator.ts b/project/src/generators/ScavCaseRewardGenerator.ts index b94de896..bf39a911 100644 --- a/project/src/generators/ScavCaseRewardGenerator.ts +++ b/project/src/generators/ScavCaseRewardGenerator.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Product } from "../models/eft/common/tables/IBotBase"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Product } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { IScavCaseConfig } from "@spt-aki/models/spt/config/IScavCaseConfig"; import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices -} from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { RagfairPriceService } from "../services/RagfairPriceService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +} from "@spt-aki/models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; /** * Handle the creation of randomised scav case rewards diff --git a/project/src/generators/WeatherGenerator.ts b/project/src/generators/WeatherGenerator.ts index ea026f62..52c8f49b 100644 --- a/project/src/generators/WeatherGenerator.ts +++ b/project/src/generators/WeatherGenerator.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { IWeather, IWeatherData } from "../models/eft/weather/IWeatherData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { WindDirection } from "../models/enums/WindDirection"; -import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { IWeather, IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { WindDirection } from "@spt-aki/models/enums/WindDirection"; +import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class WeatherGenerator diff --git a/project/src/generators/weapongen/IInventoryMagGen.ts b/project/src/generators/weapongen/IInventoryMagGen.ts index dd05c733..ac710ae1 100644 --- a/project/src/generators/weapongen/IInventoryMagGen.ts +++ b/project/src/generators/weapongen/IInventoryMagGen.ts @@ -1,4 +1,4 @@ -import { InventoryMagGen } from "./InventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; export interface IInventoryMagGen { diff --git a/project/src/generators/weapongen/InventoryMagGen.ts b/project/src/generators/weapongen/InventoryMagGen.ts index 70025a37..5584b747 100644 --- a/project/src/generators/weapongen/InventoryMagGen.ts +++ b/project/src/generators/weapongen/InventoryMagGen.ts @@ -1,6 +1,6 @@ -import { Inventory } from "../../models/eft/common/tables/IBotBase"; -import { GenerationData } from "../../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../../models/eft/common/tables/ITemplateItem"; +import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; export class InventoryMagGen { diff --git a/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts b/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts index 8608ae68..83fb5fd5 100644 --- a/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper"; -import { RandomUtil } from "../../../utils/RandomUtil"; -import { IInventoryMagGen } from "../IInventoryMagGen"; -import { InventoryMagGen } from "../InventoryMagGen"; +import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BarrelInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts index c20740ea..e5d2bda7 100644 --- a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "../../../helpers/ItemHelper"; -import { EquipmentSlots } from "../../../models/enums/EquipmentSlots"; -import { ItemAddedResult } from "../../../models/enums/ItemAddedResult"; -import { ILogger } from "../../../models/spt/utils/ILogger"; -import { LocalisationService } from "../../../services/LocalisationService"; -import { IInventoryMagGen } from "../IInventoryMagGen"; -import { InventoryMagGen } from "../InventoryMagGen"; +import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class ExternalInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts b/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts index 4754ed37..9840dae9 100644 --- a/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper"; -import { IInventoryMagGen } from "../IInventoryMagGen"; -import { InventoryMagGen } from "../InventoryMagGen"; +import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; @injectable() export class InternalMagazineInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts b/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts index 10d7ebd4..cb050c60 100644 --- a/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts +++ b/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper"; -import { BaseClasses } from "../../../models/enums/BaseClasses"; -import { EquipmentSlots } from "../../../models/enums/EquipmentSlots"; -import { IInventoryMagGen } from "../IInventoryMagGen"; -import { InventoryMagGen } from "../InventoryMagGen"; +import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; @injectable() export class UbglExternalMagGen implements IInventoryMagGen diff --git a/project/src/helpers/AssortHelper.ts b/project/src/helpers/AssortHelper.ts index bae95ec3..8026ab7b 100644 --- a/project/src/helpers/AssortHelper.ts +++ b/project/src/helpers/AssortHelper.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { ItemHelper } from "./ItemHelper"; -import { QuestHelper } from "./QuestHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class AssortHelper diff --git a/project/src/helpers/BotDifficultyHelper.ts b/project/src/helpers/BotDifficultyHelper.ts index 91a16c99..83688c7e 100644 --- a/project/src/helpers/BotDifficultyHelper.ts +++ b/project/src/helpers/BotDifficultyHelper.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotHelper } from "./BotHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotDifficultyHelper diff --git a/project/src/helpers/BotGeneratorHelper.ts b/project/src/helpers/BotGeneratorHelper.ts index a794e30a..c6889b18 100644 --- a/project/src/helpers/BotGeneratorHelper.ts +++ b/project/src/helpers/BotGeneratorHelper.ts @@ -1,24 +1,22 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { - IGetRaidConfigurationRequestData -} from "../models/eft/match/IGetRaidConfigurationRequestData"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { ItemHelper } from "./ItemHelper"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { DurabilityLimitsHelper } from "@spt-aki/helpers/DurabilityLimitsHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Item, Repairable, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotGeneratorHelper diff --git a/project/src/helpers/BotHelper.ts b/project/src/helpers/BotHelper.ts index 30cbf1e8..44194728 100644 --- a/project/src/helpers/BotHelper.ts +++ b/project/src/helpers/BotHelper.ts @@ -1,18 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { MinMax } from "../models/common/MinMax"; -import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { - EquipmentFilters, IBotConfig, RandomisationDetails -} from "../models/spt/config/IBotConfig"; -import { IPmcConfig } from "../models/spt/config/IPmcConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { Difficulty, IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { EquipmentFilters, IBotConfig, RandomisationDetails } from "@spt-aki/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotHelper diff --git a/project/src/helpers/BotWeaponGeneratorHelper.ts b/project/src/helpers/BotWeaponGeneratorHelper.ts index c245865d..d84037c0 100644 --- a/project/src/helpers/BotWeaponGeneratorHelper.ts +++ b/project/src/helpers/BotWeaponGeneratorHelper.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { Inventory } from "../models/eft/common/tables/IBotBase"; -import { GenerationData } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { Grid, ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { EquipmentSlots } from "../models/enums/EquipmentSlots"; -import { ItemAddedResult } from "../models/enums/ItemAddedResult"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { ContainerHelper } from "./ContainerHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { ItemHelper } from "./ItemHelper"; -import { WeightedRandomHelper } from "./WeightedRandomHelper"; +import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Grid, ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotWeaponGeneratorHelper diff --git a/project/src/helpers/DialogueHelper.ts b/project/src/helpers/DialogueHelper.ts index 167ac8fb..c54a8e4c 100644 --- a/project/src/helpers/DialogueHelper.ts +++ b/project/src/helpers/DialogueHelper.ts @@ -1,17 +1,17 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "../models/eft/common/tables/IItem"; -import { Dialogue, Message, MessageContent, MessageItems, MessagePreview } from "../models/eft/profile/IAkiProfile"; -import { MessageType } from "../models/enums/MessageType"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { NotificationSendHelper } from "./NotificationSendHelper"; -import { NotifierHelper } from "./NotifierHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Dialogue, Message, MessageContent, MessageItems, MessagePreview } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class DialogueHelper diff --git a/project/src/helpers/DurabilityLimitsHelper.ts b/project/src/helpers/DurabilityLimitsHelper.ts index 43ae519d..61d8edc9 100644 --- a/project/src/helpers/DurabilityLimitsHelper.ts +++ b/project/src/helpers/DurabilityLimitsHelper.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotHelper } from "./BotHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class DurabilityLimitsHelper diff --git a/project/src/helpers/GameEventHelper.ts b/project/src/helpers/GameEventHelper.ts index 01f69433..14f3097e 100644 --- a/project/src/helpers/GameEventHelper.ts +++ b/project/src/helpers/GameEventHelper.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ISeasonalEventConfig } from "../models/spt/config/ISeasonalEventConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ISeasonalEventConfig } from "@spt-aki/models/spt/config/ISeasonalEventConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; @injectable() export class GameEventHelper diff --git a/project/src/helpers/HandbookHelper.ts b/project/src/helpers/HandbookHelper.ts index 6b85c024..74c3e876 100644 --- a/project/src/helpers/HandbookHelper.ts +++ b/project/src/helpers/HandbookHelper.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { Money } from "../models/enums/Money"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { Money } from "@spt-aki/models/enums/Money"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; class LookupItem { diff --git a/project/src/helpers/HealthHelper.ts b/project/src/helpers/HealthHelper.ts index 6ad21fdc..d1443f94 100644 --- a/project/src/helpers/HealthHelper.ts +++ b/project/src/helpers/HealthHelper.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { Effects, IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHealthConfig } from "../models/spt/config/IHealthConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; +import { Effects, IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHealthConfig } from "@spt-aki/models/spt/config/IHealthConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class HealthHelper diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts index 25a7fdf5..d9eae624 100644 --- a/project/src/helpers/HideoutHelper.ts +++ b/project/src/helpers/HideoutHelper.ts @@ -1,38 +1,30 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { - Common, HideoutArea, IHideoutImprovement, Production, Productive -} from "../models/eft/common/tables/IBotBase"; -import { Upd } from "../models/eft/common/tables/IItem"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { - IHideoutContinuousProductionStartRequestData -} from "../models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; -import { - IHideoutSingleProductionStartRequestData -} from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { - IHideoutTakeProductionRequestData -} from "../models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { HideoutAreas } from "../models/enums/HideoutAreas"; -import { SkillTypes } from "../models/enums/SkillTypes"; -import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { PlayerService } from "../services/PlayerService"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { ProfileHelper } from "./ProfileHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Common, HideoutArea, IHideoutImprovement, Production, Productive } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { StageBonus } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; +import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IAddItemRequestData } from "@spt-aki/models/eft/inventory/IAddItemRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; +import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PlayerService } from "@spt-aki/services/PlayerService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class HideoutHelper diff --git a/project/src/helpers/HttpServerHelper.ts b/project/src/helpers/HttpServerHelper.ts index 4054d5c1..19a85a34 100644 --- a/project/src/helpers/HttpServerHelper.ts +++ b/project/src/helpers/HttpServerHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ConfigServer } from "../servers/ConfigServer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; @injectable() export class HttpServerHelper diff --git a/project/src/helpers/InRaidHelper.ts b/project/src/helpers/InRaidHelper.ts index ac3db33f..1d012347 100644 --- a/project/src/helpers/InRaidHelper.ts +++ b/project/src/helpers/InRaidHelper.ts @@ -1,26 +1,26 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData, IPostRaidPmcData } from "../models/eft/common/IPmcData"; -import { IQuestStatus, TraderInfo, Victim } from "../models/eft/common/tables/IBotBase"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { IFailQuestRequestData } from "../models/eft/quests/IFailQuestRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { Traders } from "../models/enums/Traders"; -import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; -import { ILostOnDeathConfig } from "../models/spt/config/ILostOnDeathConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { ProfileFixerService } from "../services/ProfileFixerService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { QuestHelper } from "./QuestHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; +import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; +import { ILostOnDeathConfig } from "@spt-aki/models/spt/config/ILostOnDeathConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class InRaidHelper diff --git a/project/src/helpers/InventoryHelper.ts b/project/src/helpers/InventoryHelper.ts index 510db837..942483eb 100644 --- a/project/src/helpers/InventoryHelper.ts +++ b/project/src/helpers/InventoryHelper.ts @@ -1,33 +1,33 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Inventory } from "../models/eft/common/tables/IBotBase"; -import { Item, Location, Upd } from "../models/eft/common/tables/IItem"; -import { AddItem, IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData"; -import { IAddItemTempObject } from "../models/eft/inventory/IAddItemTempObject"; -import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { IInventoryConfig, RewardDetails } from "../models/spt/config/IInventoryConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { ContainerHelper } from "./ContainerHelper"; -import { DialogueHelper } from "./DialogueHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { TraderAssortHelper } from "./TraderAssortHelper"; +import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item, Location, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { AddItem, IAddItemRequestData } from "@spt-aki/models/eft/inventory/IAddItemRequestData"; +import { IAddItemTempObject } from "@spt-aki/models/eft/inventory/IAddItemTempObject"; +import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IInventoryConfig, RewardDetails } from "@spt-aki/models/spt/config/IInventoryConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; export interface OwnerInventoryItems { diff --git a/project/src/helpers/ItemHelper.ts b/project/src/helpers/ItemHelper.ts index 36cbe23e..ccc6357f 100644 --- a/project/src/helpers/ItemHelper.ts +++ b/project/src/helpers/ItemHelper.ts @@ -1,22 +1,22 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { InsuredItem } from "../models/eft/common/tables/IBotBase"; -import { Item, Location, Repairable } from "../models/eft/common/tables/IItem"; -import { IStaticAmmoDetails } from "../models/eft/common/tables/ILootBase"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemBaseClassService } from "../services/ItemBaseClassService"; -import { LocaleService } from "../services/LocaleService"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { ObjectId } from "../utils/ObjectId"; -import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil"; -import { HandbookHelper } from "./HandbookHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { InsuredItem } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item, Location, Repairable } from "@spt-aki/models/eft/common/tables/IItem"; +import { IStaticAmmoDetails } from "@spt-aki/models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ObjectId } from "@spt-aki/utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() class ItemHelper diff --git a/project/src/helpers/NotificationSendHelper.ts b/project/src/helpers/NotificationSendHelper.ts index cf320f98..32e81201 100644 --- a/project/src/helpers/NotificationSendHelper.ts +++ b/project/src/helpers/NotificationSendHelper.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { INotification, NotificationType } from "../models/eft/notifier/INotifier"; -import { Dialogue, IUserDialogInfo, Message } from "../models/eft/profile/IAkiProfile"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { MessageType } from "../models/enums/MessageType"; -import { SaveServer } from "../servers/SaveServer"; -import { WebSocketServer } from "../servers/WebSocketServer"; -import { NotificationService } from "../services/NotificationService"; -import { HashUtil } from "../utils/HashUtil"; +import { INotification, NotificationType } from "@spt-aki/models/eft/notifier/INotifier"; +import { Dialogue, IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; +import { NotificationService } from "@spt-aki/services/NotificationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; @injectable() export class NotificationSendHelper diff --git a/project/src/helpers/NotifierHelper.ts b/project/src/helpers/NotifierHelper.ts index 41dfef64..d4acdf13 100644 --- a/project/src/helpers/NotifierHelper.ts +++ b/project/src/helpers/NotifierHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { INotification, NotificationType } from "../models/eft/notifier/INotifier"; -import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; -import { HttpServerHelper } from "./HttpServerHelper"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { INotification, NotificationType } from "@spt-aki/models/eft/notifier/INotifier"; +import { Message, MessageContentRagfair } from "@spt-aki/models/eft/profile/IAkiProfile"; @injectable() export class NotifierHelper diff --git a/project/src/helpers/PaymentHelper.ts b/project/src/helpers/PaymentHelper.ts index 3cd12fac..e49e4521 100644 --- a/project/src/helpers/PaymentHelper.ts +++ b/project/src/helpers/PaymentHelper.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; -import { ConfigServer } from "../servers/ConfigServer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { IInventoryConfig } from "@spt-aki/models/spt/config/IInventoryConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; @injectable() export class PaymentHelper diff --git a/project/src/helpers/PresetHelper.ts b/project/src/helpers/PresetHelper.ts index d526f70f..f48b8767 100644 --- a/project/src/helpers/PresetHelper.ts +++ b/project/src/helpers/PresetHelper.ts @@ -1,7 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; + +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class PresetHelper diff --git a/project/src/helpers/ProbabilityHelper.ts b/project/src/helpers/ProbabilityHelper.ts index edb59514..f00963e3 100644 --- a/project/src/helpers/ProbabilityHelper.ts +++ b/project/src/helpers/ProbabilityHelper.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { RandomUtil } from "../utils/RandomUtil"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class ProbabilityHelper diff --git a/project/src/helpers/ProfileHelper.ts b/project/src/helpers/ProfileHelper.ts index 83629b09..211e593c 100644 --- a/project/src/helpers/ProfileHelper.ts +++ b/project/src/helpers/ProfileHelper.ts @@ -1,17 +1,17 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { CounterKeyValue, Stats } from "../models/eft/common/tables/IBotBase"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { ProfileSnapshotService } from "../services/ProfileSnapshotService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { ItemHelper } from "./ItemHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { CounterKeyValue, Stats } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { Watermark } from "@spt-aki/utils/Watermark"; @injectable() export class ProfileHelper diff --git a/project/src/helpers/QuestConditionHelper.ts b/project/src/helpers/QuestConditionHelper.ts index 79e8ad39..f964551f 100644 --- a/project/src/helpers/QuestConditionHelper.ts +++ b/project/src/helpers/QuestConditionHelper.ts @@ -1,6 +1,7 @@ import { injectable } from "tsyringe"; -import { AvailableForConditions } from "../models/eft/common/tables/IQuest"; + +import { AvailableForConditions } from "@spt-aki/models/eft/common/tables/IQuest"; @injectable() export class QuestConditionHelper diff --git a/project/src/helpers/QuestHelper.ts b/project/src/helpers/QuestHelper.ts index 1b5c4c16..143821a5 100644 --- a/project/src/helpers/QuestHelper.ts +++ b/project/src/helpers/QuestHelper.ts @@ -1,36 +1,34 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuestStatus } from "../models/eft/common/tables/IBotBase"; -import { Item } from "../models/eft/common/tables/IItem"; -import { - AvailableForConditions, AvailableForProps, IQuest, Reward -} from "../models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { IFailQuestRequestData } from "../models/eft/quests/IFailQuestRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MessageType } from "../models/enums/MessageType"; -import { QuestRewardType } from "../models/enums/QuestRewardType"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { IQuestConfig } from "../models/spt/config/IQuestConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocaleService } from "../services/LocaleService"; -import { LocalisationService } from "../services/LocalisationService"; -import { MailSendService } from "../services/MailSendService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { QuestConditionHelper } from "./QuestConditionHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { TraderHelper } from "./TraderHelper"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; +import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { QuestRewardType } from "@spt-aki/models/enums/QuestRewardType"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class QuestHelper diff --git a/project/src/helpers/RagfairHelper.ts b/project/src/helpers/RagfairHelper.ts index 3e88b3ff..1a73cc0c 100644 --- a/project/src/helpers/RagfairHelper.ts +++ b/project/src/helpers/RagfairHelper.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; -import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { TraderAssortHelper } from "./TraderAssortHelper"; -import { UtilityHelper } from "./UtilityHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; +import { UtilityHelper } from "@spt-aki/helpers/UtilityHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; +import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class RagfairHelper diff --git a/project/src/helpers/RagfairOfferHelper.ts b/project/src/helpers/RagfairOfferHelper.ts index 1218f096..45f2e7d4 100644 --- a/project/src/helpers/RagfairOfferHelper.ts +++ b/project/src/helpers/RagfairOfferHelper.ts @@ -1,38 +1,38 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile, ISystemData } from "../models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData, OfferOwnerType } from "../models/eft/ragfair/ISearchRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { MessageType } from "../models/enums/MessageType"; -import { RagfairSort } from "../models/enums/RagfairSort"; -import { Traders } from "../models/enums/Traders"; -import { IQuestConfig } from "../models/spt/config/IQuestConfig"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { LocaleService } from "../services/LocaleService"; -import { LocalisationService } from "../services/LocalisationService"; -import { MailSendService } from "../services/MailSendService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { PresetHelper } from "./PresetHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { RagfairHelper } from "./RagfairHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { RagfairSortHelper } from "./RagfairSortHelper"; -import { TraderHelper } from "./TraderHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAkiProfile, ISystemData } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData, OfferOwnerType } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RagfairOfferHelper diff --git a/project/src/helpers/RagfairSellHelper.ts b/project/src/helpers/RagfairSellHelper.ts index 5ea7eee3..43f95f93 100644 --- a/project/src/helpers/RagfairSellHelper.ts +++ b/project/src/helpers/RagfairSellHelper.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { SellResult } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RagfairSellHelper diff --git a/project/src/helpers/RagfairServerHelper.ts b/project/src/helpers/RagfairServerHelper.ts index 002a6359..9ff80555 100644 --- a/project/src/helpers/RagfairServerHelper.ts +++ b/project/src/helpers/RagfairServerHelper.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { MessageType } from "../models/enums/MessageType"; -import { Traders } from "../models/enums/Traders"; -import { IQuestConfig } from "../models/spt/config/IQuestConfig"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { ItemFilterService } from "../services/ItemFilterService"; -import { LocaleService } from "../services/LocaleService"; -import { MailSendService } from "../services/MailSendService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { TraderHelper } from "./TraderHelper"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** * Helper class for common ragfair server actions diff --git a/project/src/helpers/RagfairSortHelper.ts b/project/src/helpers/RagfairSortHelper.ts index 747677c5..2e41203b 100644 --- a/project/src/helpers/RagfairSortHelper.ts +++ b/project/src/helpers/RagfairSortHelper.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { RagfairSort } from "../models/enums/RagfairSort"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocaleService } from "../services/LocaleService"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; @injectable() export class RagfairSortHelper diff --git a/project/src/helpers/RepairHelper.ts b/project/src/helpers/RepairHelper.ts index b986b7ee..9b1a07bd 100644 --- a/project/src/helpers/RepairHelper.ts +++ b/project/src/helpers/RepairHelper.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IRepairConfig } from "../models/spt/config/IRepairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class RepairHelper diff --git a/project/src/helpers/RepeatableQuestHelper.ts b/project/src/helpers/RepeatableQuestHelper.ts index dfffef5b..dabf30cd 100644 --- a/project/src/helpers/RepeatableQuestHelper.ts +++ b/project/src/helpers/RepeatableQuestHelper.ts @@ -1,10 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; -import { ConfigServer } from "../servers/ConfigServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { ProbabilityObject, ProbabilityObjectArray } from "../utils/RandomUtil"; + +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ProbabilityObject, ProbabilityObjectArray } from "@spt-aki/utils/RandomUtil"; @injectable() export class RepeatableQuestHelper diff --git a/project/src/helpers/SecureContainerHelper.ts b/project/src/helpers/SecureContainerHelper.ts index fe1f3f61..bce992cb 100644 --- a/project/src/helpers/SecureContainerHelper.ts +++ b/project/src/helpers/SecureContainerHelper.ts @@ -1,6 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ItemHelper } from "./ItemHelper"; + +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface OwnerInventoryItems { diff --git a/project/src/helpers/TradeHelper.ts b/project/src/helpers/TradeHelper.ts index 5a78bde0..e92f3b77 100644 --- a/project/src/helpers/TradeHelper.ts +++ b/project/src/helpers/TradeHelper.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RagfairServer } from "../servers/RagfairServer"; -import { FenceService } from "../services/FenceService"; -import { PaymentService } from "../services/PaymentService"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { RagfairServer } from "@spt-aki/servers/RagfairServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class TradeHelper diff --git a/project/src/helpers/TraderAssortHelper.ts b/project/src/helpers/TraderAssortHelper.ts index c41f6084..15a39dc7 100644 --- a/project/src/helpers/TraderAssortHelper.ts +++ b/project/src/helpers/TraderAssortHelper.ts @@ -1,26 +1,26 @@ import { inject, injectable } from "tsyringe"; -import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITrader, ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { TraderAssortService } from "../services/TraderAssortService"; -import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { MathUtil } from "../utils/MathUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { AssortHelper } from "./AssortHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { TraderHelper } from "./TraderHelper"; +import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; +import { AssortHelper } from "@spt-aki/helpers/AssortHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITrader, ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class TraderAssortHelper diff --git a/project/src/helpers/TraderHelper.ts b/project/src/helpers/TraderHelper.ts index d96db4a2..4abe301c 100644 --- a/project/src/helpers/TraderHelper.ts +++ b/project/src/helpers/TraderHelper.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ProfileTraderTemplate } from "../models/eft/common/tables/IProfileTemplate"; -import { ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { Traders } from "../models/enums/Traders"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { LocalisationService } from "../services/LocalisationService"; -import { PlayerService } from "../services/PlayerService"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ProfileTraderTemplate } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; +import { ITraderAssort, ITraderBase, LoyaltyLevel } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { FenceService } from "@spt-aki/services/FenceService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PlayerService } from "@spt-aki/services/PlayerService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class TraderHelper diff --git a/project/src/ide/BleedingEdgeEntry.ts b/project/src/ide/BleedingEdgeEntry.ts index b9902629..8b9c2173 100644 --- a/project/src/ide/BleedingEdgeEntry.ts +++ b/project/src/ide/BleedingEdgeEntry.ts @@ -1,6 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "../Program"; + +import { Program } from "@spt-aki/Program"; globalThis.G_DEBUG_CONFIGURATION = true; globalThis.G_RELEASE_CONFIGURATION = true; diff --git a/project/src/ide/DebugEntry.ts b/project/src/ide/DebugEntry.ts index 57ca352f..df404929 100644 --- a/project/src/ide/DebugEntry.ts +++ b/project/src/ide/DebugEntry.ts @@ -1,6 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "../Program"; + +import { Program } from "@spt-aki/Program"; globalThis.G_DEBUG_CONFIGURATION = true; globalThis.G_RELEASE_CONFIGURATION = true; diff --git a/project/src/ide/ReleaseEntry.ts b/project/src/ide/ReleaseEntry.ts index 14013ebb..0ddcde09 100644 --- a/project/src/ide/ReleaseEntry.ts +++ b/project/src/ide/ReleaseEntry.ts @@ -1,6 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "../Program"; + +import { Program } from "@spt-aki/Program"; globalThis.G_DEBUG_CONFIGURATION = false; globalThis.G_RELEASE_CONFIGURATION = true; diff --git a/project/src/ide/TestEntry.ts b/project/src/ide/TestEntry.ts index 5076c7a6..45f33596 100644 --- a/project/src/ide/TestEntry.ts +++ b/project/src/ide/TestEntry.ts @@ -1,6 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "../Program"; + +import { Program } from "@spt-aki/Program"; globalThis.G_DEBUG_CONFIGURATION = true; globalThis.G_RELEASE_CONFIGURATION = false; diff --git a/project/src/loaders/BundleLoader.ts b/project/src/loaders/BundleLoader.ts index 2ecc8eac..b14e5b9b 100644 --- a/project/src/loaders/BundleLoader.ts +++ b/project/src/loaders/BundleLoader.ts @@ -1,8 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; + +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; class BundleInfo { diff --git a/project/src/loaders/ModLoadOrder.ts b/project/src/loaders/ModLoadOrder.ts index e8a5ee7f..9755c1df 100644 --- a/project/src/loaders/ModLoadOrder.ts +++ b/project/src/loaders/ModLoadOrder.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ErrorHandler } from "../ErrorHandler"; -import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; +import { ErrorHandler } from "@spt-aki/ErrorHandler"; +import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class ModLoadOrder diff --git a/project/src/loaders/ModTypeCheck.ts b/project/src/loaders/ModTypeCheck.ts index bafcadeb..2edc06de 100644 --- a/project/src/loaders/ModTypeCheck.ts +++ b/project/src/loaders/ModTypeCheck.ts @@ -1,10 +1,11 @@ import { injectable } from "tsyringe"; -import { IPostAkiLoadMod } from "../models/external/IPostAkiLoadMod"; -import { IPostAkiLoadModAsync } from "../models/external/IPostAkiLoadModAsync"; -import { IPostDBLoadMod } from "../models/external/IPostDBLoadMod"; -import { IPostDBLoadModAsync } from "../models/external/IPostDBLoadModAsync"; -import { IPreAkiLoadMod } from "../models/external/IPreAkiLoadMod"; -import { IPreAkiLoadModAsync } from "../models/external/IPreAkiLoadModAsync"; + +import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; +import { IPostAkiLoadModAsync } from "@spt-aki/models/external/IPostAkiLoadModAsync"; +import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; +import { IPostDBLoadModAsync } from "@spt-aki/models/external/IPostDBLoadModAsync"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; +import { IPreAkiLoadModAsync } from "@spt-aki/models/external/IPreAkiLoadModAsync"; @injectable() export class ModTypeCheck diff --git a/project/src/loaders/PostAkiModLoader.ts b/project/src/loaders/PostAkiModLoader.ts index 3fc4d857..deb30055 100644 --- a/project/src/loaders/PostAkiModLoader.ts +++ b/project/src/loaders/PostAkiModLoader.ts @@ -1,13 +1,14 @@ import { DependencyContainer, inject, injectable } from "tsyringe"; -import { IPostAkiLoadMod } from "../models/external/IPostAkiLoadMod"; -import { IPostAkiLoadModAsync } from "../models/external/IPostAkiLoadModAsync"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { VFS } from "../utils/VFS"; -import { BundleLoader } from "./BundleLoader"; -import { ModTypeCheck } from "./ModTypeCheck"; -import { PreAkiModLoader } from "./PreAkiModLoader"; + +import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; +import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; +import { IPostAkiLoadModAsync } from "@spt-aki/models/external/IPostAkiLoadModAsync"; +import { IModLoader } from "@spt-aki/models/spt/mod/IModLoader"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class PostAkiModLoader implements IModLoader diff --git a/project/src/loaders/PostDBModLoader.ts b/project/src/loaders/PostDBModLoader.ts index af079e71..8b324792 100644 --- a/project/src/loaders/PostDBModLoader.ts +++ b/project/src/loaders/PostDBModLoader.ts @@ -1,11 +1,12 @@ import { DependencyContainer, inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { IPostDBLoadMod } from "../models/external/IPostDBLoadMod"; -import { IPostDBLoadModAsync } from "../models/external/IPostDBLoadModAsync"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { ModTypeCheck } from "./ModTypeCheck"; -import { PreAkiModLoader } from "./PreAkiModLoader"; + +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; +import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; +import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; +import { IPostDBLoadModAsync } from "@spt-aki/models/external/IPostDBLoadModAsync"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class PostDBModLoader implements OnLoad diff --git a/project/src/loaders/PreAkiModLoader.ts b/project/src/loaders/PreAkiModLoader.ts index 91e3e700..4f0308d1 100644 --- a/project/src/loaders/PreAkiModLoader.ts +++ b/project/src/loaders/PreAkiModLoader.ts @@ -3,22 +3,23 @@ import os from "node:os"; import path from "node:path"; import semver from "semver"; import { DependencyContainer, inject, injectable } from "tsyringe"; -import { ModDetails } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IPreAkiLoadMod } from "../models/external/IPreAkiLoadMod"; -import { IPreAkiLoadModAsync } from "../models/external/IPreAkiLoadModAsync"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { ModCompilerService } from "../services/ModCompilerService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; -import { BundleLoader } from "./BundleLoader"; -import { ModLoadOrder } from "./ModLoadOrder"; -import { ModTypeCheck } from "./ModTypeCheck"; + +import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; +import { ModLoadOrder } from "@spt-aki/loaders/ModLoadOrder"; +import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; +import { ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; +import { IPreAkiLoadModAsync } from "@spt-aki/models/external/IPreAkiLoadModAsync"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { IModLoader } from "@spt-aki/models/spt/mod/IModLoader"; +import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ModCompilerService } from "@spt-aki/services/ModCompilerService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class PreAkiModLoader implements IModLoader diff --git a/project/src/models/eft/common/IGlobals.ts b/project/src/models/eft/common/IGlobals.ts index 9a38dbd5..67c655f8 100644 --- a/project/src/models/eft/common/IGlobals.ts +++ b/project/src/models/eft/common/IGlobals.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Ixyz } from "./Ixyz"; -import { Item } from "./tables/IItem"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface IGlobals { diff --git a/project/src/models/eft/common/ILocation.ts b/project/src/models/eft/common/ILocation.ts index 12368e5d..57f22d9b 100644 --- a/project/src/models/eft/common/ILocation.ts +++ b/project/src/models/eft/common/ILocation.ts @@ -1,5 +1,5 @@ -import { ILocationBase } from "./ILocationBase"; -import { ILooseLoot } from "./ILooseLoot"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot"; export interface ILocation { diff --git a/project/src/models/eft/common/ILocationBase.ts b/project/src/models/eft/common/ILocationBase.ts index 54cc8d7a..d39279bb 100644 --- a/project/src/models/eft/common/ILocationBase.ts +++ b/project/src/models/eft/common/ILocationBase.ts @@ -1,5 +1,5 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { Ixyz } from "./Ixyz"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; /* eslint-disable @typescript-eslint/naming-convention */ export interface ILocationBase diff --git a/project/src/models/eft/common/ILocationsSourceDestinationBase.ts b/project/src/models/eft/common/ILocationsSourceDestinationBase.ts index 1d636f90..aa9ac14e 100644 --- a/project/src/models/eft/common/ILocationsSourceDestinationBase.ts +++ b/project/src/models/eft/common/ILocationsSourceDestinationBase.ts @@ -1,4 +1,4 @@ -import { ILocations } from "../../spt/server/ILocations"; +import { ILocations } from "@spt-aki/models/spt/server/ILocations"; export interface ILocationsGenerateAllResponse { diff --git a/project/src/models/eft/common/ILooseLoot.ts b/project/src/models/eft/common/ILooseLoot.ts index 66f96d3a..b18e41fe 100644 --- a/project/src/models/eft/common/ILooseLoot.ts +++ b/project/src/models/eft/common/ILooseLoot.ts @@ -1,5 +1,5 @@ -import { Ixyz } from "./Ixyz"; -import { Item } from "./tables/IItem"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface ILooseLoot { diff --git a/project/src/models/eft/common/IPmcData.ts b/project/src/models/eft/common/IPmcData.ts index a64b7a5c..ec0fb4cf 100644 --- a/project/src/models/eft/common/IPmcData.ts +++ b/project/src/models/eft/common/IPmcData.ts @@ -1,4 +1,4 @@ -import { IBotBase, IEftStats } from "./tables/IBotBase"; +import { IBotBase, IEftStats } from "@spt-aki/models/eft/common/tables/IBotBase"; export interface IPmcData extends IBotBase {} diff --git a/project/src/models/eft/common/tables/IBotBase.ts b/project/src/models/eft/common/tables/IBotBase.ts index 1f0ec106..8709384a 100644 --- a/project/src/models/eft/common/tables/IBotBase.ts +++ b/project/src/models/eft/common/tables/IBotBase.ts @@ -1,9 +1,9 @@ -import { HideoutAreas } from "../../../enums/HideoutAreas"; -import { MemberCategory } from "../../../enums/MemberCategory"; -import { QuestStatus } from "../../../enums/QuestStatus"; -import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; -import { Item, Upd } from "./IItem"; -import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; +import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; export interface IBotBase { diff --git a/project/src/models/eft/common/tables/IBotType.ts b/project/src/models/eft/common/tables/IBotType.ts index 6d9e6f8f..9de15042 100644 --- a/project/src/models/eft/common/tables/IBotType.ts +++ b/project/src/models/eft/common/tables/IBotType.ts @@ -1,5 +1,5 @@ -import { MinMax } from "../../../common/MinMax"; -import { Skills } from "./IBotBase"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; export interface IBotType { diff --git a/project/src/models/eft/common/tables/ICustomizationItem.ts b/project/src/models/eft/common/tables/ICustomizationItem.ts index 3236be7d..9a173862 100644 --- a/project/src/models/eft/common/tables/ICustomizationItem.ts +++ b/project/src/models/eft/common/tables/ICustomizationItem.ts @@ -1,4 +1,4 @@ -import { Ixyz } from "../Ixyz"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; export interface ICustomizationItem { diff --git a/project/src/models/eft/common/tables/ILootBase.ts b/project/src/models/eft/common/tables/ILootBase.ts index bb8801a3..12169055 100644 --- a/project/src/models/eft/common/tables/ILootBase.ts +++ b/project/src/models/eft/common/tables/ILootBase.ts @@ -1,5 +1,5 @@ -import { Ixyz } from "../Ixyz"; -import { Item } from "./IItem"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface ILootBase { diff --git a/project/src/models/eft/common/tables/IProfileTemplate.ts b/project/src/models/eft/common/tables/IProfileTemplate.ts index c44243c6..0f4ab7fc 100644 --- a/project/src/models/eft/common/tables/IProfileTemplate.ts +++ b/project/src/models/eft/common/tables/IProfileTemplate.ts @@ -1,5 +1,5 @@ -import { Dialogue, IUserBuilds, IWeaponBuild } from "../../profile/IAkiProfile"; -import { IPmcData } from "../IPmcData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Dialogue, IUserBuilds } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IProfileTemplates { diff --git a/project/src/models/eft/common/tables/IQuest.ts b/project/src/models/eft/common/tables/IQuest.ts index ba065b9e..89f90480 100644 --- a/project/src/models/eft/common/tables/IQuest.ts +++ b/project/src/models/eft/common/tables/IQuest.ts @@ -1,7 +1,7 @@ -import { QuestRewardType } from "../../../enums/QuestRewardType"; -import { QuestStatus } from "../../../enums/QuestStatus"; -import { QuestTypeEnum } from "../../../enums/QuestTypeEnum"; -import { Item } from "./IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { QuestRewardType } from "@spt-aki/models/enums/QuestRewardType"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { QuestTypeEnum } from "@spt-aki/models/enums/QuestTypeEnum"; export interface IQuest { diff --git a/project/src/models/eft/common/tables/IRepeatableQuests.ts b/project/src/models/eft/common/tables/IRepeatableQuests.ts index 76193093..e61829d0 100644 --- a/project/src/models/eft/common/tables/IRepeatableQuests.ts +++ b/project/src/models/eft/common/tables/IRepeatableQuests.ts @@ -1,4 +1,5 @@ -import { Item } from "./IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; + export interface IReward { index: number diff --git a/project/src/models/eft/common/tables/ITemplateItem.ts b/project/src/models/eft/common/tables/ITemplateItem.ts index afae10b1..c7b45aae 100644 --- a/project/src/models/eft/common/tables/ITemplateItem.ts +++ b/project/src/models/eft/common/tables/ITemplateItem.ts @@ -1,4 +1,4 @@ -import { Ixyz } from "../Ixyz"; +import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; export interface ITemplateItem { diff --git a/project/src/models/eft/common/tables/ITrader.ts b/project/src/models/eft/common/tables/ITrader.ts index 204ec0da..3487a9de 100644 --- a/project/src/models/eft/common/tables/ITrader.ts +++ b/project/src/models/eft/common/tables/ITrader.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Item } from "./IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface ITrader { diff --git a/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts b/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts index caf2f2fe..61cf21da 100644 --- a/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts +++ b/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts @@ -1,4 +1,4 @@ -import { Message } from "../profile/IAkiProfile"; +import { Message } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IGetAllAttachmentsResponse { diff --git a/project/src/models/eft/dialog/IGetFriendListDataResponse.ts b/project/src/models/eft/dialog/IGetFriendListDataResponse.ts index ae0eb034..454dfd4e 100644 --- a/project/src/models/eft/dialog/IGetFriendListDataResponse.ts +++ b/project/src/models/eft/dialog/IGetFriendListDataResponse.ts @@ -1,4 +1,4 @@ -import { IUserDialogInfo } from "../profile/IAkiProfile"; +import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IGetFriendListDataResponse { diff --git a/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts b/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts index 67426609..6e07a2fe 100644 --- a/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts +++ b/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts @@ -1,4 +1,4 @@ -import { MessageType } from "../../enums/MessageType"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; export interface IGetMailDialogViewRequestData { diff --git a/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts b/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts index 68826cc2..ef3e5af6 100644 --- a/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts +++ b/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts @@ -1,4 +1,4 @@ -import { IUserDialogInfo, Message } from "../profile/IAkiProfile"; +import { IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IGetMailDialogViewResponseData { diff --git a/project/src/models/eft/dialog/ISendMessageRequest.ts b/project/src/models/eft/dialog/ISendMessageRequest.ts index 1a746be1..dfbee57a 100644 --- a/project/src/models/eft/dialog/ISendMessageRequest.ts +++ b/project/src/models/eft/dialog/ISendMessageRequest.ts @@ -1,4 +1,4 @@ -import { MessageType } from "../../enums/MessageType"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; export interface ISendMessageRequest { diff --git a/project/src/models/eft/game/ICurrentGroupResponse.ts b/project/src/models/eft/game/ICurrentGroupResponse.ts index e5a96056..f664d9a3 100644 --- a/project/src/models/eft/game/ICurrentGroupResponse.ts +++ b/project/src/models/eft/game/ICurrentGroupResponse.ts @@ -1,4 +1,4 @@ -import { MemberCategory } from "../../../models/enums/MemberCategory"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; export interface ICurrentGroupResponse { diff --git a/project/src/models/eft/health/IOffraidEatRequestData.ts b/project/src/models/eft/health/IOffraidEatRequestData.ts index 8f1db115..11b6d41d 100644 --- a/project/src/models/eft/health/IOffraidEatRequestData.ts +++ b/project/src/models/eft/health/IOffraidEatRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface IOffraidEatRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/health/IOffraidHealRequestData.ts b/project/src/models/eft/health/IOffraidHealRequestData.ts index a8755b19..dd922b4d 100644 --- a/project/src/models/eft/health/IOffraidHealRequestData.ts +++ b/project/src/models/eft/health/IOffraidHealRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface IOffraidHealRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/hideout/IHideoutScavCase.ts b/project/src/models/eft/hideout/IHideoutScavCase.ts index d2a45e4f..f3e939e4 100644 --- a/project/src/models/eft/hideout/IHideoutScavCase.ts +++ b/project/src/models/eft/hideout/IHideoutScavCase.ts @@ -1,4 +1,4 @@ -import { MinMax } from "../../common/MinMax"; +import { MinMax } from "@spt-aki/models/common/MinMax"; export interface IHideoutScavCase { diff --git a/project/src/models/eft/inRaid/ISaveProgressRequestData.ts b/project/src/models/eft/inRaid/ISaveProgressRequestData.ts index c6a33333..4defa3d9 100644 --- a/project/src/models/eft/inRaid/ISaveProgressRequestData.ts +++ b/project/src/models/eft/inRaid/ISaveProgressRequestData.ts @@ -1,7 +1,7 @@ -import { PlayerRaidEndState } from "../../../models/enums/PlayerRaidEndState"; -import { IPostRaidPmcData } from "../common/IPmcData"; -import { ISyncHealthRequestData } from "../health/ISyncHealthRequestData"; -import { IInsuredItemsData } from "./IInsuredItemsData"; +import { IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; +import { IInsuredItemsData } from "@spt-aki/models/eft/inRaid/IInsuredItemsData"; +import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState"; export interface ISaveProgressRequestData { diff --git a/project/src/models/eft/insurance/IInsureRequestData.ts b/project/src/models/eft/insurance/IInsureRequestData.ts index e01e46f0..34bbd0d2 100644 --- a/project/src/models/eft/insurance/IInsureRequestData.ts +++ b/project/src/models/eft/insurance/IInsureRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface IInsureRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/inventory/IAddItemTempObject.ts b/project/src/models/eft/inventory/IAddItemTempObject.ts index c992fd70..3e910e28 100644 --- a/project/src/models/eft/inventory/IAddItemTempObject.ts +++ b/project/src/models/eft/inventory/IAddItemTempObject.ts @@ -1,4 +1,4 @@ -import { Item, Location } from "../common/tables/IItem"; +import { Item, Location } from "@spt-aki/models/eft/common/tables/IItem"; export interface IAddItemTempObject { diff --git a/project/src/models/eft/inventory/IInventoryAddRequestData.ts b/project/src/models/eft/inventory/IInventoryAddRequestData.ts index 7b048251..8d272f66 100644 --- a/project/src/models/eft/inventory/IInventoryAddRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryAddRequestData.ts @@ -1,4 +1,4 @@ -import { Container, IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { Container, IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryAddRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts b/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts index caf80b9f..658999be 100644 --- a/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface IInventoryBaseActionRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryBindRequestData.ts b/project/src/models/eft/inventory/IInventoryBindRequestData.ts index 6f3c27ce..4fbd2756 100644 --- a/project/src/models/eft/inventory/IInventoryBindRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryBindRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryBindRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts index d8796ea3..842d653d 100644 --- a/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryCreateMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts index 43ff1063..a606fa6b 100644 --- a/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryDeleteMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts index 735fde70..8344c5a9 100644 --- a/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryEditMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryExamineRequestData.ts b/project/src/models/eft/inventory/IInventoryExamineRequestData.ts index 2356fd11..722f48fd 100644 --- a/project/src/models/eft/inventory/IInventoryExamineRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryExamineRequestData.ts @@ -1,5 +1,5 @@ -import { OwnerInfo } from "../common/request/IBaseInteractionRequestData"; -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryExamineRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryFoldRequestData.ts b/project/src/models/eft/inventory/IInventoryFoldRequestData.ts index 4ad46b11..6005d864 100644 --- a/project/src/models/eft/inventory/IInventoryFoldRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryFoldRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryFoldRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryMergeRequestData.ts b/project/src/models/eft/inventory/IInventoryMergeRequestData.ts index d6b72ef0..543606fd 100644 --- a/project/src/models/eft/inventory/IInventoryMergeRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryMergeRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryMergeRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryMoveRequestData.ts b/project/src/models/eft/inventory/IInventoryMoveRequestData.ts index 1163d4d7..45f3512b 100644 --- a/project/src/models/eft/inventory/IInventoryMoveRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryMoveRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData, To } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData, To } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryMoveRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts b/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts index b513fc5e..c0171450 100644 --- a/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryReadEncyclopediaRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts b/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts index 7b95dd8a..97440f51 100644 --- a/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryRemoveRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySortRequestData.ts b/project/src/models/eft/inventory/IInventorySortRequestData.ts index 99829d78..cf98346e 100644 --- a/project/src/models/eft/inventory/IInventorySortRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySortRequestData.ts @@ -1,5 +1,5 @@ -import { Upd } from "../common/tables/IItem"; -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySortRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySplitRequestData.ts b/project/src/models/eft/inventory/IInventorySplitRequestData.ts index c3825c20..f087c3c9 100644 --- a/project/src/models/eft/inventory/IInventorySplitRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySplitRequestData.ts @@ -1,4 +1,4 @@ -import { Container, IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { Container, IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySplitRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySwapRequestData.ts b/project/src/models/eft/inventory/IInventorySwapRequestData.ts index 3d8f6f49..a78598c9 100644 --- a/project/src/models/eft/inventory/IInventorySwapRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySwapRequestData.ts @@ -1,5 +1,5 @@ -import { OwnerInfo } from "../common/request/IBaseInteractionRequestData"; -import { IInventoryBaseActionRequestData, To } from "./IInventoryBaseActionRequestData"; +import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IInventoryBaseActionRequestData, To } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySwapRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryTagRequestData.ts b/project/src/models/eft/inventory/IInventoryTagRequestData.ts index 5ec5dc6a..97f008f0 100644 --- a/project/src/models/eft/inventory/IInventoryTagRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryTagRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryTagRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryToggleRequestData.ts b/project/src/models/eft/inventory/IInventoryToggleRequestData.ts index 0f993575..2d5c3151 100644 --- a/project/src/models/eft/inventory/IInventoryToggleRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryToggleRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryToggleRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryTransferRequestData.ts b/project/src/models/eft/inventory/IInventoryTransferRequestData.ts index 9b19d37f..18bdc9be 100644 --- a/project/src/models/eft/inventory/IInventoryTransferRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryTransferRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryTransferRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts b/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts index d5a63f94..c292202f 100644 --- a/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts +++ b/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "./IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IOpenRandomLootContainerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts b/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts index 8dc93dec..55746a71 100644 --- a/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts +++ b/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts @@ -1,4 +1,4 @@ -import { IItemEventRouterBase } from "./IItemEventRouterBase"; +import { IItemEventRouterBase } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; export interface IEmptyItemEventRouterResponse extends IItemEventRouterBase { diff --git a/project/src/models/eft/itemEvent/IItemEventRouterBase.ts b/project/src/models/eft/itemEvent/IItemEventRouterBase.ts index f7e1e4cf..1256bfd4 100644 --- a/project/src/models/eft/itemEvent/IItemEventRouterBase.ts +++ b/project/src/models/eft/itemEvent/IItemEventRouterBase.ts @@ -1,9 +1,9 @@ -import { EquipmentBuildType } from "../../../models/enums/EquipmentBuildType"; -import { Health, IQuestStatus, Productive, Skills, TraderData } from "../common/tables/IBotBase"; -import { Item, Upd } from "../common/tables/IItem"; -import { IQuest } from "../common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; +import { Health, IQuestStatus, Productive, Skills, TraderData } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; +import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { EquipmentBuildType } from "@spt-aki/models/enums/EquipmentBuildType"; export interface IItemEventRouterBase { diff --git a/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts b/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts index 79e0f711..8af4406b 100644 --- a/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts +++ b/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts @@ -1,4 +1,4 @@ -import { IItemEventRouterBase } from "./IItemEventRouterBase"; +import { IItemEventRouterBase } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; export interface IItemEventRouterResponse extends IItemEventRouterBase {} \ No newline at end of file diff --git a/project/src/models/eft/launcher/IChangeRequestData.ts b/project/src/models/eft/launcher/IChangeRequestData.ts index 4231bf30..71b306df 100644 --- a/project/src/models/eft/launcher/IChangeRequestData.ts +++ b/project/src/models/eft/launcher/IChangeRequestData.ts @@ -1,4 +1,4 @@ -import { ILoginRequestData } from "./ILoginRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; export interface IChangeRequestData extends ILoginRequestData { diff --git a/project/src/models/eft/launcher/IRegisterData.ts b/project/src/models/eft/launcher/IRegisterData.ts index 3656827f..55727493 100644 --- a/project/src/models/eft/launcher/IRegisterData.ts +++ b/project/src/models/eft/launcher/IRegisterData.ts @@ -1,4 +1,4 @@ -import { ILoginRequestData } from "./ILoginRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; export interface IRegisterData extends ILoginRequestData { diff --git a/project/src/models/eft/launcher/IRemoveProfileData.ts b/project/src/models/eft/launcher/IRemoveProfileData.ts index 87b069e9..b88f5b7e 100644 --- a/project/src/models/eft/launcher/IRemoveProfileData.ts +++ b/project/src/models/eft/launcher/IRemoveProfileData.ts @@ -1,3 +1,3 @@ -import { ILoginRequestData } from "./ILoginRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; export type IRemoveProfileData = ILoginRequestData \ No newline at end of file diff --git a/project/src/models/eft/location/IAirdropLootResult.ts b/project/src/models/eft/location/IAirdropLootResult.ts index d9896320..7e68e9ac 100644 --- a/project/src/models/eft/location/IAirdropLootResult.ts +++ b/project/src/models/eft/location/IAirdropLootResult.ts @@ -1,4 +1,4 @@ -import { LootItem } from "../../../models/spt/services/LootItem"; +import { LootItem } from "@spt-aki/models/spt/services/LootItem"; export interface IAirdropLootResult { diff --git a/project/src/models/eft/match/ICreateGroupRequestData.ts b/project/src/models/eft/match/ICreateGroupRequestData.ts index 044b1d5a..2cb7350a 100644 --- a/project/src/models/eft/match/ICreateGroupRequestData.ts +++ b/project/src/models/eft/match/ICreateGroupRequestData.ts @@ -1,4 +1,4 @@ -import { RaidMode } from "../../enums/RaidMode"; +import { RaidMode } from "@spt-aki/models/enums/RaidMode"; export interface ICreateGroupRequestData { diff --git a/project/src/models/eft/match/IGetGroupStatusRequestData.ts b/project/src/models/eft/match/IGetGroupStatusRequestData.ts index 1ae6568e..b25fb8bf 100644 --- a/project/src/models/eft/match/IGetGroupStatusRequestData.ts +++ b/project/src/models/eft/match/IGetGroupStatusRequestData.ts @@ -1,4 +1,4 @@ -import { RaidMode } from "../../enums/RaidMode"; +import { RaidMode } from "@spt-aki/models/enums/RaidMode"; export interface IGetGroupStatusRequestData { diff --git a/project/src/models/eft/notes/INoteActionData.ts b/project/src/models/eft/notes/INoteActionData.ts index 912f639d..a36d405a 100644 --- a/project/src/models/eft/notes/INoteActionData.ts +++ b/project/src/models/eft/notes/INoteActionData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "../common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface INoteActionData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/notifier/INotifier.ts b/project/src/models/eft/notifier/INotifier.ts index 58cd1084..bd1b9c94 100644 --- a/project/src/models/eft/notifier/INotifier.ts +++ b/project/src/models/eft/notifier/INotifier.ts @@ -1,4 +1,5 @@ -import { Message } from "../profile/IAkiProfile"; +import { Message } from "@spt-aki/models/eft/profile/IAkiProfile"; + export interface INotifierChannel { server: string diff --git a/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts b/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts index ab6011ee..ab1b2016 100644 --- a/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts +++ b/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/tables/IBotBase"; +import { Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { diff --git a/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts b/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts index 4926ba2e..eb623026 100644 --- a/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts +++ b/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts @@ -1,4 +1,4 @@ -import { Item } from "../common/tables/IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface IPresetBuildActionRequestData { diff --git a/project/src/models/eft/profile/IAkiProfile.ts b/project/src/models/eft/profile/IAkiProfile.ts index 29cb60c0..0c41f890 100644 --- a/project/src/models/eft/profile/IAkiProfile.ts +++ b/project/src/models/eft/profile/IAkiProfile.ts @@ -1,8 +1,8 @@ -import { EquipmentBuildType } from "../../../models/enums/EquipmentBuildType"; -import { MemberCategory } from "../../../models/enums/MemberCategory"; -import { MessageType } from "../../enums/MessageType"; -import { IPmcData } from "../common/IPmcData"; -import { Item } from "../common/tables/IItem"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { EquipmentBuildType } from "@spt-aki/models/enums/EquipmentBuildType"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; export interface IAkiProfile { diff --git a/project/src/models/eft/ragfair/IGetItemPriceResult.ts b/project/src/models/eft/ragfair/IGetItemPriceResult.ts index a4c0862c..7e33d73e 100644 --- a/project/src/models/eft/ragfair/IGetItemPriceResult.ts +++ b/project/src/models/eft/ragfair/IGetItemPriceResult.ts @@ -1,4 +1,4 @@ -import { MinMax } from "../../../models/common/MinMax"; +import { MinMax } from "@spt-aki/models/common/MinMax"; export interface IGetItemPriceResult extends MinMax { diff --git a/project/src/models/eft/ragfair/IGetOffersResult.ts b/project/src/models/eft/ragfair/IGetOffersResult.ts index 673df4eb..e5a3d968 100644 --- a/project/src/models/eft/ragfair/IGetOffersResult.ts +++ b/project/src/models/eft/ragfair/IGetOffersResult.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "./IRagfairOffer"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; export interface IGetOffersResult { diff --git a/project/src/models/eft/ragfair/IRagfairOffer.ts b/project/src/models/eft/ragfair/IRagfairOffer.ts index a2bde897..100602c8 100644 --- a/project/src/models/eft/ragfair/IRagfairOffer.ts +++ b/project/src/models/eft/ragfair/IRagfairOffer.ts @@ -1,5 +1,5 @@ -import { MemberCategory } from "../../enums/MemberCategory"; -import { Item } from "../common/tables/IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; export interface IRagfairOffer { diff --git a/project/src/models/eft/ragfair/ISearchRequestData.ts b/project/src/models/eft/ragfair/ISearchRequestData.ts index 93072f29..155e4a54 100644 --- a/project/src/models/eft/ragfair/ISearchRequestData.ts +++ b/project/src/models/eft/ragfair/ISearchRequestData.ts @@ -1,4 +1,4 @@ -import { RagfairSort } from "../../enums/RagfairSort"; +import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; export interface ISearchRequestData { diff --git a/project/src/models/eft/repair/IRepairActionDataRequest.ts b/project/src/models/eft/repair/IRepairActionDataRequest.ts index 7d40a056..ad56e1f4 100644 --- a/project/src/models/eft/repair/IRepairActionDataRequest.ts +++ b/project/src/models/eft/repair/IRepairActionDataRequest.ts @@ -1,4 +1,4 @@ -import { IBaseRepairActionDataRequest } from "./IBaseRepairActionDataRequest"; +import { IBaseRepairActionDataRequest } from "@spt-aki/models/eft/repair/IBaseRepairActionDataRequest"; export interface IRepairActionDataRequest extends IBaseRepairActionDataRequest { diff --git a/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts b/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts index 8a12440f..586b177f 100644 --- a/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts +++ b/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts @@ -1,4 +1,4 @@ -import { IBaseRepairActionDataRequest } from "./IBaseRepairActionDataRequest"; +import { IBaseRepairActionDataRequest } from "@spt-aki/models/eft/repair/IBaseRepairActionDataRequest"; export interface ITraderRepairActionDataRequest extends IBaseRepairActionDataRequest { diff --git a/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts b/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts index 6538a248..5fc93bbb 100644 --- a/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts +++ b/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { IProcessBaseTradeRequestData } from "./IProcessBaseTradeRequestData"; +import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData { diff --git a/project/src/models/eft/trade/IProcessSellTradeRequestData.ts b/project/src/models/eft/trade/IProcessSellTradeRequestData.ts index d5b0f887..6790be15 100644 --- a/project/src/models/eft/trade/IProcessSellTradeRequestData.ts +++ b/project/src/models/eft/trade/IProcessSellTradeRequestData.ts @@ -1,4 +1,4 @@ -import { IProcessBaseTradeRequestData } from "./IProcessBaseTradeRequestData"; +import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestData { diff --git a/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts b/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts index 65dc3d5c..8137685c 100644 --- a/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts +++ b/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts @@ -1,4 +1,4 @@ -import { OwnerInfo } from "../common/request/IBaseInteractionRequestData" +import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; export interface ISellScavItemsToFenceRequestData { diff --git a/project/src/models/eft/weather/IWeatherData.ts b/project/src/models/eft/weather/IWeatherData.ts index dd0dd21b..a15d7e1a 100644 --- a/project/src/models/eft/weather/IWeatherData.ts +++ b/project/src/models/eft/weather/IWeatherData.ts @@ -1,4 +1,4 @@ -import { WindDirection } from "../../../models/enums/WindDirection"; +import { WindDirection } from "@spt-aki/models/enums/WindDirection"; export interface IWeatherData { diff --git a/project/src/models/external/HttpFramework.ts b/project/src/models/external/HttpFramework.ts index 678353d8..8fabeac2 100644 --- a/project/src/models/external/HttpFramework.ts +++ b/project/src/models/external/HttpFramework.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { IncomingMessage, ServerResponse } from "node:http"; import { injectable } from "tsyringe"; -import { HttpMethods } from "../../servers/http/HttpMethods"; + +import { HttpMethods } from "@spt-aki/servers/http/HttpMethods"; export type HandleFn = (_: string, req: IncomingMessage, resp: ServerResponse) => void; diff --git a/project/src/models/external/IPostAkiLoadMod.ts b/project/src/models/external/IPostAkiLoadMod.ts index a66e9252..0558350e 100644 --- a/project/src/models/external/IPostAkiLoadMod.ts +++ b/project/src/models/external/IPostAkiLoadMod.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPostAkiLoadMod { diff --git a/project/src/models/external/IPostAkiLoadModAsync.ts b/project/src/models/external/IPostAkiLoadModAsync.ts index 88a83567..2a6419ac 100644 --- a/project/src/models/external/IPostAkiLoadModAsync.ts +++ b/project/src/models/external/IPostAkiLoadModAsync.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPostAkiLoadModAsync { diff --git a/project/src/models/external/IPostDBLoadMod.ts b/project/src/models/external/IPostDBLoadMod.ts index 09e95763..a42c899c 100644 --- a/project/src/models/external/IPostDBLoadMod.ts +++ b/project/src/models/external/IPostDBLoadMod.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPostDBLoadMod { diff --git a/project/src/models/external/IPostDBLoadModAsync.ts b/project/src/models/external/IPostDBLoadModAsync.ts index 93e31a08..afe261bc 100644 --- a/project/src/models/external/IPostDBLoadModAsync.ts +++ b/project/src/models/external/IPostDBLoadModAsync.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPostDBLoadModAsync { diff --git a/project/src/models/external/IPreAkiLoadMod.ts b/project/src/models/external/IPreAkiLoadMod.ts index 31e33fcc..f78b9273 100644 --- a/project/src/models/external/IPreAkiLoadMod.ts +++ b/project/src/models/external/IPreAkiLoadMod.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPreAkiLoadMod { diff --git a/project/src/models/external/IPreAkiLoadModAsync.ts b/project/src/models/external/IPreAkiLoadModAsync.ts index 892d3728..9ae3b1e1 100644 --- a/project/src/models/external/IPreAkiLoadModAsync.ts +++ b/project/src/models/external/IPreAkiLoadModAsync.ts @@ -1,4 +1,4 @@ -import { DependencyContainer } from "./tsyringe"; +import { DependencyContainer } from "@spt-aki/models/external/tsyringe"; export interface IPreAkiLoadModAsync { diff --git a/project/src/models/spt/bots/GenerateWeaponResult.ts b/project/src/models/spt/bots/GenerateWeaponResult.ts index 4433eccd..a53f26e4 100644 --- a/project/src/models/spt/bots/GenerateWeaponResult.ts +++ b/project/src/models/spt/bots/GenerateWeaponResult.ts @@ -1,6 +1,6 @@ -import { Mods } from "../../eft/common/tables/IBotType"; -import { Item } from "../../eft/common/tables/IItem"; -import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +import { Mods } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; export class GenerateWeaponResult { diff --git a/project/src/models/spt/bots/IBotLootCache.ts b/project/src/models/spt/bots/IBotLootCache.ts index 10b7f294..9460a094 100644 --- a/project/src/models/spt/bots/IBotLootCache.ts +++ b/project/src/models/spt/bots/IBotLootCache.ts @@ -1,4 +1,4 @@ -import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; export interface IBotLootCache { diff --git a/project/src/models/spt/callbacks/IBotCallbacks.ts b/project/src/models/spt/callbacks/IBotCallbacks.ts index 0180faaa..9bb5076b 100644 --- a/project/src/models/spt/callbacks/IBotCallbacks.ts +++ b/project/src/models/spt/callbacks/IBotCallbacks.ts @@ -1,7 +1,7 @@ -import { IGenerateBotsRequestData } from "../../eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IBotBase } from "../../eft/common/tables/IBotBase"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; +import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; export interface IBotCallbacks { diff --git a/project/src/models/spt/callbacks/ICustomizationCallbacks.ts b/project/src/models/spt/callbacks/ICustomizationCallbacks.ts index 11df9201..bbb0303e 100644 --- a/project/src/models/spt/callbacks/ICustomizationCallbacks.ts +++ b/project/src/models/spt/callbacks/ICustomizationCallbacks.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IBuyClothingRequestData } from "../../eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "../../eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { ISuit } from "../../eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; +import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; export interface ICustomizationCallbacks { diff --git a/project/src/models/spt/callbacks/IDataCallbacks.ts b/project/src/models/spt/callbacks/IDataCallbacks.ts index d3d00935..a4d08185 100644 --- a/project/src/models/spt/callbacks/IDataCallbacks.ts +++ b/project/src/models/spt/callbacks/IDataCallbacks.ts @@ -1,11 +1,11 @@ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IGlobals } from "../../eft/common/IGlobals"; -import { IHideoutArea } from "../../eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../../eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../../eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../../eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { ISettingsBase } from "../server/ISettingsBase"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; +import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; export interface IDataCallbacks { diff --git a/project/src/models/spt/callbacks/IDialogueCallbacks.ts b/project/src/models/spt/callbacks/IDialogueCallbacks.ts index b40a21ae..818c5db2 100644 --- a/project/src/models/spt/callbacks/IDialogueCallbacks.ts +++ b/project/src/models/spt/callbacks/IDialogueCallbacks.ts @@ -1,20 +1,20 @@ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "../../eft/dialog/IFriendRequestData"; -import { IGetAllAttachmentsRequestData } from "../../eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetAllAttachmentsResponse } from "../../eft/dialog/IGetAllAttachmentsResponse"; -import { IGetChatServerListRequestData } from "../../eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "../../eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogInfoRequestData } from "../../eft/dialog/IGetMailDialogInfoRequestData"; -import { IGetMailDialogListRequestData } from "../../eft/dialog/IGetMailDialogListRequestData"; -import { IGetMailDialogViewRequestData } from "../../eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogViewResponseData } from "../../eft/dialog/IGetMailDialogViewResponseData"; -import { IPinDialogRequestData } from "../../eft/dialog/IPinDialogRequestData"; -import { IRemoveDialogRequestData } from "../../eft/dialog/IRemoveDialogRequestData"; -import { ISendMessageRequest } from "../../eft/dialog/ISendMessageRequest"; -import { ISetDialogReadRequestData } from "../../eft/dialog/ISetDialogReadRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; -import { DialogueInfo } from "../../eft/profile/IAkiProfile"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; +import { IGetAllAttachmentsRequestData } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetChatServerListRequestData } from "@spt-aki/models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogInfoRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IPinDialogRequestData } from "@spt-aki/models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "@spt-aki/models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "@spt-aki/models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IDialogueCallbacks { diff --git a/project/src/models/spt/callbacks/IGameCallbacks.ts b/project/src/models/spt/callbacks/IGameCallbacks.ts index dfc7b6a1..15d07c67 100644 --- a/project/src/models/spt/callbacks/IGameCallbacks.ts +++ b/project/src/models/spt/callbacks/IGameCallbacks.ts @@ -1,9 +1,9 @@ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IGameEmptyCrcRequestData } from "../../eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "../../eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; -import { IGameConfigResponse } from "../../eft/game/IGameConfigResponse"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; +import { IGameEmptyCrcRequestData } from "@spt-aki/models/eft/game/IGameEmptyCrcRequestData"; +import { IVersionValidateRequestData } from "@spt-aki/models/eft/game/IVersionValidateRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; export interface IGameCallbacks { diff --git a/project/src/models/spt/callbacks/IHealthCallbacks.ts b/project/src/models/spt/callbacks/IHealthCallbacks.ts index 45eadb79..009e4d87 100644 --- a/project/src/models/spt/callbacks/IHealthCallbacks.ts +++ b/project/src/models/spt/callbacks/IHealthCallbacks.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IAkiProfile } from "../../eft/profile/IAkiProfile"; -import { ISyncHealthRequestData } from "../../eft/health/ISyncHealthRequestData"; -import { IOffraidEatRequestData } from "../../eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "../../eft/health/IOffraidHealRequestData"; -import { IHealthTreatmentRequestData } from "../../eft/health/IHealthTreatmentRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IHealthCallbacks { diff --git a/project/src/models/spt/callbacks/IHideoutCallbacks.ts b/project/src/models/spt/callbacks/IHideoutCallbacks.ts index fcd88a20..2ef57ab0 100644 --- a/project/src/models/spt/callbacks/IHideoutCallbacks.ts +++ b/project/src/models/spt/callbacks/IHideoutCallbacks.ts @@ -1,14 +1,14 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IHideoutUpgradeRequestData } from "../../eft/hideout/IHideoutUpgradeRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "../../eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutScavCaseStartRequestData } from "../../eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutPutItemInRequestData } from "../../eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutTakeItemOutRequestData } from "../../eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutToggleAreaRequestData } from "../../eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutSingleProductionStartRequestData } from "../../eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutContinuousProductionStartRequestData } from "../../eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "../../eft/hideout/IHideoutTakeProductionRequestData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; export interface IHideoutCallbacks { diff --git a/project/src/models/spt/callbacks/IInraidCallbacks.ts b/project/src/models/spt/callbacks/IInraidCallbacks.ts index 97a8f4a1..1a8ddd89 100644 --- a/project/src/models/spt/callbacks/IInraidCallbacks.ts +++ b/project/src/models/spt/callbacks/IInraidCallbacks.ts @@ -1,8 +1,8 @@ -import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; -import { IAkiProfile } from "../../eft/profile/IAkiProfile"; -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IRegisterPlayerRequestData } from "../../eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../../eft/inRaid/ISaveProgressRequestData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IInraidCallbacks { diff --git a/project/src/models/spt/callbacks/IInsuranceCallbacks.ts b/project/src/models/spt/callbacks/IInsuranceCallbacks.ts index 8ce694fe..93caacde 100644 --- a/project/src/models/spt/callbacks/IInsuranceCallbacks.ts +++ b/project/src/models/spt/callbacks/IInsuranceCallbacks.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IAkiProfile } from "../../eft/profile/IAkiProfile"; -import { IGetInsuranceCostRequestData } from "../../eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "../../eft/insurance/IInsureRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IInsuranceCallbacks { diff --git a/project/src/models/spt/callbacks/IInventoryCallbacks.ts b/project/src/models/spt/callbacks/IInventoryCallbacks.ts index d74fe7f0..e7aa62be 100644 --- a/project/src/models/spt/callbacks/IInventoryCallbacks.ts +++ b/project/src/models/spt/callbacks/IInventoryCallbacks.ts @@ -1,21 +1,21 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IInventoryFoldRequestData } from "../../eft/inventory/IInventoryFoldRequestData"; -import { IInventorySplitRequestData } from "../../eft/inventory/IInventorySplitRequestData"; -import { IInventoryMoveRequestData } from "../../eft/inventory/IInventoryMoveRequestData"; -import { IInventoryMergeRequestData } from "../../eft/inventory/IInventoryMergeRequestData"; -import { IInventoryRemoveRequestData } from "../../eft/inventory/IInventoryRemoveRequestData"; -import { IInventoryTransferRequestData } from "../../eft/inventory/IInventoryTransferRequestData"; -import { IInventorySwapRequestData } from "../../eft/inventory/IInventorySwapRequestData"; -import { IInventoryToggleRequestData } from "../../eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTagRequestData } from "../../eft/inventory/IInventoryTagRequestData"; -import { IInventoryBindRequestData } from "../../eft/inventory/IInventoryBindRequestData"; -import { IInventoryExamineRequestData } from "../../eft/inventory/IInventoryExamineRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "../../eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventorySortRequestData } from "../../eft/inventory/IInventorySortRequestData"; -import { IInventoryCreateMarkerRequestData } from "../../eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "../../eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "../../eft/inventory/IInventoryEditMarkerRequestData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; export interface IInventoryCallbacks { diff --git a/project/src/models/spt/callbacks/IItemEventCallbacks.ts b/project/src/models/spt/callbacks/IItemEventCallbacks.ts index 8d726973..ccfabaea 100644 --- a/project/src/models/spt/callbacks/IItemEventCallbacks.ts +++ b/project/src/models/spt/callbacks/IItemEventCallbacks.ts @@ -1,6 +1,6 @@ -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "../../eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; export interface IItemEventCallbacks { diff --git a/project/src/models/spt/callbacks/ILauncherCallbacks.ts b/project/src/models/spt/callbacks/ILauncherCallbacks.ts index 4226aa81..ad726ec8 100644 --- a/project/src/models/spt/callbacks/ILauncherCallbacks.ts +++ b/project/src/models/spt/callbacks/ILauncherCallbacks.ts @@ -1,8 +1,8 @@ -import { IRegisterData } from "../../eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "../../eft/launcher/IRemoveProfileData"; -import { ILoginRequestData } from "../../eft/launcher/ILoginRequestData"; -import { IChangeRequestData } from "../../eft/launcher/IChangeRequestData"; -import { IGetMiniProfileRequestData } from "../../eft/launcher/IGetMiniProfileRequestData.js"; +import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; +import { IGetMiniProfileRequestData } from "@spt-aki/models/eft/launcher/IGetMiniProfileRequestData"; +import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; +import { IRemoveProfileData } from "@spt-aki/models/eft/launcher/IRemoveProfileData"; export interface ILauncherCallbacks { diff --git a/project/src/models/spt/callbacks/ILocationCallbacks.ts b/project/src/models/spt/callbacks/ILocationCallbacks.ts index f98fd683..97ed5e5f 100644 --- a/project/src/models/spt/callbacks/ILocationCallbacks.ts +++ b/project/src/models/spt/callbacks/ILocationCallbacks.ts @@ -1,7 +1,7 @@ -import { IGetLocationRequestData } from "../../eft/location/IGetLocationRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { ILocationsGenerateAllResponse } from "../../eft/common/ILocationsSourceDestinationBase"; -import { ILocationBase } from "../../eft/common/ILocationBase"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; export interface ILocationCallbacks { diff --git a/project/src/models/spt/callbacks/INoteCallbacks.ts b/project/src/models/spt/callbacks/INoteCallbacks.ts index 85b2f0d4..ff7f1078 100644 --- a/project/src/models/spt/callbacks/INoteCallbacks.ts +++ b/project/src/models/spt/callbacks/INoteCallbacks.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { INoteActionData } from "../../eft/notes/INoteActionData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; export interface INoteCallbacks { diff --git a/project/src/models/spt/callbacks/INotifierCallbacks.ts b/project/src/models/spt/callbacks/INotifierCallbacks.ts index c1832c83..45148f28 100644 --- a/project/src/models/spt/callbacks/INotifierCallbacks.ts +++ b/project/src/models/spt/callbacks/INotifierCallbacks.ts @@ -1,7 +1,7 @@ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "../../eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "../../eft/notifier/ISelectProfileRequestData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; +import { ISelectProfileRequestData } from "@spt-aki/models/eft/notifier/ISelectProfileRequestData"; export interface INotifierCallbacks { diff --git a/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts b/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts index 45fe4eaf..33bc01b6 100644 --- a/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts +++ b/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts @@ -1,8 +1,8 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -import { IPresetBuildActionRequestData } from "../../eft/presetBuild/IPresetBuildActionRequestData"; -import { IWeaponBuild } from "../../eft/profile/IAkiProfile"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IWeaponBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; export interface IPresetBuildCallbacks { diff --git a/project/src/models/spt/callbacks/IProfileCallbacks.ts b/project/src/models/spt/callbacks/IProfileCallbacks.ts index e419c27e..ff687972 100644 --- a/project/src/models/spt/callbacks/IProfileCallbacks.ts +++ b/project/src/models/spt/callbacks/IProfileCallbacks.ts @@ -1,12 +1,12 @@ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../../eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "../../eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "../../eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "../../eft/profile/IProfileCreateRequestData"; -import { IValidateNicknameRequestData } from "../../eft/profile/IValidateNicknameRequestData"; -import { ISearchFriendRequestData } from "../../eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "../../eft/profile/ISearchFriendResponse"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; +import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; export interface IProfileCallbacks { diff --git a/project/src/models/spt/callbacks/IQuestCallbacks.ts b/project/src/models/spt/callbacks/IQuestCallbacks.ts index bb795830..e3a7c782 100644 --- a/project/src/models/spt/callbacks/IQuestCallbacks.ts +++ b/project/src/models/spt/callbacks/IQuestCallbacks.ts @@ -1,14 +1,14 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IAcceptQuestRequestData } from "../../eft/quests/IAcceptQuestRequestData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { IListQuestsRequestData } from "../../eft/quests/IListQuestsRequestData"; -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { ICompleteQuestRequestData } from "../../eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../../eft/quests/IHandoverQuestRequestData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -import { IQuest } from "../../eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "../../eft/common/tables/IRepeatableQuests"; -import { IRepeatableQuestChangeRequest } from "../../eft/quests/IRepeatableQuestChangeRequest"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "@spt-aki/models/eft/quests/IListQuestsRequestData"; +import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; export interface IQuestCallbacks { diff --git a/project/src/models/spt/callbacks/IRagfairCallbacks.ts b/project/src/models/spt/callbacks/IRagfairCallbacks.ts index a6070343..4b0a8269 100644 --- a/project/src/models/spt/callbacks/IRagfairCallbacks.ts +++ b/project/src/models/spt/callbacks/IRagfairCallbacks.ts @@ -1,13 +1,13 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { ISearchRequestData } from "../../eft/ragfair/ISearchRequestData"; -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { IGetMarketPriceRequestData } from "../../eft/ragfair/IGetMarketPriceRequestData"; -import { IAddOfferRequestData } from "../../eft/ragfair/IAddOfferRequestData"; -import { IRemoveOfferRequestData } from "../../eft/ragfair/IRemoveOfferRequestData"; -import { IExtendOfferRequestData } from "../../eft/ragfair/IExtendOfferRequestData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -import { IGetItemPriceResult } from "../../eft/ragfair/IGetItemPriceResult"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "@spt-aki/models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; export interface IRagfairCallbacks { diff --git a/project/src/models/spt/callbacks/IRepairCallbacks.ts b/project/src/models/spt/callbacks/IRepairCallbacks.ts index 8ef97c55..b48cd829 100644 --- a/project/src/models/spt/callbacks/IRepairCallbacks.ts +++ b/project/src/models/spt/callbacks/IRepairCallbacks.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "../../eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "../../eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; export interface IRepairCallbacks { diff --git a/project/src/models/spt/callbacks/ITradeCallbacks.ts b/project/src/models/spt/callbacks/ITradeCallbacks.ts index 6dcb24f3..95882807 100644 --- a/project/src/models/spt/callbacks/ITradeCallbacks.ts +++ b/project/src/models/spt/callbacks/ITradeCallbacks.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IProcessRagfairTradeRequestData } from "../../eft/trade/IProcessRagfairTradeRequestData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "../../eft/trade/IProcessBaseTradeRequestData"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; export interface ITradeCallbacks { diff --git a/project/src/models/spt/callbacks/ITraderCallbacks.ts b/project/src/models/spt/callbacks/ITraderCallbacks.ts index b76cd7bc..2ca11af9 100644 --- a/project/src/models/spt/callbacks/ITraderCallbacks.ts +++ b/project/src/models/spt/callbacks/ITraderCallbacks.ts @@ -2,9 +2,9 @@ * File generated by Interface generator (dotup.dotup-vscode-interface-generator) * Date: 2022-04-28 14:22:44 */ -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; -import { ITraderAssort, ITraderBase } from "../../eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; export interface ITraderCallbacks { diff --git a/project/src/models/spt/callbacks/IWeatherCallbacks.ts b/project/src/models/spt/callbacks/IWeatherCallbacks.ts index 91f3fef5..a400d3b8 100644 --- a/project/src/models/spt/callbacks/IWeatherCallbacks.ts +++ b/project/src/models/spt/callbacks/IWeatherCallbacks.ts @@ -1,5 +1,5 @@ -import { IGetBodyResponseData } from "../../eft/httpResponse/IGetBodyResponseData"; -import { IEmptyRequestData } from "../../eft/common/IEmptyRequestData"; +import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; export interface IWeatherCallbacks { diff --git a/project/src/models/spt/callbacks/IWishlistCallbacks.ts b/project/src/models/spt/callbacks/IWishlistCallbacks.ts index 63fcc8d0..6a7239cb 100644 --- a/project/src/models/spt/callbacks/IWishlistCallbacks.ts +++ b/project/src/models/spt/callbacks/IWishlistCallbacks.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "../../eft/common/IPmcData"; -import { IWishlistActionData } from "../../eft/wishlist/IWishlistActionData"; -import { IItemEventRouterResponse } from "../../eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; export interface IWishlistCallbacks { diff --git a/project/src/models/spt/config/IAirdropConfig.ts b/project/src/models/spt/config/IAirdropConfig.ts index d10acb7d..e09fe1e1 100644 --- a/project/src/models/spt/config/IAirdropConfig.ts +++ b/project/src/models/spt/config/IAirdropConfig.ts @@ -1,6 +1,6 @@ -import { AirdropTypeEnum } from "../../../models/enums/AirdropType"; -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { AirdropTypeEnum } from "@spt-aki/models/enums/AirdropType"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IAirdropConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IBotConfig.ts b/project/src/models/spt/config/IBotConfig.ts index fde088dc..7f1edbb5 100644 --- a/project/src/models/spt/config/IBotConfig.ts +++ b/project/src/models/spt/config/IBotConfig.ts @@ -1,7 +1,7 @@ -import { GenerationData } from "../../../models/eft/common/tables/IBotType"; -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; -import { IBotDurability } from "./IBotDurability"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBotDurability } from "@spt-aki/models/spt/config/IBotDurability"; export interface IBotConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ICoreConfig.ts b/project/src/models/spt/config/ICoreConfig.ts index 8434a6b9..20d6be99 100644 --- a/project/src/models/spt/config/ICoreConfig.ts +++ b/project/src/models/spt/config/ICoreConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ICoreConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IGiftsConfig.ts b/project/src/models/spt/config/IGiftsConfig.ts index 2e17439c..95887014 100644 --- a/project/src/models/spt/config/IGiftsConfig.ts +++ b/project/src/models/spt/config/IGiftsConfig.ts @@ -1,9 +1,9 @@ -import { Item } from "../../../models/eft/common/tables/IItem"; -import { IUserDialogInfo } from "../../../models/eft/profile/IAkiProfile"; -import { GiftSenderType } from "../../../models/enums/GiftSenderType"; -import { SeasonalEventType } from "../../../models/enums/SeasonalEventType"; -import { Traders } from "../../../models/enums/Traders"; -import { IBaseConfig } from "./IBaseConfig"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { GiftSenderType } from "@spt-aki/models/enums/GiftSenderType"; +import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IGiftsConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IHealthConfig.ts b/project/src/models/spt/config/IHealthConfig.ts index e83334a4..e31de433 100644 --- a/project/src/models/spt/config/IHealthConfig.ts +++ b/project/src/models/spt/config/IHealthConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IHealthConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IHideoutConfig.ts b/project/src/models/spt/config/IHideoutConfig.ts index ec787385..05eea7fc 100644 --- a/project/src/models/spt/config/IHideoutConfig.ts +++ b/project/src/models/spt/config/IHideoutConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IHttpConfig.ts b/project/src/models/spt/config/IHttpConfig.ts index 3a6268fc..7a78105d 100644 --- a/project/src/models/spt/config/IHttpConfig.ts +++ b/project/src/models/spt/config/IHttpConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IHttpConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IInRaidConfig.ts b/project/src/models/spt/config/IInRaidConfig.ts index 0363d144..a0248170 100644 --- a/project/src/models/spt/config/IInRaidConfig.ts +++ b/project/src/models/spt/config/IInRaidConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IInRaidConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IInsuranceConfig.ts b/project/src/models/spt/config/IInsuranceConfig.ts index 1cad7a32..42174269 100644 --- a/project/src/models/spt/config/IInsuranceConfig.ts +++ b/project/src/models/spt/config/IInsuranceConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IInsuranceConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IInventoryConfig.ts b/project/src/models/spt/config/IInventoryConfig.ts index a891d1f4..1a187a34 100644 --- a/project/src/models/spt/config/IInventoryConfig.ts +++ b/project/src/models/spt/config/IInventoryConfig.ts @@ -1,5 +1,5 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IInventoryConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IItemConfig.ts b/project/src/models/spt/config/IItemConfig.ts index c595ff5d..55518842 100644 --- a/project/src/models/spt/config/IItemConfig.ts +++ b/project/src/models/spt/config/IItemConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IItemConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ILocaleConfig.ts b/project/src/models/spt/config/ILocaleConfig.ts index c85fc3b5..a3c6307e 100644 --- a/project/src/models/spt/config/ILocaleConfig.ts +++ b/project/src/models/spt/config/ILocaleConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ILocaleConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ILocationConfig.ts b/project/src/models/spt/config/ILocationConfig.ts index eaa24905..c1f8c985 100644 --- a/project/src/models/spt/config/ILocationConfig.ts +++ b/project/src/models/spt/config/ILocationConfig.ts @@ -1,6 +1,6 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBase"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { BossLocationSpawn, Wave } from "@spt-aki/models/eft/common/ILocationBase"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ILocationConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ILootConfig.ts b/project/src/models/spt/config/ILootConfig.ts index 0f363f9f..aaf6ba1b 100644 --- a/project/src/models/spt/config/ILootConfig.ts +++ b/project/src/models/spt/config/ILootConfig.ts @@ -1,5 +1,5 @@ -import { Spawnpoint } from "../../../models/eft/common/ILooseLoot"; -import { IBaseConfig } from "./IBaseConfig"; +import { Spawnpoint } from "@spt-aki/models/eft/common/ILooseLoot"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ILootConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ILostOnDeathConfig.ts b/project/src/models/spt/config/ILostOnDeathConfig.ts index 539f6ae2..8ebff4c1 100644 --- a/project/src/models/spt/config/ILostOnDeathConfig.ts +++ b/project/src/models/spt/config/ILostOnDeathConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ILostOnDeathConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IMatchConfig.ts b/project/src/models/spt/config/IMatchConfig.ts index 556ddd4b..7034b308 100644 --- a/project/src/models/spt/config/IMatchConfig.ts +++ b/project/src/models/spt/config/IMatchConfig.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IMatchConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IPlayerScavConfig.ts b/project/src/models/spt/config/IPlayerScavConfig.ts index 7cffeb6d..fa981245 100644 --- a/project/src/models/spt/config/IPlayerScavConfig.ts +++ b/project/src/models/spt/config/IPlayerScavConfig.ts @@ -1,6 +1,5 @@ -import { GenerationData } from "../../../models/eft/common/tables/IBotType"; -import { IBaseConfig } from "./IBaseConfig"; - +import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IPlayerScavConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IPmChatResponse.ts b/project/src/models/spt/config/IPmChatResponse.ts index 886d41bc..ef40efe9 100644 --- a/project/src/models/spt/config/IPmChatResponse.ts +++ b/project/src/models/spt/config/IPmChatResponse.ts @@ -1,4 +1,4 @@ -import { IBaseConfig } from "./IBaseConfig"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IPmcChatResponse extends IBaseConfig { diff --git a/project/src/models/spt/config/IPmcConfig.ts b/project/src/models/spt/config/IPmcConfig.ts index 17543927..2fc551e5 100644 --- a/project/src/models/spt/config/IPmcConfig.ts +++ b/project/src/models/spt/config/IPmcConfig.ts @@ -1,6 +1,6 @@ -import { MemberCategory } from "../../../models/enums/MemberCategory"; -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IPmcConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IQuestConfig.ts b/project/src/models/spt/config/IQuestConfig.ts index 983288b7..7539bf7b 100644 --- a/project/src/models/spt/config/IQuestConfig.ts +++ b/project/src/models/spt/config/IQuestConfig.ts @@ -1,7 +1,7 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { SeasonalEventType } from "../../../models/enums/SeasonalEventType"; -import { ELocationName } from "../../enums/ELocationName"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { ELocationName } from "@spt-aki/models/enums/ELocationName"; +import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IQuestConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IRagfairConfig.ts b/project/src/models/spt/config/IRagfairConfig.ts index 020c60e9..1755dcb3 100644 --- a/project/src/models/spt/config/IRagfairConfig.ts +++ b/project/src/models/spt/config/IRagfairConfig.ts @@ -1,5 +1,5 @@ -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IRepairConfig.ts b/project/src/models/spt/config/IRepairConfig.ts index 7f67e91b..e9544bbc 100644 --- a/project/src/models/spt/config/IRepairConfig.ts +++ b/project/src/models/spt/config/IRepairConfig.ts @@ -1,5 +1,5 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IRepairConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IScavCaseConfig.ts b/project/src/models/spt/config/IScavCaseConfig.ts index 9b5b27f6..6ceaeb6e 100644 --- a/project/src/models/spt/config/IScavCaseConfig.ts +++ b/project/src/models/spt/config/IScavCaseConfig.ts @@ -1,6 +1,5 @@ -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; - +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IScavCaseConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ISeasonalEventConfig.ts b/project/src/models/spt/config/ISeasonalEventConfig.ts index 0a4771d7..0bbcd8f9 100644 --- a/project/src/models/spt/config/ISeasonalEventConfig.ts +++ b/project/src/models/spt/config/ISeasonalEventConfig.ts @@ -1,5 +1,5 @@ -import { SeasonalEventType } from "../../../models/enums/SeasonalEventType"; -import { IBaseConfig } from "./IBaseConfig"; +import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface ISeasonalEventConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/ITraderConfig.ts b/project/src/models/spt/config/ITraderConfig.ts index a99798a2..93b4329b 100644 --- a/project/src/models/spt/config/ITraderConfig.ts +++ b/project/src/models/spt/config/ITraderConfig.ts @@ -1,6 +1,6 @@ -import { MinMax } from "../../../models/common/MinMax"; -import { LootRequest } from "../services/LootRequest"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; export interface ITraderConfig extends IBaseConfig { diff --git a/project/src/models/spt/config/IWeatherConfig.ts b/project/src/models/spt/config/IWeatherConfig.ts index 7808cb20..9fac2f88 100644 --- a/project/src/models/spt/config/IWeatherConfig.ts +++ b/project/src/models/spt/config/IWeatherConfig.ts @@ -1,6 +1,6 @@ -import { WindDirection } from "../../../models/enums/WindDirection"; -import { MinMax } from "../../common/MinMax"; -import { IBaseConfig } from "./IBaseConfig"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { WindDirection } from "@spt-aki/models/enums/WindDirection"; +import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { diff --git a/project/src/models/spt/controllers/IBotController.ts b/project/src/models/spt/controllers/IBotController.ts index aef4f152..20c9b6ec 100644 --- a/project/src/models/spt/controllers/IBotController.ts +++ b/project/src/models/spt/controllers/IBotController.ts @@ -1,8 +1,7 @@ -import { IGenerateBotsRequestData } from "../../eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../../eft/common/tables/IBotBase"; -import { IBotCore } from "../../eft/common/tables/IBotCore"; -import { Difficulty } from "../../eft/common/tables/IBotType"; - +import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; +import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; export interface IBotController { diff --git a/project/src/models/spt/dialog/ISendMessageDetails.ts b/project/src/models/spt/dialog/ISendMessageDetails.ts index 35a287a6..c574f2e0 100644 --- a/project/src/models/spt/dialog/ISendMessageDetails.ts +++ b/project/src/models/spt/dialog/ISendMessageDetails.ts @@ -1,7 +1,7 @@ -import { Item } from "../../../models/eft/common/tables/IItem"; -import { ISystemData, IUserDialogInfo, MessageContentRagfair } from "../../../models/eft/profile/IAkiProfile"; -import { MessageType } from "../../../models/enums/MessageType"; -import { Traders } from "../../../models/enums/Traders"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ISystemData, IUserDialogInfo, MessageContentRagfair } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; export interface ISendMessageDetails { diff --git a/project/src/models/spt/generators/IBotGenerator.ts b/project/src/models/spt/generators/IBotGenerator.ts index 2e834ba4..a15fb52a 100644 --- a/project/src/models/spt/generators/IBotGenerator.ts +++ b/project/src/models/spt/generators/IBotGenerator.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; -import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Chances, Generation, Inventory } from "@spt-aki/models/eft/common/tables/IBotType"; export interface IBotGenerator { diff --git a/project/src/models/spt/generators/ILocationGenerator.ts b/project/src/models/spt/generators/ILocationGenerator.ts index 9fc1a91e..195a8a8b 100644 --- a/project/src/models/spt/generators/ILocationGenerator.ts +++ b/project/src/models/spt/generators/ILocationGenerator.ts @@ -1,5 +1,5 @@ -import { IStaticContainerProps, IStaticLootDetails, IStaticAmmoDetails, IStaticForcedProps } from "../../eft/common/tables/ILootBase"; -import { ILooseLoot, SpawnpointTemplate } from "../../eft/common/ILooseLoot"; +import { ILooseLoot, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot"; +import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "@spt-aki/models/eft/common/tables/ILootBase"; export interface ILocationGenerator { diff --git a/project/src/models/spt/generators/IRagfairAssortGenerator.ts b/project/src/models/spt/generators/IRagfairAssortGenerator.ts index 277db12a..a472b38c 100644 --- a/project/src/models/spt/generators/IRagfairAssortGenerator.ts +++ b/project/src/models/spt/generators/IRagfairAssortGenerator.ts @@ -1,4 +1,4 @@ -import { Item } from "../../eft/common/tables/IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; export interface IRagfairAssortGenerator { diff --git a/project/src/models/spt/generators/IRagfairOfferGenerator.ts b/project/src/models/spt/generators/IRagfairOfferGenerator.ts index 495f37f3..0ab65f07 100644 --- a/project/src/models/spt/generators/IRagfairOfferGenerator.ts +++ b/project/src/models/spt/generators/IRagfairOfferGenerator.ts @@ -1,6 +1,6 @@ -import { IBarterScheme } from "../../eft/common/tables/ITrader"; -import { IRagfairOffer } from "../../eft/ragfair/IRagfairOffer"; -import { Item } from "../../eft/common/tables/IItem"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; export interface IRagfairOfferGenerator { diff --git a/project/src/models/spt/mod/NewItemDetails.ts b/project/src/models/spt/mod/NewItemDetails.ts index 4e60e466..4e911d8f 100644 --- a/project/src/models/spt/mod/NewItemDetails.ts +++ b/project/src/models/spt/mod/NewItemDetails.ts @@ -1,4 +1,4 @@ -import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; export abstract class NewItemDetailsBase { diff --git a/project/src/models/spt/repeatable/IQuestTypePool.ts b/project/src/models/spt/repeatable/IQuestTypePool.ts index 4b2911cf..d724536e 100644 --- a/project/src/models/spt/repeatable/IQuestTypePool.ts +++ b/project/src/models/spt/repeatable/IQuestTypePool.ts @@ -1,4 +1,4 @@ -import { ELocationName } from "../../../models/enums/ELocationName"; +import { ELocationName } from "@spt-aki/models/enums/ELocationName"; export interface IQuestTypePool { diff --git a/project/src/models/spt/server/IDatabaseTables.ts b/project/src/models/spt/server/IDatabaseTables.ts index 99838a85..d80ba637 100644 --- a/project/src/models/spt/server/IDatabaseTables.ts +++ b/project/src/models/spt/server/IDatabaseTables.ts @@ -1,26 +1,26 @@ -import { IQteData } from "../../../models/eft/hideout/IQteData"; -import { IEquipmentBuild } from "../../../models/eft/profile/IAkiProfile"; -import { IGlobals } from "../../eft/common/IGlobals"; -import { IBotBase } from "../../eft/common/tables/IBotBase"; -import { IBotCore } from "../../eft/common/tables/IBotCore"; -import { IBotType } from "../../eft/common/tables/IBotType"; -import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; -import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; -import { ILootBase } from "../../eft/common/tables/ILootBase"; -import { IMatch } from "../../eft/common/tables/IMatch"; -import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; -import { IQuest } from "../../eft/common/tables/IQuest"; -import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; -import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; -import { ITrader } from "../../eft/common/tables/ITrader"; -import { IHideoutArea } from "../../eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "../../eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "../../eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "../../eft/hideout/IHideoutSettingsBase"; -import { ILocaleBase } from "./ILocaleBase"; -import { ILocations } from "./ILocations"; -import { IServerBase } from "./IServerBase"; -import { ISettingsBase } from "./ISettingsBase"; +import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; +import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ICustomizationItem } from "@spt-aki/models/eft/common/tables/ICustomizationItem"; +import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; +import { ILootBase } from "@spt-aki/models/eft/common/tables/ILootBase"; +import { IMatch } from "@spt-aki/models/eft/common/tables/IMatch"; +import { IProfileTemplates } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; +import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IRepeatableQuestDatabase } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ITrader } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; +import { IQteData } from "@spt-aki/models/eft/hideout/IQteData"; +import { IEquipmentBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ILocaleBase } from "@spt-aki/models/spt/server/ILocaleBase"; +import { ILocations } from "@spt-aki/models/spt/server/ILocations"; +import { IServerBase } from "@spt-aki/models/spt/server/IServerBase"; +import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; export interface IDatabaseTables { diff --git a/project/src/models/spt/server/ILocations.ts b/project/src/models/spt/server/ILocations.ts index bc004d3b..b663341b 100644 --- a/project/src/models/spt/server/ILocations.ts +++ b/project/src/models/spt/server/ILocations.ts @@ -1,6 +1,6 @@ -import { ILocationBase } from "../../eft/common/ILocationBase"; -import { ILooseLoot } from "../../eft/common/ILooseLoot"; -import { ILocationsBase } from "../../eft/common/tables/ILocationsBase"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot"; +import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase"; export interface ILocations { diff --git a/project/src/models/spt/services/CustomPreset.ts b/project/src/models/spt/services/CustomPreset.ts index c90580a5..e4d865b2 100644 --- a/project/src/models/spt/services/CustomPreset.ts +++ b/project/src/models/spt/services/CustomPreset.ts @@ -1,4 +1,4 @@ -import { IPreset } from "../../eft/common/IGlobals"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; export interface CustomPreset { diff --git a/project/src/models/spt/services/CustomTraderAssortData.ts b/project/src/models/spt/services/CustomTraderAssortData.ts index 3eb5b4c9..18058d78 100644 --- a/project/src/models/spt/services/CustomTraderAssortData.ts +++ b/project/src/models/spt/services/CustomTraderAssortData.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "../../eft/common/tables/ITrader"; -import { Traders } from "../../enums/Traders"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { Traders } from "@spt-aki/models/enums/Traders"; export interface CustomTraderAssortData { diff --git a/project/src/models/spt/services/LootRequest.ts b/project/src/models/spt/services/LootRequest.ts index a384c88b..6420d794 100644 --- a/project/src/models/spt/services/LootRequest.ts +++ b/project/src/models/spt/services/LootRequest.ts @@ -1,4 +1,4 @@ -import { MinMax } from "../../common/MinMax"; +import { MinMax } from "@spt-aki/models/common/MinMax"; export interface LootRequest { diff --git a/project/src/models/spt/utils/IAsyncQueue.ts b/project/src/models/spt/utils/IAsyncQueue.ts index 3e0f851b..d511b050 100644 --- a/project/src/models/spt/utils/IAsyncQueue.ts +++ b/project/src/models/spt/utils/IAsyncQueue.ts @@ -1,4 +1,4 @@ -import { ICommand } from "./ICommand"; +import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; export interface IAsyncQueue { diff --git a/project/src/models/spt/utils/ILogger.ts b/project/src/models/spt/utils/ILogger.ts index 5044ae48..a1e42404 100644 --- a/project/src/models/spt/utils/ILogger.ts +++ b/project/src/models/spt/utils/ILogger.ts @@ -1,6 +1,6 @@ -import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; -import { LogBackgroundColor } from "../logging/LogBackgroundColor"; -import { LogTextColor } from "../logging/LogTextColor"; +import { Daum } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; export interface ILogger { diff --git a/project/src/routers/EventOutputHolder.ts b/project/src/routers/EventOutputHolder.ts index 3294ae47..0a57aa77 100644 --- a/project/src/routers/EventOutputHolder.ts +++ b/project/src/routers/EventOutputHolder.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IHideoutImprovement, Productive, TraderData, TraderInfo } from "../models/eft/common/tables/IBotBase"; -import { ProfileChange } from "../models/eft/itemEvent/IItemEventRouterBase"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IHideoutImprovement, Productive, TraderData, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { ProfileChange } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class EventOutputHolder diff --git a/project/src/routers/HttpRouter.ts b/project/src/routers/HttpRouter.ts index 80c181b8..407f2d7a 100644 --- a/project/src/routers/HttpRouter.ts +++ b/project/src/routers/HttpRouter.ts @@ -1,7 +1,7 @@ import { IncomingMessage } from "node:http"; import { injectable, injectAll } from "tsyringe"; -import { DynamicRouter, Router, StaticRouter } from "../di/Router"; +import { DynamicRouter, Router, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class HttpRouter diff --git a/project/src/routers/ImageRouter.ts b/project/src/routers/ImageRouter.ts index ee14f1c5..4fc8fe38 100644 --- a/project/src/routers/ImageRouter.ts +++ b/project/src/routers/ImageRouter.ts @@ -1,9 +1,9 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { ImageRouteService } from "../services/mod/image/ImageRouteService"; -import { HttpFileUtil } from "../utils/HttpFileUtil"; -import { VFS } from "../utils/VFS"; +import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; +import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class ImageRouter diff --git a/project/src/routers/ItemEventRouter.ts b/project/src/routers/ItemEventRouter.ts index f26ac6d4..84fa77d5 100644 --- a/project/src/routers/ItemEventRouter.ts +++ b/project/src/routers/ItemEventRouter.ts @@ -1,12 +1,12 @@ import { inject, injectable, injectAll } from "tsyringe"; -import { ItemEventRouterDefinition } from "../di/Router"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { EventOutputHolder } from "./EventOutputHolder"; +import { ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class ItemEventRouter diff --git a/project/src/routers/dynamic/BotDynamicRouter.ts b/project/src/routers/dynamic/BotDynamicRouter.ts index 4cba5041..50e110f3 100644 --- a/project/src/routers/dynamic/BotDynamicRouter.ts +++ b/project/src/routers/dynamic/BotDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class BotDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/BundleDynamicRouter.ts b/project/src/routers/dynamic/BundleDynamicRouter.ts index 97fef69e..1d8f3a06 100644 --- a/project/src/routers/dynamic/BundleDynamicRouter.ts +++ b/project/src/routers/dynamic/BundleDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class BundleDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/CustomizationDynamicRouter.ts b/project/src/routers/dynamic/CustomizationDynamicRouter.ts index e866f282..0110d63e 100644 --- a/project/src/routers/dynamic/CustomizationDynamicRouter.ts +++ b/project/src/routers/dynamic/CustomizationDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class CustomizationDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/DataDynamicRouter.ts b/project/src/routers/dynamic/DataDynamicRouter.ts index fefad2c9..cf71b6bc 100644 --- a/project/src/routers/dynamic/DataDynamicRouter.ts +++ b/project/src/routers/dynamic/DataDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class DataDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/HttpDynamicRouter.ts b/project/src/routers/dynamic/HttpDynamicRouter.ts index fe06b9a0..f46a4252 100644 --- a/project/src/routers/dynamic/HttpDynamicRouter.ts +++ b/project/src/routers/dynamic/HttpDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { DynamicRouter, RouteAction } from "../../di/Router"; -import { ImageRouter } from "../ImageRouter"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; +import { ImageRouter } from "@spt-aki/routers/ImageRouter"; @injectable() export class HttpDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/InraidDynamicRouter.ts b/project/src/routers/dynamic/InraidDynamicRouter.ts index 8ccfd221..e8e9eac0 100644 --- a/project/src/routers/dynamic/InraidDynamicRouter.ts +++ b/project/src/routers/dynamic/InraidDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class InraidDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/LocationDynamicRouter.ts b/project/src/routers/dynamic/LocationDynamicRouter.ts index d7c863d7..06e41c30 100644 --- a/project/src/routers/dynamic/LocationDynamicRouter.ts +++ b/project/src/routers/dynamic/LocationDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class LocationDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/NotifierDynamicRouter.ts b/project/src/routers/dynamic/NotifierDynamicRouter.ts index 8af19470..f7a4e0d3 100644 --- a/project/src/routers/dynamic/NotifierDynamicRouter.ts +++ b/project/src/routers/dynamic/NotifierDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class NotifierDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/TraderDynamicRouter.ts b/project/src/routers/dynamic/TraderDynamicRouter.ts index 70317842..c1bc2118 100644 --- a/project/src/routers/dynamic/TraderDynamicRouter.ts +++ b/project/src/routers/dynamic/TraderDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { DynamicRouter, RouteAction } from "../../di/Router"; +import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; @injectable() export class TraderDynamicRouter extends DynamicRouter diff --git a/project/src/routers/item_events/CustomizationItemEventRouter.ts b/project/src/routers/item_events/CustomizationItemEventRouter.ts index c2ff63be..5f56ffa6 100644 --- a/project/src/routers/item_events/CustomizationItemEventRouter.ts +++ b/project/src/routers/item_events/CustomizationItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class CustomizationItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/HealthItemEventRouter.ts b/project/src/routers/item_events/HealthItemEventRouter.ts index 25eb2812..b287ac1d 100644 --- a/project/src/routers/item_events/HealthItemEventRouter.ts +++ b/project/src/routers/item_events/HealthItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class HealthItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/HideoutItemEventRouter.ts b/project/src/routers/item_events/HideoutItemEventRouter.ts index b86c1671..aea41178 100644 --- a/project/src/routers/item_events/HideoutItemEventRouter.ts +++ b/project/src/routers/item_events/HideoutItemEventRouter.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; -import { HideoutEventActions } from "../../models/enums/HideoutEventActions"; +import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { HideoutEventActions } from "@spt-aki/models/enums/HideoutEventActions"; @injectable() export class HideoutItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/InsuranceItemEventRouter.ts b/project/src/routers/item_events/InsuranceItemEventRouter.ts index 904fe93c..bce4aaba 100644 --- a/project/src/routers/item_events/InsuranceItemEventRouter.ts +++ b/project/src/routers/item_events/InsuranceItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class InsuranceItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/InventoryItemEventRouter.ts b/project/src/routers/item_events/InventoryItemEventRouter.ts index 8dab00bf..90267a03 100644 --- a/project/src/routers/item_events/InventoryItemEventRouter.ts +++ b/project/src/routers/item_events/InventoryItemEventRouter.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; -import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; -import { ItemEventActions } from "../../models/enums/ItemEventActions"; +import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; +import { InventoryCallbacks } from "@spt-aki/callbacks/InventoryCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ItemEventActions } from "@spt-aki/models/enums/ItemEventActions"; @injectable() export class InventoryItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/NoteItemEventRouter.ts b/project/src/routers/item_events/NoteItemEventRouter.ts index 4367884c..855be195 100644 --- a/project/src/routers/item_events/NoteItemEventRouter.ts +++ b/project/src/routers/item_events/NoteItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { NoteCallbacks } from "@spt-aki/callbacks/NoteCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class NoteItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/PresetBuildItemEventRouter.ts b/project/src/routers/item_events/PresetBuildItemEventRouter.ts index 553dcf56..4fa1b4e4 100644 --- a/project/src/routers/item_events/PresetBuildItemEventRouter.ts +++ b/project/src/routers/item_events/PresetBuildItemEventRouter.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; -import { ItemEventActions } from "../../models/enums/ItemEventActions"; +import { PresetBuildCallbacks } from "@spt-aki/callbacks/PresetBuildCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ItemEventActions } from "@spt-aki/models/enums/ItemEventActions"; @injectable() export class PresetBuildItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/QuestItemEventRouter.ts b/project/src/routers/item_events/QuestItemEventRouter.ts index 33ff6b11..1e881404 100644 --- a/project/src/routers/item_events/QuestItemEventRouter.ts +++ b/project/src/routers/item_events/QuestItemEventRouter.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "../../models/spt/utils/ILogger"; +import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; @injectable() export class QuestItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/RagfairItemEventRouter.ts b/project/src/routers/item_events/RagfairItemEventRouter.ts index 05ff37b5..7c62eae1 100644 --- a/project/src/routers/item_events/RagfairItemEventRouter.ts +++ b/project/src/routers/item_events/RagfairItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class RagfairItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/RepairItemEventRouter.ts b/project/src/routers/item_events/RepairItemEventRouter.ts index eb065f2d..1333ea2c 100644 --- a/project/src/routers/item_events/RepairItemEventRouter.ts +++ b/project/src/routers/item_events/RepairItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { RepairCallbacks } from "@spt-aki/callbacks/RepairCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class RepairItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/TradeItemEventRouter.ts b/project/src/routers/item_events/TradeItemEventRouter.ts index e1b082b3..36a737fd 100644 --- a/project/src/routers/item_events/TradeItemEventRouter.ts +++ b/project/src/routers/item_events/TradeItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { TradeCallbacks } from "@spt-aki/callbacks/TradeCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class TradeItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/WishlistItemEventRouter.ts b/project/src/routers/item_events/WishlistItemEventRouter.ts index cffb017f..e18c1ebc 100644 --- a/project/src/routers/item_events/WishlistItemEventRouter.ts +++ b/project/src/routers/item_events/WishlistItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { WishlistCallbacks } from "@spt-aki/callbacks/WishlistCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class WishlistItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/save_load/HealthSaveLoadRouter.ts b/project/src/routers/save_load/HealthSaveLoadRouter.ts index f3907627..3ebb5506 100644 --- a/project/src/routers/save_load/HealthSaveLoadRouter.ts +++ b/project/src/routers/save_load/HealthSaveLoadRouter.ts @@ -1,7 +1,7 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; @injectable() export class HealthSaveLoadRouter extends SaveLoadRouter diff --git a/project/src/routers/save_load/InraidSaveLoadRouter.ts b/project/src/routers/save_load/InraidSaveLoadRouter.ts index 11e640d9..6b6c2441 100644 --- a/project/src/routers/save_load/InraidSaveLoadRouter.ts +++ b/project/src/routers/save_load/InraidSaveLoadRouter.ts @@ -1,7 +1,7 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; @injectable() export class InraidSaveLoadRouter extends SaveLoadRouter diff --git a/project/src/routers/save_load/InsuranceSaveLoadRouter.ts b/project/src/routers/save_load/InsuranceSaveLoadRouter.ts index 77a1ee52..fc1170e1 100644 --- a/project/src/routers/save_load/InsuranceSaveLoadRouter.ts +++ b/project/src/routers/save_load/InsuranceSaveLoadRouter.ts @@ -1,7 +1,7 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; @injectable() export class InsuranceSaveLoadRouter extends SaveLoadRouter diff --git a/project/src/routers/save_load/ProfileSaveLoadRouter.ts b/project/src/routers/save_load/ProfileSaveLoadRouter.ts index e71fd410..af7725a1 100644 --- a/project/src/routers/save_load/ProfileSaveLoadRouter.ts +++ b/project/src/routers/save_load/ProfileSaveLoadRouter.ts @@ -1,8 +1,8 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "../../di/Router"; -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IAkiProfile } from "../../models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; @injectable() export class ProfileSaveLoadRouter extends SaveLoadRouter diff --git a/project/src/routers/serializers/BundleSerializer.ts b/project/src/routers/serializers/BundleSerializer.ts index 868c0cf3..326733f0 100644 --- a/project/src/routers/serializers/BundleSerializer.ts +++ b/project/src/routers/serializers/BundleSerializer.ts @@ -1,10 +1,10 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { Serializer } from "../../di/Serializer"; -import { BundleLoader } from "../../loaders/BundleLoader"; -import { ILogger } from "../../models/spt/utils/ILogger"; -import { HttpFileUtil } from "../../utils/HttpFileUtil"; +import { Serializer } from "@spt-aki/di/Serializer"; +import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; @injectable() export class BundleSerializer extends Serializer diff --git a/project/src/routers/serializers/ImageSerializer.ts b/project/src/routers/serializers/ImageSerializer.ts index 75d7f959..be3d7d7a 100644 --- a/project/src/routers/serializers/ImageSerializer.ts +++ b/project/src/routers/serializers/ImageSerializer.ts @@ -1,8 +1,8 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { Serializer } from "../../di/Serializer"; -import { ImageRouter } from "../ImageRouter"; +import { Serializer } from "@spt-aki/di/Serializer"; +import { ImageRouter } from "@spt-aki/routers/ImageRouter"; @injectable() export class ImageSerializer extends Serializer diff --git a/project/src/routers/serializers/NotifySerializer.ts b/project/src/routers/serializers/NotifySerializer.ts index e3533a5a..b0960af1 100644 --- a/project/src/routers/serializers/NotifySerializer.ts +++ b/project/src/routers/serializers/NotifySerializer.ts @@ -1,10 +1,10 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { NotifierController } from "../../controllers/NotifierController"; -import { Serializer } from "../../di/Serializer"; -import { HttpServerHelper } from "../../helpers/HttpServerHelper"; -import { JsonUtil } from "../../utils/JsonUtil"; +import { NotifierController } from "@spt-aki/controllers/NotifierController"; +import { Serializer } from "@spt-aki/di/Serializer"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class NotifySerializer extends Serializer diff --git a/project/src/routers/static/BotStaticRouter.ts b/project/src/routers/static/BotStaticRouter.ts index 9fc1bc83..dde4ba98 100644 --- a/project/src/routers/static/BotStaticRouter.ts +++ b/project/src/routers/static/BotStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { BotCallbacks } from "../../callbacks/BotCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class BotStaticRouter extends StaticRouter diff --git a/project/src/routers/static/BundleStaticRouter.ts b/project/src/routers/static/BundleStaticRouter.ts index 08719951..b608362c 100644 --- a/project/src/routers/static/BundleStaticRouter.ts +++ b/project/src/routers/static/BundleStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class BundleStaticRouter extends StaticRouter diff --git a/project/src/routers/static/CustomizationStaticRouter.ts b/project/src/routers/static/CustomizationStaticRouter.ts index 58b619a7..56d6c94f 100644 --- a/project/src/routers/static/CustomizationStaticRouter.ts +++ b/project/src/routers/static/CustomizationStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class CustomizationStaticRouter extends StaticRouter diff --git a/project/src/routers/static/DataStaticRouter.ts b/project/src/routers/static/DataStaticRouter.ts index 7b5bb855..c4ab65f1 100644 --- a/project/src/routers/static/DataStaticRouter.ts +++ b/project/src/routers/static/DataStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { DataCallbacks } from "../../callbacks/DataCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class DataStaticRouter extends StaticRouter diff --git a/project/src/routers/static/DialogStaticRouter.ts b/project/src/routers/static/DialogStaticRouter.ts index dbdab4ba..0bd64f73 100644 --- a/project/src/routers/static/DialogStaticRouter.ts +++ b/project/src/routers/static/DialogStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { DialogueCallbacks } from "@spt-aki/callbacks/DialogueCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class DialogStaticRouter extends StaticRouter diff --git a/project/src/routers/static/GameStaticRouter.ts b/project/src/routers/static/GameStaticRouter.ts index 5b66c40d..e9d9d788 100644 --- a/project/src/routers/static/GameStaticRouter.ts +++ b/project/src/routers/static/GameStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { GameCallbacks } from "../../callbacks/GameCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { GameCallbacks } from "@spt-aki/callbacks/GameCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class GameStaticRouter extends StaticRouter diff --git a/project/src/routers/static/HealthStaticRouter.ts b/project/src/routers/static/HealthStaticRouter.ts index 86c84585..2f4471ed 100644 --- a/project/src/routers/static/HealthStaticRouter.ts +++ b/project/src/routers/static/HealthStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class HealthStaticRouter extends StaticRouter diff --git a/project/src/routers/static/InraidStaticRouter.ts b/project/src/routers/static/InraidStaticRouter.ts index 2ae43733..4bcf2b67 100644 --- a/project/src/routers/static/InraidStaticRouter.ts +++ b/project/src/routers/static/InraidStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class InraidStaticRouter extends StaticRouter diff --git a/project/src/routers/static/InsuranceStaticRouter.ts b/project/src/routers/static/InsuranceStaticRouter.ts index 5ab81ba1..d9c5bc00 100644 --- a/project/src/routers/static/InsuranceStaticRouter.ts +++ b/project/src/routers/static/InsuranceStaticRouter.ts @@ -1,6 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; + +import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class InsuranceStaticRouter extends StaticRouter diff --git a/project/src/routers/static/ItemEventStaticRouter.ts b/project/src/routers/static/ItemEventStaticRouter.ts index 0ac375d9..9dc0e46f 100644 --- a/project/src/routers/static/ItemEventStaticRouter.ts +++ b/project/src/routers/static/ItemEventStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { ItemEventCallbacks } from "@spt-aki/callbacks/ItemEventCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class ItemEventStaticRouter extends StaticRouter diff --git a/project/src/routers/static/LauncherStaticRouter.ts b/project/src/routers/static/LauncherStaticRouter.ts index 9423f667..b471723e 100644 --- a/project/src/routers/static/LauncherStaticRouter.ts +++ b/project/src/routers/static/LauncherStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { LauncherCallbacks } from "@spt-aki/callbacks/LauncherCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class LauncherStaticRouter extends StaticRouter diff --git a/project/src/routers/static/LocationStaticRouter.ts b/project/src/routers/static/LocationStaticRouter.ts index 6140730e..73295bec 100644 --- a/project/src/routers/static/LocationStaticRouter.ts +++ b/project/src/routers/static/LocationStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class LocationStaticRouter extends StaticRouter diff --git a/project/src/routers/static/MatchStaticRouter.ts b/project/src/routers/static/MatchStaticRouter.ts index 00e98ca0..1731fc49 100644 --- a/project/src/routers/static/MatchStaticRouter.ts +++ b/project/src/routers/static/MatchStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { MatchCallbacks } from "@spt-aki/callbacks/MatchCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class MatchStaticRouter extends StaticRouter diff --git a/project/src/routers/static/NotifierStaticRouter.ts b/project/src/routers/static/NotifierStaticRouter.ts index c2ddb176..c065ffeb 100644 --- a/project/src/routers/static/NotifierStaticRouter.ts +++ b/project/src/routers/static/NotifierStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class NotifierStaticRouter extends StaticRouter diff --git a/project/src/routers/static/PresetStaticRouter.ts b/project/src/routers/static/PresetStaticRouter.ts index e09fc8a2..860695cc 100644 --- a/project/src/routers/static/PresetStaticRouter.ts +++ b/project/src/routers/static/PresetStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { PresetBuildCallbacks } from "@spt-aki/callbacks/PresetBuildCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class PresetStaticRouter extends StaticRouter diff --git a/project/src/routers/static/ProfileStaticRouter.ts b/project/src/routers/static/ProfileStaticRouter.ts index 6392e6de..a2cd71b0 100644 --- a/project/src/routers/static/ProfileStaticRouter.ts +++ b/project/src/routers/static/ProfileStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { ProfileCallbacks } from "@spt-aki/callbacks/ProfileCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class ProfileStaticRouter extends StaticRouter diff --git a/project/src/routers/static/QuestStaticRouter.ts b/project/src/routers/static/QuestStaticRouter.ts index f35d6cc3..8d4caa42 100644 --- a/project/src/routers/static/QuestStaticRouter.ts +++ b/project/src/routers/static/QuestStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class QuestStaticRouter extends StaticRouter diff --git a/project/src/routers/static/RagfairStaticRouter.ts b/project/src/routers/static/RagfairStaticRouter.ts index 4b773db5..4da872f0 100644 --- a/project/src/routers/static/RagfairStaticRouter.ts +++ b/project/src/routers/static/RagfairStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class RagfairStaticRouter extends StaticRouter diff --git a/project/src/routers/static/TraderStaticRouter.ts b/project/src/routers/static/TraderStaticRouter.ts index 58572d5c..40c7b3fc 100644 --- a/project/src/routers/static/TraderStaticRouter.ts +++ b/project/src/routers/static/TraderStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class TraderStaticRouter extends StaticRouter diff --git a/project/src/routers/static/WeatherStaticRouter.ts b/project/src/routers/static/WeatherStaticRouter.ts index 9f70aaef..2ec39e40 100644 --- a/project/src/routers/static/WeatherStaticRouter.ts +++ b/project/src/routers/static/WeatherStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; -import { RouteAction, StaticRouter } from "../../di/Router"; +import { WeatherCallbacks } from "@spt-aki/callbacks/WeatherCallbacks"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; @injectable() export class WeatherStaticRouter extends StaticRouter diff --git a/project/src/servers/ConfigServer.ts b/project/src/servers/ConfigServer.ts index 1cf5a8a6..2fb9ead1 100644 --- a/project/src/servers/ConfigServer.ts +++ b/project/src/servers/ConfigServer.ts @@ -1,10 +1,10 @@ -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; - import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; + +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class ConfigServer diff --git a/project/src/servers/DatabaseServer.ts b/project/src/servers/DatabaseServer.ts index 355416df..49c34fa4 100644 --- a/project/src/servers/DatabaseServer.ts +++ b/project/src/servers/DatabaseServer.ts @@ -1,5 +1,6 @@ import { injectable } from "tsyringe"; -import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; + +import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; @injectable() export class DatabaseServer diff --git a/project/src/servers/HttpServer.ts b/project/src/servers/HttpServer.ts index 58fae42b..556322c7 100644 --- a/project/src/servers/HttpServer.ts +++ b/project/src/servers/HttpServer.ts @@ -1,17 +1,17 @@ import http, { IncomingMessage, ServerResponse } from "node:http"; -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; -import { ApplicationContext } from "../context/ApplicationContext"; -import { ContextVariableType } from "../context/ContextVariableType"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { ConfigServer } from "./ConfigServer"; -import { DatabaseServer } from "./DatabaseServer"; -import { IHttpListener } from "./http/IHttpListener"; -import { WebSocketServer } from "./WebSocketServer"; +import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; +import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; +import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class HttpServer diff --git a/project/src/servers/RagfairServer.ts b/project/src/servers/RagfairServer.ts index 6eeeec49..22fb4b84 100644 --- a/project/src/servers/RagfairServer.ts +++ b/project/src/servers/RagfairServer.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { TraderAssortHelper } from "../helpers/TraderAssortHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Traders } from "../models/enums/Traders"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; -import { ConfigServer } from "./ConfigServer"; +import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; +import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; @injectable() export class RagfairServer diff --git a/project/src/servers/SaveServer.ts b/project/src/servers/SaveServer.ts index 402ddc47..5cac7b81 100644 --- a/project/src/servers/SaveServer.ts +++ b/project/src/servers/SaveServer.ts @@ -1,12 +1,12 @@ import { inject, injectable, injectAll } from "tsyringe"; -import { SaveLoadRouter } from "../di/Router"; -import { IAkiProfile, Info } from "../models/eft/profile/IAkiProfile"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; +import { SaveLoadRouter } from "@spt-aki/di/Router"; +import { IAkiProfile, Info } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class SaveServer diff --git a/project/src/servers/WebSocketServer.ts b/project/src/servers/WebSocketServer.ts index c551c802..002b10c8 100644 --- a/project/src/servers/WebSocketServer.ts +++ b/project/src/servers/WebSocketServer.ts @@ -2,15 +2,15 @@ import http, { IncomingMessage } from "node:http"; import { inject, injectable } from "tsyringe"; import WebSocket from "ws"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { INotification, NotificationType } from "../models/eft/notifier/INotifier"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { ConfigServer } from "./ConfigServer"; +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { INotification, NotificationType } from "@spt-aki/models/eft/notifier/INotifier"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class WebSocketServer diff --git a/project/src/servers/http/AkiHttpListener.ts b/project/src/servers/http/AkiHttpListener.ts index 48e41565..efb950e9 100644 --- a/project/src/servers/http/AkiHttpListener.ts +++ b/project/src/servers/http/AkiHttpListener.ts @@ -2,14 +2,14 @@ import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from "node:http" import zlib from "node:zlib"; import { inject, injectAll, injectable } from "tsyringe"; -import { Serializer } from "../../di/Serializer"; -import { ILogger } from "../../models/spt/utils/ILogger"; -import { HttpRouter } from "../../routers/HttpRouter"; -import { LocalisationService } from "../../services/LocalisationService"; -import { HttpResponseUtil } from "../../utils/HttpResponseUtil"; -import { JsonUtil } from "../../utils/JsonUtil"; -import { HttpBufferHandler } from "./HttpBufferHandler"; -import { IHttpListener } from "./IHttpListener"; +import { Serializer } from "@spt-aki/di/Serializer"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { HttpRouter } from "@spt-aki/routers/HttpRouter"; +import { HttpBufferHandler } from "@spt-aki/servers/http/HttpBufferHandler"; +import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class AkiHttpListener implements IHttpListener diff --git a/project/src/services/BotEquipmentFilterService.ts b/project/src/services/BotEquipmentFilterService.ts index 79490fee..597a1dd2 100644 --- a/project/src/services/BotEquipmentFilterService.ts +++ b/project/src/services/BotEquipmentFilterService.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "../helpers/BotHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; import { EquipmentChances, Generation, GenerationData, IBotType, ModsChances -} from "../models/eft/common/tables/IBotType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails"; +} from "@spt-aki/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; import { AdjustmentDetails, EquipmentFilterDetails, EquipmentFilters, IBotConfig, WeightingAdjustmentDetails -} from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; +} from "@spt-aki/models/spt/config/IBotConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; @injectable() export class BotEquipmentFilterService diff --git a/project/src/services/BotEquipmentModPoolService.ts b/project/src/services/BotEquipmentModPoolService.ts index d0d7327d..df906d1e 100644 --- a/project/src/services/BotEquipmentModPoolService.ts +++ b/project/src/services/BotEquipmentModPoolService.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Mods } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { VFS } from "../utils/VFS"; -import { LocalisationService } from "./LocalisationService"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Mods } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { VFS } from "@spt-aki/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @injectable() diff --git a/project/src/services/BotGenerationCacheService.ts b/project/src/services/BotGenerationCacheService.ts index d77ca1d8..2742a9bc 100644 --- a/project/src/services/BotGenerationCacheService.ts +++ b/project/src/services/BotGenerationCacheService.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "../helpers/BotHelper"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocalisationService } from "./LocalisationService"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class BotGenerationCacheService diff --git a/project/src/services/BotLootCacheService.ts b/project/src/services/BotLootCacheService.ts index 0669b1f1..002b1a04 100644 --- a/project/src/services/BotLootCacheService.ts +++ b/project/src/services/BotLootCacheService.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { IBotType } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { IBotLootCache, LootCacheType } from "../models/spt/bots/IBotLootCache"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { LocalisationService } from "./LocalisationService"; -import { RagfairPriceService } from "./RagfairPriceService"; +import { PMCLootGenerator } from "@spt-aki/generators/PMCLootGenerator"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { IBotLootCache, LootCacheType } from "@spt-aki/models/spt/bots/IBotLootCache"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class BotLootCacheService diff --git a/project/src/services/BotWeaponModLimitService.ts b/project/src/services/BotWeaponModLimitService.ts index c286d273..89bee596 100644 --- a/project/src/services/BotWeaponModLimitService.ts +++ b/project/src/services/BotWeaponModLimitService.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; export class BotModLimits { diff --git a/project/src/services/CustomLocationWaveService.ts b/project/src/services/CustomLocationWaveService.ts index 6752b8a9..732827be 100644 --- a/project/src/services/CustomLocationWaveService.ts +++ b/project/src/services/CustomLocationWaveService.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { BossLocationSpawn, ILocationBase, Wave } from "../models/eft/common/ILocationBase"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ILocationConfig } from "../models/spt/config/ILocationConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; +import { BossLocationSpawn, ILocationBase, Wave } from "@spt-aki/models/eft/common/ILocationBase"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class CustomLocationWaveService diff --git a/project/src/services/FenceService.ts b/project/src/services/FenceService.ts index 04cce309..0a7556e9 100644 --- a/project/src/services/FenceService.ts +++ b/project/src/services/FenceService.ts @@ -1,27 +1,27 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { IFenceLevel, IPreset } from "../models/eft/common/IGlobals"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { Traders } from "../models/enums/Traders"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { ItemFilterService } from "./ItemFilterService"; -import { LocalisationService } from "./LocalisationService"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { IFenceLevel, IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** * Handle actions surrounding Fence diff --git a/project/src/services/GiftService.ts b/project/src/services/GiftService.ts index 5c64bff7..2d7e6a6f 100644 --- a/project/src/services/GiftService.ts +++ b/project/src/services/GiftService.ts @@ -1,17 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { GiftSenderType } from "../models/enums/GiftSenderType"; -import { GiftSentResult } from "../models/enums/GiftSentResult"; -import { MessageType } from "../models/enums/MessageType"; -import { Traders } from "../models/enums/Traders"; -import { Gift, IGiftsConfig } from "../models/spt/config/IGiftsConfig"; -import { ISendMessageDetails } from "../models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { MailSendService } from "./MailSendService"; + +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { GiftSenderType } from "@spt-aki/models/enums/GiftSenderType"; +import { GiftSentResult } from "@spt-aki/models/enums/GiftSentResult"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { Gift, IGiftsConfig } from "@spt-aki/models/spt/config/IGiftsConfig"; +import { ISendMessageDetails } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class GiftService diff --git a/project/src/services/HashCacheService.ts b/project/src/services/HashCacheService.ts index 93ee792e..101088da 100644 --- a/project/src/services/HashCacheService.ts +++ b/project/src/services/HashCacheService.ts @@ -1,8 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; + +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class HashCacheService diff --git a/project/src/services/InsuranceService.ts b/project/src/services/InsuranceService.ts index 4dde9d41..a52e3de7 100644 --- a/project/src/services/InsuranceService.ts +++ b/project/src/services/InsuranceService.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { ITraderBase } from "../models/eft/common/tables/ITrader"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IInsuredItemsData } from "../models/eft/inRaid/IInsuredItemsData"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MessageType } from "../models/enums/MessageType"; -import { Traders } from "../models/enums/Traders"; -import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { LocaleService } from "./LocaleService"; -import { LocalisationService } from "./LocalisationService"; -import { MailSendService } from "./MailSendService"; +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { SecureContainerHelper } from "@spt-aki/helpers/SecureContainerHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; +import { IInsuredItemsData } from "@spt-aki/models/eft/inRaid/IInsuredItemsData"; +import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MailSendService } from "@spt-aki/services/MailSendService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class InsuranceService diff --git a/project/src/services/ItemBaseClassService.ts b/project/src/services/ItemBaseClassService.ts index bc65dc68..114bf39e 100644 --- a/project/src/services/ItemBaseClassService.ts +++ b/project/src/services/ItemBaseClassService.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "./LocalisationService"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; /** * Cache the baseids for each item in the tiems db inside a dictionary diff --git a/project/src/services/ItemFilterService.ts b/project/src/services/ItemFilterService.ts index 2b2a5449..91d8fcd9 100644 --- a/project/src/services/ItemFilterService.ts +++ b/project/src/services/ItemFilterService.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IItemConfig } from "../models/spt/config/IItemConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IItemConfig } from "@spt-aki/models/spt/config/IItemConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; /** Centralise the handling of blacklisting items, uses blacklist found in config/item.json, stores items that should not be used by players / broken items */ @injectable() diff --git a/project/src/services/LocaleService.ts b/project/src/services/LocaleService.ts index a483d9ba..5747df1e 100644 --- a/project/src/services/LocaleService.ts +++ b/project/src/services/LocaleService.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ILocaleConfig } from "@spt-aki/models/spt/config/ILocaleConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; /** * Handles getting locales from config or users machine diff --git a/project/src/services/LocalisationService.ts b/project/src/services/LocalisationService.ts index 0aa8a3e2..0477aa86 100644 --- a/project/src/services/LocalisationService.ts +++ b/project/src/services/LocalisationService.ts @@ -1,12 +1,12 @@ import { I18n } from "i18n"; +import path from "node:path"; import { inject, injectable } from "tsyringe"; -import path from "node:path"; -import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocaleService } from "./LocaleService"; +import { ILocaleConfig } from "@spt-aki/models/spt/config/ILocaleConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocaleService } from "@spt-aki/services/LocaleService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; /** * Handles translating server text into different langauges diff --git a/project/src/services/MailSendService.ts b/project/src/services/MailSendService.ts index bc1d2f65..b1985030 100644 --- a/project/src/services/MailSendService.ts +++ b/project/src/services/MailSendService.ts @@ -1,20 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { NotificationSendHelper } from "../helpers/NotificationSendHelper"; -import { NotifierHelper } from "../helpers/NotifierHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { Dialogue, IUserDialogInfo, Message, MessageItems } from "../models/eft/profile/IAkiProfile"; -import { MessageType } from "../models/enums/MessageType"; -import { Traders } from "../models/enums/Traders"; -import { ISendMessageDetails } from "../models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { HashUtil } from "../utils/HashUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { LocalisationService } from "./LocalisationService"; + +import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Dialogue, IUserDialogInfo, Message, MessageItems } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ISendMessageDetails } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class MailSendService diff --git a/project/src/services/MatchBotDetailsCacheService.ts b/project/src/services/MatchBotDetailsCacheService.ts index 051fa7d5..2e1dc2e5 100644 --- a/project/src/services/MatchBotDetailsCacheService.ts +++ b/project/src/services/MatchBotDetailsCacheService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "./LocalisationService"; +import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; /** Cache bots in a dictionary, keyed by the bots name, keying by name isnt ideal as its not unique but this is used by the post-raid system which doesnt have any bot ids, only name */ @injectable() diff --git a/project/src/services/MatchLocationService.ts b/project/src/services/MatchLocationService.ts index 6c497467..ad29293c 100644 --- a/project/src/services/MatchLocationService.ts +++ b/project/src/services/MatchLocationService.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; -import { TimeUtil } from "../utils/TimeUtil"; +import { ICreateGroupRequestData } from "@spt-aki/models/eft/match/ICreateGroupRequestData"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class MatchLocationService diff --git a/project/src/services/ModCompilerService.ts b/project/src/services/ModCompilerService.ts index e855ae2f..c69f50b4 100644 --- a/project/src/services/ModCompilerService.ts +++ b/project/src/services/ModCompilerService.ts @@ -3,9 +3,10 @@ import fs from "node:fs"; import path from "node:path"; import { inject, injectable } from "tsyringe"; import ts from "typescript"; -import type { ILogger } from "../models/spt/utils/ILogger"; -import { VFS } from "../utils/VFS"; -import { HashCacheService } from "./HashCacheService"; + +import type { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { HashCacheService } from "@spt-aki/services/HashCacheService"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class ModCompilerService diff --git a/project/src/services/NotificationService.ts b/project/src/services/NotificationService.ts index 22bbb397..e0356e7f 100644 --- a/project/src/services/NotificationService.ts +++ b/project/src/services/NotificationService.ts @@ -1,6 +1,6 @@ import { injectable } from "tsyringe"; -import { INotification } from "../models/eft/notifier/INotifier"; +import { INotification } from "@spt-aki/models/eft/notifier/INotifier"; @injectable() export class NotificationService diff --git a/project/src/services/OpenZoneService.ts b/project/src/services/OpenZoneService.ts index c3ce1ada..c5bb5410 100644 --- a/project/src/services/OpenZoneService.ts +++ b/project/src/services/OpenZoneService.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { ILocationBase } from "../models/eft/common/ILocationBase"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ILocationConfig } from "../models/spt/config/ILocationConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocalisationService } from "./LocalisationService"; +import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ @injectable() diff --git a/project/src/services/PaymentService.ts b/project/src/services/PaymentService.ts index aacb39fd..a02fc845 100644 --- a/project/src/services/PaymentService.ts +++ b/project/src/services/PaymentService.ts @@ -1,20 +1,20 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; -import { BackendErrorCodes } from "../models/enums/BackendErrorCodes"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { LocalisationService } from "./LocalisationService"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; +import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; @injectable() export class PaymentService diff --git a/project/src/services/PlayerService.ts b/project/src/services/PlayerService.ts index be228656..99594998 100644 --- a/project/src/services/PlayerService.ts +++ b/project/src/services/PlayerService.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { TimeUtil } from "../utils/TimeUtil"; -import { LocalisationService } from "./LocalisationService"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class PlayerService diff --git a/project/src/services/PmcChatResponseService.ts b/project/src/services/PmcChatResponseService.ts index 5da1ad11..933861eb 100644 --- a/project/src/services/PmcChatResponseService.ts +++ b/project/src/services/PmcChatResponseService.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { NotificationSendHelper } from "../helpers/NotificationSendHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Aggressor, Victim } from "../models/eft/common/tables/IBotBase"; -import { IUserDialogInfo } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { MemberCategory } from "../models/enums/MemberCategory"; -import { MessageType } from "../models/enums/MessageType"; -import { IPmcChatResponse } from "../models/spt/config/IPmChatResponse"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocalisationService } from "./LocalisationService"; -import { MatchBotDetailsCacheService } from "./MatchBotDetailsCacheService"; +import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Aggressor, Victim } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { IPmcChatResponse } from "@spt-aki/models/spt/config/IPmChatResponse"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class PmcChatResponseService diff --git a/project/src/services/ProfileFixerService.ts b/project/src/services/ProfileFixerService.ts index dc86daa6..f68b8445 100644 --- a/project/src/services/ProfileFixerService.ts +++ b/project/src/services/ProfileFixerService.ts @@ -1,31 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { HideoutHelper } from "../helpers/HideoutHelper"; -import { InventoryHelper } from "../helpers/InventoryHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Bonus, HideoutSlot, IQuestStatus } from "../models/eft/common/tables/IBotBase"; -import { - IPmcDataRepeatableQuest, IRepeatableQuest -} from "../models/eft/common/tables/IRepeatableQuests"; -import { StageBonus } from "../models/eft/hideout/IHideoutArea"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { HideoutAreas } from "../models/enums/HideoutAreas"; -import { QuestStatus } from "../models/enums/QuestStatus"; -import { Traders } from "../models/enums/Traders"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { LocalisationService } from "./LocalisationService"; +import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; +import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Bonus, HideoutSlot, IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; +import { StageBonus } from "@spt-aki/models/eft/hideout/IHideoutArea"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; +import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { Traders } from "@spt-aki/models/enums/Traders"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { Watermark } from "@spt-aki/utils/Watermark"; @injectable() export class ProfileFixerService diff --git a/project/src/services/ProfileSnapshotService.ts b/project/src/services/ProfileSnapshotService.ts index c651c110..b8dfc36d 100644 --- a/project/src/services/ProfileSnapshotService.ts +++ b/project/src/services/ProfileSnapshotService.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { JsonUtil } from "../utils/JsonUtil"; +import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class ProfileSnapshotService diff --git a/project/src/services/RagfairCategoriesService.ts b/project/src/services/RagfairCategoriesService.ts index 8426f3c3..1ee6cb64 100644 --- a/project/src/services/RagfairCategoriesService.ts +++ b/project/src/services/RagfairCategoriesService.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; @injectable() export class RagfairCategoriesService diff --git a/project/src/services/RagfairLinkedItemService.ts b/project/src/services/RagfairLinkedItemService.ts index f289462c..de08ac68 100644 --- a/project/src/services/RagfairLinkedItemService.ts +++ b/project/src/services/RagfairLinkedItemService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { DatabaseServer } from "../servers/DatabaseServer"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; @injectable() export class RagfairLinkedItemService diff --git a/project/src/services/RagfairOfferService.ts b/project/src/services/RagfairOfferService.ts index b3beee53..07feab5b 100644 --- a/project/src/services/RagfairOfferService.ts +++ b/project/src/services/RagfairOfferService.ts @@ -1,22 +1,22 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { EventOutputHolder } from "../routers/EventOutputHolder"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { RagfairOfferHolder } from "../utils/RagfairOfferHolder"; -import { TimeUtil } from "../utils/TimeUtil"; -import { LocalisationService } from "./LocalisationService"; -import { RagfairCategoriesService } from "./RagfairCategoriesService"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; +import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { RagfairOfferHolder } from "@spt-aki/utils/RagfairOfferHolder"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class RagfairOfferService diff --git a/project/src/services/RagfairPriceService.ts b/project/src/services/RagfairPriceService.ts index 817f175c..54a236d4 100644 --- a/project/src/services/RagfairPriceService.ts +++ b/project/src/services/RagfairPriceService.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { MinMax } from "../models/common/MinMax"; -import { IPreset } from "../models/eft/common/IGlobals"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IBarterScheme } from "../models/eft/common/tables/ITrader"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { Money } from "../models/enums/Money"; -import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; -import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocalisationService } from "./LocalisationService"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { MinMax } from "@spt-aki/models/common/MinMax"; +import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { Money } from "@spt-aki/models/enums/Money"; +import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "@spt-aki/models/spt/ragfair/IRagfairServerPrices"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; /** * Stores flea prices for items as well as methods to interact with them diff --git a/project/src/services/RagfairRequiredItemsService.ts b/project/src/services/RagfairRequiredItemsService.ts index 11df05d7..8adc0efd 100644 --- a/project/src/services/RagfairRequiredItemsService.ts +++ b/project/src/services/RagfairRequiredItemsService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { PaymentHelper } from "../helpers/PaymentHelper"; -import { RagfairOfferService } from "../services/RagfairOfferService"; -import { ILogger } from "../models/spt/utils/ILogger"; +import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; @injectable() export class RagfairRequiredItemsService diff --git a/project/src/services/RagfairTaxService.ts b/project/src/services/RagfairTaxService.ts index 7108cdc4..e4e6fb48 100644 --- a/project/src/services/RagfairTaxService.ts +++ b/project/src/services/RagfairTaxService.ts @@ -1,12 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IStorePlayerOfferTaxAmountRequestData } from "../models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RagfairPriceService } from "../services/RagfairPriceService"; + +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IStorePlayerOfferTaxAmountRequestData } from "@spt-aki/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; @injectable() export class RagfairTaxService diff --git a/project/src/services/RepairService.ts b/project/src/services/RepairService.ts index 8ba7cdc4..fc69eb57 100644 --- a/project/src/services/RepairService.ts +++ b/project/src/services/RepairService.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { RepairHelper } from "../helpers/RepairHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { IArmorType } from "../models/eft/common/IGlobals"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { RepairKitsInfo } from "../models/eft/repair/IRepairActionDataRequest"; -import { RepairItem } from "../models/eft/repair/ITraderRepairActionDataRequest"; -import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; -import { BaseClasses } from "../models/enums/BaseClasses"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { SkillTypes } from "../models/enums/SkillTypes"; -import { BonusSettings, IRepairConfig } from "../models/spt/config/IRepairConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { LocalisationService } from "./LocalisationService"; -import { PaymentService } from "./PaymentService"; +import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; +import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; +import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; +import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; +import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; +import { IArmorType } from "@spt-aki/models/eft/common/IGlobals"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { RepairKitsInfo } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; +import { RepairItem } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; +import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; +import { BonusSettings, IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { PaymentService } from "@spt-aki/services/PaymentService"; +import { RandomUtil } from "@spt-aki/utils/RandomUtil"; @injectable() export class RepairService diff --git a/project/src/services/SeasonalEventService.ts b/project/src/services/SeasonalEventService.ts index 57d44350..68b52644 100644 --- a/project/src/services/SeasonalEventService.ts +++ b/project/src/services/SeasonalEventService.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "../helpers/BotHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IConfig } from "../models/eft/common/IGlobals"; -import { Inventory } from "../models/eft/common/tables/IBotType"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { SeasonalEventType } from "../models/enums/SeasonalEventType"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { IQuestConfig } from "../models/spt/config/IQuestConfig"; -import { ISeasonalEvent, ISeasonalEventConfig } from "../models/spt/config/ISeasonalEventConfig"; -import { ILocationData } from "../models/spt/server/ILocations"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { DatabaseImporter } from "../utils/DatabaseImporter"; -import { GiftService } from "./GiftService"; -import { LocalisationService } from "./LocalisationService"; +import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { IConfig } from "@spt-aki/models/eft/common/IGlobals"; +import { Inventory } from "@spt-aki/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; +import { ISeasonalEvent, ISeasonalEventConfig } from "@spt-aki/models/spt/config/ISeasonalEventConfig"; +import { ILocationData } from "@spt-aki/models/spt/server/ILocations"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { GiftService } from "@spt-aki/services/GiftService"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { DatabaseImporter } from "@spt-aki/utils/DatabaseImporter"; @injectable() export class SeasonalEventService diff --git a/project/src/services/TraderAssortService.ts b/project/src/services/TraderAssortService.ts index e004647f..5a826c12 100644 --- a/project/src/services/TraderAssortService.ts +++ b/project/src/services/TraderAssortService.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; export class TraderAssortService { diff --git a/project/src/services/TraderPurchasePersisterService.ts b/project/src/services/TraderPurchasePersisterService.ts index 76de725b..b050ce51 100644 --- a/project/src/services/TraderPurchasePersisterService.ts +++ b/project/src/services/TraderPurchasePersisterService.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderPurchaseData } from "../models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ITraderConfig } from "../models/spt/config/ITraderConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { TimeUtil } from "../utils/TimeUtil"; -import { LocalisationService } from "./LocalisationService"; +import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { TraderPurchaseData } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; /** * Help with storing limited item purchases from traders in profile to persist them over server restarts diff --git a/project/src/services/mod/CustomItemService.ts b/project/src/services/mod/CustomItemService.ts index 71529458..ae25d6a1 100644 --- a/project/src/services/mod/CustomItemService.ts +++ b/project/src/services/mod/CustomItemService.ts @@ -1,14 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; -import { - CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails -} from "../../models/spt/mod/NewItemDetails"; -import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; -import { ILogger } from "../../models/spt/utils/ILogger"; -import { DatabaseServer } from "../../servers/DatabaseServer"; -import { HashUtil } from "../../utils/HashUtil"; -import { JsonUtil } from "../../utils/JsonUtil"; +import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "@spt-aki/models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class CustomItemService diff --git a/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts b/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts index a8d26268..075a19db 100644 --- a/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts +++ b/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts @@ -1,4 +1,4 @@ -import { DynamicRouter, RouteAction } from "../../../di/Router"; +import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; export class DynamicRouterMod extends DynamicRouter { diff --git a/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts b/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts index d6b2b4cf..92dc69ec 100644 --- a/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts +++ b/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts @@ -1,6 +1,7 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { RouteAction } from "../../../di/Router"; -import { DynamicRouterMod } from "./DynamicRouterMod"; + +import { RouteAction } from "@spt-aki/di/Router"; +import { DynamicRouterMod } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterMod"; @injectable() export class DynamicRouterModService diff --git a/project/src/services/mod/httpListener/HttpListenerMod.ts b/project/src/services/mod/httpListener/HttpListenerMod.ts index ea34bfb2..d0fcf049 100644 --- a/project/src/services/mod/httpListener/HttpListenerMod.ts +++ b/project/src/services/mod/httpListener/HttpListenerMod.ts @@ -1,5 +1,6 @@ import { IncomingMessage, ServerResponse } from "node:http"; -import { IHttpListener } from "../../../servers/http/IHttpListener"; + +import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; export class HttpListenerMod implements IHttpListener { diff --git a/project/src/services/mod/httpListener/HttpListenerModService.ts b/project/src/services/mod/httpListener/HttpListenerModService.ts index 99d65f5e..e862ff5b 100644 --- a/project/src/services/mod/httpListener/HttpListenerModService.ts +++ b/project/src/services/mod/httpListener/HttpListenerModService.ts @@ -1,7 +1,8 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { DependencyContainer, injectable } from "tsyringe"; -import { IHttpListener } from "../../../servers/http/IHttpListener"; -import { HttpListenerMod } from "./HttpListenerMod"; + +import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; +import { HttpListenerMod } from "@spt-aki/services/mod/httpListener/HttpListenerMod"; @injectable() export class HttpListenerModService diff --git a/project/src/services/mod/onLoad/OnLoadMod.ts b/project/src/services/mod/onLoad/OnLoadMod.ts index 931b776b..24f253cc 100644 --- a/project/src/services/mod/onLoad/OnLoadMod.ts +++ b/project/src/services/mod/onLoad/OnLoadMod.ts @@ -1,4 +1,4 @@ -import { OnLoad } from "../../../di/OnLoad"; +import { OnLoad } from "@spt-aki/di/OnLoad"; export class OnLoadMod implements OnLoad { diff --git a/project/src/services/mod/onLoad/OnLoadModService.ts b/project/src/services/mod/onLoad/OnLoadModService.ts index 80a0c18f..4ffb03bf 100644 --- a/project/src/services/mod/onLoad/OnLoadModService.ts +++ b/project/src/services/mod/onLoad/OnLoadModService.ts @@ -1,5 +1,6 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { OnLoadMod } from "./OnLoadMod"; + +import { OnLoadMod } from "@spt-aki/services/mod/onLoad/OnLoadMod"; @injectable() export class OnLoadModService diff --git a/project/src/services/mod/onUpdate/OnUpdateMod.ts b/project/src/services/mod/onUpdate/OnUpdateMod.ts index c5a9ec62..88def5a4 100644 --- a/project/src/services/mod/onUpdate/OnUpdateMod.ts +++ b/project/src/services/mod/onUpdate/OnUpdateMod.ts @@ -1,4 +1,4 @@ -import { OnUpdate } from "../../../di/OnUpdate"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; export class OnUpdateMod implements OnUpdate { diff --git a/project/src/services/mod/onUpdate/OnUpdateModService.ts b/project/src/services/mod/onUpdate/OnUpdateModService.ts index 408521d2..711a5c12 100644 --- a/project/src/services/mod/onUpdate/OnUpdateModService.ts +++ b/project/src/services/mod/onUpdate/OnUpdateModService.ts @@ -1,5 +1,6 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { OnUpdateMod } from "./OnUpdateMod"; + +import { OnUpdateMod } from "@spt-aki/services/mod/onUpdate/OnUpdateMod"; @injectable() export class OnUpdateModService diff --git a/project/src/services/mod/staticRouter/StaticRouterMod.ts b/project/src/services/mod/staticRouter/StaticRouterMod.ts index 1cc785c7..b6065286 100644 --- a/project/src/services/mod/staticRouter/StaticRouterMod.ts +++ b/project/src/services/mod/staticRouter/StaticRouterMod.ts @@ -1,4 +1,4 @@ -import { RouteAction, StaticRouter } from "../../../di/Router"; +import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; export class StaticRouterMod extends StaticRouter { diff --git a/project/src/services/mod/staticRouter/StaticRouterModService.ts b/project/src/services/mod/staticRouter/StaticRouterModService.ts index 20c043ba..957efcbc 100644 --- a/project/src/services/mod/staticRouter/StaticRouterModService.ts +++ b/project/src/services/mod/staticRouter/StaticRouterModService.ts @@ -1,6 +1,7 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { RouteAction } from "../../../di/Router"; -import { StaticRouterMod } from "./StaticRouterMod"; + +import { RouteAction } from "@spt-aki/di/Router"; +import { StaticRouterMod } from "@spt-aki/services/mod/staticRouter/StaticRouterMod"; @injectable() export class StaticRouterModService diff --git a/project/src/utils/App.ts b/project/src/utils/App.ts index b6c91524..20ad2c45 100644 --- a/project/src/utils/App.ts +++ b/project/src/utils/App.ts @@ -1,12 +1,12 @@ +import os from "node:os"; import { inject, injectable, injectAll } from "tsyringe"; -import os from "node:os"; -import { OnLoad } from "../di/OnLoad"; -import { OnUpdate } from "../di/OnUpdate"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { LocalisationService } from "../services/LocalisationService"; -import { EncodingUtil } from "./EncodingUtil"; -import { TimeUtil } from "./TimeUtil"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class App diff --git a/project/src/utils/AsyncQueue.ts b/project/src/utils/AsyncQueue.ts index 2511ffcc..2e2398c3 100644 --- a/project/src/utils/AsyncQueue.ts +++ b/project/src/utils/AsyncQueue.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { ICommand } from "../models/spt/utils/ICommand"; +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; export class AsyncQueue implements IAsyncQueue { diff --git a/project/src/utils/DatabaseImporter.ts b/project/src/utils/DatabaseImporter.ts index 8b0fc4c8..5eba10b5 100644 --- a/project/src/utils/DatabaseImporter.ts +++ b/project/src/utils/DatabaseImporter.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "../di/OnLoad"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { IHttpConfig } from "../models/spt/config/IHttpConfig"; -import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ImageRouter } from "../routers/ImageRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { LocalisationService } from "../services/LocalisationService"; -import { EncodingUtil } from "./EncodingUtil"; -import { HashUtil } from "./HashUtil"; -import { ImporterUtil } from "./ImporterUtil"; -import { JsonUtil } from "./JsonUtil"; -import { VFS } from "./VFS"; +import { OnLoad } from "@spt-aki/di/OnLoad"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; +import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ImageRouter } from "@spt-aki/routers/ImageRouter"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class DatabaseImporter implements OnLoad diff --git a/project/src/utils/HashUtil.ts b/project/src/utils/HashUtil.ts index 896d4e8a..7832f427 100644 --- a/project/src/utils/HashUtil.ts +++ b/project/src/utils/HashUtil.ts @@ -1,6 +1,7 @@ import crypto from "node:crypto"; import { inject, injectable } from "tsyringe"; -import { TimeUtil } from "./TimeUtil"; + +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; @injectable() export class HashUtil diff --git a/project/src/utils/HttpFileUtil.ts b/project/src/utils/HttpFileUtil.ts index 6101a6ce..7dc79adc 100644 --- a/project/src/utils/HttpFileUtil.ts +++ b/project/src/utils/HttpFileUtil.ts @@ -1,7 +1,8 @@ import fs from "node:fs"; import { ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "../helpers/HttpServerHelper"; + +import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; @injectable() export class HttpFileUtil diff --git a/project/src/utils/HttpResponseUtil.ts b/project/src/utils/HttpResponseUtil.ts index 71279de2..dbd93496 100644 --- a/project/src/utils/HttpResponseUtil.ts +++ b/project/src/utils/HttpResponseUtil.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "../models/enums/BackendErrorCodes"; -import { LocalisationService } from "../services/LocalisationService"; -import { JsonUtil } from "./JsonUtil"; +import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @injectable() export class HttpResponseUtil diff --git a/project/src/utils/ImporterUtil.ts b/project/src/utils/ImporterUtil.ts index a2f47118..9c5e25a2 100644 --- a/project/src/utils/ImporterUtil.ts +++ b/project/src/utils/ImporterUtil.ts @@ -1,7 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { Queue } from "./collections/queue/Queue"; -import { JsonUtil } from "./JsonUtil"; -import { VFS } from "./VFS"; + +import { Queue } from "@spt-aki/utils/collections/queue/Queue"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { VFS } from "@spt-aki/utils/VFS"; /* eslint-disable @typescript-eslint/no-empty-function */ /* eslint-disable @typescript-eslint/brace-style */ diff --git a/project/src/utils/JsonUtil.ts b/project/src/utils/JsonUtil.ts index 42176bcc..a5b5877f 100644 --- a/project/src/utils/JsonUtil.ts +++ b/project/src/utils/JsonUtil.ts @@ -3,9 +3,10 @@ import JSON5 from "json5"; import { jsonc } from "jsonc"; import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { inject, injectable } from "tsyringe"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { HashUtil } from "./HashUtil"; -import { VFS } from "./VFS"; + +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { VFS } from "@spt-aki/utils/VFS"; @injectable() export class JsonUtil diff --git a/project/src/utils/ObjectId.ts b/project/src/utils/ObjectId.ts index bca1b9bd..40183e9b 100644 --- a/project/src/utils/ObjectId.ts +++ b/project/src/utils/ObjectId.ts @@ -1,8 +1,8 @@ import crypto from "node:crypto"; -import { TimeUtil } from "./TimeUtil"; - import { inject, injectable } from "tsyringe"; +import { TimeUtil } from "@spt-aki/utils/TimeUtil"; + @injectable() export class ObjectId { diff --git a/project/src/utils/RagfairOfferHolder.ts b/project/src/utils/RagfairOfferHolder.ts index f2b5e4ba..86861ded 100644 --- a/project/src/utils/RagfairOfferHolder.ts +++ b/project/src/utils/RagfairOfferHolder.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; export class RagfairOfferHolder { diff --git a/project/src/utils/RandomUtil.ts b/project/src/utils/RandomUtil.ts index 9cda7ee5..1ef6f403 100644 --- a/project/src/utils/RandomUtil.ts +++ b/project/src/utils/RandomUtil.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { JsonUtil } from "./JsonUtil"; -import { MathUtil } from "./MathUtil"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MathUtil } from "@spt-aki/utils/MathUtil"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects diff --git a/project/src/utils/UUidGenerator.ts b/project/src/utils/UUidGenerator.ts index 0c82764e..12099ee9 100644 --- a/project/src/utils/UUidGenerator.ts +++ b/project/src/utils/UUidGenerator.ts @@ -1,5 +1,6 @@ import { injectable } from "tsyringe"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; + +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; @injectable() export class UUidGenerator implements IUUidGenerator diff --git a/project/src/utils/VFS.ts b/project/src/utils/VFS.ts index 8a869cc0..896fe5ca 100644 --- a/project/src/utils/VFS.ts +++ b/project/src/utils/VFS.ts @@ -5,8 +5,9 @@ import { promisify } from "node:util"; import lockfile from "proper-lockfile"; import "reflect-metadata"; import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; + +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; @injectable() export class VFS diff --git a/project/src/utils/Watermark.ts b/project/src/utils/Watermark.ts index 2d2b94b4..22724e1f 100644 --- a/project/src/utils/Watermark.ts +++ b/project/src/utils/Watermark.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "../models/enums/ConfigTypes"; -import { ICoreConfig } from "../models/spt/config/ICoreConfig"; -import { LogTextColor } from "../models/spt/logging/LogTextColor"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { LocalisationService } from "../services/LocalisationService"; +import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() export class WatermarkLocale diff --git a/project/src/utils/logging/AbstractWinstonLogger.ts b/project/src/utils/logging/AbstractWinstonLogger.ts index 2f97a33e..b0df5b7f 100644 --- a/project/src/utils/logging/AbstractWinstonLogger.ts +++ b/project/src/utils/logging/AbstractWinstonLogger.ts @@ -3,14 +3,14 @@ import { promisify } from "node:util"; import winston, { createLogger, format, transports } from "winston"; import DailyRotateFile from "winston-daily-rotate-file"; -import { Daum } from "../../models/eft/itemEvent/IItemEventRouterRequest"; -import { LogBackgroundColor } from "../../models/spt/logging/LogBackgroundColor"; -import { LogTextColor } from "../../models/spt/logging/LogTextColor"; -import { SptLogger } from "../../models/spt/logging/SptLogger"; -import { IAsyncQueue } from "../../models/spt/utils/IAsyncQueue"; -import { ICommand } from "../../models/spt/utils/ICommand"; -import { ILogger } from "../../models/spt/utils/ILogger"; -import { IUUidGenerator } from "../../models/spt/utils/IUuidGenerator"; +import { Daum } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { SptLogger } from "@spt-aki/models/spt/logging/SptLogger"; +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; +import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; export abstract class AbstractWinstonLogger implements ILogger { diff --git a/project/src/utils/logging/WinstonMainLogger.ts b/project/src/utils/logging/WinstonMainLogger.ts index 47854b9d..dee95420 100644 --- a/project/src/utils/logging/WinstonMainLogger.ts +++ b/project/src/utils/logging/WinstonMainLogger.ts @@ -1,7 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "../../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../../models/spt/utils/IUuidGenerator"; -import { AbstractWinstonLogger } from "./AbstractWinstonLogger"; + +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; +import { AbstractWinstonLogger } from "@spt-aki/utils/logging/AbstractWinstonLogger"; @injectable() export class WinstonMainLogger extends AbstractWinstonLogger diff --git a/project/src/utils/logging/WinstonRequestLogger.ts b/project/src/utils/logging/WinstonRequestLogger.ts index 62328cd6..23857ecc 100644 --- a/project/src/utils/logging/WinstonRequestLogger.ts +++ b/project/src/utils/logging/WinstonRequestLogger.ts @@ -1,7 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "../../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../../models/spt/utils/IUuidGenerator"; -import { AbstractWinstonLogger } from "./AbstractWinstonLogger"; + +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { IUUidGenerator } from "@spt-aki/models/spt/utils/IUuidGenerator"; +import { AbstractWinstonLogger } from "@spt-aki/utils/logging/AbstractWinstonLogger"; @injectable() export class WinstonRequestLogger extends AbstractWinstonLogger