update typescript examples

TypeScript/1LogToConsole/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "LogToConsole",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

TypeScript/1LogToConsole/package.json

@@ -4,7 +4,7 @@
   "main": "src/mod.js",
   "license": "MIT",
   "author": "Chomp",
-  "akiVersion": "2.4.0",
+  "akiVersion": "3.0.0",
   "scripts": {
     "install": "npx handpick --target=devDependencies",
     "build": "tsc"

TypeScript/1LogToConsole/src/mod.ts

@@ -1,6 +1,6 @@
 import type { DependencyContainer } from "tsyringe";
-import { IMod } from "../types/@types/external/mod";
+import { IMod } from "../types/models/external/mod";
-import type { ILogger } from "../types/@types/spt/utils/ILogger";
+import { ILogger } from "../types/models/spt/utils/ILogger";
 
 class Mod implements IMod
 {

TypeScript/1LogToConsole/tsconfig.json

@@ -9,7 +9,6 @@
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
 		"resolveJsonModule": true,
-		"esModuleInterop": true,
         "outDir": "out"
     },
     "lib": [

TypeScript/1LogToConsole/types/@types/eft/common/IItemEventResponseData.d.ts

@@ -1,25 +0,0 @@
-import { Skills } from "./IPmcData";
-export interface IItemEventResponseData {
-    warnings: any[];
-    profileChanges: Record<string, ProfileChange>;
-}
-export interface ProfileChange {
-    _id: string;
-    experience: number;
-    quests: any[];
-    ragFairOffers: any[];
-    builds: any[];
-    items: Items;
-    production: Production;
-    skills: Skills;
-    traderRelations: TraderRelations;
-}
-export interface Items {
-    new: any[];
-    change: any[];
-    del: any[];
-}
-export interface Production {
-}
-export interface TraderRelations {
-}

TypeScript/1LogToConsole/types/@types/eft/common/IPmcDataRepeatableQuest.d.ts

@@ -1,71 +0,0 @@
-export interface IPmcDataRepeatableQuest {
-    name: string;
-    activeQuests: Quest[];
-    inactiveQuests: Quest[];
-    endTime: number;
-}
-export interface Quest {
-    _id: string;
-    traderId: string;
-    location: string;
-    image: string;
-    type: string;
-    isKey: boolean;
-    restartable: boolean;
-    instantComplete: boolean;
-    secretQuest: boolean;
-    canShowNotificationsInGame: boolean;
-    rewards: Rewards;
-    conditions: Conditions;
-    name: string;
-    note: string;
-    description: string;
-    successMessageText: string;
-    failMessageText: string;
-    startedMessageText: string;
-    templateId: string;
-}
-export interface Rewards {
-    Started: Reward[];
-    Success: Reward[];
-    Fail: Reward[];
-}
-export interface Reward {
-    value: number;
-    type: string;
-    index: number;
-    target?: string;
-    items?: Item[];
-}
-export interface Item {
-    _id: string;
-    _tpl: string;
-    upd: Upd;
-}
-export interface Conditions {
-    AvailableForStart: any[];
-    AvailableForFinish: AvailableForFinish[];
-    Fail: any[];
-}
-export interface AvailableForFinish {
-    _props: Props;
-    _parent: string;
-    dynamicLocale: boolean;
-}
-export interface Props {
-    id: string;
-    parentId: string;
-    dynamicLocale: boolean;
-    index: number;
-    visibilityConditions: any[];
-    target: string[];
-    value: number;
-    minDurability: number;
-    maxDurability: number;
-    dogtagLevel: number;
-    onlyFoundInRaid: boolean;
-}
-export interface Upd {
-    StackObjectsCount: number;
-    SpawnedInSession?: boolean;
-}

TypeScript/1LogToConsole/types/@types/eft/hideout/IHideoutRequestData.d.ts

@@ -1,10 +0,0 @@
-export interface IHideoutRequestData {
-    Action: "HideoutUpgrade";
-    areaType: number;
-    items: HideoutItem[];
-    timestamp: number;
-}
-export interface HideoutItem {
-    count: number;
-    id: string;
-}

TypeScript/1LogToConsole/types/@types/eft/itemEvent/IHandleEventRequestData.d.ts

@@ -1,21 +0,0 @@
-export interface IHandleEventRequestData {
-    data: Daum[];
-    tm: number;
-    reload: number;
-}
-export interface Daum {
-    Action: string;
-    item: string;
-    to?: To;
-}
-export interface To {
-    id: string;
-    container: string;
-    location: Location;
-}
-export interface Location {
-    x: number;
-    y: number;
-    r: string;
-    isSearched: boolean;
-}

TypeScript/1LogToConsole/types/@types/eft/notes/INoteData.d.ts

@@ -1,4 +0,0 @@
-export interface INote {
-    Time: number;
-    Text: string;
-}

TypeScript/1LogToConsole/types/@types/eft/presetBuild/IPresetBuildActionData.d.ts

@@ -1,25 +0,0 @@
-export interface IPresetBuildActionData {
-    Action: string;
-    id: string;
-    name: string;
-    root: string;
-    items: Item[];
-}
-export interface Item {
-    _id: string;
-    _tpl: string;
-    upd?: Upd;
-    parentId?: string;
-    slotId?: string;
-}
-export interface Upd {
-    Repairable: Repairable;
-    FireMode: FireMode;
-}
-export interface Repairable {
-    MaxDurability: number;
-    Durability: number;
-}
-export interface FireMode {
-    FireMode: string;
-}

TypeScript/1LogToConsole/types/@types/eft/ragfair/ISaleChance.d.ts

@@ -1,4 +0,0 @@
-export interface ISaleChance {
-    sellTime: number;
-    amount: number;
-}

TypeScript/1LogToConsole/types/@types/eft/repair/IRepairActionData.d.ts

@@ -1,9 +0,0 @@
-export interface IRepairActionData {
-    Action: string;
-    tid: string;
-    repairItems: RepairItem[];
-}
-export interface RepairItem {
-    _id: string;
-    count: number;
-}

TypeScript/1LogToConsole/types/@types/notes/INoteActionData.d.ts

@@ -1,6 +0,0 @@
-import { INote } from "../eft/notes/INoteData";
-export interface INoteActionData {
-    Action: string;
-    index: number;
-    note: INote;
-}

TypeScript/1LogToConsole/types/@types/spt/helpers/IGetItemResponse.d.ts

@@ -1,2 +0,0 @@
-export interface IGetItemResponse {
-}

TypeScript/1LogToConsole/types/Lib.d.ts

@@ -1,94 +0,0 @@
-import { BundleLoader } from "./loaders/BundleLoader";
-export { BundleLoader };
-import { ModLoader } from "./loaders/ModLoader";
-export { ModLoader };
-import { ContainerHelper } from "./helpers/ContainerHelper.js";
-export { ContainerHelper };
-import { InventoryHelper } from "./helpers/InventoryHelper.js";
-export { InventoryHelper };
-import { ItemHelper } from "./helpers/ItemHelper.js";
-export { ItemHelper };
-import { GameEventHelper } from "./helpers/GameEventHelper.js";
-export { GameEventHelper };
-import { QuestHelper } from "./helpers/QuestHelper.js";
-export { QuestHelper };
-import { UtilityHelper } from "./helpers/UtilityHelper.js";
-export { UtilityHelper };
-import { TraderHelper } from "./helpers/TraderHelper.js";
-export { TraderHelper };
-import { RagfairServerHelper } from "./helpers/RagfairServerHelper.js";
-export { RagfairServerHelper };
-import { DurabilityLimitsHelper } from "./helpers/DurabilityLimitsHelper.js";
-export { DurabilityLimitsHelper };
-import { WeightedRandomHelper } from "./helpers/WeightedRandomHelper.js";
-export { WeightedRandomHelper };
-import { BotCallbacks } from "./callbacks/BotCallbacks.js";
-export { BotCallbacks };
-import { DataCallbacks } from "./callbacks/DataCallbacks.js";
-export { DataCallbacks };
-import { DialogueCallbacks } from "./callbacks/DialogueCallbacks.js";
-export { DialogueCallbacks };
-import { GameCallbacks } from "./callbacks/GameCallbacks.js";
-export { GameCallbacks };
-import { HideoutCallbacks } from "./callbacks/HideoutCallbacks";
-export { HideoutCallbacks };
-import { HttpCallbacks } from "./callbacks/HttpCallbacks.js";
-export { HttpCallbacks };
-import { InraidCallbacks } from "./callbacks/InraidCallbacks.js";
-export { InraidCallbacks };
-import { InventoryCallbacks } from "./callbacks/InventoryCallbacks.js";
-export { InventoryCallbacks };
-import { NotifierCallbacks } from "./callbacks/NotifierCallbacks.js";
-export { NotifierCallbacks };
-import { ProfileCallbacks } from "./callbacks/ProfileCallbacks.js";
-export { ProfileCallbacks };
-import { QuestCallbacks } from "./callbacks/QuestCallbacks.js";
-export { QuestCallbacks };
-import { RagfairCallbacks } from "./callbacks/RagfairCallbacks.js";
-export { RagfairCallbacks };
-import { TraderCallbacks } from "./callbacks/TraderCallbacks.js";
-export { TraderCallbacks };
-import { BotController } from "./controllers/BotController.js";
-export { BotController };
-import { DialogueController } from "./controllers/DialogueController.js";
-export { DialogueController };
-import { GameController } from "./controllers/GameController.js";
-export { GameController };
-import { HealthController } from "./controllers/HealthController.js";
-export { HealthController };
-import { HideoutController } from "./controllers/HideoutController.js";
-export { HideoutController };
-import { InsuranceController } from "./controllers/InsuranceController.js";
-export { InsuranceController };
-import { InventoryController } from "./controllers/InventoryController.js";
-export { InventoryController };
-import { LocationController } from "./controllers/LocationController.js";
-export { LocationController };
-import { NotifierController } from "./controllers/NotifierController.js";
-export { NotifierController };
-import { PresetController } from "./controllers/PresetController.js";
-export { PresetController };
-import { ProfileController } from "./controllers/ProfileController.js";
-export { ProfileController };
-import { QuestController } from "./controllers/QuestController.js";
-export { QuestController };
-import { RepeatableQuestController } from "./controllers/RepeatableQuestController.js";
-export { RepeatableQuestController };
-import { RagfairController } from "./controllers/RagfairController.js";
-export { RagfairController };
-import { TraderController } from "./controllers/TraderController.js";
-export { TraderController };
-import { PaymentController } from "./controllers/PaymentController";
-export { PaymentController };
-import { PlayerController } from "./controllers/PlayerController.js";
-export { PlayerController };
-import { HandbookController } from "./controllers/HandbookController.js";
-export { HandbookController };
-import { DatabaseServer } from "./servers/DatabaseServer";
-export { DatabaseServer };
-import { HttpServer } from "./servers/HttpServer.js";
-export { HttpServer };
-import { RagfairServer } from "./servers/RagfairServer.js";
-export { RagfairServer };
-import { SaveServer } from "./servers/SaveServer";
-export { SaveServer };

TypeScript/1LogToConsole/types/Program.d.ts

@@ -1,8 +1,4 @@
-import "reflect-metadata";
+export declare class Program {
-import { App } from "./utils/App";
+    constructor();
-export interface IProgram {
+    start(): void;
-}
-export declare class Program implements IProgram {
-    private app;
-    constructor(app: App);
 }

TypeScript/1LogToConsole/types/bindings/AppLoad.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/AppUpdate.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/DynamicRoutes.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/ItemEvents.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/SaveLoad.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/ServerRespond.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/bindings/StaticRoutes.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts

@@ -1,13 +1,13 @@
 import { BotController } from "../controllers/BotController";
-import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData";
+import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IBotBase } from "../@types/eft/common/tables/IBotBase";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class BotCallbacks {
     private botController;
     private httpResponse;
-    constructor(botController: BotController, httpResponse: HttpResponse);
+    constructor(botController: BotController, httpResponse: HttpResponseUtil);
     getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string;
     getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string;
     generateBots(url: string, info: IGenerateBotsRequestData, sessionID: string): IGetBodyResponseData<IBotBase[]>;

TypeScript/1LogToConsole/types/callbacks/BundleCallbacks.d.ts

@@ -1,17 +1,16 @@
 import { BundleLoader } from "../loaders/BundleLoader";
 import { ConfigServer } from "../servers/ConfigServer";
-import { IHttpConfig } from "../@types/spt/config/IHttpConfig";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { HttpResponse } from "../utils/HttpResponse";
+import { ILogger } from "../models/spt/utils/ILogger";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
-import { IHttpServer } from "../@types/spt/server/IHttpServer";
 export declare class BundleCallbacks {
     private logger;
     private httpResponse;
     private httpServer;
     private bundleLoader;
     private configServer;
-    httpConfig: IHttpConfig;
+    private httpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer);
     sendBundle(sessionID: string, req: any, resp: any, body: any): any;
     getBundles(url: string, info: any, sessionID: string): string;
     getBundle(url: string, info: any, sessionID: string): string;

TypeScript/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts

@@ -1,17 +1,17 @@
 import { SaveServer } from "../servers/SaveServer";
 import { CustomizationController } from "../controllers/CustomizationController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData";
+import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
-import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData";
+import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ISuit } from "../@types/eft/common/tables/ITrader";
+import { ISuit } from "../models/eft/common/tables/ITrader";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class CustomizationCallbacks {
     private customizationController;
     private saveServer;
     private httpResponse;
-    constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponse);
+    constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil);
     getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{
         _id: string;
         suites: string[];

TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts

@@ -1,20 +1,20 @@
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGlobals } from "../@types/eft/common/IGlobals";
+import { IGlobals } from "../models/eft/common/IGlobals";
-import { ICustomizationItem } from "../@types/eft/common/tables/ICustomizationItem";
+import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem";
-import { IQuest } from "../@types/eft/common/tables/IQuest";
+import { IQuest } from "../models/eft/common/tables/IQuest";
-import { IHideoutArea } from "../@types/eft/hideout/IHideoutArea";
+import { IHideoutArea } from "../models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "../@types/eft/hideout/IHideoutProduction";
+import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "../@types/eft/hideout/IHideoutScavCase";
+import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "../@types/eft/hideout/IHideoutSettingsBase";
+import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ILanguageBase } from "../@types/spt/server/ILocaleBase";
+import { ILanguageBase } from "../models/spt/server/ILocaleBase";
-import { ISettingsBase } from "../@types/spt/server/ISettingsBase";
+import { ISettingsBase } from "../models/spt/server/ISettingsBase";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class DataCallbacks {
     private httpResponse;
     private databaseServer;
-    constructor(httpResponse: HttpResponse, databaseServer: DatabaseServer);
+    constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer);
     getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
     getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
     getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;

TypeScript/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts

@@ -1,31 +1,31 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { HashUtil } from "../utils/HashUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 import { DialogueController } from "../controllers/DialogueController";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { DialogueInfo } from "../@types/eft/profile/IAkiProfile";
+import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
-import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGetMailDialogViewRequestData } from "../@types/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData";
-import { IGetMailDialogInfoRequestData } from "../@types/eft/dialog/IGetMailDialogInfoRequestData";
+import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData";
-import { IRemoveDialogRequestData } from "../@types/eft/dialog/IRemoveDialogRequestData";
+import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData";
-import { IGetMailDialogListRequestData } from "../@types/eft/dialog/IGetMailDialogListRequestData";
+import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IFriendRequestData } from "../@types/eft/dialog/IFriendRequestData";
+import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData";
-import { IPinDialogRequestData } from "../@types/eft/dialog/IPinDialogRequestData";
+import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData";
-import { ISetDialogReadRequestData } from "../@types/eft/dialog/ISetDialogReadRequestData";
+import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData";
-import { IGetAllAttachmentsRequestData } from "../@types/eft/dialog/IGetAllAttachmentsRequestData";
+import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData";
-import { IGetChatServerListRequestData } from "../@types/eft/dialog/IGetChatServerListRequestData";
+import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData";
-import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse";
+import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
-import { ISendMessageRequest } from "../@types/eft/dialog/ISendMessageRequest";
+import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest";
-import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData";
+import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
 import { OnUpdate } from "../di/OnUpdate";
 export declare class DialogueCallbacks extends OnUpdate {
     private hashUtil;
     private timeUtil;
     private httpResponse;
     private dialogueController;
-    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponse, dialogueController: DialogueController);
+    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController);
     getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetFriendListDataResponse>;
     getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     getMailDialogList(url: string, info: IGetMailDialogListRequestData, sessionID: string): IGetBodyResponseData<DialogueInfo[]>;

TypeScript/1LogToConsole/types/callbacks/GameCallbacks.d.ts

@@ -1,17 +1,17 @@
 import { GameController } from "../controllers/GameController";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGameEmptyCrcRequestData } from "../@types/eft/game/IGameEmptyCrcRequestData";
+import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData";
-import { IVersionValidateRequestData } from "../@types/eft/game/IVersionValidateRequestData";
+import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse";
+import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { IWatermark } from "../@types/spt/utils/IWatermark";
+import { IWatermark } from "../models/spt/utils/IWatermark";
 declare class GameCallbacks {
     private httpResponse;
     private watermark;
     private gameController;
-    constructor(httpResponse: HttpResponse, watermark: IWatermark, gameController: GameController);
+    constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController);
     versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData;
     gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
     gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;

TypeScript/1LogToConsole/types/callbacks/HealthCallbacks.d.ts

@@ -1,19 +1,20 @@
 import { HealthController } from "../controllers/HealthController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData";
+import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData";
+import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
-import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData";
+import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
-import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData";
+import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class HealthCallbacks {
     private httpResponse;
     private profileHelper;
     private healthController;
-    constructor(httpResponse: HttpResponse, profileHelper: ProfileHelper, healthController: HealthController);
+    constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController);
     syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData<string>;
-    offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any;
+    offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
-    offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any;
+    offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
-    healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): any;
+    healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
 }

TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts

@@ -1,15 +1,15 @@
 import { HideoutController } from "../controllers/HideoutController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData";
+import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
-import { IHideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/IHideoutUpgradeCompleteRequestData";
+import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData";
-import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
-import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
-import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData";
+import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
-import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
-import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData";
+import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
-import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ConfigServer } from "../servers/ConfigServer";
 import { OnUpdate } from "../di/OnUpdate";
 export declare class HideoutCallbacks extends OnUpdate {

TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts

@@ -1,4 +1,4 @@
-import { IHttpServer } from "../@types/spt/server/IHttpServer";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
 import { OnLoad } from "../di/OnLoad";
 export declare class HttpCallbacks extends OnLoad {
     private httpServer;

TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts

@@ -1,17 +1,17 @@
 import { InraidController } from "../controllers/InraidController";
-import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData";
+import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
-import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData";
+import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
 import { ConfigServer } from "../servers/ConfigServer";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class InraidCallbacks {
     private inraidController;
     private httpResponse;
     private configServer;
     private airdropConfig;
     private inraidConfig;
-    constructor(inraidController: InraidController, httpResponse: HttpResponse, configServer: ConfigServer);
+    constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer);
     registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData;
     saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData;
     getRaidEndState(): string;

TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts

@@ -1,22 +1,23 @@
 import { InsuranceController } from "../controllers/InsuranceController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
-import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData";
+import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { ConfigServer } from "../servers/ConfigServer";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { InsuranceService } from "../services/InsuranceService";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InsuranceCallbacks extends OnLoadOnUpdate {
     private insuranceController;
     private insuranceService;
     private httpResponse;
     private configServer;
     private insuranceConfig;
-    constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponse, configServer: ConfigServer);
+    constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer);
     onLoad(): void;
     getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData<any>;
-    insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any;
+    insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
     onUpdate(secondsSinceLastRun: number): boolean;
     getRoute(): string;
 }

TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts

@@ -1,22 +1,22 @@
 import { InventoryController } from "../controllers/InventoryController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData";
+import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
-import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData";
+import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData";
+import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData";
+import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData";
+import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
-import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData";
+import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData";
+import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
-import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
-import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InventoryCallbacks {
     private inventoryController;
     constructor(inventoryController: InventoryController);

TypeScript/1LogToConsole/types/callbacks/ItemEventCallbacks.d.ts

@@ -1,11 +1,11 @@
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IItemEventRouterRequest } from "../@types/eft/itemEvent/IItemEventRouterRequest";
+import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class ItemEventCallbacks {
     private httpResponse;
     private itemEventRouter;
-    constructor(httpResponse: HttpResponse, itemEventRouter: ItemEventRouter);
+    constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter);
     handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData<IItemEventRouterResponse>;
 }

TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts

@@ -1,17 +1,17 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { SaveServer } from "../servers/SaveServer";
 import { LauncherController } from "../controllers/LauncherController";
-import { IRegisterData } from "../@types/eft/launcher/IRegisterData";
+import { IRegisterData } from "../models/eft/launcher/IRegisterData";
-import { IRemoveProfileData } from "../@types/eft/launcher/IRemoveProfileData";
+import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData";
-import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData";
+import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
-import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData";
+import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
-import { IWatermark } from "../@types/spt/utils/IWatermark";
+import { IWatermark } from "../models/spt/utils/IWatermark";
 declare class LauncherCallbacks {
     private httpResponse;
     private launcherController;
     private saveServer;
     private watermark;
-    constructor(httpResponse: HttpResponse, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark);
+    constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark);
     connect(): string;
     login(url: string, info: ILoginRequestData, sessionID: string): string;
     register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK";

TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts

@@ -1,13 +1,13 @@
 import { LocationController } from "../controllers/LocationController";
-import { IGetLocationRequestData } from "../@types/eft/location/IGetLocationRequestData";
+import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase";
+import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
-import { ILocationBase } from "../@types/eft/common/ILocationBase";
+import { ILocationBase } from "../models/eft/common/ILocationBase";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class LocationCallbacks {
     private httpResponse;
     private locationController;
-    constructor(httpResponse: HttpResponse, locationController: LocationController);
+    constructor(httpResponse: HttpResponseUtil, locationController: LocationController);
     getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData<ILocationsGenerateAllResponse>;
     getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData<ILocationBase>;
 }

TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts

@@ -1,18 +1,18 @@
 import { MatchController } from "../controllers/MatchController";
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
-import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 export declare class MatchCallbacks {
     private httpResponse;
     private jsonUtil;
     private matchController;
     private databaseServer;
-    constructor(httpResponse: HttpResponse, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer);
+    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer);
     updatePing(url: string, info: any, sessionID: string): INullResponseData;
     exitMatch(url: string, info: any, sessionID: string): INullResponseData;
     exitToMenu(url: string, info: any, sessionID: string): INullResponseData;

TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts

@@ -1,9 +1,9 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { OnLoad } from "../di/OnLoad";
 import { DelayedModLoader } from "../loaders/DelayedModLoader";
 import { ConfigServer } from "../servers/ConfigServer";
-import { ILogger } from '../@types/spt/utils/ILogger';
+import { ILogger } from '../models/spt/utils/ILogger';
-import { IHttpServer } from '../@types/spt/server/IHttpServer';
+import { IHttpServer } from '../models/spt/server/IHttpServer';
 declare class ModCallbacks extends OnLoad {
     private logger;
     private httpResponse;
@@ -11,7 +11,7 @@ declare class ModCallbacks extends OnLoad {
     private modLoader;
     private configServer;
     private httpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponse, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer);
     onLoad(): void;
     getRoute(): string;
     sendBundle(sessionID: string, req: any, resp: any, body: any): void;

TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts

@@ -1,7 +1,7 @@
 import { NoteController } from "../controllers/NoteController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { INoteActionData } from "../@types/eft/notes/INoteActionData";
+import { INoteActionData } from "../models/eft/notes/INoteActionData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class NoteCallbacks {
     private noteController;
     constructor(noteController: NoteController);

TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts

@@ -1,15 +1,15 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INotifierChannel } from "../@types/eft/notifier/INotifier";
+import { INotifierChannel } from "../models/eft/notifier/INotifier";
-import { ISelectProfileRequestData } from "../@types/eft/notifier/ISelectProfileRequestData";
+import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData";
 import { NotifierController } from "../controllers/NotifierController";
 export declare class NotifierCallbacks {
     private httpServerHelper;
     private httpResponse;
     private notifierController;
-    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponse, notifierController: NotifierController);
+    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController);
     /**
      * If we don't have anything to send, it's ok to not send anything back
      * because notification requests can be long-polling. In fact, we SHOULD wait

TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts

@@ -1,14 +1,14 @@
 import { PresetBuildController } from "../controllers/PresetBuildController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData";
+import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { WeaponBuild } from "../@types/eft/profile/IAkiProfile";
+import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class PresetBuildCallbacks {
     private httpResponse;
     private presetBuildController;
-    constructor(httpResponse: HttpResponse, presetBuildController: PresetBuildController);
+    constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController);
     getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData<WeaponBuild[]>;
     saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
     removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;

TypeScript/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts

@@ -1,21 +1,21 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 import { ProfileController } from "../controllers/ProfileController";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { INullResponseData } from "../@types/eft/httpResponse/INullResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
-import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
-import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData";
+import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
-import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData";
+import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
-import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData";
-import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse";
+import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse";
-import { IGetMiniProfileRequestData } from "../@types/eft/launcher/IGetMiniProfileRequestData";
+import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
 export declare class ProfileCallbacks {
     private httpResponse;
     private timeUtil;
     private profileController;
-    constructor(httpResponse: HttpResponse, timeUtil: TimeUtil, profileController: ProfileController);
+    constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController);
     createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData<any>;
     getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
     regenerateScav(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;

TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts

@@ -1,22 +1,22 @@
 import { QuestController } from "../controllers/QuestController";
 import { RepeatableQuestController } from "../controllers/RepeatableQuestController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData";
+import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IListQuestsRequestData } from "../@types/eft/quests/IListQuestsRequestData";
+import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData";
+import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
-import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData";
+import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IQuest } from "../@types/eft/common/tables/IQuest";
+import { IQuest } from "../models/eft/common/tables/IQuest";
-import { IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests";
+import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
-import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest";
+import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class QuestCallbacks {
     private httpResponse;
     private questController;
     private repeatableQuestController;
-    constructor(httpResponse: HttpResponse, questController: QuestController, repeatableQuestController: RepeatableQuestController);
+    constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController);
     changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse;
     acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
     completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse;

TypeScript/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts

@@ -1,20 +1,20 @@
 import { RagfairServer } from "../servers/RagfairServer";
 import { RagfairController } from "../controllers/RagfairController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData";
+import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { IAddOfferRequestData } from "../@types/eft/ragfair/IAddOfferRequestData";
+import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IRemoveOfferRequestData } from "../@types/eft/ragfair/IRemoveOfferRequestData";
+import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData";
-import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData";
+import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult";
+import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
 import { ConfigServer } from "../servers/ConfigServer";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class RagfairCallbacks extends OnLoadOnUpdate {
     private httpResponse;
     private logger;
@@ -23,7 +23,7 @@ export declare class RagfairCallbacks extends OnLoadOnUpdate {
     private ragfairController;
     private configServer;
     private ragfairConfig;
-    constructor(httpResponse: HttpResponse, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer);
+    constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer);
     onLoad(): void;
     getRoute(): string;
     search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData<any>;

TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { RepairController } from "../controllers/RepairController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest";
+import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
-import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class RepairCallbacks {
     private repairController;
     constructor(repairController: RepairController);

TypeScript/1LogToConsole/types/callbacks/TradeCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { TradeController } from "../controllers/TradeController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 export declare class TradeCallbacks {
     private tradeController;
     constructor(tradeController: TradeController);

TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts

@@ -1,13 +1,13 @@
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TraderController } from "../controllers/TraderController";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader";
+import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 export declare class TraderCallbacks extends OnLoadOnUpdate {
     private httpResponse;
     private traderController;
-    constructor(httpResponse: HttpResponse, traderController: TraderController);
+    constructor(httpResponse: HttpResponseUtil, traderController: TraderController);
     onLoad(): void;
     getRoute(): string;
     getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ITraderBase[]>;

TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts

@@ -1,10 +1,10 @@
 import { WeatherController } from "../controllers/WeatherController";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
     private httpResponse;
     private weatherController;
-    constructor(httpResponse: HttpResponse, weatherController: WeatherController);
+    constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController);
     getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
 }

TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts

@@ -1,7 +1,7 @@
 import { WishlistController } from "../controllers/WishlistController";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData";
+import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class WishlistCallbacks {
     private wishlistController;
     constructor(wishlistController: WishlistController);

TypeScript/1LogToConsole/types/configs/AkiConfig.d.ts

@@ -1,3 +0,0 @@
-export const akiVersion: string;
-export const projectName: string;
-export const compatibleTarkovVersion: string;

TypeScript/1LogToConsole/types/configs/BotConfig.d.ts

@@ -1,309 +0,0 @@
-export declare namespace presetBatch {
-    const assault: number;
-    const bossBully: number;
-    const bossGluhar: number;
-    const bossKilla: number;
-    const bossKojaniy: number;
-    const bossSanitar: number;
-    const bossTagilla: number;
-    const bossTest: number;
-    const cursedAssault: number;
-    const followerBully: number;
-    const followerGluharAssault: number;
-    const followerGluharScout: number;
-    const followerGluharSecurity: number;
-    const followerGluharSnipe: number;
-    const followerKojaniy: number;
-    const followerSanitar: number;
-    const followerTagilla: number;
-    const followerTest: number;
-    const marksman: number;
-    const pmcBot: number;
-    const sectantPriest: number;
-    const sectantWarrior: number;
-    const gifter: number;
-    const test: number;
-    const exUsec: number;
-}
-export declare const bosses: string[];
-export declare namespace durability {
-    namespace _default {
-        namespace armor {
-            const maxDelta: number;
-            const minDelta: number;
-        }
-        namespace weapon {
-            export const lowestMax: number;
-            export const highestMax: number;
-            const maxDelta_1: number;
-            export { maxDelta_1 as maxDelta };
-            const minDelta_1: number;
-            export { minDelta_1 as minDelta };
-        }
-    }
-    export { _default as default };
-    export namespace pmc {
-        export namespace armor_1 {
-            export const lowestMaxPercent: number;
-            export const highestMaxPercent: number;
-            const maxDelta_2: number;
-            export { maxDelta_2 as maxDelta };
-            const minDelta_2: number;
-            export { minDelta_2 as minDelta };
-        }
-        export { armor_1 as armor };
-        export namespace weapon_1 {
-            const lowestMax_1: number;
-            export { lowestMax_1 as lowestMax };
-            const highestMax_1: number;
-            export { highestMax_1 as highestMax };
-            const maxDelta_3: number;
-            export { maxDelta_3 as maxDelta };
-            const minDelta_3: number;
-            export { minDelta_3 as minDelta };
-        }
-        export { weapon_1 as weapon };
-    }
-    export namespace boss {
-        export namespace armor_2 {
-            const maxDelta_4: number;
-            export { maxDelta_4 as maxDelta };
-            const minDelta_4: number;
-            export { minDelta_4 as minDelta };
-        }
-        export { armor_2 as armor };
-        export namespace weapon_2 {
-            const lowestMax_2: number;
-            export { lowestMax_2 as lowestMax };
-            const highestMax_2: number;
-            export { highestMax_2 as highestMax };
-            const maxDelta_5: number;
-            export { maxDelta_5 as maxDelta };
-            const minDelta_5: number;
-            export { minDelta_5 as minDelta };
-        }
-        export { weapon_2 as weapon };
-    }
-    export namespace follower {
-        export namespace armor_3 {
-            const maxDelta_6: number;
-            export { maxDelta_6 as maxDelta };
-            const minDelta_6: number;
-            export { minDelta_6 as minDelta };
-        }
-        export { armor_3 as armor };
-        export namespace weapon_3 {
-            const lowestMax_3: number;
-            export { lowestMax_3 as lowestMax };
-            const highestMax_3: number;
-            export { highestMax_3 as highestMax };
-            const maxDelta_7: number;
-            export { maxDelta_7 as maxDelta };
-            const minDelta_7: number;
-            export { minDelta_7 as minDelta };
-        }
-        export { weapon_3 as weapon };
-    }
-    export namespace assault_1 {
-        export namespace armor_4 {
-            const maxDelta_8: number;
-            export { maxDelta_8 as maxDelta };
-            const minDelta_8: number;
-            export { minDelta_8 as minDelta };
-        }
-        export { armor_4 as armor };
-        export namespace weapon_4 {
-            const lowestMax_4: number;
-            export { lowestMax_4 as lowestMax };
-            const highestMax_4: number;
-            export { highestMax_4 as highestMax };
-            const maxDelta_9: number;
-            export { maxDelta_9 as maxDelta };
-            const minDelta_9: number;
-            export { minDelta_9 as minDelta };
-        }
-        export { weapon_4 as weapon };
-    }
-    export { assault_1 as assault };
-    export namespace cursedassault {
-        export namespace armor_5 {
-            const maxDelta_10: number;
-            export { maxDelta_10 as maxDelta };
-            const minDelta_10: number;
-            export { minDelta_10 as minDelta };
-        }
-        export { armor_5 as armor };
-        export namespace weapon_5 {
-            const lowestMax_5: number;
-            export { lowestMax_5 as lowestMax };
-            const highestMax_5: number;
-            export { highestMax_5 as highestMax };
-            const maxDelta_11: number;
-            export { maxDelta_11 as maxDelta };
-            const minDelta_11: number;
-            export { minDelta_11 as minDelta };
-        }
-        export { weapon_5 as weapon };
-    }
-    export namespace marksman_1 {
-        export namespace armor_6 {
-            const maxDelta_12: number;
-            export { maxDelta_12 as maxDelta };
-            const minDelta_12: number;
-            export { minDelta_12 as minDelta };
-        }
-        export { armor_6 as armor };
-        export namespace weapon_6 {
-            const lowestMax_6: number;
-            export { lowestMax_6 as lowestMax };
-            const highestMax_6: number;
-            export { highestMax_6 as highestMax };
-            const maxDelta_13: number;
-            export { maxDelta_13 as maxDelta };
-            const minDelta_13: number;
-            export { minDelta_13 as minDelta };
-        }
-        export { weapon_6 as weapon };
-    }
-    export { marksman_1 as marksman };
-    export namespace pmcbot {
-        export namespace armor_7 {
-            const maxDelta_14: number;
-            export { maxDelta_14 as maxDelta };
-            const minDelta_14: number;
-            export { minDelta_14 as minDelta };
-        }
-        export { armor_7 as armor };
-        export namespace weapon_7 {
-            const lowestMax_7: number;
-            export { lowestMax_7 as lowestMax };
-            const highestMax_7: number;
-            export { highestMax_7 as highestMax };
-            const maxDelta_15: number;
-            export { maxDelta_15 as maxDelta };
-            const minDelta_15: number;
-            export { minDelta_15 as minDelta };
-        }
-        export { weapon_7 as weapon };
-    }
-    export namespace exusec {
-        export namespace armor_8 {
-            const maxDelta_16: number;
-            export { maxDelta_16 as maxDelta };
-            const minDelta_16: number;
-            export { minDelta_16 as minDelta };
-        }
-        export { armor_8 as armor };
-        export namespace weapon_8 {
-            const lowestMax_8: number;
-            export { lowestMax_8 as lowestMax };
-            const highestMax_8: number;
-            export { highestMax_8 as highestMax };
-            const maxDelta_17: number;
-            export { maxDelta_17 as maxDelta };
-            const minDelta_17: number;
-            export { minDelta_17 as minDelta };
-        }
-        export { weapon_8 as weapon };
-    }
-    export namespace sectantpriest {
-        export namespace armor_9 {
-            const maxDelta_18: number;
-            export { maxDelta_18 as maxDelta };
-            const minDelta_18: number;
-            export { minDelta_18 as minDelta };
-        }
-        export { armor_9 as armor };
-        export namespace weapon_9 {
-            const lowestMax_9: number;
-            export { lowestMax_9 as lowestMax };
-            const highestMax_9: number;
-            export { highestMax_9 as highestMax };
-            const maxDelta_19: number;
-            export { maxDelta_19 as maxDelta };
-            const minDelta_19: number;
-            export { minDelta_19 as minDelta };
-        }
-        export { weapon_9 as weapon };
-    }
-    export namespace sectantwarrior {
-        export namespace armor_10 {
-            const maxDelta_20: number;
-            export { maxDelta_20 as maxDelta };
-            const minDelta_20: number;
-            export { minDelta_20 as minDelta };
-        }
-        export { armor_10 as armor };
-        export namespace weapon_10 {
-            const lowestMax_10: number;
-            export { lowestMax_10 as lowestMax };
-            const highestMax_10: number;
-            export { highestMax_10 as highestMax };
-            const maxDelta_21: number;
-            export { maxDelta_21 as maxDelta };
-            const minDelta_21: number;
-            export { minDelta_21 as minDelta };
-        }
-        export { weapon_10 as weapon };
-    }
-}
-export declare namespace lootNValue {
-    export const scav: number;
-    const pmc_1: number;
-    export { pmc_1 as pmc };
-}
-export declare namespace pmc_2 {
-    namespace dynamicLoot {
-        const whitelist: any[];
-        const blacklist: string[];
-        const spawnLimits: {
-            "5c99f98d86f7745c314214b3": number;
-            "5c164d2286f774194c5e69fa": number;
-            "550aa4cd4bdc2dd8348b456c": number;
-            "55818add4bdc2d5b648b456f": number;
-            "55818ad54bdc2ddc698b4569": number;
-            "55818aeb4bdc2ddc698b456a": number;
-            "55818ae44bdc2dde698b456c": number;
-            "55818af64bdc2d5b648b4570": number;
-            "5448e54d4bdc2dcc718b4568": number;
-            "5448f3a64bdc2d60728b456a": number;
-            "5447e1d04bdc2dff2f8b4567": number;
-            "5a341c4686f77469e155819e": number;
-            "55818b164bdc2ddc698b456c": number;
-            "5448bc234bdc2d3c308b4569": number;
-            "543be5dd4bdc2deb348b4569": number;
-            "543be5cb4bdc2deb348b4568": number;
-            "5485a8684bdc2da71d8b4567": number;
-            "5d650c3e815116009f6201d2": number;
-            "5448f39d4bdc2d0a728b4568": number;
-            "543be6564bdc2df4348b4568": number;
-        };
-        const moneyStackLimits: {
-            "5449016a4bdc2d6f028b456f": number;
-            "5696686a4bdc2da3298b456a": number;
-            "569668774bdc2da2298b4568": number;
-        };
-    }
-    const cartridgeBlacklist: string[];
-    const difficulty: string;
-    const isUsec: number;
-    const chanceSameSideIsHostilePercent: number;
-    const usecType: string;
-    const bearType: string;
-    const maxBackpackLootTotalRub: number;
-    const maxPocketLootTotalRub: number;
-    const maxVestLootTotalRub: number;
-    namespace types {
-        const assault_2: number;
-        export { assault_2 as assault };
-        const cursedAssault_1: number;
-        export { cursedAssault_1 as cursedAssault };
-        const pmcBot_1: number;
-        export { pmcBot_1 as pmcBot };
-        const exUsec_1: number;
-        export { exUsec_1 as exUsec };
-    }
-}
-export { pmc_2 as pmc };
-export declare const showTypeInNickname: boolean;
-export declare const maxBotCap: number;

TypeScript/1LogToConsole/types/configs/HealthConfig.d.ts

@@ -1,8 +0,0 @@
-export namespace healthMultipliers {
-    const death: number;
-    const blacked: number;
-}
-export namespace save {
-    const health: boolean;
-    const effects: boolean;
-}

TypeScript/1LogToConsole/types/configs/HideoutConfig.d.ts

@@ -1,28 +0,0 @@
-export const runIntervalSeconds: number;
-export namespace scavCase {
-    const rewardParentBlacklist: any[];
-    const rewardItemBlacklist: any[];
-    namespace ammoRewards {
-        const giveMultipleOfTen: boolean;
-        const minAmount: number;
-    }
-    namespace moneyRewards {
-        const enabled: boolean;
-        namespace rub {
-            const min: number;
-            const max: number;
-        }
-        namespace usd {
-            const min_1: number;
-            export { min_1 as min };
-            const max_1: number;
-            export { max_1 as max };
-        }
-        namespace eur {
-            const min_2: number;
-            export { min_2 as min };
-            const max_2: number;
-            export { max_2 as max };
-        }
-    }
-}

TypeScript/1LogToConsole/types/configs/HttpConfig.d.ts

@@ -1,2 +0,0 @@
-export const ip: string;
-export const port: number;

TypeScript/1LogToConsole/types/configs/InraidConfig.d.ts

@@ -1,15 +0,0 @@
-export const MIAOnRaidEnd: boolean;
-export namespace raidMenuSettings {
-    const aiAmount: string;
-    const aiDifficulty: string;
-    const bossEnabled: boolean;
-    const scavWars: boolean;
-    const taggedAndCursed: boolean;
-}
-export namespace save {
-    const loot: boolean;
-    const durability: boolean;
-}
-export const carExtracts: string[];
-export const carExtractBaseStandingGain: number;
-export const scavExtractGain: number;

TypeScript/1LogToConsole/types/configs/InsuranceConfig.d.ts

@@ -1,9 +0,0 @@
-export const insuranceMultiplier: {
-    "54cb50c76803fa8b248b4571": number;
-    "54cb57776803fa99248b456e": number;
-};
-export const returnChancePercent: {
-    "54cb50c76803fa8b248b4571": number;
-    "54cb57776803fa99248b456e": number;
-};
-export const runIntervalSeconds: number;

TypeScript/1LogToConsole/types/configs/InventoryConfig.d.ts

@@ -1 +0,0 @@
-export const newItemsMarkedFound: boolean;

TypeScript/1LogToConsole/types/configs/LocationConfig.d.ts

@@ -1,52 +0,0 @@
-export namespace looseLootMultiplier {
-    const bigmap: number;
-    const develop: number;
-    const factory4_day: number;
-    const factory4_night: number;
-    const interchange: number;
-    const laboratory: number;
-    const rezervbase: number;
-    const shoreline: number;
-    const woods: number;
-    const hideout: number;
-    const lighthouse: number;
-    const privatearea: number;
-    const suburbs: number;
-    const tarkovstreets: number;
-    const terminal: number;
-    const town: number;
-}
-export namespace staticLootMultiplier {
-    const bigmap_1: number;
-    export { bigmap_1 as bigmap };
-    const develop_1: number;
-    export { develop_1 as develop };
-    const factory4_day_1: number;
-    export { factory4_day_1 as factory4_day };
-    const factory4_night_1: number;
-    export { factory4_night_1 as factory4_night };
-    const interchange_1: number;
-    export { interchange_1 as interchange };
-    const laboratory_1: number;
-    export { laboratory_1 as laboratory };
-    const rezervbase_1: number;
-    export { rezervbase_1 as rezervbase };
-    const shoreline_1: number;
-    export { shoreline_1 as shoreline };
-    const woods_1: number;
-    export { woods_1 as woods };
-    const hideout_1: number;
-    export { hideout_1 as hideout };
-    const lighthouse_1: number;
-    export { lighthouse_1 as lighthouse };
-    const privatearea_1: number;
-    export { privatearea_1 as privatearea };
-    const suburbs_1: number;
-    export { suburbs_1 as suburbs };
-    const tarkovstreets_1: number;
-    export { tarkovstreets_1 as tarkovstreets };
-    const terminal_1: number;
-    export { terminal_1 as terminal };
-    const town_1: number;
-    export { town_1 as town };
-}

TypeScript/1LogToConsole/types/configs/MatchConfig.d.ts

@@ -1 +0,0 @@
-export const enabled: boolean;

TypeScript/1LogToConsole/types/configs/QuestConfig.d.ts

@@ -1,70 +0,0 @@
-export const redeemTime: number;
-export const repeatableQuests: {
-    name: string;
-    types: string[];
-    resetTime: number;
-    numQuests: number;
-    minPlayerLevel: number;
-    rewardScaling: {
-        levels: number[];
-        experience: number[];
-        roubles: number[];
-        items: number[];
-        reputation: number[];
-        rewardSpread: number;
-    };
-    locations: {
-        any: string[];
-        factory4_day: string[];
-        bigmap: string[];
-        Woods: string[];
-        Shoreline: string[];
-        Interchange: string[];
-        Lighthouse: string[];
-        laboratory: string[];
-        RezervBase: string[];
-    };
-    traderWhitelist: {
-        traderId: any;
-        questTypes: string[];
-    }[];
-    questConfig: {
-        Exploration: {
-            maxExtracts: number;
-            specificExits: {
-                probability: number;
-                passageRequirementWhitelist: string[];
-            };
-        };
-        Completion: {
-            minRequestedAmount: number;
-            maxRequestedAmount: number;
-            minRequestedBulletAmount: number;
-            maxRequestedBulletAmount: number;
-            useWhitelist: boolean;
-            useBlacklist: boolean;
-        };
-        Elimination: {
-            targets: {
-                key: string;
-                relativeProbability: number;
-                data: {
-                    isBoss: boolean;
-                };
-            }[];
-            bodyPartProb: number;
-            bodyParts: {
-                key: string;
-                relativeProbability: number;
-                data: string[];
-            }[];
-            specificLocationProb: number;
-            distLocationBlacklist: string[];
-            distProb: number;
-            maxDist: number;
-            minDist: number;
-            maxKills: number;
-            minKills: number;
-        };
-    };
-}[];

TypeScript/1LogToConsole/types/configs/RagfairConfig.d.ts

@@ -1,87 +0,0 @@
-export const runIntervalSeconds: number;
-export namespace sell {
-    const fees: boolean;
-    namespace chance {
-        const base: number;
-        const overprices: number;
-        const underpriced: number;
-    }
-    namespace time {
-        const base_1: number;
-        export { base_1 as base };
-        export const min: number;
-        export const max: number;
-    }
-    namespace reputation {
-        const gain: number;
-        const loss: number;
-    }
-}
-export const traders: {
-    "54cb50c76803fa8b248b4571": boolean;
-    "54cb57776803fa99248b456e": boolean;
-    "579dc571d53a0658a154fbec": boolean;
-    "58330581ace78e27b8b10cee": boolean;
-    "5935c25fb3acc3127c3d8cd9": boolean;
-    "5a7c2eca46aef81a7ca2145d": boolean;
-    "5ac3b934156ae10c4430e83c": boolean;
-    "5c0647fdd443bc2504c2d371": boolean;
-    ragfair: boolean;
-};
-export namespace dynamic {
-    const expiredOfferThreshold: number;
-    namespace offerItemCount {
-        const min_1: number;
-        export { min_1 as min };
-        const max_1: number;
-        export { max_1 as max };
-    }
-    namespace price {
-        const min_2: number;
-        export { min_2 as min };
-        const max_2: number;
-        export { max_2 as max };
-    }
-    namespace endTimeSeconds {
-        const min_3: number;
-        export { min_3 as min };
-        const max_3: number;
-        export { max_3 as max };
-    }
-    namespace condition {
-        export const conditionChance: number;
-        const min_4: number;
-        export { min_4 as min };
-        const max_4: number;
-        export { max_4 as max };
-    }
-    namespace stackablePercent {
-        const min_5: number;
-        export { min_5 as min };
-        const max_5: number;
-        export { max_5 as max };
-    }
-    namespace nonStackableCount {
-        const min_6: number;
-        export { min_6 as min };
-        const max_6: number;
-        export { max_6 as max };
-    }
-    namespace rating {
-        const min_7: number;
-        export { min_7 as min };
-        const max_7: number;
-        export { max_7 as max };
-    }
-    const currencies: {
-        "5449016a4bdc2d6f028b456f": number;
-        "5696686a4bdc2da3298b456a": number;
-        "569668774bdc2da2298b4568": number;
-    };
-    const showAsSingleStack: any[];
-    namespace blacklist {
-        const custom: string[];
-        const enableBsgList: boolean;
-        const enableQuestList: boolean;
-    }
-}

TypeScript/1LogToConsole/types/configs/RepairConfig.d.ts

@@ -1 +0,0 @@
-export const priceMultiplier: number;

TypeScript/1LogToConsole/types/configs/TraderConfig.d.ts

@@ -1,10 +0,0 @@
-export const updateTime: {
-    traderId: any;
-    seconds: number;
-}[];
-export const updateTimeDefault: number;
-export const fenceAssortSize: number;
-export const fenceMaxPresetsCount: number;
-export const fencePresetPriceMult: number;
-export const minDurabilityForSale: number;
-export const fenceItemIgnoreList: string[];

TypeScript/1LogToConsole/types/configs/WeatherConfig.d.ts

@@ -1,55 +0,0 @@
-export const acceleration: number;
-export namespace weather {
-    namespace clouds {
-        const min: number;
-        const max: number;
-    }
-    namespace windSpeed {
-        const min_1: number;
-        export { min_1 as min };
-        const max_1: number;
-        export { max_1 as max };
-    }
-    namespace windDirection {
-        const min_2: number;
-        export { min_2 as min };
-        const max_2: number;
-        export { max_2 as max };
-    }
-    namespace windGustiness {
-        const min_3: number;
-        export { min_3 as min };
-        const max_3: number;
-        export { max_3 as max };
-    }
-    namespace rain {
-        const min_4: number;
-        export { min_4 as min };
-        const max_4: number;
-        export { max_4 as max };
-    }
-    namespace rainIntensity {
-        const min_5: number;
-        export { min_5 as min };
-        const max_5: number;
-        export { max_5 as max };
-    }
-    namespace fog {
-        const min_6: number;
-        export { min_6 as min };
-        const max_6: number;
-        export { max_6 as max };
-    }
-    namespace temp {
-        const min_7: number;
-        export { min_7 as min };
-        const max_7: number;
-        export { max_7 as max };
-    }
-    namespace pressure {
-        const min_8: number;
-        export { min_8 as min };
-        const max_8: number;
-        export { max_8 as max };
-    }
-}

TypeScript/1LogToConsole/types/controllers/BotController.d.ts

@@ -1,8 +1,8 @@
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { Difficulty } from "../@types/eft/common/tables/IBotType";
+import { Difficulty } from "../models/eft/common/tables/IBotType";
-import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData";
+import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IBotBase } from "../@types/eft/common/tables/IBotBase";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { IBotCore } from "../@types/eft/common/tables/IBotCore";
+import { IBotCore } from "../models/eft/common/tables/IBotCore";
 import { ConfigServer } from "../servers/ConfigServer";
 import { BotHelper } from "../helpers/BotHelper";
 import { BotGenerator } from "../generators/BotGenerator";

TypeScript/1LogToConsole/types/controllers/CustomizationController.d.ts

@@ -1,13 +1,13 @@
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IWearClothingRequestData } from "../@types/eft/customization/IWearClothingRequestData";
+import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
-import { IBuyClothingRequestData } from "../@types/eft/customization/IBuyClothingRequestData";
+import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
-import { ISuit } from "../@types/eft/common/tables/ITrader";
+import { ISuit } from "../models/eft/common/tables/ITrader";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class CustomizationController {
     private logger;
     private itemEventRouter;

TypeScript/1LogToConsole/types/controllers/DialogueController.d.ts

@@ -1,16 +1,16 @@
 import { SaveServer } from "../servers/SaveServer";
 import { DialogueHelper } from "../helpers/DialogueHelper";
-import { DialogueInfo } from "../@types/eft/profile/IAkiProfile";
+import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
-import { IGetBodyResponseData } from "../@types/eft/httpResponse/IGetBodyResponseData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IGetFriendListDataResponse } from "../@types/eft/dialog/IGetFriendListDataResponse";
+import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
-import { IGetMailDialogViewResponseData } from "../@types/eft/dialog/IGetMailDialogViewResponseData";
+import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { IGetAllAttachmentsResponse } from "../@types/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class DialogueController {
     private httpResponse;
     private saveServer;
     private dialogueHelper;
-    constructor(httpResponse: HttpResponse, saveServer: SaveServer, dialogueHelper: DialogueHelper);
+    constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper);
     getFriendList(sessionID: string): IGetFriendListDataResponse;
     generateDialogueList(sessionID: string): IGetBodyResponseData<DialogueInfo[]>;
     getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo;

TypeScript/1LogToConsole/types/controllers/GameController.d.ts

@@ -1,9 +1,9 @@
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGameConfigResponse } from "../@types/eft/game/IGameConfigResponse";
+import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
 import { ConfigServer } from "../servers/ConfigServer";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
-import { IWatermark } from "../@types/spt/utils/IWatermark";
+import { IWatermark } from "../models/spt/utils/IWatermark";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 export declare class GameController {
     private logger;

TypeScript/1LogToConsole/types/controllers/HealthController.d.ts

@@ -2,14 +2,14 @@ import { ItemHelper } from "../helpers/ItemHelper";
 import { PaymentService } from "../services/PaymentService";
 import { InventoryHelper } from "../helpers/InventoryHelper";
 import { HealthHelper } from "../helpers/HealthHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHealthTreatmentRequestData } from "../@types/eft/health/IHealthTreatmentRequestData";
+import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
-import { IOffraidEatRequestData } from "../@types/eft/health/IOffraidEatRequestData";
+import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
-import { IOffraidHealRequestData } from "../@types/eft/health/IOffraidHealRequestData";
+import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
-import { ISyncHealthRequestData } from "../@types/eft/health/ISyncHealthRequestData";
+import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class HealthController {
     private logger;
     private itemEventRouter;

TypeScript/1LogToConsole/types/controllers/HideoutController.d.ts

@@ -10,20 +10,20 @@ import { ProfileHelper } from "../helpers/ProfileHelper";
 import { PaymentHelper } from "../helpers/PaymentHelper";
 import { InventoryHelper } from "../helpers/InventoryHelper";
 import { HideoutHelper } from "../helpers/HideoutHelper";
-import { IHideoutUpgradeRequestData } from "../@types/eft/hideout/IHideoutUpgradeRequestData";
+import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { HideoutUpgradeCompleteRequestData } from "../@types/eft/hideout/HideoutUpgradeCompleteRequestData";
+import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData";
-import { IHideoutPutItemInRequestData } from "../@types/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
-import { IHideoutTakeItemOutRequestData } from "../@types/eft/hideout/IHideoutTakeItemOutRequestData";
+import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
-import { IHideoutToggleAreaRequestData } from "../@types/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
-import { IHideoutSingleProductionStartRequestData } from "../@types/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import { IHideoutScavCaseStartRequestData } from "../@types/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
-import { IHideoutTakeProductionRequestData } from "../@types/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
-import { IHideoutContinousProductionStartRequestData } from "../@types/eft/hideout/IHideoutContinousProductionStartRequestData";
+import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class HideoutController {
     private logger;
     private hashUtil;
@@ -41,7 +41,7 @@ export declare class HideoutController {
     private hideoutHelper;
     private configServer;
     private hideoutConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponse, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer);
     upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
     upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
     putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse;

TypeScript/1LogToConsole/types/controllers/InraidController.d.ts

@@ -2,31 +2,29 @@ import { SaveServer } from "../servers/SaveServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
 import { HealthHelper } from "../helpers/HealthHelper";
-import { IRegisterPlayerRequestData } from "../@types/eft/inRaid/IRegisterPlayerRequestData";
+import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
-import { ISaveProgressRequestData } from "../@types/eft/inRaid/ISaveProgressRequestData";
+import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
 import { ConfigServer } from "../servers/ConfigServer";
 import { JsonUtil } from "../utils/JsonUtil";
 import { QuestHelper } from "../helpers/QuestHelper";
 import { InRaidHelper } from "../helpers/InRaidHelper";
 import { InsuranceService } from "../services/InsuranceService";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper";
 export declare class InraidController {
-    private logger;
     private saveServer;
     private jsonUtil;
     private databaseServer;
     private questHelper;
     private itemHelper;
-    private profileHelper;
+    private extendedProfileHelper;
     private healthHelper;
     private traderHelper;
     private insuranceService;
     private inRaidHelper;
     private configServer;
     private inraidConfig;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer);
+    constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer);
     addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void;
     saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void;
 }

TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts

@@ -8,12 +8,12 @@ import { PaymentService } from "../services/PaymentService";
 import { DialogueHelper } from "../helpers/DialogueHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IGetInsuranceCostRequestData } from "../@types/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
-import { IInsureRequestData } from "../@types/eft/insurance/IInsureRequestData";
+import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { InsuranceService } from "../services/InsuranceService";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class InsuranceController {
     private logger;
     private randomUtil;

TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts

@@ -6,25 +6,25 @@ import { ProfileHelper } from "../helpers/ProfileHelper";
 import { PaymentHelper } from "../helpers/PaymentHelper";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryMoveRequestData } from "../@types/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
-import { IInventoryRemoveRequestData } from "../@types/eft/inventory/IInventoryRemoveRequestData";
+import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventorySplitRequestData } from "../@types/eft/inventory/IInventorySplitRequestData";
+import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventoryMergeRequestData } from "../@types/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryTransferRequestData } from "../@types/eft/inventory/IInventoryTransferRequestData";
+import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IInventorySwapRequestData } from "../@types/eft/inventory/IInventorySwapRequestData";
+import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryFoldRequestData } from "../@types/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventoryToggleRequestData } from "../@types/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTagRequestData } from "../@types/eft/inventory/IInventoryTagRequestData";
+import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
-import { IInventoryBindRequestData } from "../@types/eft/inventory/IInventoryBindRequestData";
+import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryExamineRequestData } from "../@types/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../@types/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventorySortRequestData } from "../@types/eft/inventory/IInventorySortRequestData";
+import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
-import { IInventoryCreateMarkerRequestData } from "../@types/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
-import { IInventoryDeleteMarkerRequestData } from "../@types/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import { IInventoryEditMarkerRequestData } from "../@types/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class InventoryController {
     private logger;
     private hashUtil;

TypeScript/1LogToConsole/types/controllers/LauncherController.d.ts

@@ -2,11 +2,10 @@ import { HashUtil } from "../utils/HashUtil";
 import { SaveServer } from "../servers/SaveServer";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { IRegisterData } from "../@types/eft/launcher/IRegisterData";
+import { IRegisterData } from "../models/eft/launcher/IRegisterData";
-import { ILoginRequestData } from "../@types/eft/launcher/ILoginRequestData";
+import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
-import { IChangeRequestData } from "../@types/eft/launcher/IChangeRequestData";
+import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
-import { Info } from "../@types/eft/profile/IAkiProfile";
+import { Info } from "../models/eft/profile/IAkiProfile";
-import { ICoreConfig } from "../@types/spt/config/ICoreConfig";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 export declare class LauncherController {
     private hashUtil;
@@ -14,7 +13,7 @@ export declare class LauncherController {
     private httpServerHelper;
     private databaseServer;
     private configServer;
-    coreConfig: ICoreConfig;
+    private coreConfig;
     constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer);
     connect(): any;
     find(sessionIdKey: string): Info;

TypeScript/1LogToConsole/types/controllers/LocationController.d.ts

@@ -1,10 +1,10 @@
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { LocationGenerator } from "../generators/LocationGenerator";
-import { ILocationBase } from "../@types/eft/common/ILocationBase";
+import { ILocationBase } from "../models/eft/common/ILocationBase";
-import { ILocationsGenerateAllResponse } from "../@types/eft/common/ILocationsSourceDestinationBase";
+import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class LocationController {
     private jsonUtil;
     private logger;

TypeScript/1LogToConsole/types/controllers/MatchController.d.ts

@@ -1,11 +1,9 @@
 import { TraderHelper } from "../helpers/TraderHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IEndOfflineRaidRequestData } from "../@types/eft/match/IEndOfflineRaidRequestData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { IStartOfflineRaidRequestData } from "../@types/eft/match/IStartOffineRaidRequestData";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
 import { ConfigServer } from "../servers/ConfigServer";
-import { IMatchConfig } from "../@types/spt/config/IMatchConfig";
-import { IInRaidConfig } from "../@types/spt/config/IInRaidConfig";
 import { SaveServer } from "../servers/SaveServer";
 import { MatchLocationService } from "../services/MatchLocationService";
 export declare class MatchController {
@@ -14,8 +12,8 @@ export declare class MatchController {
     private matchLocationService;
     private traderHelper;
     private configServer;
-    matchConfig: IMatchConfig;
+    private matchConfig;
-    inraidConfig: IInRaidConfig;
+    private inraidConfig;
     constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer);
     getEnabled(): boolean;
     getProfile(info: any): IPmcData[];

TypeScript/1LogToConsole/types/controllers/NoteController.d.ts

@@ -1,6 +1,6 @@
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { INoteActionData } from "../@types/eft/notes/INoteActionData";
+import { INoteActionData } from "../models/eft/notes/INoteActionData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 declare class NoteController {
     private itemEventRouter;

TypeScript/1LogToConsole/types/controllers/NotifierController.d.ts

@@ -1,6 +1,6 @@
 import { NotifierHelper } from "../helpers/NotifierHelper";
 import { NotificationService } from "../services/NotificationService";
-import { INotifierChannel } from "../@types/eft/notifier/INotifier";
+import { INotifierChannel } from "../models/eft/notifier/INotifier";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 export declare class NotifierController {
     private notifierHelper;

TypeScript/1LogToConsole/types/controllers/PaymentController.d.ts

@@ -1,56 +0,0 @@
-import { IPmcData } from "../@types/eft/common/IPmcData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
-import { IProcessBuyTradeRequestData } from "../@types/eft/trade/IProcessBuyTradeRequestData";
-import { IProcessSellTradeRequestData } from "../@types/eft/trade/IProcessSellTradeRequestData";
-export declare class PaymentController {
-    /**
-     * Check whether tpl is Money
-     * @param {string} tpl
-     * @returns void
-     */
-    static isMoneyTpl(tpl: string): boolean;
-    /**
-    * Gets currency TPL from TAG
-    * @param {string} currency
-    * @returns string
-    */
-    static getCurrency(currency: string): string;
-    /**
-    * Gets currency TAG from TPL
-    * @param {string} currency
-    * @returns string
-    */
-    static getCurrencyTag(currency: string): string;
-    /**
-    * Gets Currency to Ruble conversion Value
-    * @param {number} value
-    * @param {string} currencyFrom
-    * @returns number
-    */
-    static inRUB(value: number, currencyFrom: string): number;
-    /**
-     * Gets Ruble to Currency conversion Value
-     * @param {number} value
-     * @param {string} currencyTo
-     * @returns number
-     */
-    static fromRUB(value: number, currencyTo: string): number;
-    /**
-     * Take money and insert items into return to server request
-     * @param {Object} pmcData
-     * @param {Object} body
-     * @param {string} sessionID
-     * @returns Object
-     */
-    static payMoney(pmcData: IPmcData, body: IProcessBuyTradeRequestData, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse;
-    /**
-     * Receive money back after selling
-     * @param {IPmcData} pmcData
-     * @param {number} amount
-     * @param {IProcessSellTradeRequestData} body
-     * @param {IItemEventRouterResponse} output
-     * @param {string} sessionID
-     * @returns IItemEventRouterResponse
-     */
-    static getMoney(pmcData: IPmcData, amount: number, body: IProcessSellTradeRequestData, output: IItemEventRouterResponse, sessionID: string): IItemEventRouterResponse;
-}

TypeScript/1LogToConsole/types/controllers/PlayerController.d.ts

@@ -1,28 +0,0 @@
-import { IPmcData } from "../@types/eft/common/IPmcData";
-import { IPlayerIncrementSkillLevelRequestData } from "../@types/eft/player/IPlayerIncrementSkillLevelRequestData";
-export declare class PlayerController {
-    /**
-     * increases the profile skill and updates any output
-     * @param {Object} pmcData
-     * @param {Object} output
-     * @param {String} skillName
-     * @param {Number} amount
-     */
-    static incrementSkillLevel(pmcData: IPmcData, output: IPlayerIncrementSkillLevelRequestData, skillName: string, amount: number): void;
-    /**
-     * @param {Object} pmcData
-     * @returns number
-     */
-    static calculateLevel(pmcData: IPmcData): number;
-    /**
-     * @returns number
-     */
-    static getRandomExperience(): number;
-    /**
-     * Made a 2d array table with 0 - free slot and 1 - used slot
-     * @param {Object} pmcData
-     * @param {string} sessionID
-     * @returns Array
-     */
-    static getStashSlotMap(pmcData: IPmcData, sessionID: string): any[][];
-}

TypeScript/1LogToConsole/types/controllers/PresetBuildController.d.ts

@@ -1,9 +1,9 @@
 import { ItemHelper } from "../helpers/ItemHelper";
 import { SaveServer } from "../servers/SaveServer";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IPresetBuildActionRequestData } from "../@types/eft/presetBuild/IPresetBuildActionRequestData";
+import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { WeaponBuild } from "../@types/eft/profile/IAkiProfile";
+import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
 import { HashUtil } from "../utils/HashUtil";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 export declare class PresetBuildController {

TypeScript/1LogToConsole/types/controllers/ProfileController.d.ts

@@ -1,18 +1,18 @@
 import { SaveServer } from "../servers/SaveServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IProfileChangeNicknameRequestData } from "../@types/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
-import { IProfileChangeVoiceRequestData } from "../@types/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
-import { IProfileCreateRequestData } from "../@types/eft/profile/IProfileCreateRequestData";
+import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
-import { IValidateNicknameRequestData } from "../@types/eft/profile/IValidateNicknameRequestData";
+import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
-import { ISearchFriendRequestData } from "../@types/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData";
-import { ISearchFriendResponse } from "../@types/eft/profile/ISearchFriendResponse";
+import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse";
 import { HashUtil } from "../utils/HashUtil";
 import { TimeUtil } from "../utils/TimeUtil";
-import { IMiniProfile } from "../@types/eft/launcher/IMiniProfile";
+import { IMiniProfile } from "../models/eft/launcher/IMiniProfile";
+import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper";
 export declare class ProfileController {
     private hashUtil;
     private timeUtil;
@@ -20,8 +20,8 @@ export declare class ProfileController {
     private databaseServer;
     private itemHelper;
     private traderHelper;
-    private profileHelper;
+    private extendedProfileHelper;
-    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, profileHelper: ProfileHelper);
+    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper);
     getMiniProfiles(): IMiniProfile[];
     getMiniProfile(sessionID: string): any;
     getCompleteProfile(sessionID: string): IPmcData[];

TypeScript/1LogToConsole/types/controllers/QuestController.d.ts

@@ -8,13 +8,13 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ConfigServer } from "../servers/ConfigServer";
 import { PlayerService } from "../services/PlayerService";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IQuest } from "../@types/eft/common/tables/IQuest";
+import { IQuest } from "../models/eft/common/tables/IQuest";
-import { IAcceptQuestRequestData } from "../@types/eft/quests/IAcceptQuestRequestData";
+import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
-import { ICompleteQuestRequestData } from "../@types/eft/quests/ICompleteQuestRequestData";
+import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
-import { IHandoverQuestRequestData } from "../@types/eft/quests/IHandoverQuestRequestData";
+import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class QuestController {
     private logger;
     private timeUtil;

TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts

@@ -1,5 +1,5 @@
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponse } from "../utils/HttpResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 import { RagfairServer } from "../servers/RagfairServer";
 import { SaveServer } from "../servers/SaveServer";
@@ -14,24 +14,24 @@ import { PaymentHelper } from "../helpers/PaymentHelper";
 import { InventoryHelper } from "../helpers/InventoryHelper";
 import { RagfairHelper } from "../helpers/RagfairHelper";
 import { RagfairSellHelper } from "../helpers/RagfairSellHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IAddOfferRequestData, Requirement } from "../@types/eft/ragfair/IAddOfferRequestData";
+import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IExtendOfferRequestData } from "../@types/eft/ragfair/IExtendOfferRequestData";
+import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
-import { IGetMarketPriceRequestData } from "../@types/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { ISearchRequestData } from "../@types/eft/ragfair/ISearchRequestData";
+import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { Item } from "../@types/eft/common/tables/IItem";
+import { Item } from "../models/eft/common/tables/IItem";
-import { IGetItemPriceResult } from "../@types/eft/ragfair/IGetItemPriceResult";
+import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
-import { IGetOffersResult } from "../@types/eft/ragfair/IGetOffersResult";
+import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
 import { ConfigServer } from "../servers/ConfigServer";
-import { IAkiProfile } from "../@types/eft/profile/IAkiProfile";
+import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { IRagfairOffer } from "../@types/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
 import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator";
 import { RagfairSortHelper } from "../helpers/RagfairSortHelper";
 import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper";
 import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper";
 import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class RagfairController {
     private logger;
     private timeUtil;
@@ -57,7 +57,7 @@ export declare class RagfairController {
     private ragfairOfferGenerator;
     private configServer;
     private ragfairConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponse, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer);
     getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult;
     update(): void;
     getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult;

TypeScript/1LogToConsole/types/controllers/RepairController.d.ts

@@ -2,15 +2,14 @@ import { DatabaseServer } from "../servers/DatabaseServer";
 import { QuestHelper } from "../helpers/QuestHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
 import { PaymentService } from "../services/PaymentService";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IRepairActionDataRequest } from "../@types/eft/repair/IRepairActionDataRequest";
+import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ITraderRepairActionDataRequest } from "../@types/eft/repair/ITraderRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
 import { ConfigServer } from "../servers/ConfigServer";
-import { IRepairConfig } from "../@types/spt/config/IRepairConfig";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { RepairHelper } from "../helpers/RepairHelper";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export declare class RepairController {
     private logger;
     private itemEventRouter;
@@ -20,7 +19,7 @@ export declare class RepairController {
     private paymentService;
     private repairHelper;
     private configServer;
-    repairConfig: IRepairConfig;
+    private repairConfig;
     constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer);
     /**
      * Repair with trader

TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts

@@ -5,20 +5,20 @@ import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { IEmptyRequestData } from "../@types/eft/common/IEmptyRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData, TraderInfo } from "../@types/eft/common/IPmcData";
+import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData";
-import { IRepeatableQuestConfig, ELocationName, IQuestConfig } from "../@types/spt/config/IQuestConfig";
+import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig";
-import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../@types/eft/common/tables/IRepeatableQuests";
+import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
-import { Exit } from "../@types/eft/common/ILocationBase";
+import { Exit } from "../models/eft/common/ILocationBase";
-import { IRepeatableQuestChangeRequest } from "../@types/eft/quests/IRepeatableQuestChangeRequest";
+import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { PaymentService } from "../services/PaymentService";
 import { ConfigServer } from "../servers/ConfigServer";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 export interface IQuestTypePool {
     types: string[];
     pool: IQuestPool;
@@ -61,7 +61,7 @@ export declare class RepeatableQuestController {
     private paymentService;
     private objectId;
     private configServer;
-    questConfig: IQuestConfig;
+    private questConfig;
     constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer);
     /**
      * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint

TypeScript/1LogToConsole/types/controllers/TradeController.d.ts

@@ -1,13 +1,13 @@
 import { RagfairServer } from "../servers/RagfairServer";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { TradeHelper } from "../helpers/TradeHelper";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IProcessRagfairTradeRequestData } from "../@types/eft/trade/IProcessRagfairTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { Upd } from "../@types/eft/common/tables/IItem";
+import { Upd } from "../models/eft/common/tables/IItem";
-import { IProcessBaseTradeRequestData } from "../@types/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 declare class TradeController {
     private logger;
     private itemEventRouter;

TypeScript/1LogToConsole/types/controllers/TraderController.d.ts

@@ -2,12 +2,11 @@ import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { TraderAssortService } from "../services/TraderAssortService";
-import { IBarterScheme, ITraderAssort, ITraderBase } from "../@types/eft/common/tables/ITrader";
+import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
 import { TraderHelper } from "../helpers/TraderHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { ConfigServer } from "../servers/ConfigServer";
-import { ITraderConfig } from "../@types/spt/config/ITraderConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
-import { ILogger } from "../@types/spt/utils/ILogger";
 import { TraderAssortHelper } from "../helpers/TraderAssortHelper";
 export declare class TraderController {
     private logger;
@@ -19,7 +18,7 @@ export declare class TraderController {
     private traderAssortService;
     private jsonUtil;
     private configServer;
-    traderConfig: ITraderConfig;
+    private traderConfig;
     constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer);
     load(): void;
     getTrader(traderID: string, sessionID: string): ITraderBase;

TypeScript/1LogToConsole/types/controllers/WeatherController.d.ts

@@ -1,11 +1,10 @@
 import { ConfigServer } from "../servers/ConfigServer";
-import { IWeatherConfig } from "../@types/spt/config/IWeatherConfig";
 import { WeatherGenerator } from "../generators/WeatherGenerator";
-import { IWeatherData } from "../@types/eft/weather/IWeatherData";
+import { IWeatherData } from "../models/eft/weather/IWeatherData";
 export declare class WeatherController {
     private weatherGenerator;
     private configServer;
-    weatherConfig: IWeatherConfig;
+    private weatherConfig;
     constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer);
     generate(): IWeatherData;
 }

TypeScript/1LogToConsole/types/controllers/WishlistController.d.ts

@@ -1,7 +1,7 @@
 import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IWishlistActionData } from "../@types/eft/wishlist/IWishlistActionData";
+import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
-import { IItemEventRouterResponse } from "../@types/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class WishlistController {
     private itemEvenRouter;
     constructor(itemEvenRouter: ItemEventRouter);

TypeScript/1LogToConsole/types/di/Container.d.ts

@@ -1,7 +1,6 @@
 import { DependencyContainer } from "tsyringe";
 export declare class Container {
     static registerTypes(depContainer: DependencyContainer): void;
-    static registerServerSpecificClasses(depContainer: DependencyContainer): void;
     private static registerUtils;
     private static registerRouters;
     private static registerGenerators;

TypeScript/1LogToConsole/types/di/Router.d.ts

@@ -1,5 +1,6 @@
-import { IPmcData } from "../@types/eft/common/IPmcData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IAkiProfile } from "../@types/eft/profile/IAkiProfile";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 export declare class Router {
     private handledRoutes;
     constructor();
@@ -17,7 +18,7 @@ export declare class DynamicRouter extends Router {
 }
 export declare class ItemEventRouterDefinition extends Router {
     constructor();
-    handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): any;
+    handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
 }
 export declare class SaveLoadRouter extends Router {
     constructor();

TypeScript/1LogToConsole/types/di/Serializer.d.ts

@@ -1,4 +1,4 @@
-import { IHttpServer } from "../@types/spt/server/IHttpServer";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
 export declare class Serializer {
     serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void;
     canHandle(something: string): boolean;

TypeScript/1LogToConsole/types/generators/BotEquipmentGenerator.d.ts

@@ -1,18 +0,0 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData";
-import { Chances, Mods } from "../@types/eft/common/tables/IBotType";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { HashUtil } from "../utils/HashUtil";
-import { Logger } from "../utils/Logger";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-export declare class BotEquipmentGenerator {
-    private logger;
-    private hashUtil;
-    private randomUtil;
-    private databaseServer;
-    private botGeneratorHelper;
-    private weightedRandomHelper;
-    constructor(logger: Logger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper);
-    generateEquipment(equipmentSlot: string, equipmentPool: Record<string, number>, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void;
-}

TypeScript/1LogToConsole/types/generators/BotGenerator.d.ts

@@ -1,20 +1,14 @@
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
-import { IGenerateBotsRequestData } from "../@types/eft/bot/IGenerateBotsRequestData";
+import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IBotBase } from "../@types/eft/common/tables/IBotBase";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { JsonUtil } from "../utils/JsonUtil";
 import { ConfigServer } from "../servers/ConfigServer";
 import { GameEventHelper } from "../helpers/GameEventHelper";
 import { BotInventoryGenerator } from "./BotInventoryGenerator";
 import { BotHelper } from "../helpers/BotHelper";
-declare namespace BotGenerator {
-    interface IRandomisedBotLevelResult {
-        level: number;
-        exp: number;
-    }
-}
 export declare class BotGenerator {
     private logger;
     private hashUtil;
@@ -28,8 +22,8 @@ export declare class BotGenerator {
     private botConfig;
     constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer);
     generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[];
-    generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase;
+    private generateBot;
-    generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult;
+    private generateRandomLevel;
     /** Converts health object to the required format */
     private generateHealth;
     private generateSkills;
@@ -40,4 +34,3 @@ export declare class BotGenerator {
     private getPMCDifficulty;
     private generateDogtag;
 }
-export {};

TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts

@@ -1,11 +1,11 @@
-import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData";
+import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { Inventory, Chances, Generation, Mods } from "../@types/eft/common/tables/IBotType";
+import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType";
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
 import { BotWeaponGenerator } from "./BotWeaponGenerator";
 import { BotLootGenerator } from "./BotLootGenerator";
-import { ILogger } from "../@types/spt/utils/ILogger";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 export declare class BotInventoryGenerator {
@@ -20,6 +20,6 @@ export declare class BotInventoryGenerator {
     private botConfig;
     constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper);
     generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory;
-    generateEquipment(equipmentSlot: string, equipmentPool: Record<string, number>, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void;
+    private generateEquipment;
     private generateInventoryBase;
 }

TypeScript/1LogToConsole/types/generators/BotLootGenerator.d.ts

@@ -1,17 +1,14 @@
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ConfigServer } from "../servers/ConfigServer";
-import { IBotConfig } from "../@types/spt/config/IBotConfig";
 import { HandbookHelper } from "../helpers/HandbookHelper";
 import { PMCLootGenerator } from "../generators/PMCLootGenerator";
-import { Inventory as PmcInventory } from "../@types/eft/common/IPmcData";
+import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { ItemMinMax, Items } from "../@types/eft/common/tables/IBotType";
+import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { ILogger } from "../@types/spt/utils/ILogger";
 export declare class BotLootGenerator {
-    private logger;
     private jsonUtil;
     private hashUtil;
     private randomUtil;
@@ -20,8 +17,8 @@ export declare class BotLootGenerator {
     private botGeneratorHelper;
     private pmcLootGenerator;
     private configServer;
-    botConfig: IBotConfig;
+    private botConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer);
     generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void;
     private getRandomisedCount;
     private addLootFromPool;