diff --git a/project/.swcrc b/project/.swcrc index 9ea66ecc..7bed62cc 100644 --- a/project/.swcrc +++ b/project/.swcrc @@ -15,7 +15,7 @@ "keepClassNames": true, "baseUrl": "./", "paths": { - "@spt-aki/*": [ + "@spt/*": [ "src/*" ] } diff --git a/project/Server.code-workspace b/project/Server.code-workspace index ad4e8f48..74be53e7 100644 --- a/project/Server.code-workspace +++ b/project/Server.code-workspace @@ -5,7 +5,7 @@ }, ], "settings": { - "window.title": "SPT-AKI Server", + "window.title": "SPT Server", "editor.formatOnSave": false, // We use an extension to format on save. "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.codeActionsOnSave": ["source.formatDocument", "source.fixAll.eslint"], diff --git a/project/assets/configs/core.json b/project/assets/configs/core.json index 56a27881..d4218cab 100644 --- a/project/assets/configs/core.json +++ b/project/assets/configs/core.json @@ -1,6 +1,6 @@ { - "akiVersion": "3.9.0", - "projectName": "SPT-AKI", + "sptVersion": "3.9.0", + "projectName": "SPT", "compatibleTarkovVersion": "0.14.5.29997", "serverName": "SPT Server", "profileSaveIntervalSeconds": 15, @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/project/assets/database/bots/types/bear.json b/project/assets/database/bots/types/bear.json index 0781daa8..20c03e8b 100644 --- a/project/assets/database/bots/types/bear.json +++ b/project/assets/database/bots/types/bear.json @@ -2182,15 +2182,12 @@ "Mako", "weardo98", "Chomp", - "Shiro-chan", "Security-Sama", "Waffle", - "Senko", "Basuro", "Bepis", "Baliston", "Crow", - "Aki-chan", "Fin", "Gatsu66", "Kiki", diff --git a/project/assets/database/bots/types/pmcbear.json b/project/assets/database/bots/types/pmcbear.json index d135d38e..3bd653ae 100644 --- a/project/assets/database/bots/types/pmcbear.json +++ b/project/assets/database/bots/types/pmcbear.json @@ -2181,15 +2181,12 @@ "Mako", "weardo98", "Chomp", - "Shiro-chan", "Security-Sama", "Waffle", - "Senko", "Basuro", "Bepis", "Baliston", "Crow", - "Aki-chan", "Fin", "Gatsu66", "Kiki", diff --git a/project/assets/database/bots/types/pmcusec.json b/project/assets/database/bots/types/pmcusec.json index 983b3201..f37a2a90 100644 --- a/project/assets/database/bots/types/pmcusec.json +++ b/project/assets/database/bots/types/pmcusec.json @@ -2178,15 +2178,12 @@ "Mako", "weardo98", "Chomp", - "Shiro-chan", "Security-Sama", "Waffle", - "Senko", "Basuro", "Bepis", "Baliston", "Crow", - "Aki-chan", "Fin", "Gatsu66", "Kiki", diff --git a/project/assets/database/bots/types/usec.json b/project/assets/database/bots/types/usec.json index 62dbbb15..867ef45c 100644 --- a/project/assets/database/bots/types/usec.json +++ b/project/assets/database/bots/types/usec.json @@ -2179,15 +2179,12 @@ "Mako", "weardo98", "Chomp", - "Shiro-chan", "Security-Sama", "Waffle", - "Senko", "Basuro", "Bepis", "Baliston", "Crow", - "Aki-chan", "Fin", "Gatsu66", "Kiki", diff --git a/project/assets/database/locales/server/ar.json b/project/assets/database/locales/server/ar.json index 26972f8c..ec4e09fe 100644 --- a/project/assets/database/locales/server/ar.json +++ b/project/assets/database/locales/server/ar.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[حدث غير معالج] %s\n\n\n\n\n\n\n", "executing_startup_callbacks": "الخادم: تنفيذ استدعاءات بدء التشغيل...\n\n\n\n\n\n\n", "fence-unable_to_find_assort_by_id": "تعذر العثور على تشكيلة فينس للمعرف: %s\n\n\n\n\n\n\n", - "fixer-mod_item_found": "العنصر: %s تم العثور عليه في الملف الشخصي والذي لا يوجد في قاعدة البيانات. ستواجه أخطاء، يمكن أن يكون ذلك بسبب استخدام إضافة عناصر وإزالة الإضافة دون حذف العناصر المعدلة من المخزون. لا تستخدم هذا الملف الشخصي. قم بفتح Aki_Data\\Server\\configs\\core.json، وقم بتحرير 'removeModItemsFromProfile' ليكون مفعلا. سيسمح ذلك للخادم بتحرير ملفك الشخصي وربما إزالة العناصر السيئة.\n\n\n\n\n\n\n", + "fixer-mod_item_found": "العنصر: %s تم العثور عليه في الملف الشخصي والذي لا يوجد في قاعدة البيانات. ستواجه أخطاء، يمكن أن يكون ذلك بسبب استخدام إضافة عناصر وإزالة الإضافة دون حذف العناصر المعدلة من المخزون. لا تستخدم هذا الملف الشخصي. قم بفتح SPT_Data\\Server\\configs\\core.json، وقم بتحرير 'removeModItemsFromProfile' ليكون مفعلا. سيسمح ذلك للخادم بتحرير ملفك الشخصي وربما إزالة العناصر السيئة.\n\n\n\n\n\n\n", "fixer-updated_pockets": "تم تحديث العنصر 'جيب' إلى الإصدار الجديد 18876 مع 3 فتحات خاصة.\n\n\n\n\n\n\n", "gameevent-bot_not_found": "addEventGearToScavs() - تعذر العثور على بوت من النوع %s في قاعدة البيانات، تخطي العملية.\n\n\n\n\n\n\n", "gameevent-no_gear_data": "لا توجد بيانات معدات في ملف التكوين seasonalevents.json للحدث %s.\n\n\n\n\n\n\n", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "حدث خطأ أثناء تحليل ترتيب المودات.\n\n\n\n\n\n\n", "modloader-incompatibilities_not_string_array": "يجب أن يكون Mod %s package.json الخاصية 'incompatibilities' مصفوفة سلاسل", "modloader-incompatible_mod_found": "المود {{author}}-{{name}} غير متوافق مع {{incompatibleModName}}.\n\n\n\n\n\n\n", - "modloader-invalid_akiversion_field": "التعديل %s يحتوي على سلسلة semver غير صالحة في حقل akiVersion. أمثلة على قيم صالحة: https://github.com/npm/node-semver#versions\n\n\n\n\n", + "modloader-invalid_sptVersion_field": "التعديل %s يحتوي على سلسلة semver غير صالحة في حقل sptVersion. أمثلة على قيم صالحة: https://github.com/npm/node-semver#versions\n\n\n\n\n", "modloader-invalid_version_property": "ملف package.json للمود %s يحتوي على سلسلة إصدار غير صالحة.\n\n\n\n\n\n\n", "modloader-not_correct_mod_folder": "يوجد مجلد بالاسم (%s) في مجلد المودات الخاص بك. لقد قمت بتثبيت المود بشكل غير صحيح. قد تكون قد قمت بفك ضغط محتويات المود مباشرة في مجلد المودات بالخطأ. يرجى الرجوع إلى صفحة الأسئلة الشائعة على الموقع وصفحة مركز المودات لمعرفة كيفية تثبيت المودات بشكل صحيح.\n\n\n\n\n\n\n", "modloader-is_client_mod": "المود (%s) هو مود خاص بالعميل ويجب وضعه في المجلد التالي: /spt/bepinex/plugins\n\n\n\n\n\n\n", @@ -142,15 +142,15 @@ "modloader-loading_mods": "محمل الإضافات: جاري تحميل %s إضافة إلى الخادم...", "modloader-main_property_not_js": "يجب أن تكون الخاصية الرئيسية للإضافة %s ملفًا من نوع .js في الملف package.json", "modloader-main_property_points_to_nothing": "الخاصية الرئيسية للملف package.json الخاص بالإضافة %s يشير إلى ملف غير موجود", - "modloader-missing_akiversion_field": "الإضافة %s تفتقد لحقل نسخة الإصدار ، على الأرجح بسبب كونه قديم العهد وغير متوافق مع الإصدار الحالي من AKI", + "modloader-missing_sptVersion_field": "الإضافة %s تفتقد لحقل نسخة الإصدار ، على الأرجح بسبب كونه قديم العهد وغير متوافق مع الإصدار الحالي من SPT", "modloader-missing_dependency": "الإضافة {{mod}} تتطلب تثبيت {{modDependency}}.", "modloader-missing_package_json": "الإضافة (%s) تفتقد ملف package.json الخاص بها. تأكد من التحقق من صفحة تحميل الإضافة للحصول على تعليمات التثبيت", "modloader-missing_package_json_property": "ملف package.json الخاص بالإضافة {{modName}} يتطلب خاصية {{prop}}", - "modloader-mod_incompatible": "محمل الإضافات: الإضافة (%s) غير متوافقة. يجب ان تطبق واحدة على الأقل مما يلي IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "محمل الإضافات: الإضافة (%s) غير متوافقة. يجب ان تطبق واحدة على الأقل مما يلي IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "محمل الإضافات: الإضافة (%s) غير متوافقة. لأنه تفتقر لخاصية 'رئيسية'", "modloader-async_mod_error": "محمل الإضافات: حدث خطأ عند تحميل إضافة %s غير متزامنة", "modloader-no_mods_loaded": "تم العثور على أخطاء مع الإضافات, لا توجد إضافة ليتم تحميلها", - "modloader-outdated_akiversion_field": "الإضافة %s غير متوافقة مع الإصدار الحالي من AKI. قد تواجه مشكلات - لن يتم تقديم أي دعم!", + "modloader-outdated_sptVersion_field": "الإضافة %s غير متوافقة مع الإصدار الحالي من SPT. قد تواجه مشكلات - لن يتم تقديم أي دعم!", "modloader-outdated_dependency": "الإضافة {{mod}} يتطلب إصدار {{modDependency}} {{requiredVersion}}. الإصدار المثبت الحالي هو {{currentVersion}}", "modloader-user_mod_folder_missing": "محمل الإضافات: المجلد user/mod مفقود ، جاري الإنشاء...", "modloader-mod_order_missing": "محمل الإضافات: ملف ترتيب الإضافات order.json مفقود ، جاري الإنشاء...", @@ -219,7 +219,7 @@ "watermark-do_not_report": "لا تقم بالإبلاغ", "watermark-free_of_charge": "هذا العمل مجاني", "watermark-paid_scammed": "إذا كنت تدفع المال، فقد خدعت", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "تم إيقاف دعم الإضافات في هذه النسخة", "watermark-no_support": "لا يوجد دعم", "watermark-not_an_issue": "هذه ليست بمشكلة", diff --git a/project/assets/database/locales/server/cs.json b/project/assets/database/locales/server/cs.json index a192bb39..ff0164a5 100644 --- a/project/assets/database/locales/server/cs.json +++ b/project/assets/database/locales/server/cs.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[NEVYŘÍZENÁ UDÁLOST] %s", "executing_startup_callbacks": "Server: Provádění zpětných volání při spuštění...", "fence-unable_to_find_assort_by_id": "Nelze najít Fencův assort pro id: %s", - "fixer-mod_item_found": "Položka: %s nalezena v profilu, který neexistuje v položkách db. Setkáte se s chybami, ty můžou být způsobeny použitím módu položek a odstraněním módu bez odstranění moddovaných položek z inventáře. NEPOUŽÍVEJTE TENTO PROFIL. Otevřete Aki_Data\\Server\\configs\\core.json, upravte 'removeModItemsFromProfile' aby zde bylo 'true'. To umožní serveru upravovat váš profil a s trochou štěstí odstraní závadné položky", + "fixer-mod_item_found": "Položka: %s nalezena v profilu, který neexistuje v položkách db. Setkáte se s chybami, ty můžou být způsobeny použitím módu položek a odstraněním módu bez odstranění moddovaných položek z inventáře. NEPOUŽÍVEJTE TENTO PROFIL. Otevřete SPT_Data\\Server\\configs\\core.json, upravte 'removeModItemsFromProfile' aby zde bylo 'true'. To umožní serveru upravovat váš profil a s trochou štěstí odstraní závadné položky", "fixer-updated_pockets": "Aktualizována položka 'pocket' na novou verzi 18876 s 3x speciálními sloty", "gameevent-bot_not_found": "addEventGearToScavs() - nelze najít bota typu %s v databázi, přeskakuji", "gameevent-no_gear_data": "Žádné údaje o vybavení v seasonalevents.json pro událost %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Chyba parsování načítání pořadí módů", "modloader-incompatibilities_not_string_array": "Vlastnost módu %s package.json 'incompatibility' by měla být pole pro řetězec", "modloader-incompatible_mod_found": "Modifikace {{author}}-{{name}} je nekompatibilní s {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mód %s obsahuje neplatný semver řetězec v poli akiVersion. Příklady platných hodnot: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mód %s obsahuje neplatný semver řetězec v poli sptVersion. Příklady platných hodnot: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mód %s package.json obsahuje neplatnou verzi řetězce", "modloader-not_correct_mod_folder": "Složka s názvem (%s) existuje ve složce s mody. Nesprávně jste nainstalovali mód. Možná jste omylem extrahovali obsah modu přímo do složky modů. Pro informace jak správně instalovat módy jděte na web FAQ a na stránku módu", "modloader-is_client_mod": "Mód (%s) je klientský mód a měl by být umístěn v následující složce: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: načítání modů %s serveru...", "modloader-main_property_not_js": "Mód %s package.json musí bát soubor typu .js", "modloader-main_property_points_to_nothing": "Hlavní vlastnost módu %s package.json odkazuje na neexistující soubor", - "modloader-missing_akiversion_field": "Módu %s chybí pole akiVersion s největší pravděpodobností z důvodu že je zastaralý a nekompatibilní s aktuální verzí AKI", + "modloader-missing_sptVersion_field": "Módu %s chybí pole sptVersion s největší pravděpodobností z důvodu že je zastaralý a nekompatibilní s aktuální verzí SPT", "modloader-missing_dependency": "Mód {{mod}} vyžaduje instalaci {{modDependency}}.", "modloader-missing_package_json": "Módu (%s) chybí package.json. Ujistěte se, že jste zkontrolovali stránku módu pro návod k instalaci", "modloader-missing_package_json_property": "Mod {{modName}} package.json vyžaduje vlastnost {{prop}}", - "modloader-mod_incompatible": "ModLoader: Mód (%s) je nekompatibilní. Musí implementovat alespoň jeden z IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Mód (%s) je nekompatibilní. Musí implementovat alespoň jeden z IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mód (%s) je nekompatibilní. Chybí mu vlastnost 'main'", "modloader-async_mod_error": "ModLoader: Chyba při načítání async módu: %s", "modloader-no_mods_loaded": "Byly nalezeny chyby s módy, ŽADNÉ MÓDY NEBUDOU NAČTENY", - "modloader-outdated_akiversion_field": "Mod %s není kompatibilní s aktuální verzí AKI. Můžete narazit na problémy - nebude poskytnuta žádná podpora!", + "modloader-outdated_sptVersion_field": "Mod %s není kompatibilní s aktuální verzí SPT. Můžete narazit na problémy - nebude poskytnuta žádná podpora!", "modloader-outdated_dependency": "Mód {{mod}} vyžaduje verzi {{modDependency}} {{requiredVersion}}. Aktuálně nainstalovaná verze je {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: Chybí složka user/mod, vytvářím...", "modloader-mod_order_missing": "ModLoader: order.json chybí, vytváření...", @@ -247,7 +247,7 @@ "watermark-do_not_report": "NENAHLAŠUJ TO", "watermark-free_of_charge": "Tento produkt je zdarma", "watermark-paid_scammed": "Chcete pomoci s překladem SPT? připojte se ke Discord a požádejte o pomoc", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "TATO VERZE MÁ ZÁKÁZÁNO MÓDOVÁNÍ SERVERU", "watermark-no_support": "ŽÁDNÁ PODPORA NEBUDE POSKYTNUTA", "watermark-not_an_issue": "TOTO NENÍ CHYBA", diff --git a/project/assets/database/locales/server/de.json b/project/assets/database/locales/server/de.json index 8bce4673..b8fcfe85 100644 --- a/project/assets/database/locales/server/de.json +++ b/project/assets/database/locales/server/de.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[UNBEHANDELTES EREIGNIS] %s", "executing_startup_callbacks": "Server: Startprozesse werden ausgeführt...", "fence-unable_to_find_assort_by_id": "Im Sortiment von Fence konnte ID: %s nicht gefunden werden", - "fixer-mod_item_found": "Gegenstand: %s im Profil gefunden, das nicht in der Artikeldatenbank vorhanden ist. Es werden Fehler auftreten. Dies kann darauf zurückzuführend sein, dass Sie einen Artikel-Mod verwenden und den Mod entfernen haben, ohne die modifizierten Artikel aus Ihrem Inventar zu löschen. VERWENDEN SIE DIESES PROFIL NICHT. Öffnen Sie Aki_Data\\Server\\configs\\core.json und ändern Sie 'removeModItemsFromProfile', zu \"true\". Dadurch kann der Server Ihr Profil bearbeiten und hoffentlich die fehlerhaften Elemente entfernen", + "fixer-mod_item_found": "Gegenstand: %s im Profil gefunden, das nicht in der Artikeldatenbank vorhanden ist. Es werden Fehler auftreten. Dies kann darauf zurückzuführend sein, dass Sie einen Artikel-Mod verwenden und den Mod entfernen haben, ohne die modifizierten Artikel aus Ihrem Inventar zu löschen. VERWENDEN SIE DIESES PROFIL NICHT. Öffnen Sie SPT_Data\\Server\\configs\\core.json und ändern Sie 'removeModItemsFromProfile', zu \"true\". Dadurch kann der Server Ihr Profil bearbeiten und hoffentlich die fehlerhaften Elemente entfernen", "fixer-updated_pockets": "'Taschen' Gegenstand würde aktualisiert auf die neue Version 18876 mit x3 speziellen Steckplätzen", "gameevent-bot_not_found": "addEventGearToScavs() – Bot vom Typ %s konnte in der Datenbank nicht gefunden werden. Überspringen", "gameevent-no_gear_data": "Keine Ausrüstungsdaten in der seasonalevents.json Konfiguration für das Event %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Fehler beim Parsen der Mod-Ladereihenfolge", "modloader-incompatibilities_not_string_array": "Die Mod %s package.json Eigenschaft 'Inkompatibilitäten' sollte ein String-Array sein", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} ist nicht kompatibel mit {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s enthält eine ungültige Semver-Zeichenfolge im Feld 'akiVersion'. Beispiele für gültige Werte: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s enthält eine ungültige Semver-Zeichenfolge im Feld 'sptVersion'. Beispiele für gültige Werte: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json enthält eine ungültige Versionszeichenfolge", "modloader-not_correct_mod_folder": "In deinem Mods-Ordner existiert ein Ordner namens (%s). Du hast eine Modifikation falsch installiert. Möglicherweise hast du versehentlich den Inhalt einer Mod direkt in den Mod-Ordner extrahiert. Informationen zur korrekten Installation von Mods findest du in den FAQ der Website und auf der Mod-Hub-Seite", "modloader-is_client_mod": "Mod (%s) ist ein Client-Mod und sollte im folgenden Ordner abgelegt werden: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: %s Server-Mods werden geladen...", "modloader-main_property_not_js": "Die Haupteigenschaft von Mod %s package.json muss eine .js Datei sein", "modloader-main_property_points_to_nothing": "Die Haupteigenschaft von Mod %s package.json verweist auf eine nicht vorhandene Datei", - "modloader-missing_akiversion_field": "Mod %s fehlt das Feld 'akiVersion', wahrscheinlich weil es veraltet und nicht mit der aktuellen Version von AKI kompatibel ist", + "modloader-missing_sptVersion_field": "Mod %s fehlt das Feld 'sptVersion', wahrscheinlich weil es veraltet und nicht mit der aktuellen Version von SPT kompatibel ist", "modloader-missing_dependency": "Mod {{mod}} erfordert die Installation von {{modDependency}}.", "modloader-missing_package_json": "Mod (%s) fehlt package.json. Stell sicher, dass du die Installationsanweisungen auf der Mod-Hub-Seite gelesen hast", "modloader-missing_package_json_property": "Mod {{modName}} package.json erfordert die Eigenschaft {{prop}}", - "modloader-mod_incompatible": "ModLoader: Mod (%s) ist inkompatibel. Es muss mindestens eines von IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod implementiert sein", + "modloader-mod_incompatible": "ModLoader: Mod (%s) ist inkompatibel. Es muss mindestens eines von IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod implementiert sein", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) ist inkompatibel. Es fehlt eine 'Haupt'-Eigenschaft", "modloader-async_mod_error": "ModLoader: Fehler beim Laden der asynchronen Mod: %s", "modloader-no_mods_loaded": "Bei den Mods wurden Fehler gefunden. Es werden keine Mods geladen", - "modloader-outdated_akiversion_field": "Mod %s ist nicht mit der aktuellen Version von AKI kompatibel. Möglicherweise stoßen Sie auf Probleme – es wird kein Support bereitgestellt!", + "modloader-outdated_sptVersion_field": "Mod %s ist nicht mit der aktuellen Version von SPT kompatibel. Möglicherweise stoßen Sie auf Probleme – es wird kein Support bereitgestellt!", "modloader-outdated_dependency": "Mod {{mod}} erfordert die {{modDependency}}-Version {{requiredVersion}}. Die aktuell installierte Version ist {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: Benutzer-/Mod-Ordner fehlt, ordner wird erstellt...", "modloader-mod_order_missing": "ModLoader: order.json fehlt, Ordner wird erstellt...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "MELDEN UNTERSAGT", "watermark-free_of_charge": "Diese Arbeit ist kostenfrei", "watermark-paid_scammed": "Wenn Sie Geld bezahlt haben, wurden Sie betrogen", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "BEI DIESEM BUILD IST DAS SERVER-MODDING DEAKTIVIERT", "watermark-no_support": "ES WIRD KEIN SUPPORT GEWÄHRT", "watermark-not_an_issue": "DAS IST KEIN PROBLEM", diff --git a/project/assets/database/locales/server/el.json b/project/assets/database/locales/server/el.json index 57549ae6..d8eefefd 100644 --- a/project/assets/database/locales/server/el.json +++ b/project/assets/database/locales/server/el.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[ΜΗ ΔΙΑΧΕΙΡΙΣΙΜΟ ΓΕΓΟΝΟΣ] %s", "executing_startup_callbacks": "Διακομιστής: εκτέλεση επανακλήσεων εκκίνησης...", "fence-unable_to_find_assort_by_id": "Αδυναμία εύρεσης ταξινόμησης του fence για την ταυτότητα: %s", - "fixer-mod_item_found": "Αντικείμενο: Το %s που βρέθηκε στο προφίλ δεν υπάρχει στα στοιχεία της βάσης δεδομένων. Θα αντιμετωπίσετε σφάλματα, αυτά μπορεί να οφείλονται στη χρήση ενός πρόσθετου (mod) αντικειμένων και, με την αφαίρεση του πρόσθετου ΧΩΡΙΣ την διαγραφή των τροποποιημένων αντικειμένων από το απόθεμα του παίκτη σας. ΜΗΝ ΧΡΗΣΙΜΟΠΟΙΗΣΕΤΕ ΑΥΤΟ ΤΟ ΠΡΟΦΙΛ. Ανοίξτε το Aki_Data\\Server\\configs\\core.json, επεξεργαστείτε το 'removeModItemsFromProfile' για να είναι αληθές (true). Αυτό θα επιτρέψει στο διακομιστή να επεξεργαστεί το προφίλ σας και να προσπαθήσει να αφαιρέσει τα κακά στοιχεία", + "fixer-mod_item_found": "Αντικείμενο: Το %s που βρέθηκε στο προφίλ δεν υπάρχει στα στοιχεία της βάσης δεδομένων. Θα αντιμετωπίσετε σφάλματα, αυτά μπορεί να οφείλονται στη χρήση ενός πρόσθετου (mod) αντικειμένων και, με την αφαίρεση του πρόσθετου ΧΩΡΙΣ την διαγραφή των τροποποιημένων αντικειμένων από το απόθεμα του παίκτη σας. ΜΗΝ ΧΡΗΣΙΜΟΠΟΙΗΣΕΤΕ ΑΥΤΟ ΤΟ ΠΡΟΦΙΛ. Ανοίξτε το SPT_Data\\Server\\configs\\core.json, επεξεργαστείτε το 'removeModItemsFromProfile' για να είναι αληθές (true). Αυτό θα επιτρέψει στο διακομιστή να επεξεργαστεί το προφίλ σας και να προσπαθήσει να αφαιρέσει τα κακά στοιχεία", "fixer-updated_pockets": "Ενημερώθηκε το στοιχείο 'τσέπη' στη νέα έκδοση 18876 με x3 ειδικές υποδοχές", "gameevent-bot_not_found": "addEventGearToScavs() - δεν είναι σε θέση να βρει bot του τύπου %s στη βάση δεδομένων, παράλειψη", "gameevent-no_gear_data": "Δεν υπάρχουν δεδομένα εξοπλισμού στο seasonalevents.json config για το γεγονός %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Σφάλμα κατά την ανάλυση της σειράς φόρτωσης πρόσθετου (mod)", "modloader-incompatibilities_not_string_array": "Στο πρόσθετο %s package.json η ιδιότητα \"ασυμβατότητες\" θα πρέπει να είναι μία συστοιχία συμβολοσειρών", "modloader-incompatible_mod_found": "Το πρόσθετο {{author}}-{{name}} δεν είναι συμβατό με το {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Το πρόσθετο %s περιέχει μια μη έγκυρη semver συμβολοσειρά στο πεδίο akiVersion. Παραδείγματα έγκυρων τιμών: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Το πρόσθετο %s περιέχει μια μη έγκυρη semver συμβολοσειρά στο πεδίο sptVersion. Παραδείγματα έγκυρων τιμών: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Το πρόσθετο %s package.json περιέχει μια μη έγκυρη έκδοση συμβολοσειράς", "modloader-not_correct_mod_folder": "Ένας φάκελος που ονομάζεται (%s) υπάρχει στο φάκελο των πρόσθετων σας. Εγκαταστήσατε εσφαλμένα ένα πρόσθετο (mod). Μπορεί να έχετε εξαγάγει τα περιεχόμενα ενός πρόσθετου απευθείας στο φάκελο πρόσθετων κατά λάθος. Ανατρέξτε στις ιστοσελίδα με τις συχνές ερωτήσεις και τη κομβική σελίδα των πρόσθετων για το πώς να εγκαταστήσετε σωστά πρόσθετα (mods)", "modloader-is_client_mod": "Το πρόσθετο (%s) είναι ένα πρόσθετο πελάτη και θα πρέπει να τοποθετηθεί στον ακόλουθο φάκελο: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: φόρτωση πρόσθετων %s διακομιστή...", "modloader-main_property_not_js": "Η κύρια ιδιότητα του πρόσθετου %s package.json πρέπει να είναι ένα αρχείο .js", "modloader-main_property_points_to_nothing": "Η κύρια ιδιότητα του πρόσθετου %s package.json πρέπει να παραπέμπει σε μη υπάρχον αρχείο", - "modloader-missing_akiversion_field": "Το Πρόσθετο %s λείπει από το πεδίο akiVersion, πιθανότατα λόγω έλλειψης ενημέρωσης και μη συμβατότητας με την τρέχουσα έκδοση του AKI", + "modloader-missing_sptVersion_field": "Το Πρόσθετο %s λείπει από το πεδίο sptVersion, πιθανότατα λόγω έλλειψης ενημέρωσης και μη συμβατότητας με την τρέχουσα έκδοση του SPT", "modloader-missing_dependency": "Το πρόσθετο {{mod}} απαιτεί την εγκατάσταση του {{modDependency}}.", "modloader-missing_package_json": "Το Πρόσθετο (%s) λείπει το package.json. Βεβαιωθείτε ότι έχετε ελέγξει την κομβική σελίδα πρόσθετων για τις οδηγίες εγκατάστασης", "modloader-missing_package_json_property": "Το πρόσθετο {{modName}} package.json απαιτεί την ιδιότητα {{prop}}", - "modloader-mod_incompatible": "ModLoader: Το Πρόσθετο (%s) είναι μη συμβατό. Πρέπει να εφαρμόσει τουλάχιστον ένα από τα IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Το Πρόσθετο (%s) είναι μη συμβατό. Πρέπει να εφαρμόσει τουλάχιστον ένα από τα IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Το πρόσθετο (%s) είναι μη συμβατό. Του λείπει μια 'κύρια' ιδιότητα", "modloader-async_mod_error": "ModLoader: Σφάλμα κατά τη φόρτωση του πρόσθετου async: %s", "modloader-no_mods_loaded": "Βρέθηκαν λάθη με τα πρόσθετα, ΚΑΝΕΝΑ ΠΡΟΣΘΕΤΟ ΔΕ ΘΑ ΦΟΡΤΩΘΕΙ", - "modloader-outdated_akiversion_field": "Το Πρόσθετο %s δεν είναι συμβατό με την τρέχουσα έκδοση του AKI. Μπορεί να αντιμετωπίσετε προβλήματα - δε θα υπάρξει υποστήριξη!", + "modloader-outdated_sptVersion_field": "Το Πρόσθετο %s δεν είναι συμβατό με την τρέχουσα έκδοση του SPT. Μπορεί να αντιμετωπίσετε προβλήματα - δε θα υπάρξει υποστήριξη!", "modloader-outdated_dependency": "Το Πρόσθετο {{mod}} απαιτεί {{modDependency}} την έκδοση {{requiredVersion}}. Η τρέχουσα εγκατεστημένη έκδοση είναι {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: λείπει ο φάκελος user/mod, δημιουργία...", "modloader-mod_order_missing": "ModLoader: το order.json λείπει, δημιουργία...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "ΜΗΝ ΤΟ ΑΝΑΦΕΡΕΤΕ", "watermark-free_of_charge": "Αυτή η εργασία είναι χωρίς χρέωση", "watermark-paid_scammed": "Αν πληρώσατε χρήματα, σας έχουν εξαπατήσει", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "ΑΥΤΗ Η ΕΚΔΟΣΗ ΕΧΕΙ ΑΠΕΝΕΡΓΟΠΟΙΗΜΈΝΕΣ ΤΙΣ ΤΡΟΠΟΠΟΙΗΣΕΙΣ ΑΠΟ ΤΟΝ ΔΙΑΚΟΜΙΣΤΗ", "watermark-no_support": "ΔΕΝ ΘΑ ΔΩΘΕΙ ΥΠΟΣΤΗΡΙΞΗ", "watermark-not_an_issue": "ΑΥΤΟ ΔΕΝ ΕΙΝΑΙ ΠΡΟΒΛΗΜΑ", diff --git a/project/assets/database/locales/server/en.json b/project/assets/database/locales/server/en.json index 7cb1858b..e7ca8f49 100644 --- a/project/assets/database/locales/server/en.json +++ b/project/assets/database/locales/server/en.json @@ -68,9 +68,9 @@ "fence-unable_to_find_assort_by_id": "Unable to find fence assort for id: %s", "fence-unable_to_find_offer_by_id": "Unable to find offer with id: %s", "fence-unable_to_get_ammo_penetration_value": "No penetration value found for Ammo: %s, Unable to check if its above penetration limit, assuming false", - "fixer-clothing_item_found": "Clothing item: %s found in profile that does not exist in SPT. You WILL experience errors, this can be due to using a clothing mod and removing the mod with your character still wearing it. DO NOT USE THIS PROFILE. Open Aki_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the missing clothing", - "fixer-mod_item_found": "Item: %s found in profile that does not exist in items db. You WILL experience errors, this can be due to using an items mod and removing the mod without deleting the modded items from your inventory. DO NOT USE THIS PROFILE. Open Aki_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the bad items", - "fixer-trader_found": "Trader: %s found in profile that does not exist in SPT. You WILL experience errors, this can be due to using an trader mod and removing the mod without deleting the messages from said trader. DO NOT USE THIS PROFILE. Open Aki_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the bad messages", + "fixer-clothing_item_found": "Clothing item: %s found in profile that does not exist in SPT. You WILL experience errors, this can be due to using a clothing mod and removing the mod with your character still wearing it. DO NOT USE THIS PROFILE. Open SPT_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the missing clothing", + "fixer-mod_item_found": "Item: %s found in profile that does not exist in items db. You WILL experience errors, this can be due to using an items mod and removing the mod without deleting the modded items from your inventory. DO NOT USE THIS PROFILE. Open SPT_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the bad items", + "fixer-trader_found": "Trader: %s found in profile that does not exist in SPT. You WILL experience errors, this can be due to using an trader mod and removing the mod without deleting the messages from said trader. DO NOT USE THIS PROFILE. Open SPT_Data\\Server\\configs\\core.json, edit 'removeModItemsFromProfile' to be true. This will allow the server to edit your profile and hopefully remove the bad messages", "fixer-updated_pockets": "Updated 'pocket' item to new 18876 version with x3 special slots", "gameevent-bot_not_found": "addEventGearToScavs() - unable to find bot of type %s in database, skipping", "gameevent-no_gear_data": "No gear data in seasonalevents.json config for event %s", @@ -172,7 +172,7 @@ "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} is incompatible with {{incompatibleModName}}", "modloader-installing_external_dependencies": "Installing dependencies for Mod: {{name}} by: {{author}}", "modloader-installing_external_dependencies_disabled": "Mod: {{name}} by: {{author}} requires external dependencies but the feature is currently disabled, go to \"{{configPath}}\", set \"{{configOption}}\" to true and restart the server.\nBy enabling this you accept all responsibility for what {{name}} downloads to your machine.", - "modloader-invalid_akiversion_field": "Mod %s contains an invalid semver string in the akiVersion field. Examples of valid values: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s contains an invalid semver string in the sptVersion field. Examples of valid values: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json contains an invalid version string", "modloader-is_client_mod": "Mod (%s) is a client mod and should be placed in the following folder: /spt/bepinex/plugins", "modloader-load_order_conflict": "`{{modOneName}}` and `{{modTwoName}}` have conflicting load order requirements, the server is unable to start until this is fixed and will shut down", @@ -180,18 +180,18 @@ "modloader-loading_mods": "ModLoader: loading %s server mods...", "modloader-main_property_not_js": "Mod %s package.json main property must be a .js file", "modloader-main_property_points_to_nothing": "Mod %s package.json main property points to non-existing file", - "modloader-missing_akiversion_field": "Mod %s is missing the akiVersion field, most likely due to being out of date and incompatible with the current version of AKI", + "modloader-missing_sptVersion_field": "Mod %s is missing the sptVersion field, most likely due to being out of date and incompatible with the current version of SPT", "modloader-missing_dependency": "Mod {{mod}} requires {{modDependency}} to be installed.", "modloader-missing_package_json": "Mod (%s) is missing package.json. Make sure you have checked the mods hub page for install instructions", "modloader-missing_package_json_property": "Mod {{modName}} package.json requires {{prop}} property", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) is incompatible. It lacks a 'main' property", - "modloader-mod_incompatible": "ModLoader: Mod (%s) is incompatible. It must implement at least one of IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Mod (%s) is incompatible. It must implement at least one of IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_order_error": "ModLoader: Errors were found in order.json, GOING TO USE DEFAULT LOAD ORDER", "modloader-mod_order_missing": "ModLoader: order.json is missing, creating...", "modloader-mod_order_missing_from_json": "ModLoader: Mod %s is missing from order.json, adding", "modloader-no_mods_loaded": "Errors were found with mods, NO MODS WILL BE LOADED", "modloader-not_correct_mod_folder": "A folder called (%s) exists in your mods folder. You incorrectly installed a mod. You may have extracted the contents of a mod directly into the mod folder by mistake. Refer to the websites FAQ and the mods hub page on how to install mods correctly", - "modloader-outdated_akiversion_field": "Mod %s is not compatible with the current version of AKI. You may encounter issues - no support will be provided!", + "modloader-outdated_sptVersion_field": "Mod %s is not compatible with the current version of SPT. You may encounter issues - no support will be provided!", "modloader-outdated_dependency": "Mod {{mod}} requires {{modDependency}} version {{requiredVersion}}. Current installed version is {{currentVersion}}", "modloader-skipped_mod": "Skipping loading of Mod: {{mod}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod folder missing, creating...", @@ -642,7 +642,7 @@ "watermark-discord_url": "https://discord.sp-tarkov.com", "watermark-do_not_report": "DO NOT REPORT IT", "watermark-free_of_charge": "This work is free of charge", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "THIS BUILD HAS SERVER MODDING DISABLED", "watermark-no_support": "NO SUPPORT WILL BE GIVEN", "watermark-not_an_issue": "THIS IS NOT AN ISSUE", diff --git a/project/assets/database/locales/server/es-es.json b/project/assets/database/locales/server/es-es.json index 421a1863..2cf0c303 100644 --- a/project/assets/database/locales/server/es-es.json +++ b/project/assets/database/locales/server/es-es.json @@ -130,7 +130,7 @@ "modloader-error_parsing_mod_load_order": "Error al traducir el orden de las modificaciones", "modloader-incompatibilities_not_string_array": "La propiedad 'incompatibilities' de la modificacion %s package.json deberia ser un arreglo de string", "modloader-incompatible_mod_found": "La modificación {{author}}-{{name}} no es compatible con {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "La modificacion %s contiene un valor semver in correcto en el campo akiVersion. Ejemplos de valores validos: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "La modificacion %s contiene un valor semver in correcto en el campo sptVersion. Ejemplos de valores validos: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "La modificacion %s package.json contiene un valor invalido de version", "modloader-not_correct_mod_folder": "Existe una carpeta llamada (%s) en la carpeta de mods. Has instalado incorrectamente un mod. Es posible que haya extraído el contenido de un mod directamente en la carpeta mod por error. Consulte la página de preguntas frecuentes y la página de mods sobre cómo instalar correctamente los mods", "modloader-is_client_mod": "La modificación (%s) es de cliente, esta debería ponerse en el directorio: /spt/bepinex/plugins", @@ -141,15 +141,15 @@ "modloader-loading_mods": "ModLoader: cargando %s modificaciones...", "modloader-main_property_not_js": "La propiedad 'main' de la modificacion %s package.json debe ser un archivo .js", "modloader-main_property_points_to_nothing": "La propiedad 'main' de la modificacion %s package.json apunta a un archivo inexistente", - "modloader-missing_akiversion_field": "La modificacion %s no contiene el campo akiVersion, es posible que esto se deba a que la misma esta desactualizada o no es compatible con la version de AKI utilizada", + "modloader-missing_sptVersion_field": "La modificacion %s no contiene el campo sptVersion, es posible que esto se deba a que la misma esta desactualizada o no es compatible con la version de SPT utilizada", "modloader-missing_dependency": "La modificación {{mod}} requiere que la modificación {{modDependency}} sea instalada también.", "modloader-missing_package_json": "La modificacion (%s) le falta el archivo package.json", "modloader-missing_package_json_property": "La modificacion {{modName}} requiere la propiedad {{prop}} en el archivo package.json", - "modloader-mod_incompatible": "ModLoader: modificacion incompatible. Debe implementar por lo menos una de estas interfaces: IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: modificacion incompatible. Debe implementar por lo menos una de estas interfaces: IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "Moderador: Mod (%s) es incompatible. Le falta la propiedad 'mayo'", "modloader-async_mod_error": "ModLoader: Error al cargar el mod asíncrono: %s", "modloader-no_mods_loaded": "Se encontraron errores cargando las modificacion, NINGUNA MODIFICACION SERA CARGADA", - "modloader-outdated_akiversion_field": "La modificacion %s no es compatible con la version actual de AKI. Es posible que tengas dificultades jugando - no se proveera soporte!", + "modloader-outdated_sptVersion_field": "La modificacion %s no es compatible con la version actual de SPT. Es posible que tengas dificultades jugando - no se proveera soporte!", "modloader-outdated_dependency": "La modificacion {{mod}} requiere {{modDependency}} version {{requiredVersion}}. La version actualmente instalada es {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: directorio user/mod no encontrado, creandolo...", "modloader-mod_order_missing": "ModLoader: order.json no se encuentra, creando...", @@ -246,7 +246,7 @@ "watermark-do_not_report": "NO LO REPORTES", "watermark-free_of_charge": "Este trabajo es libre de cargo.", "watermark-paid_scammed": "Si has pagado por esto, te han estafado.", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "ESTA VERSIÓN TIENE LAS MODIFICACIONES DESACTIVADAS", "watermark-no_support": "NO SE DARÁ NINGÚN TIPO DE SOPORTE", "watermark-not_an_issue": "ESTO NO ES UN PROBLEMA", diff --git a/project/assets/database/locales/server/fr.json b/project/assets/database/locales/server/fr.json index b4b284eb..b8c368df 100644 --- a/project/assets/database/locales/server/fr.json +++ b/project/assets/database/locales/server/fr.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[EVENEMENT IMPREVU] %s", "executing_startup_callbacks": "Serveur : exécution des rappels de démarrage...", "fence-unable_to_find_assort_by_id": "Impossible de trouver l'assort de Fence pour l'id : %s", - "fixer-mod_item_found": "Objet : %s a été trouvé dans le profil mais n'existe pas dans la base des objets. Cela VA produire des erreurs, ce type d'erreur peut survenir si vous utilisez un mod rajoutant des objets et que vous supprimez ce mod sans supprimer les items moddés. N'UTILISEZ PAS CE PROFIL. Ouvrez Aki_Data\\Server\\configs\\core.json, éditez 'removeModItemsFromProfile' à la valeur true. Cela permettra au serveur d'éditer votre profil, en espérant qu'il supprime lesdits objets", + "fixer-mod_item_found": "Objet : %s a été trouvé dans le profil mais n'existe pas dans la base des objets. Cela VA produire des erreurs, ce type d'erreur peut survenir si vous utilisez un mod rajoutant des objets et que vous supprimez ce mod sans supprimer les items moddés. N'UTILISEZ PAS CE PROFIL. Ouvrez SPT_Data\\Server\\configs\\core.json, éditez 'removeModItemsFromProfile' à la valeur true. Cela permettra au serveur d'éditer votre profil, en espérant qu'il supprime lesdits objets", "fixer-updated_pockets": "Objet 'poches' mis à jour vers la version 18876 avec x3 emplacements spéciaux", "gameevent-bot_not_found": "addEventGearToScavs() - impossible de trouver le bot de type %s dans la base de données, passage à l'étape suivante", "gameevent-no_gear_data": "Aucune donnée d'équipement dans la configuration de seasonalevents.json pour l'événement %s", @@ -128,10 +128,10 @@ "modloader-cyclic_dependency": "Dépendance cyclique détectée. Cette erreur doit être résolue. Le serveur s'éteindra automatiquement tant que cela n'est pas corrigé", "modloader-load_order_conflict": "`{{modOneName}}` et `{{modTwoName}}` ont des ordres de chargement en conflit, le serveur ne peut pas démarrer tant que ceci n'est pas corrigé et s'arrêtera", "modloader-dependency_container_not_initalized": "Le conteneur de dépendances a été demandé, mais n'était pas initialisé", - "modloader-error_parsing_mod_load_order": "SPT-AKI n'a pas réussi à déterminer l'ordre correct des mods", + "modloader-error_parsing_mod_load_order": "SPT n'a pas réussi à déterminer l'ordre correct des mods", "modloader-incompatibilities_not_string_array": "la propriété 'incompatibilities' dans le fichier package.json du mod %s doit être un tableau de chaînes de caractères", "modloader-incompatible_mod_found": "Le mod {{author}}-{{name}} est incompatible avec {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Le mod %s contient une chaîne de caractères semver invalide dans le champ akiVersion. Exemples de chaînes correctes: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Le mod %s contient une chaîne de caractères semver invalide dans le champ sptVersion. Exemples de chaînes correctes: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Le mod %s package.json contient une chaîne de version invalide", "modloader-not_correct_mod_folder": "Un dossier appelé (%s) existe dans le dossier des mods. Vous avez mal installé un mod. Vous avez peut-être extrait le contenu d'un mod directement dans le dossier des mods par erreur. Reportez-vous à la FAQ des sites Web et à la page du hub des mods pour savoir comment installer les mods correctement", "modloader-is_client_mod": "Le mod (%s) est un mod client et doit être placé dans le dossier suivant : /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: Chargement des mods du serveur %s...", "modloader-main_property_not_js": "Mod %s package.json : la propriété principale doit être un fichier .js", "modloader-main_property_points_to_nothing": "La propriété principale du mod %s package.json pointe vers un fichier inexistant", - "modloader-missing_akiversion_field": "Le mod %s n'a pas de champ akiVersion , il est possible que le mod ne soit plus à jour et donc incompatible avec la version actuelle de SPT-AKI", + "modloader-missing_sptVersion_field": "Le mod %s n'a pas de champ sptVersion , il est possible que le mod ne soit plus à jour et donc incompatible avec la version actuelle de SPT", "modloader-missing_dependency": "Le mod : {{mod}}, nécessite {{modDependency}} pour être installé.", "modloader-missing_package_json": "Mod (%s) n'a pas de fichier package.json. Assurez-vous d'avoir vérifié les instructions d'installation sur la page du mod", "modloader-missing_package_json_property": "Mod {{modName}} package.json requiert la propriété {{prop}}", - "modloader-mod_incompatible": "ModLoader: Le mod (%s) est incompatible. Il doit implémenter au moins un de ces trois : IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Le mod (%s) est incompatible. Il doit implémenter au moins un de ces trois : IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Le mod (%s) est incompatible. Il manque une propriété 'main'", "modloader-async_mod_error": "ModLoader: Erreur pendant le chargement de async mod: %s", "modloader-no_mods_loaded": "Des erreurs ont été trouvées avec certains mods, ATTENTION, AUCUN MOD NE SERA CHARGE", - "modloader-outdated_akiversion_field": "Le mod %s n'est pas compatible avec la version actuelle de SPT-AKI. Des erreurs peuvent survenir - aucun support ne sera fourni !", + "modloader-outdated_sptVersion_field": "Le mod %s n'est pas compatible avec la version actuelle de SPT. Des erreurs peuvent survenir - aucun support ne sera fourni !", "modloader-outdated_dependency": "Mod {{mod}} a besoin de {{modDependency}} version {{requiredVersion}}. Version actuelle : {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: dossier user/mod manquant, création en cours...", "modloader-mod_order_missing": "ModLoader: order.json est manquant, création en cours...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "NE PAS SIGNALER !", "watermark-free_of_charge": "Ce travail est gratuit", "watermark-paid_scammed": "Si vous avez payé pour utiliser SPT ce n'est pas normal, c'est une ARNAQUE. Par contre attention : payer pour posséder le jeu original EfT est tout à fait normal et obligatoire", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "CE BUILD A LE MODDING DESACTIVE", "watermark-no_support": "AUCUN SUPPORT NE SERA FOURNI", "watermark-not_an_issue": "CECI N'EST PAS UNE ERREUR", diff --git a/project/assets/database/locales/server/hu.json b/project/assets/database/locales/server/hu.json index 66660ff2..13c80b69 100644 --- a/project/assets/database/locales/server/hu.json +++ b/project/assets/database/locales/server/hu.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[KEZELETLEN ESEMÉNY] %s", "executing_startup_callbacks": "Kiszolgáló: indítási visszahívások végrehajtása...", "fence-unable_to_find_assort_by_id": "Nem található meg Fence választéka a következő azonosítóhoz: %s", - "fixer-mod_item_found": "Elem: %s megtalálható a profilban, de nem létezik az items db-ben. Hibaüzeneteket fogsz kapni, ez azért lehet, mert egy modolt tárgyat használtál, és eltávolítottad a modot anélkül, hogy törölted volna a készletedből azokat. NE HASZNÁLD EZT A PROFILT. Nyisd meg az Aki_Data\\Server\\configs\\core.json-t, szerkeszd a 'removeModItemsFromProfile' beállítást igaz értékre. Ez lehetővé teszi a szerver számára, hogy módosítsd a profilod és remélhetőleg eltávolítsd a hibás elemeket", + "fixer-mod_item_found": "Elem: %s megtalálható a profilban, de nem létezik az items db-ben. Hibaüzeneteket fogsz kapni, ez azért lehet, mert egy modolt tárgyat használtál, és eltávolítottad a modot anélkül, hogy törölted volna a készletedből azokat. NE HASZNÁLD EZT A PROFILT. Nyisd meg az SPT_Data\\Server\\configs\\core.json-t, szerkeszd a 'removeModItemsFromProfile' beállítást igaz értékre. Ez lehetővé teszi a szerver számára, hogy módosítsd a profilod és remélhetőleg eltávolítsd a hibás elemeket", "fixer-updated_pockets": "Frissített 'pocket' tárgy az új, 18876-os verzióra, amely x3 speciális slotot tartalmaz", "gameevent-bot_not_found": "addEventGearToScavs() - nem találja a %s típusú botot az adatbázisban, kihagyás", "gameevent-no_gear_data": "A seasonalevents.json konfigban nincsenek felszerelés adatok a következő eseményhez %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Hiba a mod betöltési sorrendjének elemzésekor", "modloader-incompatibilities_not_string_array": "A Mod %s package.json „incompatibilities” tulajdonságának karakterlánc tömbnek kell lennie", "modloader-incompatible_mod_found": "{{author}}-{{name}} mod nem kompatibilis a következővel: {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "A mod %s érvénytelen semver karakterláncot tartalmaz az akiVersion mezőben. Példák az érvényes értékekre: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "A mod %s érvénytelen semver karakterláncot tartalmaz az sptVersion mezőben. Példák az érvényes értékekre: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "A(z) %s mod package.json fájlja érvénytelen verziójú karakterláncot tartalmaz", "modloader-not_correct_mod_folder": "A mods mappában létezik egy (%s) nevű mappa. Helytelenül telepítettél egy modot. Lehet, hogy egy mod tartalmát tévedésből közvetlenül a mod mappába csomagoltad. A modok helyes telepítésével kapcsolatban lásd a webhelyek GYIK-jét és a mod oldalát hogyan kell azt helyesen telepíteni", "modloader-is_client_mod": "A következő mod (%s) egy kliens mod és a következő mappába kell helyezni: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: %s szervermodok betöltése...", "modloader-main_property_not_js": "A mod %s package.json fő tulajdonsága egy .js fájl kell legyen", "modloader-main_property_points_to_nothing": "A %s mod package.json fő tulajdonsága egy nem létező fájlra mutat", - "modloader-missing_akiversion_field": "%s modnak hiányzik az akiVersion mezője, valószínűleg azért, mert elavult és nem kompatibilis az AKI jelenlegi verziójával", + "modloader-missing_sptVersion_field": "%s modnak hiányzik az sptVersion mezője, valószínűleg azért, mert elavult és nem kompatibilis az SPT jelenlegi verziójával", "modloader-missing_dependency": "{{mod}} mod a következőnek a telepítését igényli {{modDependency}}.", "modloader-missing_package_json": "%s mod a package.json fájlt hiányolja. Győződj meg róla, hogy ellenőrizted a mod oldalát a telepítési utasításokért", "modloader-missing_package_json_property": "A mod {{modName}} package.json megköveteli a {{prop}} jellemzőket", - "modloader-mod_incompatible": "ModLoader: Mod (%s) nem kompatibilis. Az IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod közül legalább egyet tartalmaznia kell", + "modloader-mod_incompatible": "ModLoader: Mod (%s) nem kompatibilis. Az IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod közül legalább egyet tartalmaznia kell", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) nem kompatibilis. Nincs 'main' tulajdonsága", "modloader-async_mod_error": "ModLoader: Hiba az aszinkron mod betöltésekor: %s", "modloader-no_mods_loaded": "Hibákat találtunk a modoknál, A MODOK NEM LESZNEK BETÖLTVE", - "modloader-outdated_akiversion_field": "A mod %s nem kompatibilis az AKI jelenlegi verziójával. Problémák merülhetnek fel - semmilyen segítséget nem fogunk nyújtani!", + "modloader-outdated_sptVersion_field": "A mod %s nem kompatibilis az SPT jelenlegi verziójával. Problémák merülhetnek fel - semmilyen segítséget nem fogunk nyújtani!", "modloader-outdated_dependency": "{{mod}} mod futtatásához szükséges a {{modDependency}} {{requiredVersion}} verziója. Az aktuálisan telepített verzió {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod mappa hiányzik, létrehozás...", "modloader-mod_order_missing": "ModLoader: order.json hiányzik, létrehozás...", @@ -247,7 +247,7 @@ "watermark-do_not_report": "NE JELENTSD", "watermark-free_of_charge": "Ez a munka ingyenes", "watermark-paid_scammed": "Ha fizettél érte, átvertek", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "Ez a verzió nem támogatja a szerver moddolást", "watermark-no_support": "Nem adunk semmilyen segítséget", "watermark-not_an_issue": "EZ NEM PROBLÉMA", diff --git a/project/assets/database/locales/server/id.json b/project/assets/database/locales/server/id.json index edf03221..3d050d40 100644 --- a/project/assets/database/locales/server/id.json +++ b/project/assets/database/locales/server/id.json @@ -58,7 +58,7 @@ "event-unhandled_event": "[UNHANDLED EVENT] %s", "executing_startup_callbacks": "Server: menjalankan panggilan balik startup...", "fence-unable_to_find_assort_by_id": "Tidak dapat menemukan barang fence dengan id: %s", - "fixer-mod_item_found": "Barang: %s yang ditemukan dalam profil tidak ada dalam database. ANDA AKAN mengalami permasalahan, hal ini disebabkan dengan menggunakan barang mod dan menghapuskan mod tanpa menghilangkan barang dari mod tersebut. JANGAN GUNAKAN PROFIL INI. Buka Aki_Data\\Server\\configs\\core.json, ubah 'removeModItemsFromProfile' menjadi true. Hal ini memperbolehkan server untuk menyunting profil anda sehingga barang yang bermasalah dapat dihapus", + "fixer-mod_item_found": "Barang: %s yang ditemukan dalam profil tidak ada dalam database. ANDA AKAN mengalami permasalahan, hal ini disebabkan dengan menggunakan barang mod dan menghapuskan mod tanpa menghilangkan barang dari mod tersebut. JANGAN GUNAKAN PROFIL INI. Buka SPT_Data\\Server\\configs\\core.json, ubah 'removeModItemsFromProfile' menjadi true. Hal ini memperbolehkan server untuk menyunting profil anda sehingga barang yang bermasalah dapat dihapus", "fixer-updated_pockets": "Update benda 'pocket' ke versi 18876 yang baru dengan x3 slot spesial", "gameevent-bot_not_found": "addEventGearToScavs() - tidak dapat menemukan bot dengan tipe %s di database, dilewati", "gameevent-no_gear_data": "Tidak ada data perlengkapan dalam konfigurasi seasonalevents.json untuk acara %s", @@ -122,7 +122,7 @@ "modloader-error_parsing_mod_load_order": "Permasalahan dalam penguraian urutan pemuatan mod", "modloader-incompatibilities_not_string_array": "Mod %s data package.json 'incompatibilities' harus string array", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} tidak compatibel dengan {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s memiliki string semver invalid dalam laman akiVersion. Contoh yang valid: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s memiliki string semver invalid dalam laman sptVersion. Contoh yang valid: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json memiliki versi string yang invalid", "modloader-not_correct_mod_folder": "Folder bernama (%s) ada di dalam folder mods. Anda salah memasang mod. Anda mungkin mengekstrak isi sebuah mod langsung ke dalam folder mod dengan tidak sengaja. Lihat FAQ situs web dan halaman hub mod untuk mengetahui cara memasang mod dengan benar", "modloader-is_client_mod": "Mod (%s) merupakan mod client dan harus dipasang dalam folder: /spt/bepinex/plugins", @@ -133,15 +133,15 @@ "modloader-loading_mods": "ModLoader: loading %s server mods...", "modloader-main_property_not_js": "Mod %s properti utama package.json harus berupa file .js", "modloader-main_property_points_to_nothing": "Mod %s properti utama package.json mengarah ke file yang tidak ada", - "modloader-missing_akiversion_field": "Mod %s kekurangan laman akiVersion, kemungkinan besar karena sudah ketinggalan jauh dan tidak kompatible dengan versi AKI sekarang", + "modloader-missing_sptVersion_field": "Mod %s kekurangan laman sptVersion, kemungkinan besar karena sudah ketinggalan jauh dan tidak kompatible dengan versi SPT sekarang", "modloader-missing_dependency": "Mod {{mod}} memerlukan dependesi {{modDependency}} dipasang.", "modloader-missing_package_json": "Mod (%s) kehilangan package.json. Pastikan anda sudah mengecek halaman hub mod untuk panduan instal", "modloader-missing_package_json_property": "Mod package.json {{modName}} memerlukan data {{prop}}", - "modloader-mod_incompatible": "ModLoader: Mod (%s) tidak kompatibel. Harus menggunakan setidaknya salah satu dari IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Mod (%s) tidak kompatibel. Harus menggunakan setidaknya salah satu dari IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) tidak kompatibel. Tidak memiliki properti 'utama'", "modloader-async_mod_error": "ModLoader: Terjadi permasalahan ketika loading mod async: %s", "modloader-no_mods_loaded": "Permasalahan ditemukan dengan mods, TIDAK ADA MOD YANG AKAN DIPASANG", - "modloader-outdated_akiversion_field": "Mod %s tidak kompatibel dengan versi AKI saat ini. Anda mungkin akan mengalami masalah - bantuan tidak akan diberikan!", + "modloader-outdated_sptVersion_field": "Mod %s tidak kompatibel dengan versi SPT saat ini. Anda mungkin akan mengalami masalah - bantuan tidak akan diberikan!", "modloader-outdated_dependency": "Mod {{mod}} memerlukan dependensi {{modDependency}} versi {{requiredVersion}}. Versi yang diinstal saat ini {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: folder user/mod tidak ada, membuatkan...", "modloader-mod_order_missing": "ModLoader: order.json tidak ada, membuatkan...", @@ -214,7 +214,7 @@ "watermark-do_not_report": "TIDAK USAH DILAPORKAN", "watermark-free_of_charge": "Hasil kerja ini tidak memungut biaya apapun", "watermark-paid_scammed": "Jika anda dipungut biaya, anda telah ditipu", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "SERVER MODDING DINONAKTIFKAN DALAM VERSI INI", "watermark-no_support": "BANTUAN TIDAK AKAN DIBERIKAN", "watermark-not_an_issue": "INI BUKAN PERMASALAHAN", diff --git a/project/assets/database/locales/server/it.json b/project/assets/database/locales/server/it.json index 8fbceea6..136c1bf0 100644 --- a/project/assets/database/locales/server/it.json +++ b/project/assets/database/locales/server/it.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[EVENTO INATTESO] %s", "executing_startup_callbacks": "Server: esecuzione delle chiamate all'avvio...", "fence-unable_to_find_assort_by_id": "Impossibile trovare l'assortimento di Fence con id: %s", - "fixer-mod_item_found": "Oggetto %s che non esiste nel database è stato trovato nel profilo. Avrai sicuramente degli errori, potrebbero essere causati da una mod che aggiunge item che è stata rimossa senza eliminare gli oggetti dall'inventario. Non utilizzare questo profilo! Apri Aki_Data\\Server\\configs\\core.json, modifica 'removeModItemsFromProfile' in modo che sia 'true'. Questo permetterà al server di modificare il tuo profilo e si spera che possa anche rimuovere l'item incriminato", + "fixer-mod_item_found": "Oggetto %s che non esiste nel database è stato trovato nel profilo. Avrai sicuramente degli errori, potrebbero essere causati da una mod che aggiunge item che è stata rimossa senza eliminare gli oggetti dall'inventario. Non utilizzare questo profilo! Apri SPT_Data\\Server\\configs\\core.json, modifica 'removeModItemsFromProfile' in modo che sia 'true'. Questo permetterà al server di modificare il tuo profilo e si spera che possa anche rimuovere l'item incriminato", "fixer-updated_pockets": "Aggiornato l'oggetto 'tasche' alla nuova versione 18876 con x3 slot speciali", "gameevent-bot_not_found": "addEventGearToScavs() - impossibile trovare il bot di tipo %s nel database, perciò viene skippato", "gameevent-no_gear_data": "Nessun dato sull'equipaggiamento per l'evento %s in seasonalevents.json", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Errore nel processare l'ordine di caricamento della mod", "modloader-incompatibilities_not_string_array": "Le proprietà 'incompatibilities' della mod %s, nel package.json, devono essere uno string array", "modloader-incompatible_mod_found": "La mod {{author}}-{{name}} è incompatibile con {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "La mod %s contiene una stringa semver invalida nel campo akiVersion. Esempi di valori validi: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "La mod %s contiene una stringa semver invalida nel campo sptVersion. Esempi di valori validi: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Il package.json della Mod %s contiene una stringa 'version' non valida", "modloader-not_correct_mod_folder": "Nella cartella mcd esiste una cartella chiamata (%s). È stata installata in modo non corretto una mcd. Potresti aver estratto per errore il contenuto di una mcd direttamente nella cartella mcd. Fare riferimento ai siti web FAQ e alla pagina mods su come installare correttamente le mcd", "modloader-is_client_mod": "La mod (%s) è una mod del client e dovrebbe essere posizionata nella seguente cartella: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: caricamento %s mods del server...", "modloader-main_property_not_js": "La proprietà 'main' del package.json della mod %s deve essere un file .js", "modloader-main_property_points_to_nothing": "Mod %s package.json Le proprietà principali rimandano a un file inesistente", - "modloader-missing_akiversion_field": "Alla mod %s manca il campo 'akiVersion', molto probabilmente non è aggiornata ed è incompatibile con la versione attuale di AKI", + "modloader-missing_sptVersion_field": "Alla mod %s manca il campo 'sptVersion', molto probabilmente non è aggiornata ed è incompatibile con la versione attuale di SPT", "modloader-missing_dependency": "La mod {{mod}} richiede {{modDependency}} per essere installata.", "modloader-missing_package_json": "Alla mod (%s) manca il file package.json", "modloader-missing_package_json_property": "Il package.json della mod {{modName}} deve avere la proprietà {{prop}}", - "modloader-mod_incompatible": "ModLoader: mod incompatibile. Deve implementare almeno uno tra: IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: mod incompatibile. Deve implementare almeno uno tra: IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) è incompatibile. Manca una proprietà 'principale'", "modloader-async_mod_error": "ModLoader: Errore durante il caricamento asincrono della mod: %s", "modloader-no_mods_loaded": "Sono stati trovati errori con le mod, NESSUNA MOD VERRA' CARICATA", - "modloader-outdated_akiversion_field": "La mod %s non è compatibile con la versione corrente di AKI. Potresti avere problemi - non verrà dato supporto!", + "modloader-outdated_sptVersion_field": "La mod %s non è compatibile con la versione corrente di SPT. Potresti avere problemi - non verrà dato supporto!", "modloader-outdated_dependency": "La mod {{mod}} richiede {{modDependency}} alla versione {{requiredVersion}}. Attualmente è installata la versione {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: manca la cartella 'user/mod', creazione in corso...", "modloader-mod_order_missing": "ModLoader: manca il file 'order.json', creazione in corso...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "NON SEGNALARLO", "watermark-free_of_charge": "Questo lavoro è gratuito", "watermark-paid_scammed": "Se hai pagato per questo, sei stato scammato", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "QUESTA BUILD HA LE MOD SERVER DISATTIVATE", "watermark-no_support": "NESSUN SUPPORTO SARA' FORNITO", "watermark-not_an_issue": "QUESTO NON É UN ERRORE", @@ -603,8 +603,8 @@ "launcher-profile_sptzerotohero": "Inizi con quasi nulla, niente Rubli/Dollari/Euro, reputazione mercanti a zero, un coltello, nessuna missione completata", "launcher-profile_sptdeveloper": "Profilo di prova, i PMC iniziano al livello 69, molti Rubli/Dollari/Euro, gli USEC cominciano con tutte le quest pronte a cominciare, i BEAR cominciano con tutte le quest pronte per essere consegnate, Balaclava dell'invincibilità incluso", "launcher-missing_property": "Al profilo: %s manca la property descriptionLocaleKey", - "release-beta-disclaimer": "Premendo OK accetti che non ti venga offerto nessun supporto perchè questa versione è sperimentale e solo per testare bug. NON è una versione da giocare! Le mod sono disabilitate. Non affezionarti al tuo profilo perché potrebbe essere necessario crearne spesso di nuovi. Segnala i bug che trovi nell'apposito canale su discord o sulla pagina web dev.sp-tarkov.com/SPT-AKI/Issues/issues. Se non premi il tasto OK in tempo, il gioco si chiuderà.", - "release-beta-disclaimer-mods-enabled": "Premendo OK accetti che non ti venga offerto nessun supporto perchè questa versione è sperimentale e solo per testare bug. NON è per giocarci! Le mod sono disabilitate, NON aprire segnalazioni se stai usando delle mod. NON chiedere ai modder di aggiornare le loro mod. Segnala i bug che trovi nell'apposito canale su discord o sulla pagina web dev.sp-tarkov.com/SPT-AKI/Issues/issues. Se non premi il tasto OK in tempo, il gioco si chiuderà.", + "release-beta-disclaimer": "Premendo OK accetti che non ti venga offerto nessun supporto perchè questa versione è sperimentale e solo per testare bug. NON è una versione da giocare! Le mod sono disabilitate. Non affezionarti al tuo profilo perché potrebbe essere necessario crearne spesso di nuovi. Segnala i bug che trovi nell'apposito canale su discord o sulla pagina web dev.sp-tarkov.com/SPT/Issues/issues. Se non premi il tasto OK in tempo, il gioco si chiuderà.", + "release-beta-disclaimer-mods-enabled": "Premendo OK accetti che non ti venga offerto nessun supporto perchè questa versione è sperimentale e solo per testare bug. NON è per giocarci! Le mod sono disabilitate, NON aprire segnalazioni se stai usando delle mod. NON chiedere ai modder di aggiornare le loro mod. Segnala i bug che trovi nell'apposito canale su discord o sulla pagina web dev.sp-tarkov.com/SPT/Issues/issues. Se non premi il tasto OK in tempo, il gioco si chiuderà.", "release-beta-disclaimer-accept": "L'utente ha accettato i termini della beta", "release-server-mods-loaded": "Sono state rilevate una o più mod del server su una versione con mod abilitate, rimuovile se vuoi che le tue segnalazioni tornino a funzionare. Controlla le prime voci sulla finestra del server per sapere quali sono quelle da rimuovere.", "release-server-mods-debug-message": "Mod del server caricate", diff --git a/project/assets/database/locales/server/ja.json b/project/assets/database/locales/server/ja.json index 18b73232..2c1f0827 100644 --- a/project/assets/database/locales/server/ja.json +++ b/project/assets/database/locales/server/ja.json @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "mod ロード順の解析中にエラーが発生しました。", "modloader-incompatibilities_not_string_array": "Mod %s package.json プロパティ '非互換性' は文字列配列でなければなりません。", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} is incompatible with {{incompatibleModName}}。", - "modloader-invalid_akiversion_field": "モッド %s のakiVersion区域にで不正確なSemver文字列が使用されています。 正しい例はこちらに： https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "モッド %s のsptVersion区域にで不正確なSemver文字列が使用されています。 正しい例はこちらに： https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "モッド %s のpackage.jsonにで不正確なバージョン文字列が使用されています。", "modloader-not_correct_mod_folder": "Modsフォルダに (%s) という名前のフォルダが存在します。Modのインストールの手順が間違えています。 あなたが間違ってModフォルダに直接Modの内容をそのまま抽出した可能性があります。 ウェブサイトの FAQ および Mod のハブページを参照してください", "modloader-is_client_mod": "モッド %s はクライアントタイプのモッドです。正しいインストール先はこちら： /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "モッド読み込むツール: %s 個のモッド読み込む中...", "modloader-main_property_not_js": "モッド %s のpackage.jsonの主要プロパティは .js ファイルである必要があります。", "modloader-main_property_points_to_nothing": "モッド %s のpackage.jsonの主要プロパティは存在しないファイルを指定仕様としています。", - "modloader-missing_akiversion_field": "モッド %s のakiVersion区域が未設定されています。多くの場合、これは古いモッドで、現バージョンのAKIに互換性の問題が生じる恐れがあります。", + "modloader-missing_sptVersion_field": "モッド %s のsptVersion区域が未設定されています。多くの場合、これは古いモッドで、現バージョンのSPTに互換性の問題が生じる恐れがあります。", "modloader-missing_dependency": "モッド {{mod}} の前提条件である {{modDependency}} をインストール必要があります。", "modloader-missing_package_json": "モッド %s のpackage.jsonが見つかりません。", "modloader-missing_package_json_property": "モッド {{modName}} のpackage.json のプロパティ {{prop}} の設定が必要となります。", - "modloader-mod_incompatible": "モッド読み込むツール: モッド互換性の問題が発生しました. 最低限の要求として、モッドがこれらのどちらかのインプリメンツに指名する必要があります： IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "モッド読み込むツール: モッド互換性の問題が発生しました. 最低限の要求として、モッドがこれらのどちらかのインプリメンツに指名する必要があります： IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) は互換性がありません。'main' プロパティが欠落しています", "modloader-async_mod_error": "ModLoader: 非同期Modのロード時にエラーが発生しました: %s", "modloader-no_mods_loaded": "どれかのモッドか複数のモッドにエラーを発見。すべてのモッドの読み込みをスキップしました。", - "modloader-outdated_akiversion_field": "モッド %s は現バージョンのAKIに互換性がありません。問題が発生した場合、問い合わせに対応しかねます。", + "modloader-outdated_sptVersion_field": "モッド %s は現バージョンのSPTに互換性がありません。問題が発生した場合、問い合わせに対応しかねます。", "modloader-outdated_dependency": "モッド {{mod}} の前提条件である {{modDependency}} はバージョン {{requiredVersion}}　を要求されています。現在インストールされているバージョンは {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod フォルダーが見つかりません、フォルダー作成中...", "modloader-mod_order_missing": "ModLoader: order.json が見つかりません。作成中...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "通報しないでください。", "watermark-free_of_charge": "本プログラムは無料です。", "watermark-paid_scammed": "もしお金を支払った場合、あなたは詐欺に遭ってます", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "本バージョンはサーバーモッドを無効に設定しています。", "watermark-no_support": "問い合わせに対応しかねます。", "watermark-not_an_issue": "これは不具合ではありません。", diff --git a/project/assets/database/locales/server/ko.json b/project/assets/database/locales/server/ko.json index 7c16831c..eabae52a 100644 --- a/project/assets/database/locales/server/ko.json +++ b/project/assets/database/locales/server/ko.json @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "모드 순서를 가져오는데 오류가 발생하였습니다", "modloader-incompatibilities_not_string_array": "모드 %s 의 package.json 파일 중 'incompatibilities' 속성은 문자 배열 타입이어야 합니다", "modloader-incompatible_mod_found": "모드 {{author}}-{{name}} 는 {{incompatibleModName}} 모드와 호환되지 않습니다", - "modloader-invalid_akiversion_field": "모드 %s 의 'akiVersion' 속성에 잘못된 semver 값이 설정되어있습니다. 올바른 값의 예제 참조: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "모드 %s 의 'sptVersion' 속성에 잘못된 semver 값이 설정되어있습니다. 올바른 값의 예제 참조: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "모드 %s 의 package.json 은(는) 잘못된 version 문자열을 포함하고 있습니다", "modloader-not_correct_mod_folder": "폴더 (%s) 가 mods 폴더 내에 존재합니다. 모드 설치를 잘못하였습니다. 실수로 모드 내부 파일을 잘못 옮겼을 수도 있습니다. 웹사이트 FAQ를 참조하시고 해당 모드의 SPT 허브 페이지에서 정확한 설치 방법을 확인하세요", "modloader-is_client_mod": "모드 (%s) 는 클라이언트 모드로 '/spt/bepinex/plugins' 폴더에 위치해야 합니다", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: 총 %s 개의 모드 불러오는 중...", "modloader-main_property_not_js": "모드 %s 의 package.json 파일 중 main 속성은 무조건 .js 파일을 설정해야합니다", "modloader-main_property_points_to_nothing": "모드 %s 의 package.json 파일 중 'main' 속성이 존재하지 않는 파일로 설정되어있습니다", - "modloader-missing_akiversion_field": "모드 %s 안에 'akiVersion' 속성이 없습니다, 호환이 되지 않는 SPT-AKI 버전이거나 오래된 버전일 가능성이 높습니다", + "modloader-missing_sptVersion_field": "모드 %s 안에 'sptVersion' 속성이 없습니다, 호환이 되지 않는 SPT 버전이거나 오래된 버전일 가능성이 높습니다", "modloader-missing_dependency": "모드 {{mod}} 는 {{modDependency}} 모드를 요구하며 설치되어있어야 합니다", "modloader-missing_package_json": "모드 (%s) 의 package.json 파일이 없습니다", "modloader-missing_package_json_property": "모드 {{modName}} 의 package.json 파일 중 '{{prop}}' 속성의 값이 요구됩니다", - "modloader-mod_incompatible": "ModLoader: 모드 (%s) 은(는) 호환되지 않는 모드입니다. 다음 중 한 가지 이상의 메소드가 구현되어야 합니다 IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: 모드 (%s) 은(는) 호환되지 않는 모드입니다. 다음 중 한 가지 이상의 메소드가 구현되어야 합니다 IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: 모드 (%s) 은(는) 호환되지 않습니다. 'main' 속성이 부족합니다 ", "modloader-async_mod_error": "ModLoader: 비동기 모드를 로드할 때 오류: %s", "modloader-no_mods_loaded": "모드를 불러오는 중에 오류가 발생하였습니다, 모든 모드가 비활성화되었습니다", - "modloader-outdated_akiversion_field": "모드 %s 는 현재 버전의 SPT-AKI 와 호환되지 않습니다. 오류가 발생할 수 있습니다 - 문제에 대한 문의 및 지원은 없습니다!", + "modloader-outdated_sptVersion_field": "모드 %s 는 현재 버전의 SPT 와 호환되지 않습니다. 오류가 발생할 수 있습니다 - 문제에 대한 문의 및 지원은 없습니다!", "modloader-outdated_dependency": "모드 {{mod}} 는 {{modDependency}} 모드의 {{requiredVersion}} 버전이 요구됩니다. 현재 설치 된 버전은 {{currentVersion}} 입니다", "modloader-user_mod_folder_missing": "ModLoader: user/mods 폴더가 없습니다, 생성 중...", "modloader-mod_order_missing": "ModLoader: order.json이 누락되어 생성 중입니다…", @@ -163,7 +163,7 @@ "payment-not_enough_money_to_complete_transation_short": "거래하기 위한 충분한 소지금이 없습니다", "payment-zero_price_no_payment": "가격이 0 이므로 지불할 필요가 없습니다", "player-attempt_to_increment_skill_with_negative_value": "음수 값으로는 해당 스킬 레벨을 올리지 못함: %s", - "port_already_in_use": "포트 %s 이(가) 이미 사용 중입니다, SPT-AKI 서버가 이미 실행 중인지 확인하세요", + "port_already_in_use": "포트 %s 이(가) 이미 사용 중입니다, SPT 서버가 이미 실행 중인지 확인하세요", "profile_saved": "프로필이 저장되었습니다", "profile_save_callback_error": "onBeforeSaveCallback을 실행하는 동안 오류가 발생했습니다: {{callback}}, {{error}}", "profile-unable_to_find_profile_by_id_cannot_delete": "프로필 id: %s 에 일치하는 프로필이 없어 삭제하지 못했습니다", @@ -247,7 +247,7 @@ "watermark-do_not_report": "리포트 하지마세요", "watermark-free_of_charge": "이 소프트웨어는 무료입니다", "watermark-paid_scammed": "만약 금전적 대가를 지불하였다면, 사기에 당하신 겁니다.", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "이 버전은 모드가 비활성화된 빌드입니다", "watermark-no_support": "문의 및 지원은 없습니다", "watermark-not_an_issue": "이 메시지는 오류 또는 문제가 아닙니다", diff --git a/project/assets/database/locales/server/nl.json b/project/assets/database/locales/server/nl.json index 347f7ab9..c3f46fef 100644 --- a/project/assets/database/locales/server/nl.json +++ b/project/assets/database/locales/server/nl.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[ONBEHANDELDE EVENEMENT] %s", "executing_startup_callbacks": "Server: Uitvoeren van opstart terugkoppelingen...", "fence-unable_to_find_assort_by_id": "Kan assortiment voor verkoper 'Fence' niet vinden voor id: %s", - "fixer-mod_item_found": "Voorwerp: %s gevonden in het profiel dat niet bestaat in de database. Je ZAL fouten tegenkomen. Dit kan komen omdat je een mod die voorwerpen heeft toevoegden aan het spel weer hebt verwijderd. Maar je hebt de voorwerpen niet vooraf verwijderd uit je inventaris voordat je de mod verwijderde. GEBRUIK DIT PROFIEL NIET. Open INSTALATIEFOLDER_SPT\\Aki_Data\\Server\\configs\\core.json en verander de variabel 'removeModItemsFromProfile' van 'false' naar 'true'. Dit maakt het mogelijk dat de server jou profiel aanpast en hopelijk de verwijderde voorwerpen ook daatwerkelijk verwijderd", + "fixer-mod_item_found": "Voorwerp: %s gevonden in het profiel dat niet bestaat in de database. Je ZAL fouten tegenkomen. Dit kan komen omdat je een mod die voorwerpen heeft toevoegden aan het spel weer hebt verwijderd. Maar je hebt de voorwerpen niet vooraf verwijderd uit je inventaris voordat je de mod verwijderde. GEBRUIK DIT PROFIEL NIET. Open INSTALATIEFOLDER_SPT\\SPT_Data\\Server\\configs\\core.json en verander de variabel 'removeModItemsFromProfile' van 'false' naar 'true'. Dit maakt het mogelijk dat de server jou profiel aanpast en hopelijk de verwijderde voorwerpen ook daatwerkelijk verwijderd", "fixer-updated_pockets": "Het onderdeel 'pocket' geupdate naar nieuwe versie '18876' met 3x speciale plekken", "gameevent-bot_not_found": "addEventGearToScavs() - kan geen bot van type %s vinden in database, wordt overgeslagen", "gameevent-no_gear_data": "Geen data voor uitrustingen in seasonalevents.json instellingen voor evenement %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Fout tijdens het parsen van de mod laadvolgorde", "modloader-incompatibilities_not_string_array": "Mod %s package.json property 'incompatibilities' moet een string array zijn", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} is niet compatibel met {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s bevat een invalide semver string in het akiVersion veld. Voorbeelden van valide waarden: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s bevat een invalide semver string in het sptVersion veld. Voorbeelden van valide waarden: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json bevat een invalide versie string", "modloader-not_correct_mod_folder": "Er bestaat een map met de naam (%s) in uw mods map. U heeft een mod onjuist geïnstalleerd. U heeft misschien per ongeluk de inhoud van een mod direct in de mod map uitgepakt. Raadpleeg de websites FAQ en de hub pagina van de mods op hoe mods correct geïnstalleerd kunnen worden", "modloader-is_client_mod": "Mod (%s) is een client mod en moet in de volgende map geplaatst worden: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: %s mods worden ingeladen op server...", "modloader-main_property_not_js": "Mod %s package.json main property moet een .js bestand zijn", "modloader-main_property_points_to_nothing": "Mod %s package.json main property wijst naar een niet bestaand bestand", - "modloader-missing_akiversion_field": "Mod %s mist een akiVersion veld, zeer waarschijnlijk omdat deze verouderd en niet comptatibel is met de huide AKI versie", + "modloader-missing_sptVersion_field": "Mod %s mist een sptVersion veld, zeer waarschijnlijk omdat deze verouderd en niet comptatibel is met de huide SPT versie", "modloader-missing_dependency": "Voor mod {{mod}} moet {{modDependency}} geïnstalleerd zijn.", "modloader-missing_package_json": "Mod (%s) mist een package.json", "modloader-missing_package_json_property": "Mod {{modName}} package.json vereist {{prop}} property", - "modloader-mod_incompatible": "ModLoader: mod niet compatibel. Het moet minstens een van de volgende interfaces implementeren: IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: mod niet compatibel. Het moet minstens een van de volgende interfaces implementeren: IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) is niet compatibel. Het heeft geen 'main' eigenschap", "modloader-async_mod_error": "ModLoader: Fout tijdens het laden van async mod: %s", "modloader-no_mods_loaded": "Er zijn errors gevonden met mods, ER WORDEN GEEN MODS GELADEN", - "modloader-outdated_akiversion_field": "Mod %s is niet compatibel met de huide versie van AKI. Je kan problemen tegenkomen - er wordt geen support geleverd!", + "modloader-outdated_sptVersion_field": "Mod %s is niet compatibel met de huide versie van SPT. Je kan problemen tegenkomen - er wordt geen support geleverd!", "modloader-outdated_dependency": "Mod {{mod}} vereist {{modDependency}} versie {{requiredVersion}}. Huidige versie is {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod map mist en wordt aangemaakt...", "modloader-mod_order_missing": "ModLoader: order.json mist, wordt aangemaakt...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "RAPPORTEER HET NIET", "watermark-free_of_charge": "Dit werk is gratis", "watermark-paid_scammed": "Als je geld hebt betaald ben je afgezet", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "DEZE BUILD HEEFT SERVER MODDEN UITGESCHAKELD", "watermark-no_support": "ER WORDT GEEN SUPPORT GEGEVEN", "watermark-not_an_issue": "DIT IS GEEN PROBLEEM", diff --git a/project/assets/database/locales/server/no.json b/project/assets/database/locales/server/no.json index 3f311f34..da8787cb 100644 --- a/project/assets/database/locales/server/no.json +++ b/project/assets/database/locales/server/no.json @@ -58,7 +58,7 @@ "event-unhandled_event": "[UNHÅNDTERT HENDELSE] %s", "executing_startup_callbacks": "Server: Utfører start-callbacks...", "fence-unable_to_find_assort_by_id": "Kunne ikke finne Fence assortement for id: %s", - "fixer-mod_item_found": "Element: %s funnet i profilen som ikke finnes i produkt db. du KOMMER TIL å oppleve feil, det kan være på grunn av bruk av en item mod og fjerning av modden uten å slette de modifiserte elementene fra inventaret ditt. IKKE BRUK DENNE PROFILEN. Åpne Aki_Data\\Server\\configs\\core.json, rediger 'removeModItemsFromProfile' til å være sann. Dette vil tillate at serveren redigerer profilen din og forhåpentligvis fjerner de dårlige elementene", + "fixer-mod_item_found": "Element: %s funnet i profilen som ikke finnes i produkt db. du KOMMER TIL å oppleve feil, det kan være på grunn av bruk av en item mod og fjerning av modden uten å slette de modifiserte elementene fra inventaret ditt. IKKE BRUK DENNE PROFILEN. Åpne SPT_Data\\Server\\configs\\core.json, rediger 'removeModItemsFromProfile' til å være sann. Dette vil tillate at serveren redigerer profilen din og forhåpentligvis fjerner de dårlige elementene", "fixer-updated_pockets": "Oppdaterte 'pocket' elementet til ny versjon 18876 med x3 spesialplasser", "gameevent-bot_not_found": "addEventGearToScavs() - ute av stand til å finne bot av type %s i databasen, hopper over", "gameevent-no_gear_data": "Ingen utstyrsdata i sesonghendelser.json config for hendelse %s", @@ -129,7 +129,7 @@ "modloader-error_parsing_mod_load_order": "Feil under parsing av mod lastings rekkefølge", "modloader-incompatibilities_not_string_array": "Mod %s package.json egenskaps 'inkompatibiliteter' bør være en streng array", "modloader-incompatible_mod_found": "Mod {{author}}–{{name}} er inkompatibel med {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s inneholder en ugyldig semver streng i akiVersjonsfeltet. Eksempler på gyldige verdier: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s inneholder en ugyldig semver streng i sptVersjonsfeltet. Eksempler på gyldige verdier: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s pakke.json inneholder en ugyldig versjonstreng", "modloader-not_correct_mod_folder": "En mappe kalt (%s) finnes i din mods-mappe. Du har installert en mod på feil måte. Du kan ha utpakket ut innholdet av en mod direkte inn i mod mappen ved en feil. Se nettstedets FAQ og mods hub-sider angående hvordan du installerer mods riktig", "modloader-is_client_mod": "Mod (%s) er en klientmod og skal plasseres i følgende mappe: /spt/bepinex/plugins", @@ -140,15 +140,15 @@ "modloader-loading_mods": "ModLoader: laster inn %s server mods...", "modloader-main_property_not_js": "Mod %s package.json hovedegenskap må være en .js-fil", "modloader-main_property_points_to_nothing": "Mod %s package.json hovedegenskap peker til en ikke-eksisterende fil", - "modloader-missing_akiversion_field": "Mod %s mangler akiVersion feltet, sannsynligvis fordi den er foreldet og er inkompatibel med gjeldende versjon av AKI", + "modloader-missing_sptVersion_field": "Mod %s mangler sptVersion feltet, sannsynligvis fordi den er foreldet og er inkompatibel med gjeldende versjon av SPT", "modloader-missing_dependency": "Mod {{mod}} krever at {{modDependency}} er installert.", "modloader-missing_package_json": "Mod (%s) mangler package.json. Sørg for at du har sjekket mods hub-siden for installasjonsinstruksjoner", "modloader-missing_package_json_property": "Mod {{modName}} package.json krever {{prop}} egenskap", - "modloader-mod_incompatible": "Modloader: Mod (%s) er ikke kompatibel. Den må implementere minst en av IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "Modloader: Mod (%s) er ikke kompatibel. Den må implementere minst en av IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) er ikke kompatibel. Den mangler en hovedegenskap", "modloader-async_mod_error": "ModLoader: Feil ved lasting av async mod: %s", "modloader-no_mods_loaded": "Feil ble funnet med mods, INGEN MODS VIL BLI LASTET", - "modloader-outdated_akiversion_field": "Mod %s er ikke kompatibel med gjeldende versjon av AKI. Du kan oppleve problemer - ingen støtte vil bli gitt!", + "modloader-outdated_sptVersion_field": "Mod %s er ikke kompatibel med gjeldende versjon av SPT. Du kan oppleve problemer - ingen støtte vil bli gitt!", "modloader-outdated_dependency": "Mod {{mod}} krever {{modDependency}} versjon {{requiredVersion}}. Gjeldende installerte versjon er {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod mappe mangler, oppretter...", "modloader-mod_order_missing": "ModLoader: order.json mangler, oppretter...", @@ -196,7 +196,7 @@ "watermark-do_not_report": "IKKE RAPPORTER DET", "watermark-free_of_charge": "Dette arbeidet er gjort gratis og uten vederlag", "watermark-paid_scammed": "Om du har betalt penger for dette, har du blitt lurt", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "DETTE BUILDET HAR SERVER MODDING DEAKTIVERT", "watermark-no_support": "INGEN STØTTE VIL BLI GITT", "watermark-not_an_issue": "DETTE ER IKKE ET PROBLEM", diff --git a/project/assets/database/locales/server/pl.json b/project/assets/database/locales/server/pl.json index 038ac7af..f9acc127 100644 --- a/project/assets/database/locales/server/pl.json +++ b/project/assets/database/locales/server/pl.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[NIEOBSŁUGIWANE ZDARZENIE] %s", "executing_startup_callbacks": "Serwer: wykonywanie funkcji zwrotnych uruchomienia...", "fence-unable_to_find_assort_by_id": "Nie można znaleźć asortymentu pasera o id: %s", - "fixer-mod_item_found": "Przedmiot: %s znaleziono w profilu, który nie istnieje w bazie przedmiotów. Doświadczysz błędów. Może to być spowodowane użyciem modów przedmiotów i usunięciem modu bez usunięcia zmodyfikowanych przedmiotów z ekwipunku. NIE UŻYWAJ TEGO PROFILU. Otwórz Aki_Data\\Server\\configs\\core.json, zmień 'removeModItemsFromProfile' na wartość \"true\". Pozwoli to serwerowi na edytowanie twojego profilu i miejmy nadzieję usunięcie wadliwych przedmiotów", + "fixer-mod_item_found": "Przedmiot: %s znaleziono w profilu, który nie istnieje w bazie przedmiotów. Doświadczysz błędów. Może to być spowodowane użyciem modów przedmiotów i usunięciem modu bez usunięcia zmodyfikowanych przedmiotów z ekwipunku. NIE UŻYWAJ TEGO PROFILU. Otwórz SPT_Data\\Server\\configs\\core.json, zmień 'removeModItemsFromProfile' na wartość \"true\". Pozwoli to serwerowi na edytowanie twojego profilu i miejmy nadzieję usunięcie wadliwych przedmiotów", "fixer-updated_pockets": "Zaktualizowano przedmiot 'pocket' do nowej wersji 18876 z x3 specjalnych miejsc", "gameevent-bot_not_found": "addEventGearToScavs() - nie można znaleźć bota o typie %s w bazie danych, pomijanie", "gameevent-no_gear_data": "Brak danych o wyposażeniu w pliku konfiguracyjnym seasonalevents.json dla wydarzenia %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Błąd analizowania kolejności ładowania modów", "modloader-incompatibilities_not_string_array": "Mod %s właściwość package.json 'incompatibilities' powinna być tabelą string", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} jest niezgodny z {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s zawiera nieprawidłowy string semver w polu akiVersion. Przykłady prawidłowych wartości: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s zawiera nieprawidłowy string semver w polu sptVersion. Przykłady prawidłowych wartości: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json zawiera nieprawidłowy string wersji", "modloader-not_correct_mod_folder": "Folder o nazwie (%s) istnieje w twoim folderze modów. Niepoprawnie zainstalowałeś moda. Możliwe, że wypakowałeś zawartości moda prosto do foldera modów przez pomyłkę. Odnieś się do FAQ na stronie internetowej i do strony hub moda, aby poprawnie go zainstalować", "modloader-is_client_mod": "Mod (%s) jest modem klienta i powinien zostać umieszczony w następującym folderze: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: ładowanie %s modów serwera...", "modloader-main_property_not_js": "Główna właściwość package.json modu %s musi być plikiem .js", "modloader-main_property_points_to_nothing": "Podstawowa właściwość package.json modu %s wskazuje na nieistniejący plik", - "modloader-missing_akiversion_field": "Mod %s nie zawiera pola akiVersion, najprawdopodobniej z powodu przedawnienia i niezgodności z aktualną wersją AKI", + "modloader-missing_sptVersion_field": "Mod %s nie zawiera pola sptVersion, najprawdopodobniej z powodu przedawnienia i niezgodności z aktualną wersją SPT", "modloader-missing_dependency": "Mod {{mod}} wymaga zainstalowania modu {{modDependency}}.", "modloader-missing_package_json": "Mod (%s) nie zawiera package.json. Sprawdź czy sprawdziłeś instrukcję instalowania modyfikacji na stronie", "modloader-missing_package_json_property": "Mod {{modName}} package.json wymaga {{prop}} właściwości", - "modloader-mod_incompatible": "ModLoader: Mod (%s) jest niezgodny. Musi implementować co najmniej jedno z IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Mod (%s) jest niezgodny. Musi implementować co najmniej jedno z IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) jest niekompatybilny. Brakuje właściwości \"głównej\"", "modloader-async_mod_error": "ModLoader: Błąd podczas ładowania modu asynchronicznego: %s", "modloader-no_mods_loaded": "Znaleziono błędy związane z modami, ŻADNE MODY NIE ZOSTANĄ ZAŁADOWANE", - "modloader-outdated_akiversion_field": "Mod %s nie jest kompatybilny z aktualną wersją AKI. Mogą wystąpić problemy - nie zostanie udzielone żadne wsparcie!", + "modloader-outdated_sptVersion_field": "Mod %s nie jest kompatybilny z aktualną wersją SPT. Mogą wystąpić problemy - nie zostanie udzielone żadne wsparcie!", "modloader-outdated_dependency": "Mod {{mod}} wymaga moda {{modDependency}} w wersji {{requiredVersion}}. Obecnie zainstalowana wersja to {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: brak folderu user/mod, tworzenie...", "modloader-mod_order_missing": "ModLoader: brak order.json, tworzenie...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "NIE ZGŁASZAJ TEGO", "watermark-free_of_charge": "Ta praca jest darmowa", "watermark-paid_scammed": "Jeśli zapłaciłeś pieniądze, zostałeś oszukany", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "TA WERSJA MA WYŁĄCZONE MODYFIKACJE SERWERA", "watermark-no_support": "NIE UDZIELAMY WSPARCIA", "watermark-not_an_issue": "TO NIE JEST PROBLEM", diff --git a/project/assets/database/locales/server/pt-br.json b/project/assets/database/locales/server/pt-br.json index 6ed9ec22..d56dda8f 100644 --- a/project/assets/database/locales/server/pt-br.json +++ b/project/assets/database/locales/server/pt-br.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[EVENTO NÃO TRATADO] %s", "executing_startup_callbacks": "Servidor: executando retornos de chamada de inicialização...", "fence-unable_to_find_assort_by_id": "Não foi possível encontrar a variedade (assort) do fence para o ID: %s", - "fixer-mod_item_found": "Item: %s encontrado no perfil que não existe no banco de dados de itens. Você IRÁ enfrentar erros, isso pode ocorrer ao usar um mod de itens e remover o mod sem excluir os itens modificados do seu inventário. NÃO USE ESTE PERFIL. Abra Aki_Data\\Server\\configs\\core.json, edite 'removeModItemsFromProfile' para true. Isso permitirá que o servidor edite seu perfil e, esperançosamente, remova os itens problemáticos", + "fixer-mod_item_found": "Item: %s encontrado no perfil que não existe no banco de dados de itens. Você IRÁ enfrentar erros, isso pode ocorrer ao usar um mod de itens e remover o mod sem excluir os itens modificados do seu inventário. NÃO USE ESTE PERFIL. Abra SPT_Data\\Server\\configs\\core.json, edite 'removeModItemsFromProfile' para true. Isso permitirá que o servidor edite seu perfil e, esperançosamente, remova os itens problemáticos", "fixer-updated_pockets": "Atualizado o item 'bolso' para a nova versão 18876 com x3 slots especiais", "gameevent-bot_not_found": "addEventGearToScavs() - não foi possível encontrar o bot do tipo %s no banco de dados, ignorando", "gameevent-no_gear_data": "Sem dados de equipamento no arquivo de configuração seasonalevents.json para o evento %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Erro ao analisar a ordem de carregamento do mod", "modloader-incompatibilities_not_string_array": "A propriedade 'incompatibilities' do arquivo package.json do mod %s deveria ser uma matriz de strings", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} é incompatível com {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "O mod %s contém uma string semver inválida no campo akiVersion. Exemplos de valores válidos podem ser encontrados em: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "O mod %s contém uma string semver inválida no campo sptVersion. Exemplos de valores válidos podem ser encontrados em: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json contém uma string de versão inválida", "modloader-not_correct_mod_folder": "Existe uma pasta chamada (%s) em sua pasta de mods. Você instalou incorretamente um mod. Pode ser que você tenha extraído o conteúdo de um mod diretamente na pasta de mods por engano. Consulte as FAQs do site e a página do hub de mods sobre como instalar mods corretamente", "modloader-is_client_mod": "O mod (%s) é um mod de cliente e deve ser colocado na seguinte pasta: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: carregando mods do servidor %s...", "modloader-main_property_not_js": "O arquivo package.json do mod %s deve ter a propriedade main como um arquivo .js", "modloader-main_property_points_to_nothing": "A propriedade principal mod %s package.json aponta para um arquivo inexistente", - "modloader-missing_akiversion_field": "O mod %s está sem o campo akiVersion, provavelmente devido a estar desatualizado e incompatível com a versão atual do AKI", + "modloader-missing_sptVersion_field": "O mod %s está sem o campo sptVersion, provavelmente devido a estar desatualizado e incompatível com a versão atual do SPT", "modloader-missing_dependency": "O mod {{mod}} requer a instalação de {{modDependency}}.", "modloader-missing_package_json": "O Mod (%s) está sem o arquivo package.json. Certifique-se de ter verificado a página de instruções de instalação no hub de mods", "modloader-missing_package_json_property": "Mod {{modName}} package.json requer a propriedade {{prop}}", - "modloader-mod_incompatible": "ModLoader: Mod (%s) é incompatível. Ele deve implementar pelo menos um dos modelos IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: Mod (%s) é incompatível. Ele deve implementar pelo menos um dos modelos IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) é incompatível. Ele não possui uma propriedade 'main'", "modloader-async_mod_error": "ModLoader: Erro ao carregar mod assíncrono: %s", "modloader-no_mods_loaded": "Foram encontrados erros nos mods, NENHUM MOD SERÁ CARREGADO", - "modloader-outdated_akiversion_field": "O mod %s não é compatível com a versão atual do AKI. Você pode encontrar erros - nenhum suporte será fornecido!", + "modloader-outdated_sptVersion_field": "O mod %s não é compatível com a versão atual do SPT. Você pode encontrar erros - nenhum suporte será fornecido!", "modloader-outdated_dependency": "O mod {{mod}} requer a versão {{modDependency}} {{requiredVersion}}. A versão atual instalada é {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: pasta de usuário/mod ausente, criando...", "modloader-mod_order_missing": "ModLoader: order.json não encontrado, criando...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "NÃO RELATE ISSO", "watermark-free_of_charge": "Esse trabalho é gratuito", "watermark-paid_scammed": "Se você pagou, você foi escamado", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "ESTA VERSÃO TEM OS MODS DO SERVIDOR DESATIVADO", "watermark-no_support": "NÃO SERÁ FORNECIDO NENHUM SUPORTE", "watermark-not_an_issue": "ISSO NÃO É UM PROBLEMA", diff --git a/project/assets/database/locales/server/pt-pt.json b/project/assets/database/locales/server/pt-pt.json index 9604efeb..ce26f915 100644 --- a/project/assets/database/locales/server/pt-pt.json +++ b/project/assets/database/locales/server/pt-pt.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[EVENTO NÃO TRATADO] %s", "executing_startup_callbacks": "Servidor: executando chamadas de inicialização...", "fence-unable_to_find_assort_by_id": "Não foi possível encontrar o item com id: %s no assort do Fence", - "fixer-mod_item_found": "Item: %s foi encontrado no perfil e não existe na base de dados de itens. Você IRÁ receber erros, isto pode ocorrer ao usar um mod de itens e remover o mod sem excluir os itens modificados do seu inventário. NÃO UTILIZE ESTE PERFIL. Abra 'Aki_Data\\Server\\configs\\core.json', edite o valor de 'removeModItemsFromProfile' para 'true'. Isso permitirá que o servidor edite o seu perfil e, se tudo der certo, remover os itens problemáticos", + "fixer-mod_item_found": "Item: %s foi encontrado no perfil e não existe na base de dados de itens. Você IRÁ receber erros, isto pode ocorrer ao usar um mod de itens e remover o mod sem excluir os itens modificados do seu inventário. NÃO UTILIZE ESTE PERFIL. Abra 'SPT_Data\\Server\\configs\\core.json', edite o valor de 'removeModItemsFromProfile' para 'true'. Isso permitirá que o servidor edite o seu perfil e, se tudo der certo, remover os itens problemáticos", "fixer-updated_pockets": "Item 'pocket' atualizado para nova versão 18876 com 3 novos slots especiais", "gameevent-bot_not_found": "addEventGearToScavs() - não foi possível encontrar bot do tipo %s na base de dados, ignorando", "gameevent-no_gear_data": "Sem dados de equipamento na configuração seasonalevents.json para o evento %s", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Erro ao analisar ordem de carregamento de mods", "modloader-incompatibilities_not_string_array": "A propriedade 'incompatibilities' no package.json do mod %s deve ser um array de strings", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} é incompatível com {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "O Mod %s contém uma string de semver inválida no campo akiVersion. Exemplos de valores válidos: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "O Mod %s contém uma string de semver inválida no campo sptVersion. Exemplos de valores válidos: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "O package.json do Mod %s contém uma string de versão inválida", "modloader-not_correct_mod_folder": "Uma pasta chamada (%s) existe na tua pasta de mods. Instalaste um mod incorretamente. Podes ter extraído o conteúdo de um mod diretamente na pasta do mod por engano. Consulta o FAQ do site e a página do mod no hub para saberes como instalar mods corretamente", "modloader-is_client_mod": "Mod (%s) é um mod de cliente e deve ser colocado na seguinte pasta: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: carregando %s mods de servidor...", "modloader-main_property_not_js": "A propriedade main no package.json do mod %s deve ser um ficheiro .js", "modloader-main_property_points_to_nothing": "A propriedade main no package.json do mod %s aponta para um ficheiro que não existe", - "modloader-missing_akiversion_field": "Mod %s tem o campo akiVersion em falta, muito provavelmente por estar desatualizado e incompatível com a versão atual do AKI", + "modloader-missing_sptVersion_field": "Mod %s tem o campo sptVersion em falta, muito provavelmente por estar desatualizado e incompatível com a versão atual do SPT", "modloader-missing_dependency": "Mod {{mod}} requer que {{modDependency}} seja instalado.", "modloader-missing_package_json": "Mod (%s) está faltando package.json. Tenha certeza que você checou a página de mods hub para as intruções de instalação", "modloader-missing_package_json_property": "O package.json do mod {{modName}} requer a propriedade {{prop}}", - "modloader-mod_incompatible": "ModLoader: Mod (%s) é incompatível. Ele deve implementar pelo menos um de IPostAkiLoadMod, IPostDBLoadMod, IPreAkiMod", + "modloader-mod_incompatible": "ModLoader: Mod (%s) é incompatível. Ele deve implementar pelo menos um de IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) é incompatível. Falta uma propriedade 'main'", "modloader-async_mod_error": "ModLoader: Erro ao carregar o mod assíncrono: %s", "modloader-no_mods_loaded": "Erros foram encontrados com mods, NENHUM MODS SERÁ CARREGADO", - "modloader-outdated_akiversion_field": "Mod %s não é compatível com a versão atual do AKI. Você pode encontrar problemas - nenhum suporte será fornecido!", + "modloader-outdated_sptVersion_field": "Mod %s não é compatível com a versão atual do SPT. Você pode encontrar problemas - nenhum suporte será fornecido!", "modloader-outdated_dependency": "Mod {{mod}} requer {{modDependency}} versão {{requiredVersion}}. A versão atual instalada é {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: pasta user/mod não foi encontrada, criando...", "modloader-mod_order_missing": "ModLoader: order.json está faltando, criando...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "NÃO REPORTAR", "watermark-free_of_charge": "Este trabalho é gratuito", "watermark-paid_scammed": "Se pagaste dinheiro, foste burlado", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "ESTA VERSÃO IMPOSSIBILITA O USO DE MODS PARA SERVER", "watermark-no_support": "NENHUM SUPORTE SERÁ DADO", "watermark-not_an_issue": "ISTO NÃO É UM PROBLEMA", diff --git a/project/assets/database/locales/server/ru.json b/project/assets/database/locales/server/ru.json index a3a9df14..00a9e1b5 100644 --- a/project/assets/database/locales/server/ru.json +++ b/project/assets/database/locales/server/ru.json @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Ошибка парсинга порядка загрузки модов", "modloader-incompatibilities_not_string_array": "В файле package.json мода %s свойство 'incompatibilities' должно быть массивом строк", "modloader-incompatible_mod_found": "Мод {{author}}-{{name}} не совместим с модом {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "В моде %s содержится недопустимая строка semver в поле akiVersion. Примеры допустимых значений: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "В моде %s содержится недопустимая строка semver в поле sptVersion. Примеры допустимых значений: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "В моде %s package.json содержит недопустимую строку версии", "modloader-not_correct_mod_folder": "Папка с именем (%s) существует в папке модов. Вы неверно установили мод. Возможно, вы случайно распаковали содержимое мода непосредственно в папку модов. Посетите наш веб-сайт и FAQ о том как правильно установить моды", "modloader-is_client_mod": "Мод (%s) является модом для клиента и должен находиться в следующей папке: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "Загрузчик модов: загружаем %s мод(ов/а)...", "modloader-main_property_not_js": "В файле package.json мода %s в свойстве 'main' должен быть указан .js файл", "modloader-main_property_points_to_nothing": "В файле package.json мода %s свойство 'main' указывает на несуществующий файл", - "modloader-missing_akiversion_field": "Мод %s не имеет строки akiVersion, скорее всего данный мод является очень старым и несовместим с текущей версией AKI", + "modloader-missing_sptVersion_field": "Мод %s не имеет строки sptVersion, скорее всего данный мод является очень старым и несовместим с текущей версией SPT", "modloader-missing_dependency": "Мод {{mod}} требует {{modDependency}} для правильной работы.", "modloader-missing_package_json": "В моде (%s) отсутствует package.json", "modloader-missing_package_json_property": "В моде {{modName}} файл package.json требует следующее свойство: {{prop}} ", - "modloader-mod_incompatible": "Загрузчик модов: Мод (%s) несовместим, он должен наследовать как минимум один из интерфейсов: IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod", + "modloader-mod_incompatible": "Загрузчик модов: Мод (%s) несовместим, он должен наследовать как минимум один из интерфейсов: IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Мод (%s) несовместим. У него отсутствует свойство 'main'", "modloader-async_mod_error": "Загрузчик модов: Ошибка при загрузке асинхронного мода: %s", "modloader-no_mods_loaded": "Были обнаружены ошибки в модах, МОДЫ НЕ БУДУТ ЗАГРУЖЕНЫ", - "modloader-outdated_akiversion_field": "Мод %s не совместим с текущей версией AKI. Возможны проблемы - поддержки не будет!", + "modloader-outdated_sptVersion_field": "Мод %s не совместим с текущей версией SPT. Возможны проблемы - поддержки не будет!", "modloader-outdated_dependency": "Мод {{mod}} требует {{modDependency}} версии {{requiredVersion}}. Текущая установленная версия - {{currentVersion}}", "modloader-user_mod_folder_missing": "Загрузчик модов: папка user/mod отсутствует, создаем...", "modloader-mod_order_missing": "Загрузчик модов: файл order.json отсутствует, создаем...", @@ -248,7 +248,7 @@ "watermark-do_not_report": "НЕ ОТПРАВЛЯЙТЕ БАГ-РЕПОРТ НАСЧЕТ ЭТОГО", "watermark-free_of_charge": "Данный проект является бесплатным", "watermark-paid_scammed": "Если вы заплатили деньги, вас обманули", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "В ЭТОЙ СБОРКЕ ОТСУТСТВУЮТ ВОЗМОЖНОСТИ МОДИФИКАЦИИ", "watermark-no_support": "ПОДДЕРЖКА НЕ БУДЕТ ОКАЗЫВАТЬСЯ", "watermark-not_an_issue": "ЭТО НЕ ОШИБКА", diff --git a/project/assets/database/locales/server/sv-se.json b/project/assets/database/locales/server/sv-se.json index 3fa917ad..56a721fd 100644 --- a/project/assets/database/locales/server/sv-se.json +++ b/project/assets/database/locales/server/sv-se.json @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Fel vid analys av modladdningsordning", "modloader-incompatibilities_not_string_array": "Mod %s package.json-egenskapen 'incompatibilities' bör vara en strängmatris", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}} är inkompatibel med {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "Mod %s innehåller en ogiltig semversträng i akiVersion-fältet. Exempel på giltiga värden: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s innehåller en ogiltig semversträng i sptVersion-fältet. Exempel på giltiga värden: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json innehåller en ogiltig versionssträng", "modloader-not_correct_mod_folder": "En mapp som heter (%s) finns i din moddmapp. Du har felaktigt installerat en mod. Du kan ha extraherat innehållet i en mod direkt in i mappen av misstag. Se webbplatsens FAQ och moddarnas hub-sida om hur du installerar mods korrekt", "modloader-is_client_mod": "Mod (%s) är en klientmod och bör placeras i följande mapp: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: laddar %s mods...", "modloader-main_property_not_js": "Mod %s package.json huvudegenskap måste vara en .js-fil", "modloader-main_property_points_to_nothing": "Mod %s package.json huvudegenskap pekar på en icke-existerande fil", - "modloader-missing_akiversion_field": "Mod %s saknar akiVersion-fältet, troligen på grund av att den är inaktuell och inkompatibel med den aktuella versionen av AKI", + "modloader-missing_sptVersion_field": "Mod %s saknar sptVersion-fältet, troligen på grund av att den är inaktuell och inkompatibel med den aktuella versionen av SPT", "modloader-missing_dependency": "Mod {{mod}} kräver att {{modDependency}} är installerad.", "modloader-missing_package_json": "Mod (%s) saknas package.json", "modloader-missing_package_json_property": "Mod {{modName}} package.json kräver egenskapen {{prop}}", - "modloader-mod_incompatible": "ModLoader: mod inkompatibel. Den måste implementera minst en av IPostAkiLoadMod, IPostDBLoadMod, IpreAkiLoadMod", + "modloader-mod_incompatible": "ModLoader: mod inkompatibel. Den måste implementera minst en av IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) är inkompatibel. Den saknar en 'main' egenskap", "modloader-async_mod_error": "ModLoader: Fel vid inläsning av asynkront mod: %s", "modloader-no_mods_loaded": "Fel hittades med mods, INGA MODS KOMMER ATT LADAS", - "modloader-outdated_akiversion_field": "Mod %s är inte kompatibel med den aktuella versionen av AKI. Du kan stöta på problem - ingen support kommer att tillhandahållas!", + "modloader-outdated_sptVersion_field": "Mod %s är inte kompatibel med den aktuella versionen av SPT. Du kan stöta på problem - ingen support kommer att tillhandahållas!", "modloader-outdated_dependency": "Mod {{mod}} kräver {{modDependency}} version {{requiredVersion}}. Aktuell installerad version är {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: användare/mod-mapp saknas, skapar...", "modloader-mod_order_missing": "ModLoader: order.json saknas, skapar...", @@ -247,7 +247,7 @@ "watermark-do_not_report": "RAPPORTERA DET INTE", "watermark-free_of_charge": "Detta arbete är kostnadsfritt", "watermark-paid_scammed": "Om du har betalat pengar har du blivit lurad", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "DENNA BYGGNAD HAR SERVERMODNING INAKTIVERAD", "watermark-no_support": "INGET STÖD KOMMER ATT GIVES", "watermark-not_an_issue": "DETTA ÄR INTE ETT PROBLEM", diff --git a/project/assets/database/locales/server/tr.json b/project/assets/database/locales/server/tr.json index 0338020d..d8af0352 100644 --- a/project/assets/database/locales/server/tr.json +++ b/project/assets/database/locales/server/tr.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[IŞLENMEMIŞ ETKINLIK] %s", "executing_startup_callbacks": "Sunucu:callback aramaları başlatılıyor...", "fence-unable_to_find_assort_by_id": "Id: %s Fence için assort verisi bulunamıyor", - "fixer-mod_item_found": "Eşya: %s, eşya veritabanında bulunmayan profilde bulundu. Hatalarla karşılaşacaksınız, bunun nedeni bir eşya modu kullanmak ve modlanmış eşyaları envanterinizden silmeden modu kaldırmak olabilir. BU PROFILI KULLANMAYIN. Aki_Data\\Server\\configs\\core.json dosyasını açın, 'removeModItemsFromProfile' seçeneğini true olacak şekilde düzenleyin. Bu, sunucunun profilinizi düzenlemesine ve umarım kötü öğeleri kaldırmasına izin verecektir", + "fixer-mod_item_found": "Eşya: %s, eşya veritabanında bulunmayan profilde bulundu. Hatalarla karşılaşacaksınız, bunun nedeni bir eşya modu kullanmak ve modlanmış eşyaları envanterinizden silmeden modu kaldırmak olabilir. BU PROFILI KULLANMAYIN. SPT_Data\\Server\\configs\\core.json dosyasını açın, 'removeModItemsFromProfile' seçeneğini true olacak şekilde düzenleyin. Bu, sunucunun profilinizi düzenlemesine ve umarım kötü öğeleri kaldırmasına izin verecektir", "fixer-updated_pockets": "'Cep' öğesi x3 özel yuvalı yeni 18876 sürümüne güncellendi", "gameevent-bot_not_found": "addEventGearToScavs() - veritabanında %s türünde bot bulunamıyor, atlanıyor", "gameevent-no_gear_data": "Seasonalevents.json yapılandırmasında %s etkinliği için dişli verisi yok", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "Mod yükleme sırası ayrıştırılırken hata oluştu", "modloader-incompatibilities_not_string_array": "Mod %s package.json özelliği 'incompatibilities' bir dize dizisi olmalıdır", "modloader-incompatible_mod_found": "Mod {{author}}-{{name}}, {{incompatibleModName}} ile uyumsuz", - "modloader-invalid_akiversion_field": "Mod %s, akiVersion alanında geçersiz bir semver dizesi içeriyor. Geçerli değerlere örnekler: https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "Mod %s, sptVersion alanında geçersiz bir semver dizesi içeriyor. Geçerli değerlere örnekler: https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "Mod %s package.json geçersiz bir sürüm dizesi içeriyor", "modloader-not_correct_mod_folder": "Modlar klasörünüzde (%s) adında bir klasör var. Bir modu yanlış yüklediniz. Bir modun içeriğini yanlışlıkla doğrudan mod klasörüne çıkarmış olabilirsiniz. Modların doğru şekilde nasıl yükleneceği hakkında web siteleri SSS ve modlar merkezi sayfasına bakın", "modloader-is_client_mod": "Mod (%s) bir istemci modudur ve aşağıdaki klasöre yerleştirilmelidir: /spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "ModLoader: %s sunucu modları yükleniyor...", "modloader-main_property_not_js": "Mod %s package.json ana özelliği bir .js dosyası olmalıdır", "modloader-main_property_points_to_nothing": "Mod %s package.json ana özelliği mevcut olmayan dosyaya işaret ediyor", - "modloader-missing_akiversion_field": "Mod %s'de akiVersion alanı eksik, bunun nedeni büyük olasılıkla güncel olmaması ve mevcut AKI sürümüyle uyumsuz olması", + "modloader-missing_sptVersion_field": "Mod %s'de sptVersion alanı eksik, bunun nedeni büyük olasılıkla güncel olmaması ve mevcut SPT sürümüyle uyumsuz olması", "modloader-missing_dependency": "Mod {{mod}}, {{modDependency}}'nin yüklenmesini gerektirir.", "modloader-missing_package_json": "Mod (%s) eksik package.json. Yükleme talimatları için mods hub sayfasını kontrol ettiğinizden emin olun", "modloader-missing_package_json_property": "Mod {{modName}} package.json {{prop}} özelliği gerektirir", - "modloader-mod_incompatible": "ModLoader: Mod (%s) uyumsuz. IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod'dan en az birini uygulamalıdır", + "modloader-mod_incompatible": "ModLoader: Mod (%s) uyumsuz. IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod'dan en az birini uygulamalıdır", "modloader-mod_has_no_main_property": "ModLoader: Mod (%s) uyumsuz. Bir 'main' özelliği yok", "modloader-async_mod_error": "ModLoader: Async mod yüklenirken hata oluştu: %s", "modloader-no_mods_loaded": "Modlarda hata bulundu, HİÇBİR MOD YÜKLENMEYECEK", - "modloader-outdated_akiversion_field": "Mod %s, AKI'nin mevcut sürümü ile uyumlu değildir. Sorunlarla karşılaşabilirsiniz - destek sağlanmayacaktır!", + "modloader-outdated_sptVersion_field": "Mod %s, SPT'nin mevcut sürümü ile uyumlu değildir. Sorunlarla karşılaşabilirsiniz - destek sağlanmayacaktır!", "modloader-outdated_dependency": "Mod {{mod}}, {{modDependency}} sürüm {{requiredVersion}} gerektirir. Şu anda yüklü olan sürüm {{currentVersion}}", "modloader-user_mod_folder_missing": "ModLoader: user/mod klasörü eksik, oluşturuluyor...", "modloader-mod_order_missing": "ModLoader: order.json eksik, oluşturuluyor...", @@ -247,8 +247,8 @@ "watermark-discord_url": "https://discord.sp-tarkov.com", "watermark-do_not_report": "SAKIN BİLDİRMEYİN", "watermark-free_of_charge": "Bu çalışma ücretsizdir", - "watermark-paid_scammed": "Spt-Aki 'ye Para ödediyseniz dolandırılmışsınızdır", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-paid_scammed": "SPT 'ye Para ödediyseniz dolandırılmışsınızdır", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "BU YAPIDA SUNUCU MODLAMASI DEVRE DIŞI BIRAKILMIŞTIR", "watermark-no_support": "HİÇBİR DESTEK VERİLMEYECEK", "watermark-not_an_issue": "BU BİR HATA DEĞİL", diff --git a/project/assets/database/locales/server/zh-TW.json b/project/assets/database/locales/server/zh-TW.json index 7cbbaf4b..3cb3678c 100644 --- a/project/assets/database/locales/server/zh-TW.json +++ b/project/assets/database/locales/server/zh-TW.json @@ -71,7 +71,7 @@ "modloader-cyclic_dependency": "發現Cyclic dependency(循環依賴). 此錯誤必須修復. 修復前伺服器無法啟動, 伺服器將關閉", "modloader-load_order_conflict": "模組 `{{modOneName}}` 和模組 `{{modTwoName}}` 發現載入順序的衝突, 修復前伺服器無法啟動, 伺服器將關閉", "modloader-loading_mods": "ModLoader: 載入伺服器模組 %s 中...", - "modloader-mod_incompatible": "ModLoader: 模組 (%s) 不相容. 必須為 IPostAkiLoadMod, IPostDBLoadMod, IPreAkiLoadMod 其中一個", + "modloader-mod_incompatible": "ModLoader: 模組 (%s) 不相容. 必須為 IPostSptLoadMod, IPostDBLoadMod, IPreSptLoadMod 其中一個", "modloader-mod_has_no_main_property": "ModLoader: 模組 (%s) 不相容. 缺少一個 'main' 屬性", "modloader-async_mod_error": "ModLoader: 載入async模組: %s 發生錯誤", "modloader-user_mod_folder_missing": "ModLoader: 沒找到 user/mod 資料夾, 建立中...", diff --git a/project/assets/database/locales/server/zh-cn.json b/project/assets/database/locales/server/zh-cn.json index f7b64091..ee617e30 100644 --- a/project/assets/database/locales/server/zh-cn.json +++ b/project/assets/database/locales/server/zh-cn.json @@ -60,7 +60,7 @@ "event-unhandled_event": "[未处理事件] %s", "executing_startup_callbacks": "服务端：正在执行启动回调", "fence-unable_to_find_assort_by_id": "找不到id:%s的fence商品", - "fixer-mod_item_found": "存档中发现物品：%s不存在于物品数据库中。你将会遇到错误，这可能是由于使用了物品模组且在移除模组时没有删除物品栏里的模组物品。不要使用这个存档。打开Aki_Data\\Server\\configs\\core.json，编辑'removeModItemsFromProfile'为true。这会允许服务端编辑你的存档且有望移除有害物品", + "fixer-mod_item_found": "存档中发现物品：%s不存在于物品数据库中。你将会遇到错误，这可能是由于使用了物品模组且在移除模组时没有删除物品栏里的模组物品。不要使用这个存档。打开SPT_Data\\Server\\configs\\core.json，编辑'removeModItemsFromProfile'为true。这会允许服务端编辑你的存档且有望移除有害物品", "fixer-updated_pockets": "更新 'pocket' 物品至有三个特殊槽位的新的 18876 版本", "gameevent-bot_not_found": "addEventGearToScavs() - 数据库中找不到%s种类的bot，正在跳过", "gameevent-no_gear_data": "seasonalevents.json中没有%s事件的装备数据", @@ -131,7 +131,7 @@ "modloader-error_parsing_mod_load_order": "分析模组加载顺序时出错", "modloader-incompatibilities_not_string_array": "模组%s package.json属性“incompatibilities”应该是字符串数组", "modloader-incompatible_mod_found": "模组 {{author}}-{{name}} 不兼容 {{incompatibleModName}}", - "modloader-invalid_akiversion_field": "模组 %s 在akiVersion字段中包含无效的semver字符串。无效值示例：https://github.com/npm/node-semver#versions", + "modloader-invalid_sptVersion_field": "模组 %s 在sptVersion字段中包含无效的semver字符串。无效值示例：https://github.com/npm/node-semver#versions", "modloader-invalid_version_property": "模组 %s package.json包含无效的版本字符串", "modloader-not_correct_mod_folder": "模组文件夹中存在名为 (%s) 的文件夹。您安装的模组不正确。 您可能通过错误的方式直接解压了模组的内容。 关于如何正确安装模组参见网站FAQ和模组的发布页", "modloader-is_client_mod": "模组 %s 是一个客户端模组，应该被放置在这个文件夹：/spt/bepinex/plugins", @@ -142,15 +142,15 @@ "modloader-loading_mods": "模组加载器：正在加载%s个客户端模组……", "modloader-main_property_not_js": "模组 %s package.json的main属性必须时一个.js文件", "modloader-main_property_points_to_nothing": "模组 %s package.json的main属性指向了一个不存在的文件", - "modloader-missing_akiversion_field": "模组 %s 缺少akiVersion字段，很可能由于过期且不兼容当前版本的AKI", + "modloader-missing_sptVersion_field": "模组 %s 缺少sptVersion字段，很可能由于过期且不兼容当前版本的SPT", "modloader-missing_dependency": "模组 {{mod}} 需要安装 {{modDependency}}。", "modloader-missing_package_json": "模组（%s）缺少package.json", "modloader-missing_package_json_property": "模组{{modName}} package.json需要{{prop}}属性", - "modloader-mod_incompatible": "模组加载器: 模组（%s）不兼容。它必须执行IPostAkiLoadMod、IPostDBLoadMod、IpreAkiLoadMod中至少一个", + "modloader-mod_incompatible": "模组加载器: 模组（%s）不兼容。它必须执行IPostSptLoadMod、IPostDBLoadMod、IPreSptLoadMod中至少一个", "modloader-mod_has_no_main_property": "ModLoader: (%s) mod 不兼容，它缺少一个\"main\"属性", "modloader-async_mod_error": "模组加载器：加载异步模组：%s时出错", "modloader-no_mods_loaded": "模组发现错误，不 会 加 载 任 何 模 组", - "modloader-outdated_akiversion_field": "模组%s与当前版本AKI不兼容。你可能会遇到问题 - 不会提供支援！", + "modloader-outdated_sptVersion_field": "模组%s与当前版本SPT不兼容。你可能会遇到问题 - 不会提供支援！", "modloader-outdated_dependency": "模组{{mod}} 需要{{modDependency}}，版本{{requiredVersion}}。当前已安装版本是{{currentVersion}}", "modloader-user_mod_folder_missing": "模组加载器：缺少user/mod文件夹，正在新建……", "modloader-mod_order_missing": "模组加载器：缺少order.json，正在新建……", @@ -224,7 +224,7 @@ "server_start_meme_12": "您今年的物业费还没交过来", "server_start_meme_13": "ඞ ... 可疑", "server_start_meme_14": "ඞ ඞ ඞ ඞ 太空狼人杀 ඞ ඞ ඞ ඞ ඞ", - "server_start_meme_15": "喂！有人吗？我被AKI头子Chomp绑架了", + "server_start_meme_15": "喂！有人吗？我被SPT头子Chomp绑架了", "server_start_meme_16": "莫-*嗝*-莫蒂，我们似乎被困在某种计算机系统上", "server_start_meme_17": "很快就到你家门口。开始逃跑吧", "server_start_meme_18": "如果你看到了这条消息，恭喜，你识字", @@ -248,7 +248,7 @@ "watermark-do_not_report": "不 要 报 告", "watermark-free_of_charge": "该软件免费", "watermark-paid_scammed": "如果你花钱了，说明你被骗了", - "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT-AKI/Server/issues", + "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues", "watermark-modding_disabled": "该 编 译 不 启 用 服 务 端 模 改", "watermark-no_support": "不 会 提 供 支 持", "watermark-not_an_issue": "这 不 是 个 问 题", diff --git a/project/gulpfile.mjs b/project/gulpfile.mjs index 32a27680..87ebc381 100644 --- a/project/gulpfile.mjs +++ b/project/gulpfile.mjs @@ -23,8 +23,8 @@ console.log(`target arch: ${targetArch}, target platform: ${targetPlatform}`); const nodeVersion = "node20"; // As of @yao-pkg/pkg-fetch v3.5.9, it's v20.11.1 const stdio = "inherit"; const buildDir = "build/"; -const dataDir = path.join(buildDir, "Aki_Data", "Server"); -const serverExeName = "Aki.Server.exe"; +const dataDir = path.join(buildDir, "SPT_Data", "Server"); +const serverExeName = "SPT.Server.exe"; const serverExe = path.join(buildDir, serverExeName); const pkgConfig = "pkgconfig.json"; const entries = { @@ -179,7 +179,7 @@ const writeBuildDataToJSON = async () => buildInfo.commit = coreParsed.commit; buildInfo.buildTime = coreParsed.buildTime; - buildInfo.akiVersion = coreParsed.akiVersion; + buildInfo.sptVersion = coreParsed.sptVersion; await fs.writeFile(buildJsonPath, JSON.stringify(buildInfo, null, 4)); } catch (error) @@ -357,7 +357,7 @@ gulp.task("build:release", build("release")); gulp.task("build:bleeding", build("bleeding")); gulp.task("build:bleedingmods", build("bleedingmods")); -gulp.task("run:build", async () => await exec("Aki.Server.exe", { stdio, cwd: buildDir })); +gulp.task("run:build", async () => await exec(serverExeName, { stdio, cwd: buildDir })); gulp.task( "run:debug", async () => await exec("ts-node-dev -r tsconfig-paths/register src/ide/TestEntry.ts", { stdio }), diff --git a/project/package.json b/project/package.json index a7ee60d5..fbd77aaa 100644 --- a/project/package.json +++ b/project/package.json @@ -1,10 +1,10 @@ { - "name": "aki-server", + "name": "spt-server", "version": "3.9.0", - "author": "SPT-AKI Server", + "author": "SPT Server", "license": "NCSA", "main": "obj/bundle.js", - "repository": "https://dev.sp-tarkov.com/SPT-AKI/Server", + "repository": "https://dev.sp-tarkov.com/SPT/Server", "description": "The single-player modding framework for Escape From Tarkov.", "icon": "assets/images/icon.ico", "engines": { diff --git a/project/src/ErrorHandler.ts b/project/src/ErrorHandler.ts index 4301f0f9..6e6fa673 100644 --- a/project/src/ErrorHandler.ts +++ b/project/src/ErrorHandler.ts @@ -1,7 +1,7 @@ import readline from "node:readline"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { AsyncQueue } from "@spt-aki/utils/AsyncQueue"; -import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { AsyncQueue } from "@spt/utils/AsyncQueue"; +import { WinstonMainLogger } from "@spt/utils/logging/WinstonMainLogger"; export class ErrorHandler { diff --git a/project/src/Program.ts b/project/src/Program.ts index 9bb2b9c1..2d58379b 100644 --- a/project/src/Program.ts +++ b/project/src/Program.ts @@ -1,9 +1,9 @@ import { container } from "tsyringe"; -import { Container } from "@spt-aki/di/Container"; -import { ErrorHandler } from "@spt-aki/ErrorHandler"; -import type { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { App } from "@spt-aki/utils/App"; -import { Watermark } from "@spt-aki/utils/Watermark"; +import { Container } from "@spt/di/Container"; +import { ErrorHandler } from "@spt/ErrorHandler"; +import type { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { App } from "@spt/utils/App"; +import { Watermark } from "@spt/utils/Watermark"; export class Program { @@ -12,7 +12,7 @@ export class Program { // set window properties process.stdout.setEncoding("utf8"); - process.title = "SPT-AKI Server"; + process.title = "SPT Server"; this.errorHandler = new ErrorHandler(); } @@ -25,9 +25,9 @@ export class Program const watermark = childContainer.resolve("Watermark"); watermark.initialize(); - const preAkiModLoader = childContainer.resolve("PreAkiModLoader"); + const preSptModLoader = childContainer.resolve("PreSptModLoader"); Container.registerListTypes(childContainer); - await preAkiModLoader.load(childContainer); + await preSptModLoader.load(childContainer); Container.registerPostLoadTypes(container, childContainer); childContainer.resolve("App").load(); diff --git a/project/src/callbacks/AchievementCallbacks.ts b/project/src/callbacks/AchievementCallbacks.ts index 5baa4bd8..a760472a 100644 --- a/project/src/callbacks/AchievementCallbacks.ts +++ b/project/src/callbacks/AchievementCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { AchievementController } from "@spt-aki/controllers/AchievementController"; -import { ProfileController } from "@spt-aki/controllers/ProfileController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { ICompletedAchievementsResponse } from "@spt-aki/models/eft/profile/ICompletedAchievementsResponse"; -import { IGetAchievementsResponse } from "@spt-aki/models/eft/profile/IGetAchievementsResponse"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { AchievementController } from "@spt/controllers/AchievementController"; +import { ProfileController } from "@spt/controllers/ProfileController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse"; +import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class AchievementCallbacks diff --git a/project/src/callbacks/BotCallbacks.ts b/project/src/callbacks/BotCallbacks.ts index 059f20c2..6631ba8f 100644 --- a/project/src/callbacks/BotCallbacks.ts +++ b/project/src/callbacks/BotCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { BotController } from "@spt-aki/controllers/BotController"; -import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Difficulties } from "@spt-aki/models/eft/common/tables/IBotType"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { BotController } from "@spt/controllers/BotController"; +import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { Difficulties } from "@spt/models/eft/common/tables/IBotType"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class BotCallbacks diff --git a/project/src/callbacks/BuildsCallbacks.ts b/project/src/callbacks/BuildsCallbacks.ts index c347f561..f8585a28 100644 --- a/project/src/callbacks/BuildsCallbacks.ts +++ b/project/src/callbacks/BuildsCallbacks.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { BuildController } from "@spt-aki/controllers/BuildController"; -import { ISetMagazineRequest } from "@spt-aki/models/eft/builds/ISetMagazineRequest"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IRemoveBuildRequestData } from "@spt-aki/models/eft/presetBuild/IRemoveBuildRequestData"; -import { IUserBuilds } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { BuildController } from "@spt/controllers/BuildController"; +import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData"; +import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class BuildsCallbacks diff --git a/project/src/callbacks/BundleCallbacks.ts b/project/src/callbacks/BundleCallbacks.ts index f3d73715..7c42d529 100644 --- a/project/src/callbacks/BundleCallbacks.ts +++ b/project/src/callbacks/BundleCallbacks.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { BundleLoader } from "@spt/loaders/BundleLoader"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class BundleCallbacks diff --git a/project/src/callbacks/ClientLogCallbacks.ts b/project/src/callbacks/ClientLogCallbacks.ts index 8a7cdb62..47c0cb24 100644 --- a/project/src/callbacks/ClientLogCallbacks.ts +++ b/project/src/callbacks/ClientLogCallbacks.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ClientLogController } from "@spt-aki/controllers/ClientLogController"; -import { ModLoadOrder } from "@spt-aki/loaders/ModLoadOrder"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IBsgLogging, ICoreConfig, IRelease } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IClientLogRequest } from "@spt-aki/models/spt/logging/IClientLogRequest"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { ClientLogController } from "@spt/controllers/ClientLogController"; +import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IBsgLogging, ICoreConfig, IRelease } from "@spt/models/spt/config/ICoreConfig"; +import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; /** Handle client logging related events */ @injectable() diff --git a/project/src/callbacks/CustomizationCallbacks.ts b/project/src/callbacks/CustomizationCallbacks.ts index cf714b9c..6bc39b56 100644 --- a/project/src/callbacks/CustomizationCallbacks.ts +++ b/project/src/callbacks/CustomizationCallbacks.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationController } from "@spt-aki/controllers/CustomizationController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; -import { IGetSuitsResponse } from "@spt-aki/models/eft/customization/IGetSuitsResponse"; -import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { CustomizationController } from "@spt/controllers/CustomizationController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISuit } from "@spt/models/eft/common/tables/ITrader"; +import { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData"; +import { IGetSuitsResponse } from "@spt/models/eft/customization/IGetSuitsResponse"; +import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class CustomizationCallbacks diff --git a/project/src/callbacks/DataCallbacks.ts b/project/src/callbacks/DataCallbacks.ts index f678490c..d12491f1 100644 --- a/project/src/callbacks/DataCallbacks.ts +++ b/project/src/callbacks/DataCallbacks.ts @@ -1,20 +1,20 @@ import { inject, injectable } from "tsyringe"; -import { HideoutController } from "@spt-aki/controllers/HideoutController"; -import { RagfairController } from "@spt-aki/controllers/RagfairController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; -import { ICustomizationItem } from "@spt-aki/models/eft/common/tables/ICustomizationItem"; -import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; -import { IGetItemPricesResponse } from "@spt-aki/models/eft/game/IGetItemPricesResponse"; -import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { Money } from "@spt-aki/models/enums/Money"; -import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { HideoutController } from "@spt/controllers/HideoutController"; +import { RagfairController } from "@spt/controllers/RagfairController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGlobals } from "@spt/models/eft/common/IGlobals"; +import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem"; +import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase"; +import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse"; +import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { Money } from "@spt/models/enums/Money"; +import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; /** * Handle client requests diff --git a/project/src/callbacks/DialogueCallbacks.ts b/project/src/callbacks/DialogueCallbacks.ts index b40bfa05..1028b22a 100644 --- a/project/src/callbacks/DialogueCallbacks.ts +++ b/project/src/callbacks/DialogueCallbacks.ts @@ -1,41 +1,41 @@ import { inject, injectable } from "tsyringe"; -import { DialogueController } from "@spt-aki/controllers/DialogueController"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUIDRequestData"; +import { DialogueController } from "@spt/controllers/DialogueController"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData"; import { IAcceptFriendRequestData, ICancelFriendRequestData, IDeclineFriendRequestData, -} from "@spt-aki/models/eft/dialog/IAcceptFriendRequestData"; -import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; -import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; -import { IChatServer } from "@spt-aki/models/eft/dialog/IChatServer"; -import { IClearMailMessageRequest } from "@spt-aki/models/eft/dialog/IClearMailMessageRequest"; -import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; -import { IDeleteFriendRequest } from "@spt-aki/models/eft/dialog/IDeleteFriendRequest"; -import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; -import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; -import { IGetAllAttachmentsRequestData } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetChatServerListRequestData } from "@spt-aki/models/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogInfoRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IGetMailDialogListRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogListRequestData"; -import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; -import { IPinDialogRequestData } from "@spt-aki/models/eft/dialog/IPinDialogRequestData"; -import { IRemoveDialogRequestData } from "@spt-aki/models/eft/dialog/IRemoveDialogRequestData"; -import { IRemoveMailMessageRequest } from "@spt-aki/models/eft/dialog/IRemoveMailMessageRequest"; -import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { ISetDialogReadRequestData } from "@spt-aki/models/eft/dialog/ISetDialogReadRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/eft/dialog/IAcceptFriendRequestData"; +import { IAddUserGroupMailRequest } from "@spt/models/eft/dialog/IAddUserGroupMailRequest"; +import { IChangeGroupMailOwnerRequest } from "@spt/models/eft/dialog/IChangeGroupMailOwnerRequest"; +import { IChatServer } from "@spt/models/eft/dialog/IChatServer"; +import { IClearMailMessageRequest } from "@spt/models/eft/dialog/IClearMailMessageRequest"; +import { ICreateGroupMailRequest } from "@spt/models/eft/dialog/ICreateGroupMailRequest"; +import { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest"; +import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData"; +import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse"; +import { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData"; +import { IRemoveMailMessageRequest } from "@spt/models/eft/dialog/IRemoveMailMessageRequest"; +import { IRemoveUserGroupMailRequest } from "@spt/models/eft/dialog/IRemoveUserGroupMailRequest"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "@spt/models/eft/profile/ISptProfile"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class DialogueCallbacks implements OnUpdate @@ -312,6 +312,6 @@ export class DialogueCallbacks implements OnUpdate public getRoute(): string { - return "aki-dialogue"; + return "spt-dialogue"; } } diff --git a/project/src/callbacks/GameCallbacks.ts b/project/src/callbacks/GameCallbacks.ts index f9ff6aa4..82048e2d 100644 --- a/project/src/callbacks/GameCallbacks.ts +++ b/project/src/callbacks/GameCallbacks.ts @@ -1,26 +1,26 @@ import { inject, injectable } from "tsyringe"; -import { GameController } from "@spt-aki/controllers/GameController"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUIDRequestData"; -import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; -import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; -import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; -import { IGameEmptyCrcRequestData } from "@spt-aki/models/eft/game/IGameEmptyCrcRequestData"; -import { IGameKeepAliveResponse } from "@spt-aki/models/eft/game/IGameKeepAliveResponse"; -import { IGameLogoutResponseData } from "@spt-aki/models/eft/game/IGameLogoutResponseData"; -import { IGameModeRequestData } from "@spt-aki/models/eft/game/IGameModeRequestData"; -import { IGameModeResponse } from "@spt-aki/models/eft/game/IGameModeResponse"; -import { IGameStartResponse } from "@spt-aki/models/eft/game/IGameStartResponse"; -import { IGetRaidTimeRequest } from "@spt-aki/models/eft/game/IGetRaidTimeRequest"; -import { IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; -import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; -import { IVersionValidateRequestData } from "@spt-aki/models/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { Watermark } from "@spt-aki/utils/Watermark"; +import { GameController } from "@spt/controllers/GameController"; +import { OnLoad } from "@spt/di/OnLoad"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData"; +import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse"; +import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse"; +import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse"; +import { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData"; +import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse"; +import { IGameLogoutResponseData } from "@spt/models/eft/game/IGameLogoutResponseData"; +import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData"; +import { IGameModeResponse } from "@spt/models/eft/game/IGameModeResponse"; +import { IGameStartResponse } from "@spt/models/eft/game/IGameStartResponse"; +import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest"; +import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse"; +import { IServerDetails } from "@spt/models/eft/game/IServerDetails"; +import { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { Watermark } from "@spt/utils/Watermark"; @injectable() export class GameCallbacks implements OnLoad @@ -40,7 +40,7 @@ export class GameCallbacks implements OnLoad public getRoute(): string { - return "aki-game"; + return "spt-game"; } /** diff --git a/project/src/callbacks/HandbookCallbacks.ts b/project/src/callbacks/HandbookCallbacks.ts index b85489e4..84aefa2b 100644 --- a/project/src/callbacks/HandbookCallbacks.ts +++ b/project/src/callbacks/HandbookCallbacks.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { HandbookController } from "@spt-aki/controllers/HandbookController"; -import { OnLoad } from "@spt-aki/di/OnLoad"; +import { HandbookController } from "@spt/controllers/HandbookController"; +import { OnLoad } from "@spt/di/OnLoad"; @injectable() export class HandbookCallbacks implements OnLoad @@ -15,6 +15,6 @@ export class HandbookCallbacks implements OnLoad public getRoute(): string { - return "aki-handbook"; + return "spt-handbook"; } } diff --git a/project/src/callbacks/HealthCallbacks.ts b/project/src/callbacks/HealthCallbacks.ts index a6af1a83..f3ff21ca 100644 --- a/project/src/callbacks/HealthCallbacks.ts +++ b/project/src/callbacks/HealthCallbacks.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { HealthController } from "@spt-aki/controllers/HealthController"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; -import { IWorkoutData } from "@spt-aki/models/eft/health/IWorkoutData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { HealthController } from "@spt/controllers/HealthController"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData"; +import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class HealthCallbacks @@ -22,7 +22,7 @@ export class HealthCallbacks {} /** - * Custom aki server request found in modules/HealthSynchronizer.cs + * Custom spt server request found in modules/HealthSynchronizer.cs * @param url * @param info HealthListener.Instance.CurrentHealth class * @param sessionID session id @@ -35,7 +35,7 @@ export class HealthCallbacks } /** - * Custom aki server request found in modules/QTEPatch.cs + * Custom spt server request found in modules/QTEPatch.cs * @param url * @param info HealthListener.Instance.CurrentHealth class * @param sessionID session id diff --git a/project/src/callbacks/HideoutCallbacks.ts b/project/src/callbacks/HideoutCallbacks.ts index 9319fb25..8b076a9e 100644 --- a/project/src/callbacks/HideoutCallbacks.ts +++ b/project/src/callbacks/HideoutCallbacks.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { HideoutController } from "@spt-aki/controllers/HideoutController"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHandleQTEEventRequestData } from "@spt-aki/models/eft/hideout/IHandleQTEEventRequestData"; -import { IHideoutCancelProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutCancelProductionRequestData"; -import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutImproveAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutImproveAreaRequestData"; -import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; -import { IRecordShootingRangePoints } from "@spt-aki/models/eft/hideout/IRecordShootingRangePoints"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { HideoutController } from "@spt/controllers/HideoutController"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHandleQTEEventRequestData } from "@spt/models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutCancelProductionRequestData } from "@spt/models/eft/hideout/IHideoutCancelProductionRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "@spt/models/eft/hideout/IHideoutImproveAreaRequestData"; +import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class HideoutCallbacks implements OnUpdate @@ -213,6 +213,6 @@ export class HideoutCallbacks implements OnUpdate public getRoute(): string { - return "aki-hideout"; + return "spt-hideout"; } } diff --git a/project/src/callbacks/HttpCallbacks.ts b/project/src/callbacks/HttpCallbacks.ts index 95932f16..a378126c 100644 --- a/project/src/callbacks/HttpCallbacks.ts +++ b/project/src/callbacks/HttpCallbacks.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { HttpServer } from "@spt-aki/servers/HttpServer"; +import { OnLoad } from "@spt/di/OnLoad"; +import { HttpServer } from "@spt/servers/HttpServer"; @injectable() export class HttpCallbacks implements OnLoad @@ -15,7 +15,7 @@ export class HttpCallbacks implements OnLoad public getRoute(): string { - return "aki-http"; + return "spt-http"; } public getImage(): string diff --git a/project/src/callbacks/InraidCallbacks.ts b/project/src/callbacks/InraidCallbacks.ts index 809b5f34..12466fad 100644 --- a/project/src/callbacks/InraidCallbacks.ts +++ b/project/src/callbacks/InraidCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { InraidController } from "@spt-aki/controllers/InraidController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IItemDeliveryRequestData } from "@spt-aki/models/eft/inRaid/IItemDeliveryRequestData"; -import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { InraidController } from "@spt/controllers/InraidController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IItemDeliveryRequestData } from "@spt/models/eft/inRaid/IItemDeliveryRequestData"; +import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; /** * Handle client requests diff --git a/project/src/callbacks/InsuranceCallbacks.ts b/project/src/callbacks/InsuranceCallbacks.ts index 754b4210..39786771 100644 --- a/project/src/callbacks/InsuranceCallbacks.ts +++ b/project/src/callbacks/InsuranceCallbacks.ts @@ -1,17 +1,17 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceController } from "@spt-aki/controllers/InsuranceController"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; -import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; -import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { InsuranceService } from "@spt-aki/services/InsuranceService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { InsuranceController } from "@spt/controllers/InsuranceController"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData"; +import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { InsuranceService } from "@spt/services/InsuranceService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class InsuranceCallbacks implements OnUpdate @@ -62,6 +62,6 @@ export class InsuranceCallbacks implements OnUpdate public getRoute(): string { - return "aki-insurance"; + return "spt-insurance"; } } diff --git a/project/src/callbacks/InventoryCallbacks.ts b/project/src/callbacks/InventoryCallbacks.ts index 975d9cb8..fb7546f1 100644 --- a/project/src/callbacks/InventoryCallbacks.ts +++ b/project/src/callbacks/InventoryCallbacks.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { InventoryController } from "@spt-aki/controllers/InventoryController"; -import { QuestController } from "@spt-aki/controllers/QuestController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; -import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; -import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; -import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; -import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; -import { IOpenRandomLootContainerRequestData } from "@spt-aki/models/eft/inventory/IOpenRandomLootContainerRequestData"; -import { IRedeemProfileRequestData } from "@spt-aki/models/eft/inventory/IRedeemProfileRequestData"; -import { ISetFavoriteItems } from "@spt-aki/models/eft/inventory/ISetFavoriteItems"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; +import { InventoryController } from "@spt/controllers/InventoryController"; +import { QuestController } from "@spt/controllers/QuestController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData"; +import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData"; +import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData"; +import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData"; @injectable() export class InventoryCallbacks diff --git a/project/src/callbacks/ItemEventCallbacks.ts b/project/src/callbacks/ItemEventCallbacks.ts index 0d1d7064..1ca5d7cb 100644 --- a/project/src/callbacks/ItemEventCallbacks.ts +++ b/project/src/callbacks/ItemEventCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { Warning } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; -import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { Warning } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { ItemEventRouter } from "@spt/routers/ItemEventRouter"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class ItemEventCallbacks diff --git a/project/src/callbacks/LauncherCallbacks.ts b/project/src/callbacks/LauncherCallbacks.ts index 61adbb21..6324f5fb 100644 --- a/project/src/callbacks/LauncherCallbacks.ts +++ b/project/src/callbacks/LauncherCallbacks.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { LauncherController } from "@spt-aki/controllers/LauncherController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; -import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "@spt-aki/models/eft/launcher/IRemoveProfileData"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { Watermark } from "@spt-aki/utils/Watermark"; +import { LauncherController } from "@spt/controllers/LauncherController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData"; +import { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { Watermark } from "@spt/utils/Watermark"; @injectable() export class LauncherCallbacks diff --git a/project/src/callbacks/LocationCallbacks.ts b/project/src/callbacks/LocationCallbacks.ts index e37afd49..4ad4c054 100644 --- a/project/src/callbacks/LocationCallbacks.ts +++ b/project/src/callbacks/LocationCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { LocationController } from "@spt-aki/controllers/LocationController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { LocationController } from "@spt/controllers/LocationController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class LocationCallbacks diff --git a/project/src/callbacks/MatchCallbacks.ts b/project/src/callbacks/MatchCallbacks.ts index 68983763..4c9774be 100644 --- a/project/src/callbacks/MatchCallbacks.ts +++ b/project/src/callbacks/MatchCallbacks.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { MatchController } from "@spt-aki/controllers/MatchController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflineRaidRequestData"; -import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; -import { IMatchGroupCurrentResponse } from "@spt-aki/models/eft/match/IMatchGroupCurrentResponse"; -import { IMatchGroupInviteSendRequest } from "@spt-aki/models/eft/match/IMatchGroupInviteSendRequest"; -import { IMatchGroupPlayerRemoveRequest } from "@spt-aki/models/eft/match/IMatchGroupPlayerRemoveRequest"; -import { IMatchGroupStartGameRequest } from "@spt-aki/models/eft/match/IMatchGroupStartGameRequest"; -import { IMatchGroupStatusRequest } from "@spt-aki/models/eft/match/IMatchGroupStatusRequest"; -import { IMatchGroupStatusResponse } from "@spt-aki/models/eft/match/IMatchGroupStatusResponse"; -import { IMatchGroupTransferRequest } from "@spt-aki/models/eft/match/IMatchGroupTransferRequest"; -import { IProfileStatusResponse } from "@spt-aki/models/eft/match/IProfileStatusResponse"; -import { IPutMetricsRequestData } from "@spt-aki/models/eft/match/IPutMetricsRequestData"; -import { IRequestIdRequest } from "@spt-aki/models/eft/match/IRequestIdRequest"; -import { IUpdatePingRequestData } from "@spt-aki/models/eft/match/IUpdatePingRequestData"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { MatchController } from "@spt/controllers/MatchController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData"; +import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; +import { IMatchGroupCurrentResponse } from "@spt/models/eft/match/IMatchGroupCurrentResponse"; +import { IMatchGroupInviteSendRequest } from "@spt/models/eft/match/IMatchGroupInviteSendRequest"; +import { IMatchGroupPlayerRemoveRequest } from "@spt/models/eft/match/IMatchGroupPlayerRemoveRequest"; +import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest"; +import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest"; +import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse"; +import { IMatchGroupTransferRequest } from "@spt/models/eft/match/IMatchGroupTransferRequest"; +import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse"; +import { IPutMetricsRequestData } from "@spt/models/eft/match/IPutMetricsRequestData"; +import { IRequestIdRequest } from "@spt/models/eft/match/IRequestIdRequest"; +import { IUpdatePingRequestData } from "@spt/models/eft/match/IUpdatePingRequestData"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; @injectable() export class MatchCallbacks diff --git a/project/src/callbacks/ModCallbacks.ts b/project/src/callbacks/ModCallbacks.ts index 4a685e0a..f4ca96eb 100644 --- a/project/src/callbacks/ModCallbacks.ts +++ b/project/src/callbacks/ModCallbacks.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { PostAkiModLoader } from "@spt-aki/loaders/PostAkiModLoader"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { OnLoad } from "@spt/di/OnLoad"; +import { PostSptModLoader } from "@spt/loaders/PostSptModLoader"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HttpFileUtil } from "@spt/utils/HttpFileUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class ModCallbacks implements OnLoad @@ -18,7 +18,7 @@ export class ModCallbacks implements OnLoad @inject("WinstonLogger") protected logger: ILogger, @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("HttpFileUtil") protected httpFileUtil: HttpFileUtil, - @inject("PostAkiModLoader") protected postAkiModLoader: PostAkiModLoader, + @inject("PostSptModLoader") protected postSptModLoader: PostSptModLoader, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, ) @@ -30,12 +30,12 @@ export class ModCallbacks implements OnLoad { if (globalThis.G_MODS_ENABLED) { - await this.postAkiModLoader.load(); + await this.postSptModLoader.load(); } } public getRoute(): string { - return "aki-mods"; + return "spt-mods"; } } diff --git a/project/src/callbacks/NoteCallbacks.ts b/project/src/callbacks/NoteCallbacks.ts index 0b126e13..723496f5 100644 --- a/project/src/callbacks/NoteCallbacks.ts +++ b/project/src/callbacks/NoteCallbacks.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { NoteController } from "@spt-aki/controllers/NoteController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; +import { NoteController } from "@spt/controllers/NoteController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt/models/eft/notes/INoteActionData"; @injectable() export class NoteCallbacks diff --git a/project/src/callbacks/NotifierCallbacks.ts b/project/src/callbacks/NotifierCallbacks.ts index 4aec49d0..f7f8d58d 100644 --- a/project/src/callbacks/NotifierCallbacks.ts +++ b/project/src/callbacks/NotifierCallbacks.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { NotifierController } from "@spt-aki/controllers/NotifierController"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUIDRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; -import { ISelectProfileResponse } from "@spt-aki/models/eft/notifier/ISelectProfileResponse"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { NotifierController } from "@spt/controllers/NotifierController"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INotifierChannel } from "@spt/models/eft/notifier/INotifier"; +import { ISelectProfileResponse } from "@spt/models/eft/notifier/ISelectProfileResponse"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; @injectable() export class NotifierCallbacks diff --git a/project/src/callbacks/PresetCallbacks.ts b/project/src/callbacks/PresetCallbacks.ts index 5740a264..0fafb7c1 100644 --- a/project/src/callbacks/PresetCallbacks.ts +++ b/project/src/callbacks/PresetCallbacks.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { PresetController } from "@spt-aki/controllers/PresetController"; -import { OnLoad } from "@spt-aki/di/OnLoad"; +import { PresetController } from "@spt/controllers/PresetController"; +import { OnLoad } from "@spt/di/OnLoad"; @injectable() export class PresetCallbacks implements OnLoad @@ -15,6 +15,6 @@ export class PresetCallbacks implements OnLoad public getRoute(): string { - return "aki-presets"; + return "spt-presets"; } } diff --git a/project/src/callbacks/ProfileCallbacks.ts b/project/src/callbacks/ProfileCallbacks.ts index faa7f23d..87dfde56 100644 --- a/project/src/callbacks/ProfileCallbacks.ts +++ b/project/src/callbacks/ProfileCallbacks.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { ProfileController } from "@spt-aki/controllers/ProfileController"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IGetMiniProfileRequestData } from "@spt-aki/models/eft/launcher/IGetMiniProfileRequestData"; -import { GetProfileStatusResponseData } from "@spt-aki/models/eft/profile/GetProfileStatusResponseData"; -import { ICreateProfileResponse } from "@spt-aki/models/eft/profile/ICreateProfileResponse"; -import { IGetOtherProfileRequest } from "@spt-aki/models/eft/profile/IGetOtherProfileRequest"; -import { IGetOtherProfileResponse } from "@spt-aki/models/eft/profile/IGetOtherProfileResponse"; -import { IGetProfileSettingsRequest } from "@spt-aki/models/eft/profile/IGetProfileSettingsRequest"; -import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; -import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; -import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ProfileController } from "@spt/controllers/ProfileController"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData"; +import { ICreateProfileResponse } from "@spt/models/eft/profile/ICreateProfileResponse"; +import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest"; +import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse"; +import { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest"; +import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse"; +import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** Handle profile related client events */ @injectable() diff --git a/project/src/callbacks/QuestCallbacks.ts b/project/src/callbacks/QuestCallbacks.ts index a232fd66..28baf7e7 100644 --- a/project/src/callbacks/QuestCallbacks.ts +++ b/project/src/callbacks/QuestCallbacks.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { QuestController } from "@spt-aki/controllers/QuestController"; -import { RepeatableQuestController } from "@spt-aki/controllers/RepeatableQuestController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; -import { IListQuestsRequestData } from "@spt-aki/models/eft/quests/IListQuestsRequestData"; -import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { QuestController } from "@spt/controllers/QuestController"; +import { RepeatableQuestController } from "@spt/controllers/RepeatableQuestController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IQuest } from "@spt/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData"; +import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class QuestCallbacks diff --git a/project/src/callbacks/RagfairCallbacks.ts b/project/src/callbacks/RagfairCallbacks.ts index 6b6e4c82..bc5b8e9a 100644 --- a/project/src/callbacks/RagfairCallbacks.ts +++ b/project/src/callbacks/RagfairCallbacks.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { RagfairController } from "@spt-aki/controllers/RagfairController"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAddOfferRequestData } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; -import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; -import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; -import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; -import { IGetRagfairOfferByIdRequest } from "@spt-aki/models/eft/ragfair/IGetRagfairOfferByIdRequest"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { IRemoveOfferRequestData } from "@spt-aki/models/eft/ragfair/IRemoveOfferRequestData"; -import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { ISendRagfairReportRequestData } from "@spt-aki/models/eft/ragfair/ISendRagfairReportRequestData"; -import { IStorePlayerOfferTaxAmountRequestData } from "@spt-aki/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { RagfairServer } from "@spt-aki/servers/RagfairServer"; -import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { RagfairController } from "@spt/controllers/RagfairController"; +import { OnLoad } from "@spt/di/OnLoad"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult"; +import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "@spt/models/eft/ragfair/ISendRagfairReportRequestData"; +import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { RagfairServer } from "@spt/servers/RagfairServer"; +import { RagfairTaxService } from "@spt/services/RagfairTaxService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; /** * Handle ragfair related callback events @@ -51,7 +51,7 @@ export class RagfairCallbacks implements OnLoad, OnUpdate public getRoute(): string { - return "aki-ragfair"; + return "spt-ragfair"; } public async onUpdate(timeSinceLastRun: number): Promise diff --git a/project/src/callbacks/RepairCallbacks.ts b/project/src/callbacks/RepairCallbacks.ts index 9ec9b421..97095090 100644 --- a/project/src/callbacks/RepairCallbacks.ts +++ b/project/src/callbacks/RepairCallbacks.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { RepairController } from "@spt-aki/controllers/RepairController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; +import { RepairController } from "@spt/controllers/RepairController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest"; @injectable() export class RepairCallbacks diff --git a/project/src/callbacks/SaveCallbacks.ts b/project/src/callbacks/SaveCallbacks.ts index 359cf1a5..b5d7d941 100644 --- a/project/src/callbacks/SaveCallbacks.ts +++ b/project/src/callbacks/SaveCallbacks.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; +import { OnLoad } from "@spt/di/OnLoad"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { SaveServer } from "@spt/servers/SaveServer"; @injectable() export class SaveCallbacks implements OnLoad, OnUpdate @@ -26,7 +26,7 @@ export class SaveCallbacks implements OnLoad, OnUpdate public getRoute(): string { - return "aki-save"; + return "spt-save"; } public async onUpdate(secondsSinceLastRun: number): Promise diff --git a/project/src/callbacks/TradeCallbacks.ts b/project/src/callbacks/TradeCallbacks.ts index 2602ac3d..a77f5a0e 100644 --- a/project/src/callbacks/TradeCallbacks.ts +++ b/project/src/callbacks/TradeCallbacks.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { TradeController } from "@spt-aki/controllers/TradeController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; -import { IProcessRagfairTradeRequestData } from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; -import { ISellScavItemsToFenceRequestData } from "@spt-aki/models/eft/trade/ISellScavItemsToFenceRequestData"; +import { TradeController } from "@spt/controllers/TradeController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData"; +import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData"; @injectable() export class TradeCallbacks diff --git a/project/src/callbacks/TraderCallbacks.ts b/project/src/callbacks/TraderCallbacks.ts index be2ee5d1..45599353 100644 --- a/project/src/callbacks/TraderCallbacks.ts +++ b/project/src/callbacks/TraderCallbacks.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { TraderController } from "@spt-aki/controllers/TraderController"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { TraderController } from "@spt/controllers/TraderController"; +import { OnLoad } from "@spt/di/OnLoad"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class TraderCallbacks implements OnLoad, OnUpdate @@ -28,7 +28,7 @@ export class TraderCallbacks implements OnLoad, OnUpdate public getRoute(): string { - return "aki-traders"; + return "spt-traders"; } /** Handle client/trading/api/traderSettings */ diff --git a/project/src/callbacks/WeatherCallbacks.ts b/project/src/callbacks/WeatherCallbacks.ts index 5a156d99..dfbef05b 100644 --- a/project/src/callbacks/WeatherCallbacks.ts +++ b/project/src/callbacks/WeatherCallbacks.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { WeatherController } from "@spt-aki/controllers/WeatherController"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { WeatherController } from "@spt/controllers/WeatherController"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IWeatherData } from "@spt/models/eft/weather/IWeatherData"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class WeatherCallbacks diff --git a/project/src/callbacks/WishlistCallbacks.ts b/project/src/callbacks/WishlistCallbacks.ts index aebb3993..e7cea1aa 100644 --- a/project/src/callbacks/WishlistCallbacks.ts +++ b/project/src/callbacks/WishlistCallbacks.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { WishlistController } from "@spt-aki/controllers/WishlistController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; +import { WishlistController } from "@spt/controllers/WishlistController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt/models/eft/wishlist/IWishlistActionData"; @injectable() export class WishlistCallbacks diff --git a/project/src/context/ApplicationContext.ts b/project/src/context/ApplicationContext.ts index 5fd2ab60..eb345c60 100644 --- a/project/src/context/ApplicationContext.ts +++ b/project/src/context/ApplicationContext.ts @@ -1,7 +1,7 @@ import { injectable } from "tsyringe"; -import { ContextVariable } from "@spt-aki/context/ContextVariable"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { LinkedList } from "@spt-aki/utils/collections/lists/LinkedList"; +import { ContextVariable } from "@spt/context/ContextVariable"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { LinkedList } from "@spt/utils/collections/lists/LinkedList"; @injectable() export class ApplicationContext diff --git a/project/src/context/ContextVariable.ts b/project/src/context/ContextVariable.ts index 9dd5755d..34c92ec7 100644 --- a/project/src/context/ContextVariable.ts +++ b/project/src/context/ContextVariable.ts @@ -1,4 +1,4 @@ -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; export class ContextVariable { diff --git a/project/src/controllers/AchievementController.ts b/project/src/controllers/AchievementController.ts index d460dd90..8c8c2a9a 100644 --- a/project/src/controllers/AchievementController.ts +++ b/project/src/controllers/AchievementController.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ICompletedAchievementsResponse } from "@spt-aki/models/eft/profile/ICompletedAchievementsResponse"; -import { IGetAchievementsResponse } from "@spt-aki/models/eft/profile/IGetAchievementsResponse"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse"; +import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; /** * Logic for handling In Raid callbacks diff --git a/project/src/controllers/BotController.ts b/project/src/controllers/BotController.ts index 8444cb66..02da821e 100644 --- a/project/src/controllers/BotController.ts +++ b/project/src/controllers/BotController.ts @@ -1,31 +1,31 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { BotGenerator } from "@spt-aki/generators/BotGenerator"; -import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Condition, IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; -import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; -import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { WildSpawnTypeNumber } from "@spt-aki/models/enums/WildSpawnTypeNumber"; -import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { BotGenerator } from "@spt/generators/BotGenerator"; +import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { MinMax } from "@spt/models/common/MinMax"; +import { Condition, IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt/models/eft/common/tables/IBotCore"; +import { Difficulty } from "@spt/models/eft/common/tables/IBotType"; +import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { WildSpawnTypeNumber } from "@spt/models/enums/WildSpawnTypeNumber"; +import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotController diff --git a/project/src/controllers/BuildController.ts b/project/src/controllers/BuildController.ts index ced9755f..459453c9 100644 --- a/project/src/controllers/BuildController.ts +++ b/project/src/controllers/BuildController.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { ISetMagazineRequest } from "@spt-aki/models/eft/builds/ISetMagazineRequest"; -import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IRemoveBuildRequestData } from "@spt-aki/models/eft/presetBuild/IRemoveBuildRequestData"; -import { IEquipmentBuild, IMagazineBuild, IUserBuilds, IWeaponBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { EquipmentBuildType } from "@spt-aki/models/enums/EquipmentBuildType"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest"; +import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData"; +import { IEquipmentBuild, IMagazineBuild, IUserBuilds, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { EquipmentBuildType } from "@spt/models/enums/EquipmentBuildType"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class BuildController diff --git a/project/src/controllers/ClientLogController.ts b/project/src/controllers/ClientLogController.ts index ca0ba74b..fc40412f 100644 --- a/project/src/controllers/ClientLogController.ts +++ b/project/src/controllers/ClientLogController.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { IClientLogRequest } from "@spt-aki/models/spt/logging/IClientLogRequest"; -import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -import { LogLevel } from "@spt-aki/models/spt/logging/LogLevel"; -import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest"; +import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; +import { LogLevel } from "@spt/models/spt/logging/LogLevel"; +import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; @injectable() export class ClientLogController diff --git a/project/src/controllers/CustomizationController.ts b/project/src/controllers/CustomizationController.ts index 1145ef1b..478371d0 100644 --- a/project/src/controllers/CustomizationController.ts +++ b/project/src/controllers/CustomizationController.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; -import { ClothingItem, IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISuit } from "@spt/models/eft/common/tables/ITrader"; +import { ClothingItem, IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData"; +import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class CustomizationController diff --git a/project/src/controllers/DialogueController.ts b/project/src/controllers/DialogueController.ts index 0bd9c488..22d77b6e 100644 --- a/project/src/controllers/DialogueController.ts +++ b/project/src/controllers/DialogueController.ts @@ -1,23 +1,23 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { IDialogueChatBot } from "@spt-aki/helpers/Dialogue/IDialogueChatBot"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; -import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; -import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { Dialogue, DialogueInfo, IAkiProfile, IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData"; +import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse"; +import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { Dialogue, DialogueInfo, ISptProfile, IUserDialogInfo, Message } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class DialogueController @@ -195,7 +195,7 @@ export class DialogueController * @param request get dialog request (params used when dialog doesnt exist in profile) * @returns Dialogue */ - protected getDialogByIdFromProfile(profile: IAkiProfile, request: IGetMailDialogViewRequestData): Dialogue + protected getDialogByIdFromProfile(profile: ISptProfile, request: IGetMailDialogViewRequestData): Dialogue { if (!profile.dialogues[request.dialogId]) { @@ -228,7 +228,7 @@ export class DialogueController * @param dialogUsers The participants of the mail * @returns IUserDialogInfo array */ - protected getProfilesForMail(fullProfile: IAkiProfile, dialogUsers: IUserDialogInfo[]): IUserDialogInfo[] + protected getProfilesForMail(fullProfile: ISptProfile, dialogUsers: IUserDialogInfo[]): IUserDialogInfo[] { const result: IUserDialogInfo[] = []; if (dialogUsers) diff --git a/project/src/controllers/GameController.ts b/project/src/controllers/GameController.ts index c0d37e0b..ef2e48e8 100644 --- a/project/src/controllers/GameController.ts +++ b/project/src/controllers/GameController.ts @@ -1,53 +1,53 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { ILocation } from "@spt-aki/models/eft/common/ILocation"; -import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { BodyPartHealth } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; -import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; -import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; -import { IGameKeepAliveResponse } from "@spt-aki/models/eft/game/IGameKeepAliveResponse"; -import { IGameModeRequestData } from "@spt-aki/models/eft/game/IGameModeRequestData"; -import { ESessionMode } from "@spt-aki/models/eft/game/IGameModeResponse"; -import { IGetRaidTimeRequest } from "@spt-aki/models/eft/game/IGetRaidTimeRequest"; -import { IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; -import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { ILootConfig } from "@spt-aki/models/spt/config/ILootConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { CustomLocationWaveService } from "@spt-aki/services/CustomLocationWaveService"; -import { GiftService } from "@spt-aki/services/GiftService"; -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { OpenZoneService } from "@spt-aki/services/OpenZoneService"; -import { ProfileActivityService } from "@spt-aki/services/ProfileActivityService"; -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; -import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { HideoutHelper } from "@spt/helpers/HideoutHelper"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { ILocation } from "@spt/models/eft/common/ILocation"; +import { ILooseLoot } from "@spt/models/eft/common/ILooseLoot"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { BodyPartHealth } from "@spt/models/eft/common/tables/IBotBase"; +import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse"; +import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse"; +import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse"; +import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse"; +import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData"; +import { ESessionMode } from "@spt/models/eft/game/IGameModeResponse"; +import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest"; +import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse"; +import { IServerDetails } from "@spt/models/eft/game/IServerDetails"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { ILootConfig } from "@spt/models/spt/config/ILootConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService"; +import { GiftService } from "@spt/services/GiftService"; +import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { OpenZoneService } from "@spt/services/OpenZoneService"; +import { ProfileActivityService } from "@spt/services/ProfileActivityService"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; +import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class GameController @@ -66,7 +66,7 @@ export class GameController @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("TimeUtil") protected timeUtil: TimeUtil, @inject("HashUtil") protected hashUtil: HashUtil, - @inject("PreAkiModLoader") protected preAkiModLoader: PreAkiModLoader, + @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("HttpServerHelper") protected httpServerHelper: HttpServerHelper, @inject("RandomUtil") protected randomUtil: RandomUtil, @inject("HideoutHelper") protected hideoutHelper: HideoutHelper, @@ -199,7 +199,7 @@ export class GameController this.profileFixerService.checkForAndFixPmcProfileIssues(pmcProfile); - this.profileFixerService.addMissingAkiVersionTagToProfile(fullProfile); + this.profileFixerService.addMissingSptVersionTagToProfile(fullProfile); if (pmcProfile.Hideout) { @@ -834,21 +834,21 @@ export class GameController * Get a list of installed mods and save their details to the profile being used * @param fullProfile Profile to add mod details to */ - protected saveActiveModsToProfile(fullProfile: IAkiProfile): void + protected saveActiveModsToProfile(fullProfile: ISptProfile): void { // Add empty mod array if undefined - if (!fullProfile.aki.mods) + if (!fullProfile.spt.mods) { - fullProfile.aki.mods = []; + fullProfile.spt.mods = []; } // Get active mods - const activeMods = this.preAkiModLoader.getImportedModDetails(); + const activeMods = this.preSptModLoader.getImportedModDetails(); for (const modKey in activeMods) { const modDetails = activeMods[modKey]; if ( - fullProfile.aki.mods.some( + fullProfile.spt.mods.some( (x) => x.author === modDetails.author && x.name === modDetails.name @@ -860,7 +860,7 @@ export class GameController continue; } - fullProfile.aki.mods.push({ + fullProfile.spt.mods.push({ author: modDetails.author, dateAdded: Date.now(), name: modDetails.name, @@ -940,7 +940,7 @@ export class GameController * Check for a dialog with the key 'undefined', and remove it * @param fullProfile Profile to check for dialog in */ - protected checkForAndRemoveUndefinedDialogs(fullProfile: IAkiProfile): void + protected checkForAndRemoveUndefinedDialogs(fullProfile: ISptProfile): void { const undefinedDialog = fullProfile.dialogues.undefined; if (undefinedDialog) @@ -980,11 +980,11 @@ export class GameController } } - protected logProfileDetails(fullProfile: IAkiProfile): void + protected logProfileDetails(fullProfile: ISptProfile): void { - this.logger.debug(`Profile made with: ${fullProfile.aki.version}`); + this.logger.debug(`Profile made with: ${fullProfile.spt.version}`); this.logger.debug( - `Server version: ${globalThis.G_AKIVERSION || this.coreConfig.akiVersion} ${globalThis.G_COMMIT}`, + `Server version: ${globalThis.G_SPTVERSION || this.coreConfig.sptVersion} ${globalThis.G_COMMIT}`, ); this.logger.debug(`Debug enabled: ${globalThis.G_DEBUG_CONFIGURATION}`); this.logger.debug(`Mods enabled: ${globalThis.G_MODS_ENABLED}`); diff --git a/project/src/controllers/HandbookController.ts b/project/src/controllers/HandbookController.ts index 5823d583..c50129e9 100644 --- a/project/src/controllers/HandbookController.ts +++ b/project/src/controllers/HandbookController.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; @injectable() export class HandbookController diff --git a/project/src/controllers/HealthController.ts b/project/src/controllers/HealthController.ts index a1b17536..e965fe0e 100644 --- a/project/src/controllers/HealthController.ts +++ b/project/src/controllers/HealthController.ts @@ -1,22 +1,22 @@ import { inject, injectable } from "tsyringe"; -import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { BodyPart, IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; -import { IWorkoutData } from "@spt-aki/models/eft/health/IWorkoutData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { HealthHelper } from "@spt/helpers/HealthHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { BodyPart, IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData"; +import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { Traders } from "@spt/models/enums/Traders"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class HealthController @@ -233,7 +233,7 @@ export class HealthController // eslint-disable-next-line @typescript-eslint/no-unused-vars public applyWorkoutChanges(pmcData: IPmcData, info: IWorkoutData, sessionId: string): void { - // https://dev.sp-tarkov.com/SPT-AKI/Server/issues/2674 + // https://dev.sp-tarkov.com/SPT/Server/issues/2674 // TODO: // Health effects (fractures etc) are handled in /player/health/sync. pmcData.Skills.Common = info.skills.Common; diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts index 262e9ae0..c85b350f 100644 --- a/project/src/controllers/HideoutController.ts +++ b/project/src/controllers/HideoutController.ts @@ -1,57 +1,57 @@ import { inject, injectable } from "tsyringe"; -import { ScavCaseRewardGenerator } from "@spt-aki/generators/ScavCaseRewardGenerator"; -import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { ScavCaseRewardGenerator } from "@spt/generators/ScavCaseRewardGenerator"; +import { HideoutHelper } from "@spt/helpers/HideoutHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { HideoutArea, ITaskConditionCounter, Product, ScavCase, -} from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { HideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/HideoutUpgradeCompleteRequestData"; -import { IHandleQTEEventRequestData } from "@spt-aki/models/eft/hideout/IHandleQTEEventRequestData"; -import { IHideoutArea, Stage } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutCancelProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutCancelProductionRequestData"; -import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutImproveAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutImproveAreaRequestData"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; -import { IQteData } from "@spt-aki/models/eft/hideout/IQteData"; -import { IRecordShootingRangePoints } from "@spt-aki/models/eft/hideout/IRecordShootingRangePoints"; -import { IAddItemDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemDirectRequest"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { ProfileActivityService } from "@spt-aki/services/ProfileActivityService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { HideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/HideoutUpgradeCompleteRequestData"; +import { IHandleQTEEventRequestData } from "@spt/models/eft/hideout/IHandleQTEEventRequestData"; +import { IHideoutArea, Stage } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutCancelProductionRequestData } from "@spt/models/eft/hideout/IHideoutCancelProductionRequestData"; +import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutImproveAreaRequestData } from "@spt/models/eft/hideout/IHideoutImproveAreaRequestData"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IQteData } from "@spt/models/eft/hideout/IQteData"; +import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints"; +import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { ProfileActivityService } from "@spt/services/ProfileActivityService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class HideoutController diff --git a/project/src/controllers/InraidController.ts b/project/src/controllers/InraidController.ts index 5e46e751..754feb40 100644 --- a/project/src/controllers/InraidController.ts +++ b/project/src/controllers/InraidController.ts @@ -1,45 +1,45 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; -import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; -import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { BodyPartHealth } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig"; -import { IBTRConfig } from "@spt-aki/models/spt/config/IBTRConfig"; -import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; -import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ITraderServiceModel } from "@spt-aki/models/spt/services/ITraderServiceModel"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { InsuranceService } from "@spt-aki/services/InsuranceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; -import { PmcChatResponseService } from "@spt-aki/services/PmcChatResponseService"; -import { TraderServicesService } from "@spt-aki/services/TraderServicesService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator"; +import { HealthHelper } from "@spt/helpers/HealthHelper"; +import { InRaidHelper } from "@spt/helpers/InRaidHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { BodyPartHealth } from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; +import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig"; +import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; +import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { InsuranceService } from "@spt/services/InsuranceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; +import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; +import { TraderServicesService } from "@spt/services/TraderServicesService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** * Logic for handling In Raid callbacks diff --git a/project/src/controllers/InsuranceController.ts b/project/src/controllers/InsuranceController.ts index 190ceb04..81c238bf 100644 --- a/project/src/controllers/InsuranceController.ts +++ b/project/src/controllers/InsuranceController.ts @@ -1,34 +1,34 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; -import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; -import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { Insurance } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { InsuranceService } from "@spt-aki/services/InsuranceService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData"; +import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { Insurance } from "@spt/models/eft/profile/ISptProfile"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { InsuranceService } from "@spt/services/InsuranceService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class InsuranceController diff --git a/project/src/controllers/InventoryController.ts b/project/src/controllers/InventoryController.ts index 8a60fcc1..79a1e531 100644 --- a/project/src/controllers/InventoryController.ts +++ b/project/src/controllers/InventoryController.ts @@ -1,50 +1,50 @@ import { inject, injectable } from "tsyringe"; -import { LootGenerator } from "@spt-aki/generators/LootGenerator"; -import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; -import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; -import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; -import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; -import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; -import { IOpenRandomLootContainerRequestData } from "@spt-aki/models/eft/inventory/IOpenRandomLootContainerRequestData"; -import { IRedeemProfileRequestData } from "@spt-aki/models/eft/inventory/IRedeemProfileRequestData"; -import { ISetFavoriteItems } from "@spt-aki/models/eft/inventory/ISetFavoriteItems"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { LootGenerator } from "@spt/generators/LootGenerator"; +import { HideoutHelper } from "@spt/helpers/HideoutHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData"; +import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData"; +import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData"; +import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class InventoryController @@ -672,7 +672,7 @@ export class InventoryController * @param itemTpls Inspected item tpls * @param fullProfile Profile to add xp to */ - protected flagItemsAsInspectedAndRewardXp(itemTpls: string[], fullProfile: IAkiProfile): void + protected flagItemsAsInspectedAndRewardXp(itemTpls: string[], fullProfile: ISptProfile): void { for (const itemTpl of itemTpls) { diff --git a/project/src/controllers/LauncherController.ts b/project/src/controllers/LauncherController.ts index 5bd42e25..24a50c06 100644 --- a/project/src/controllers/LauncherController.ts +++ b/project/src/controllers/LauncherController.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; -import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; -import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData"; +import { IConnectResponse } from "@spt/models/eft/profile/IConnectResponse"; +import { Info, ModDetails } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class LauncherController @@ -34,7 +34,7 @@ export class LauncherController @inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("LocalisationService") protected localisationService: LocalisationService, - @inject("PreAkiModLoader") protected preAkiModLoader: PreAkiModLoader, + @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("ConfigServer") protected configServer: ConfigServer, ) { @@ -206,7 +206,7 @@ export class LauncherController */ public getLoadedServerMods(): Record { - return this.preAkiModLoader.getImportedModDetails(); + return this.preSptModLoader.getImportedModDetails(); } /** @@ -218,9 +218,9 @@ export class LauncherController { const profile = this.profileHelper.getFullProfile(sessionId); - if (profile?.aki?.mods) + if (profile?.spt?.mods) { - return this.preAkiModLoader.getProfileModsGroupedByModName(profile?.aki?.mods); + return this.preSptModLoader.getProfileModsGroupedByModName(profile?.spt?.mods); } return []; diff --git a/project/src/controllers/LocationController.ts b/project/src/controllers/LocationController.ts index 72dd8720..9d9d7948 100644 --- a/project/src/controllers/LocationController.ts +++ b/project/src/controllers/LocationController.ts @@ -1,32 +1,32 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { LocationGenerator } from "@spt-aki/generators/LocationGenerator"; -import { LootGenerator } from "@spt-aki/generators/LootGenerator"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { ILocation } from "@spt-aki/models/eft/common/ILocation"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; -import { ILooseLoot, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot"; -import { IAirdropLootResult } from "@spt-aki/models/eft/location/IAirdropLootResult"; -import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; -import { AirdropTypeEnum } from "@spt-aki/models/enums/AirdropType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { IRaidChanges } from "@spt-aki/models/spt/location/IRaidChanges"; -import { ILocations } from "@spt-aki/models/spt/server/ILocations"; -import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { LocationGenerator } from "@spt/generators/LocationGenerator"; +import { LootGenerator } from "@spt/generators/LootGenerator"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { ILocation } from "@spt/models/eft/common/ILocation"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase"; +import { ILooseLoot, SpawnpointTemplate } from "@spt/models/eft/common/ILooseLoot"; +import { IAirdropLootResult } from "@spt/models/eft/location/IAirdropLootResult"; +import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData"; +import { AirdropTypeEnum } from "@spt/models/enums/AirdropType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; +import { ILocations } from "@spt/models/spt/server/ILocations"; +import { LootRequest } from "@spt/models/spt/services/LootRequest"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class LocationController diff --git a/project/src/controllers/MatchController.ts b/project/src/controllers/MatchController.ts index 23dd7b78..9040fbc5 100644 --- a/project/src/controllers/MatchController.ts +++ b/project/src/controllers/MatchController.ts @@ -1,35 +1,35 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { LootGenerator } from "@spt-aki/generators/LootGenerator"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflineRaidRequestData"; -import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; -import { IMatchGroupStartGameRequest } from "@spt-aki/models/eft/match/IMatchGroupStartGameRequest"; -import { IMatchGroupStatusRequest } from "@spt-aki/models/eft/match/IMatchGroupStatusRequest"; -import { IMatchGroupStatusResponse } from "@spt-aki/models/eft/match/IMatchGroupStatusResponse"; -import { IProfileStatusResponse } from "@spt-aki/models/eft/match/IProfileStatusResponse"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; -import { IMatchConfig } from "@spt-aki/models/spt/config/IMatchConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; -import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { MatchLocationService } from "@spt-aki/services/MatchLocationService"; -import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { LootGenerator } from "@spt/generators/LootGenerator"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData"; +import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData"; +import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest"; +import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest"; +import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse"; +import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "@spt/models/spt/config/IMatchConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService"; +import { BotLootCacheService } from "@spt/services/BotLootCacheService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { MatchLocationService } from "@spt/services/MatchLocationService"; +import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class MatchController diff --git a/project/src/controllers/NoteController.ts b/project/src/controllers/NoteController.ts index d1414eee..3676a42b 100644 --- a/project/src/controllers/NoteController.ts +++ b/project/src/controllers/NoteController.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Note } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Note } from "@spt/models/eft/common/tables/IBotBase"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt/models/eft/notes/INoteActionData"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; @injectable() export class NoteController diff --git a/project/src/controllers/NotifierController.ts b/project/src/controllers/NotifierController.ts index 9c61bc66..2199b483 100644 --- a/project/src/controllers/NotifierController.ts +++ b/project/src/controllers/NotifierController.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; -import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; -import { NotificationService } from "@spt-aki/services/NotificationService"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { NotifierHelper } from "@spt/helpers/NotifierHelper"; +import { INotifierChannel } from "@spt/models/eft/notifier/INotifier"; +import { NotificationService } from "@spt/services/NotificationService"; @injectable() export class NotifierController diff --git a/project/src/controllers/PresetController.ts b/project/src/controllers/PresetController.ts index 7cce0f85..29f2ea1e 100644 --- a/project/src/controllers/PresetController.ts +++ b/project/src/controllers/PresetController.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; @injectable() export class PresetController diff --git a/project/src/controllers/ProfileController.ts b/project/src/controllers/ProfileController.ts index 359787a5..8d783c00 100644 --- a/project/src/controllers/ProfileController.ts +++ b/project/src/controllers/ProfileController.ts @@ -1,36 +1,36 @@ import { inject, injectable } from "tsyringe"; -import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ITemplateSide } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IMiniProfile } from "@spt-aki/models/eft/launcher/IMiniProfile"; -import { GetProfileStatusResponseData } from "@spt-aki/models/eft/profile/GetProfileStatusResponseData"; -import { IAkiProfile, Inraid, Vitality } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IGetOtherProfileRequest } from "@spt-aki/models/eft/profile/IGetOtherProfileRequest"; -import { IGetOtherProfileResponse } from "@spt-aki/models/eft/profile/IGetOtherProfileResponse"; -import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; -import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; -import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ITemplateSide } from "@spt/models/eft/common/tables/IProfileTemplate"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IMiniProfile } from "@spt/models/eft/launcher/IMiniProfile"; +import { GetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData"; +import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest"; +import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse"; +import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse"; +import { ISptProfile, Inraid, Vitality } from "@spt/models/eft/profile/ISptProfile"; +import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class ProfileController @@ -91,7 +91,7 @@ export class ProfileController prevexp: 0, nextlvl: 0, maxlvl: maxlvl, - akiData: this.profileHelper.getDefaultAkiDataObject(), + sptData: this.profileHelper.getDefaultSptDataObject(), }; } @@ -106,7 +106,7 @@ export class ProfileController prevexp: currlvl === 0 ? 0 : this.profileHelper.getExperience(currlvl), nextlvl: nextlvl, maxlvl: maxlvl, - akiData: profile.aki, + sptData: profile.spt, }; return result; @@ -173,13 +173,13 @@ export class ProfileController pmcData.Inventory.hideoutAreaStashes = {}; // Create profile - const profileDetails: IAkiProfile = { + const profileDetails: ISptProfile = { info: account, characters: { pmc: pmcData, scav: {} as IPmcData }, suits: profile.suits, userbuilds: profile.userbuilds, dialogues: profile.dialogues, - aki: this.profileHelper.getDefaultAkiDataObject(), + spt: this.profileHelper.getDefaultSptDataObject(), vitality: {} as Vitality, inraid: {} as Inraid, insurance: [], @@ -285,7 +285,7 @@ export class ProfileController * @param response Event router response */ protected givePlayerStartingQuestRewards( - profileDetails: IAkiProfile, + profileDetails: ISptProfile, sessionID: string, response: IItemEventRouterResponse, ): void diff --git a/project/src/controllers/QuestController.ts b/project/src/controllers/QuestController.ts index 4a86422d..f5000012 100644 --- a/project/src/controllers/QuestController.ts +++ b/project/src/controllers/QuestController.ts @@ -1,37 +1,37 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IQuest, IQuestCondition } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; -import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; -import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; -import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IQuestStatus } from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IQuest, IQuestCondition } from "@spt/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData"; +import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType"; +import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class QuestController diff --git a/project/src/controllers/RagfairController.ts b/project/src/controllers/RagfairController.ts index d61b72da..6bdb1c5c 100644 --- a/project/src/controllers/RagfairController.ts +++ b/project/src/controllers/RagfairController.ts @@ -1,47 +1,47 @@ import { inject, injectable } from "tsyringe"; -import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; -import { RagfairOfferHelper } from "@spt-aki/helpers/RagfairOfferHelper"; -import { RagfairSellHelper } from "@spt-aki/helpers/RagfairSellHelper"; -import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IBarterScheme, ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IAddOfferRequestData, Requirement } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; -import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; -import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; -import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; -import { IGetRagfairOfferByIdRequest } from "@spt-aki/models/eft/ragfair/IGetRagfairOfferByIdRequest"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { IRemoveOfferRequestData } from "@spt-aki/models/eft/ragfair/IRemoveOfferRequestData"; -import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RagfairServer } from "@spt-aki/servers/RagfairServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; -import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairHelper } from "@spt/helpers/RagfairHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "@spt/helpers/RagfairSellHelper"; +import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { IAddOfferRequestData, Requirement } from "@spt/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult"; +import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RagfairServer } from "@spt/servers/RagfairServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "@spt/services/RagfairRequiredItemsService"; +import { RagfairTaxService } from "@spt/services/RagfairTaxService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** * Handle RagfairCallback events @@ -248,7 +248,7 @@ export class RagfairController * @param offer Flea offer to update * @param fullProfile Players full profile */ - protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, fullProfile: IAkiProfile): void + protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, fullProfile: ISptProfile): void { // No trader found, create a blank record for them if (!fullProfile.traderPurchases[offer.user.id]) diff --git a/project/src/controllers/RepairController.ts b/project/src/controllers/RepairController.ts index 45059ca7..ade6bab5 100644 --- a/project/src/controllers/RepairController.ts +++ b/project/src/controllers/RepairController.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; -import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { RepairService } from "@spt-aki/services/RepairService"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { RepairHelper } from "@spt/helpers/RepairHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { PaymentService } from "@spt/services/PaymentService"; +import { RepairService } from "@spt/services/RepairService"; @injectable() export class RepairController diff --git a/project/src/controllers/RepeatableQuestController.ts b/project/src/controllers/RepeatableQuestController.ts index 15dd6bf5..d7e50655 100644 --- a/project/src/controllers/RepeatableQuestController.ts +++ b/project/src/controllers/RepeatableQuestController.ts @@ -1,36 +1,36 @@ import { inject, injectable } from "tsyringe"; -import { RepeatableQuestGenerator } from "@spt-aki/generators/RepeatableQuestGenerator"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { RepeatableQuestGenerator } from "@spt/generators/RepeatableQuestGenerator"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IChangeRequirement, IPmcDataRepeatableQuest, IRepeatableQuest, -} from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ELocationName } from "@spt-aki/models/enums/ELocationName"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { IQuestTypePool } from "@spt-aki/models/spt/repeatable/IQuestTypePool"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ELocationName } from "@spt/models/enums/ELocationName"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { PaymentService } from "@spt/services/PaymentService"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class RepeatableQuestController diff --git a/project/src/controllers/TradeController.ts b/project/src/controllers/TradeController.ts index b6e22abe..2a5e8471 100644 --- a/project/src/controllers/TradeController.ts +++ b/project/src/controllers/TradeController.ts @@ -1,40 +1,40 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TradeHelper } from "@spt-aki/helpers/TradeHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TradeHelper } from "@spt/helpers/TradeHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IOfferRequest, IProcessRagfairTradeRequestData, -} from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; -import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; -import { ISellScavItemsToFenceRequestData } from "@spt-aki/models/eft/trade/ISellScavItemsToFenceRequestData"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RagfairServer } from "@spt-aki/servers/RagfairServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/eft/trade/IProcessRagfairTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; +import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RagfairServer } from "@spt/servers/RagfairServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class TradeController diff --git a/project/src/controllers/TraderController.ts b/project/src/controllers/TraderController.ts index af1de49a..cbd60513 100644 --- a/project/src/controllers/TraderController.ts +++ b/project/src/controllers/TraderController.ts @@ -1,20 +1,20 @@ import { inject, injectable } from "tsyringe"; -import { FenceBaseAssortGenerator } from "@spt-aki/generators/FenceBaseAssortGenerator"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; -import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { FenceBaseAssortGenerator } from "@spt/generators/FenceBaseAssortGenerator"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { FenceService } from "@spt/services/FenceService"; +import { TraderAssortService } from "@spt/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class TraderController diff --git a/project/src/controllers/WeatherController.ts b/project/src/controllers/WeatherController.ts index f807cf12..91c92ec2 100644 --- a/project/src/controllers/WeatherController.ts +++ b/project/src/controllers/WeatherController.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; -import { IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { WeatherGenerator } from "@spt/generators/WeatherGenerator"; +import { IWeatherData } from "@spt/models/eft/weather/IWeatherData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class WeatherController diff --git a/project/src/controllers/WishlistController.ts b/project/src/controllers/WishlistController.ts index fcf25b91..0f270d48 100644 --- a/project/src/controllers/WishlistController.ts +++ b/project/src/controllers/WishlistController.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt/models/eft/wishlist/IWishlistActionData"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; @injectable() export class WishlistController diff --git a/project/src/di/Container.ts b/project/src/di/Container.ts index d5ab4f97..6299c9df 100644 --- a/project/src/di/Container.ts +++ b/project/src/di/Container.ts @@ -1,269 +1,269 @@ import { DependencyContainer, Lifecycle } from "tsyringe"; -import { AchievementCallbacks } from "@spt-aki/callbacks/AchievementCallbacks"; -import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; -import { BuildsCallbacks } from "@spt-aki/callbacks/BuildsCallbacks"; -import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; -import { ClientLogCallbacks } from "@spt-aki/callbacks/ClientLogCallbacks"; -import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; -import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; -import { DialogueCallbacks } from "@spt-aki/callbacks/DialogueCallbacks"; -import { GameCallbacks } from "@spt-aki/callbacks/GameCallbacks"; -import { HandbookCallbacks } from "@spt-aki/callbacks/HandbookCallbacks"; -import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; -import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; -import { HttpCallbacks } from "@spt-aki/callbacks/HttpCallbacks"; -import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; -import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; -import { InventoryCallbacks } from "@spt-aki/callbacks/InventoryCallbacks"; -import { ItemEventCallbacks } from "@spt-aki/callbacks/ItemEventCallbacks"; -import { LauncherCallbacks } from "@spt-aki/callbacks/LauncherCallbacks"; -import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; -import { MatchCallbacks } from "@spt-aki/callbacks/MatchCallbacks"; -import { ModCallbacks } from "@spt-aki/callbacks/ModCallbacks"; -import { NoteCallbacks } from "@spt-aki/callbacks/NoteCallbacks"; -import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; -import { PresetCallbacks } from "@spt-aki/callbacks/PresetCallbacks"; -import { ProfileCallbacks } from "@spt-aki/callbacks/ProfileCallbacks"; -import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; -import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; -import { RepairCallbacks } from "@spt-aki/callbacks/RepairCallbacks"; -import { SaveCallbacks } from "@spt-aki/callbacks/SaveCallbacks"; -import { TradeCallbacks } from "@spt-aki/callbacks/TradeCallbacks"; -import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; -import { WeatherCallbacks } from "@spt-aki/callbacks/WeatherCallbacks"; -import { WishlistCallbacks } from "@spt-aki/callbacks/WishlistCallbacks"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { AchievementController } from "@spt-aki/controllers/AchievementController"; -import { BotController } from "@spt-aki/controllers/BotController"; -import { BuildController } from "@spt-aki/controllers/BuildController"; -import { ClientLogController } from "@spt-aki/controllers/ClientLogController"; -import { CustomizationController } from "@spt-aki/controllers/CustomizationController"; -import { DialogueController } from "@spt-aki/controllers/DialogueController"; -import { GameController } from "@spt-aki/controllers/GameController"; -import { HandbookController } from "@spt-aki/controllers/HandbookController"; -import { HealthController } from "@spt-aki/controllers/HealthController"; -import { HideoutController } from "@spt-aki/controllers/HideoutController"; -import { InraidController } from "@spt-aki/controllers/InraidController"; -import { InsuranceController } from "@spt-aki/controllers/InsuranceController"; -import { InventoryController } from "@spt-aki/controllers/InventoryController"; -import { LauncherController } from "@spt-aki/controllers/LauncherController"; -import { LocationController } from "@spt-aki/controllers/LocationController"; -import { MatchController } from "@spt-aki/controllers/MatchController"; -import { NoteController } from "@spt-aki/controllers/NoteController"; -import { NotifierController } from "@spt-aki/controllers/NotifierController"; -import { PresetController } from "@spt-aki/controllers/PresetController"; -import { ProfileController } from "@spt-aki/controllers/ProfileController"; -import { QuestController } from "@spt-aki/controllers/QuestController"; -import { RagfairController } from "@spt-aki/controllers/RagfairController"; -import { RepairController } from "@spt-aki/controllers/RepairController"; -import { RepeatableQuestController } from "@spt-aki/controllers/RepeatableQuestController"; -import { TradeController } from "@spt-aki/controllers/TradeController"; -import { TraderController } from "@spt-aki/controllers/TraderController"; -import { WeatherController } from "@spt-aki/controllers/WeatherController"; -import { WishlistController } from "@spt-aki/controllers/WishlistController"; -import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; -import { BotGenerator } from "@spt-aki/generators/BotGenerator"; -import { BotInventoryGenerator } from "@spt-aki/generators/BotInventoryGenerator"; -import { BotLevelGenerator } from "@spt-aki/generators/BotLevelGenerator"; -import { BotLootGenerator } from "@spt-aki/generators/BotLootGenerator"; -import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; -import { FenceBaseAssortGenerator } from "@spt-aki/generators/FenceBaseAssortGenerator"; -import { LocationGenerator } from "@spt-aki/generators/LocationGenerator"; -import { LootGenerator } from "@spt-aki/generators/LootGenerator"; -import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; -import { PMCLootGenerator } from "@spt-aki/generators/PMCLootGenerator"; -import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; -import { RepeatableQuestGenerator } from "@spt-aki/generators/RepeatableQuestGenerator"; -import { RepeatableQuestRewardGenerator } from "@spt-aki/generators/RepeatableQuestRewardGenerator"; -import { ScavCaseRewardGenerator } from "@spt-aki/generators/ScavCaseRewardGenerator"; -import { BarrelInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/BarrelInventoryMagGen"; -import { ExternalInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/ExternalInventoryMagGen"; -import { InternalMagazineInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/InternalMagazineInventoryMagGen"; -import { UbglExternalMagGen } from "@spt-aki/generators/weapongen/implementations/UbglExternalMagGen"; -import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; -import { AssortHelper } from "@spt-aki/helpers/AssortHelper"; -import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; -import { SptCommandoCommands } from "@spt-aki/helpers/Dialogue/Commando/SptCommandoCommands"; -import { GiveSptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand"; -import { ProfileSptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand"; -import { TraderSptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand"; -import { CommandoDialogueChatBot } from "@spt-aki/helpers/Dialogue/CommandoDialogueChatBot"; -import { SptDialogueChatBot } from "@spt-aki/helpers/Dialogue/SptDialogueChatBot"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { DurabilityLimitsHelper } from "@spt-aki/helpers/DurabilityLimitsHelper"; -import { GameEventHelper } from "@spt-aki/helpers/GameEventHelper"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { HealthHelper } from "@spt-aki/helpers/HealthHelper"; -import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; -import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProbabilityHelper } from "@spt-aki/helpers/ProbabilityHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; -import { RagfairOfferHelper } from "@spt-aki/helpers/RagfairOfferHelper"; -import { RagfairSellHelper } from "@spt-aki/helpers/RagfairSellHelper"; -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; -import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; -import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; -import { SecureContainerHelper } from "@spt-aki/helpers/SecureContainerHelper"; -import { TradeHelper } from "@spt-aki/helpers/TradeHelper"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { UtilityHelper } from "@spt-aki/helpers/UtilityHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; -import { ModLoadOrder } from "@spt-aki/loaders/ModLoadOrder"; -import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; -import { PostAkiModLoader } from "@spt-aki/loaders/PostAkiModLoader"; -import { PostDBModLoader } from "@spt-aki/loaders/PostDBModLoader"; -import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { BotDynamicRouter } from "@spt-aki/routers/dynamic/BotDynamicRouter"; -import { BundleDynamicRouter } from "@spt-aki/routers/dynamic/BundleDynamicRouter"; -import { CustomizationDynamicRouter } from "@spt-aki/routers/dynamic/CustomizationDynamicRouter"; -import { DataDynamicRouter } from "@spt-aki/routers/dynamic/DataDynamicRouter"; -import { HttpDynamicRouter } from "@spt-aki/routers/dynamic/HttpDynamicRouter"; -import { InraidDynamicRouter } from "@spt-aki/routers/dynamic/InraidDynamicRouter"; -import { LocationDynamicRouter } from "@spt-aki/routers/dynamic/LocationDynamicRouter"; -import { NotifierDynamicRouter } from "@spt-aki/routers/dynamic/NotifierDynamicRouter"; -import { TraderDynamicRouter } from "@spt-aki/routers/dynamic/TraderDynamicRouter"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { HttpRouter } from "@spt-aki/routers/HttpRouter"; -import { ImageRouter } from "@spt-aki/routers/ImageRouter"; -import { CustomizationItemEventRouter } from "@spt-aki/routers/item_events/CustomizationItemEventRouter"; -import { HealthItemEventRouter } from "@spt-aki/routers/item_events/HealthItemEventRouter"; -import { HideoutItemEventRouter } from "@spt-aki/routers/item_events/HideoutItemEventRouter"; -import { InsuranceItemEventRouter } from "@spt-aki/routers/item_events/InsuranceItemEventRouter"; -import { InventoryItemEventRouter } from "@spt-aki/routers/item_events/InventoryItemEventRouter"; -import { NoteItemEventRouter } from "@spt-aki/routers/item_events/NoteItemEventRouter"; -import { QuestItemEventRouter } from "@spt-aki/routers/item_events/QuestItemEventRouter"; -import { RagfairItemEventRouter } from "@spt-aki/routers/item_events/RagfairItemEventRouter"; -import { RepairItemEventRouter } from "@spt-aki/routers/item_events/RepairItemEventRouter"; -import { TradeItemEventRouter } from "@spt-aki/routers/item_events/TradeItemEventRouter"; -import { WishlistItemEventRouter } from "@spt-aki/routers/item_events/WishlistItemEventRouter"; -import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; -import { HealthSaveLoadRouter } from "@spt-aki/routers/save_load/HealthSaveLoadRouter"; -import { InraidSaveLoadRouter } from "@spt-aki/routers/save_load/InraidSaveLoadRouter"; -import { InsuranceSaveLoadRouter } from "@spt-aki/routers/save_load/InsuranceSaveLoadRouter"; -import { ProfileSaveLoadRouter } from "@spt-aki/routers/save_load/ProfileSaveLoadRouter"; -import { BundleSerializer } from "@spt-aki/routers/serializers/BundleSerializer"; -import { ImageSerializer } from "@spt-aki/routers/serializers/ImageSerializer"; -import { NotifySerializer } from "@spt-aki/routers/serializers/NotifySerializer"; -import { AchievementStaticRouter } from "@spt-aki/routers/static/AchievementStaticRouter"; -import { BotStaticRouter } from "@spt-aki/routers/static/BotStaticRouter"; -import { BuildsStaticRouter } from "@spt-aki/routers/static/BuildStaticRouter"; -import { BundleStaticRouter } from "@spt-aki/routers/static/BundleStaticRouter"; -import { ClientLogStaticRouter } from "@spt-aki/routers/static/ClientLogStaticRouter"; -import { CustomizationStaticRouter } from "@spt-aki/routers/static/CustomizationStaticRouter"; -import { DataStaticRouter } from "@spt-aki/routers/static/DataStaticRouter"; -import { DialogStaticRouter } from "@spt-aki/routers/static/DialogStaticRouter"; -import { GameStaticRouter } from "@spt-aki/routers/static/GameStaticRouter"; -import { HealthStaticRouter } from "@spt-aki/routers/static/HealthStaticRouter"; -import { InraidStaticRouter } from "@spt-aki/routers/static/InraidStaticRouter"; -import { InsuranceStaticRouter } from "@spt-aki/routers/static/InsuranceStaticRouter"; -import { ItemEventStaticRouter } from "@spt-aki/routers/static/ItemEventStaticRouter"; -import { LauncherStaticRouter } from "@spt-aki/routers/static/LauncherStaticRouter"; -import { LocationStaticRouter } from "@spt-aki/routers/static/LocationStaticRouter"; -import { MatchStaticRouter } from "@spt-aki/routers/static/MatchStaticRouter"; -import { NotifierStaticRouter } from "@spt-aki/routers/static/NotifierStaticRouter"; -import { ProfileStaticRouter } from "@spt-aki/routers/static/ProfileStaticRouter"; -import { QuestStaticRouter } from "@spt-aki/routers/static/QuestStaticRouter"; -import { RagfairStaticRouter } from "@spt-aki/routers/static/RagfairStaticRouter"; -import { TraderStaticRouter } from "@spt-aki/routers/static/TraderStaticRouter"; -import { WeatherStaticRouter } from "@spt-aki/routers/static/WeatherStaticRouter"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { AkiHttpListener } from "@spt-aki/servers/http/AkiHttpListener"; -import { HttpServer } from "@spt-aki/servers/HttpServer"; -import { RagfairServer } from "@spt-aki/servers/RagfairServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; -import { AkiWebSocketConnectionHandler } from "@spt-aki/servers/ws/AkiWebSocketConnectionHandler"; -import { IWebSocketConnectionHandler } from "@spt-aki/servers/ws/IWebSocketConnectionHandler"; -import { DefaultAkiWebSocketMessageHandler } from "@spt-aki/servers/ws/message/DefaultAkiWebSocketMessageHandler"; -import { IAkiWebSocketMessageHandler } from "@spt-aki/servers/ws/message/IAkiWebSocketMessageHandler"; -import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; -import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; -import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; -import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; -import { BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; -import { BundleHashCacheService } from "@spt-aki/services/cache/BundleHashCacheService"; -import { ModHashCacheService } from "@spt-aki/services/cache/ModHashCacheService"; -import { CustomLocationWaveService } from "@spt-aki/services/CustomLocationWaveService"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { GiftService } from "@spt-aki/services/GiftService"; -import { InsuranceService } from "@spt-aki/services/InsuranceService"; -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; -import { MatchLocationService } from "@spt-aki/services/MatchLocationService"; -import { CustomItemService } from "@spt-aki/services/mod/CustomItemService"; -import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService"; -import { HttpListenerModService } from "@spt-aki/services/mod/httpListener/HttpListenerModService"; -import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; -import { OnLoadModService } from "@spt-aki/services/mod/onLoad/OnLoadModService"; -import { OnUpdateModService } from "@spt-aki/services/mod/onUpdate/OnUpdateModService"; -import { StaticRouterModService } from "@spt-aki/services/mod/staticRouter/StaticRouterModService"; -import { ModCompilerService } from "@spt-aki/services/ModCompilerService"; -import { NotificationService } from "@spt-aki/services/NotificationService"; -import { OpenZoneService } from "@spt-aki/services/OpenZoneService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { PmcChatResponseService } from "@spt-aki/services/PmcChatResponseService"; -import { ProfileActivityService } from "@spt-aki/services/ProfileActivityService"; -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; -import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; -import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; -import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; -import { RagfairTaxService } from "@spt-aki/services/RagfairTaxService"; -import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService"; -import { RepairService } from "@spt-aki/services/RepairService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; -import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; -import { TraderServicesService } from "@spt-aki/services/TraderServicesService"; -import { App } from "@spt-aki/utils/App"; -import { AsyncQueue } from "@spt-aki/utils/AsyncQueue"; -import type { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { JsonCloner } from "@spt-aki/utils/cloners/JsonCloner"; -import { RecursiveCloner } from "@spt-aki/utils/cloners/RecursiveCloner"; -import { StructuredCloner } from "@spt-aki/utils/cloners/StructuredCloner"; -import { CompareUtil } from "@spt-aki/utils/CompareUtil"; -import { DatabaseImporter } from "@spt-aki/utils/DatabaseImporter"; -import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; -import { WinstonRequestLogger } from "@spt-aki/utils/logging/WinstonRequestLogger"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; -import { VFS } from "@spt-aki/utils/VFS"; -import { Watermark, WatermarkLocale } from "@spt-aki/utils/Watermark"; +import { AchievementCallbacks } from "@spt/callbacks/AchievementCallbacks"; +import { BotCallbacks } from "@spt/callbacks/BotCallbacks"; +import { BuildsCallbacks } from "@spt/callbacks/BuildsCallbacks"; +import { BundleCallbacks } from "@spt/callbacks/BundleCallbacks"; +import { ClientLogCallbacks } from "@spt/callbacks/ClientLogCallbacks"; +import { CustomizationCallbacks } from "@spt/callbacks/CustomizationCallbacks"; +import { DataCallbacks } from "@spt/callbacks/DataCallbacks"; +import { DialogueCallbacks } from "@spt/callbacks/DialogueCallbacks"; +import { GameCallbacks } from "@spt/callbacks/GameCallbacks"; +import { HandbookCallbacks } from "@spt/callbacks/HandbookCallbacks"; +import { HealthCallbacks } from "@spt/callbacks/HealthCallbacks"; +import { HideoutCallbacks } from "@spt/callbacks/HideoutCallbacks"; +import { HttpCallbacks } from "@spt/callbacks/HttpCallbacks"; +import { InraidCallbacks } from "@spt/callbacks/InraidCallbacks"; +import { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks"; +import { InventoryCallbacks } from "@spt/callbacks/InventoryCallbacks"; +import { ItemEventCallbacks } from "@spt/callbacks/ItemEventCallbacks"; +import { LauncherCallbacks } from "@spt/callbacks/LauncherCallbacks"; +import { LocationCallbacks } from "@spt/callbacks/LocationCallbacks"; +import { MatchCallbacks } from "@spt/callbacks/MatchCallbacks"; +import { ModCallbacks } from "@spt/callbacks/ModCallbacks"; +import { NoteCallbacks } from "@spt/callbacks/NoteCallbacks"; +import { NotifierCallbacks } from "@spt/callbacks/NotifierCallbacks"; +import { PresetCallbacks } from "@spt/callbacks/PresetCallbacks"; +import { ProfileCallbacks } from "@spt/callbacks/ProfileCallbacks"; +import { QuestCallbacks } from "@spt/callbacks/QuestCallbacks"; +import { RagfairCallbacks } from "@spt/callbacks/RagfairCallbacks"; +import { RepairCallbacks } from "@spt/callbacks/RepairCallbacks"; +import { SaveCallbacks } from "@spt/callbacks/SaveCallbacks"; +import { TradeCallbacks } from "@spt/callbacks/TradeCallbacks"; +import { TraderCallbacks } from "@spt/callbacks/TraderCallbacks"; +import { WeatherCallbacks } from "@spt/callbacks/WeatherCallbacks"; +import { WishlistCallbacks } from "@spt/callbacks/WishlistCallbacks"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { AchievementController } from "@spt/controllers/AchievementController"; +import { BotController } from "@spt/controllers/BotController"; +import { BuildController } from "@spt/controllers/BuildController"; +import { ClientLogController } from "@spt/controllers/ClientLogController"; +import { CustomizationController } from "@spt/controllers/CustomizationController"; +import { DialogueController } from "@spt/controllers/DialogueController"; +import { GameController } from "@spt/controllers/GameController"; +import { HandbookController } from "@spt/controllers/HandbookController"; +import { HealthController } from "@spt/controllers/HealthController"; +import { HideoutController } from "@spt/controllers/HideoutController"; +import { InraidController } from "@spt/controllers/InraidController"; +import { InsuranceController } from "@spt/controllers/InsuranceController"; +import { InventoryController } from "@spt/controllers/InventoryController"; +import { LauncherController } from "@spt/controllers/LauncherController"; +import { LocationController } from "@spt/controllers/LocationController"; +import { MatchController } from "@spt/controllers/MatchController"; +import { NoteController } from "@spt/controllers/NoteController"; +import { NotifierController } from "@spt/controllers/NotifierController"; +import { PresetController } from "@spt/controllers/PresetController"; +import { ProfileController } from "@spt/controllers/ProfileController"; +import { QuestController } from "@spt/controllers/QuestController"; +import { RagfairController } from "@spt/controllers/RagfairController"; +import { RepairController } from "@spt/controllers/RepairController"; +import { RepeatableQuestController } from "@spt/controllers/RepeatableQuestController"; +import { TradeController } from "@spt/controllers/TradeController"; +import { TraderController } from "@spt/controllers/TraderController"; +import { WeatherController } from "@spt/controllers/WeatherController"; +import { WishlistController } from "@spt/controllers/WishlistController"; +import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator"; +import { BotGenerator } from "@spt/generators/BotGenerator"; +import { BotInventoryGenerator } from "@spt/generators/BotInventoryGenerator"; +import { BotLevelGenerator } from "@spt/generators/BotLevelGenerator"; +import { BotLootGenerator } from "@spt/generators/BotLootGenerator"; +import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator"; +import { FenceBaseAssortGenerator } from "@spt/generators/FenceBaseAssortGenerator"; +import { LocationGenerator } from "@spt/generators/LocationGenerator"; +import { LootGenerator } from "@spt/generators/LootGenerator"; +import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator"; +import { PMCLootGenerator } from "@spt/generators/PMCLootGenerator"; +import { RagfairAssortGenerator } from "@spt/generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator"; +import { RepeatableQuestGenerator } from "@spt/generators/RepeatableQuestGenerator"; +import { RepeatableQuestRewardGenerator } from "@spt/generators/RepeatableQuestRewardGenerator"; +import { ScavCaseRewardGenerator } from "@spt/generators/ScavCaseRewardGenerator"; +import { BarrelInventoryMagGen } from "@spt/generators/weapongen/implementations/BarrelInventoryMagGen"; +import { ExternalInventoryMagGen } from "@spt/generators/weapongen/implementations/ExternalInventoryMagGen"; +import { InternalMagazineInventoryMagGen } from "@spt/generators/weapongen/implementations/InternalMagazineInventoryMagGen"; +import { UbglExternalMagGen } from "@spt/generators/weapongen/implementations/UbglExternalMagGen"; +import { WeatherGenerator } from "@spt/generators/WeatherGenerator"; +import { AssortHelper } from "@spt/helpers/AssortHelper"; +import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { ContainerHelper } from "@spt/helpers/ContainerHelper"; +import { SptCommandoCommands } from "@spt/helpers/Dialogue/Commando/SptCommandoCommands"; +import { GiveSptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand"; +import { ProfileSptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand"; +import { TraderSptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand"; +import { CommandoDialogueChatBot } from "@spt/helpers/Dialogue/CommandoDialogueChatBot"; +import { SptDialogueChatBot } from "@spt/helpers/Dialogue/SptDialogueChatBot"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { DurabilityLimitsHelper } from "@spt/helpers/DurabilityLimitsHelper"; +import { GameEventHelper } from "@spt/helpers/GameEventHelper"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { HealthHelper } from "@spt/helpers/HealthHelper"; +import { HideoutHelper } from "@spt/helpers/HideoutHelper"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { InRaidHelper } from "@spt/helpers/InRaidHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt/helpers/NotifierHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProbabilityHelper } from "@spt/helpers/ProbabilityHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { RagfairHelper } from "@spt/helpers/RagfairHelper"; +import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper"; +import { RagfairSellHelper } from "@spt/helpers/RagfairSellHelper"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper"; +import { RepairHelper } from "@spt/helpers/RepairHelper"; +import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper"; +import { SecureContainerHelper } from "@spt/helpers/SecureContainerHelper"; +import { TradeHelper } from "@spt/helpers/TradeHelper"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { UtilityHelper } from "@spt/helpers/UtilityHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { BundleLoader } from "@spt/loaders/BundleLoader"; +import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; +import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; +import { PostDBModLoader } from "@spt/loaders/PostDBModLoader"; +import { PostSptModLoader } from "@spt/loaders/PostSptModLoader"; +import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { BotDynamicRouter } from "@spt/routers/dynamic/BotDynamicRouter"; +import { BundleDynamicRouter } from "@spt/routers/dynamic/BundleDynamicRouter"; +import { CustomizationDynamicRouter } from "@spt/routers/dynamic/CustomizationDynamicRouter"; +import { DataDynamicRouter } from "@spt/routers/dynamic/DataDynamicRouter"; +import { HttpDynamicRouter } from "@spt/routers/dynamic/HttpDynamicRouter"; +import { InraidDynamicRouter } from "@spt/routers/dynamic/InraidDynamicRouter"; +import { LocationDynamicRouter } from "@spt/routers/dynamic/LocationDynamicRouter"; +import { NotifierDynamicRouter } from "@spt/routers/dynamic/NotifierDynamicRouter"; +import { TraderDynamicRouter } from "@spt/routers/dynamic/TraderDynamicRouter"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { HttpRouter } from "@spt/routers/HttpRouter"; +import { ImageRouter } from "@spt/routers/ImageRouter"; +import { CustomizationItemEventRouter } from "@spt/routers/item_events/CustomizationItemEventRouter"; +import { HealthItemEventRouter } from "@spt/routers/item_events/HealthItemEventRouter"; +import { HideoutItemEventRouter } from "@spt/routers/item_events/HideoutItemEventRouter"; +import { InsuranceItemEventRouter } from "@spt/routers/item_events/InsuranceItemEventRouter"; +import { InventoryItemEventRouter } from "@spt/routers/item_events/InventoryItemEventRouter"; +import { NoteItemEventRouter } from "@spt/routers/item_events/NoteItemEventRouter"; +import { QuestItemEventRouter } from "@spt/routers/item_events/QuestItemEventRouter"; +import { RagfairItemEventRouter } from "@spt/routers/item_events/RagfairItemEventRouter"; +import { RepairItemEventRouter } from "@spt/routers/item_events/RepairItemEventRouter"; +import { TradeItemEventRouter } from "@spt/routers/item_events/TradeItemEventRouter"; +import { WishlistItemEventRouter } from "@spt/routers/item_events/WishlistItemEventRouter"; +import { ItemEventRouter } from "@spt/routers/ItemEventRouter"; +import { HealthSaveLoadRouter } from "@spt/routers/save_load/HealthSaveLoadRouter"; +import { InraidSaveLoadRouter } from "@spt/routers/save_load/InraidSaveLoadRouter"; +import { InsuranceSaveLoadRouter } from "@spt/routers/save_load/InsuranceSaveLoadRouter"; +import { ProfileSaveLoadRouter } from "@spt/routers/save_load/ProfileSaveLoadRouter"; +import { BundleSerializer } from "@spt/routers/serializers/BundleSerializer"; +import { ImageSerializer } from "@spt/routers/serializers/ImageSerializer"; +import { NotifySerializer } from "@spt/routers/serializers/NotifySerializer"; +import { AchievementStaticRouter } from "@spt/routers/static/AchievementStaticRouter"; +import { BotStaticRouter } from "@spt/routers/static/BotStaticRouter"; +import { BuildsStaticRouter } from "@spt/routers/static/BuildStaticRouter"; +import { BundleStaticRouter } from "@spt/routers/static/BundleStaticRouter"; +import { ClientLogStaticRouter } from "@spt/routers/static/ClientLogStaticRouter"; +import { CustomizationStaticRouter } from "@spt/routers/static/CustomizationStaticRouter"; +import { DataStaticRouter } from "@spt/routers/static/DataStaticRouter"; +import { DialogStaticRouter } from "@spt/routers/static/DialogStaticRouter"; +import { GameStaticRouter } from "@spt/routers/static/GameStaticRouter"; +import { HealthStaticRouter } from "@spt/routers/static/HealthStaticRouter"; +import { InraidStaticRouter } from "@spt/routers/static/InraidStaticRouter"; +import { InsuranceStaticRouter } from "@spt/routers/static/InsuranceStaticRouter"; +import { ItemEventStaticRouter } from "@spt/routers/static/ItemEventStaticRouter"; +import { LauncherStaticRouter } from "@spt/routers/static/LauncherStaticRouter"; +import { LocationStaticRouter } from "@spt/routers/static/LocationStaticRouter"; +import { MatchStaticRouter } from "@spt/routers/static/MatchStaticRouter"; +import { NotifierStaticRouter } from "@spt/routers/static/NotifierStaticRouter"; +import { ProfileStaticRouter } from "@spt/routers/static/ProfileStaticRouter"; +import { QuestStaticRouter } from "@spt/routers/static/QuestStaticRouter"; +import { RagfairStaticRouter } from "@spt/routers/static/RagfairStaticRouter"; +import { TraderStaticRouter } from "@spt/routers/static/TraderStaticRouter"; +import { WeatherStaticRouter } from "@spt/routers/static/WeatherStaticRouter"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SptHttpListener } from "@spt/servers/http/SptHttpListener"; +import { HttpServer } from "@spt/servers/HttpServer"; +import { RagfairServer } from "@spt/servers/RagfairServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; +import { DefaultSptWebSocketMessageHandler } from "@spt/servers/ws/message/DefaultSptWebSocketMessageHandler"; +import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; +import { SptWebSocketConnectionHandler } from "@spt/servers/ws/SptWebSocketConnectionHandler"; +import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService"; +import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService"; +import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService"; +import { BotLootCacheService } from "@spt/services/BotLootCacheService"; +import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService"; +import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; +import { ModHashCacheService } from "@spt/services/cache/ModHashCacheService"; +import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService"; +import { FenceService } from "@spt/services/FenceService"; +import { GiftService } from "@spt/services/GiftService"; +import { InsuranceService } from "@spt/services/InsuranceService"; +import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; +import { MatchLocationService } from "@spt/services/MatchLocationService"; +import { CustomItemService } from "@spt/services/mod/CustomItemService"; +import { DynamicRouterModService } from "@spt/services/mod/dynamicRouter/DynamicRouterModService"; +import { HttpListenerModService } from "@spt/services/mod/httpListener/HttpListenerModService"; +import { ImageRouteService } from "@spt/services/mod/image/ImageRouteService"; +import { OnLoadModService } from "@spt/services/mod/onLoad/OnLoadModService"; +import { OnUpdateModService } from "@spt/services/mod/onUpdate/OnUpdateModService"; +import { StaticRouterModService } from "@spt/services/mod/staticRouter/StaticRouterModService"; +import { ModCompilerService } from "@spt/services/ModCompilerService"; +import { NotificationService } from "@spt/services/NotificationService"; +import { OpenZoneService } from "@spt/services/OpenZoneService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { PmcChatResponseService } from "@spt/services/PmcChatResponseService"; +import { ProfileActivityService } from "@spt/services/ProfileActivityService"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; +import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; +import { RagfairCategoriesService } from "@spt/services/RagfairCategoriesService"; +import { RagfairLinkedItemService } from "@spt/services/RagfairLinkedItemService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { RagfairRequiredItemsService } from "@spt/services/RagfairRequiredItemsService"; +import { RagfairTaxService } from "@spt/services/RagfairTaxService"; +import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService"; +import { RepairService } from "@spt/services/RepairService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { TraderAssortService } from "@spt/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; +import { TraderServicesService } from "@spt/services/TraderServicesService"; +import { App } from "@spt/utils/App"; +import { AsyncQueue } from "@spt/utils/AsyncQueue"; +import type { ICloner } from "@spt/utils/cloners/ICloner"; +import { JsonCloner } from "@spt/utils/cloners/JsonCloner"; +import { RecursiveCloner } from "@spt/utils/cloners/RecursiveCloner"; +import { StructuredCloner } from "@spt/utils/cloners/StructuredCloner"; +import { CompareUtil } from "@spt/utils/CompareUtil"; +import { DatabaseImporter } from "@spt/utils/DatabaseImporter"; +import { EncodingUtil } from "@spt/utils/EncodingUtil"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpFileUtil } from "@spt/utils/HttpFileUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { ImporterUtil } from "@spt/utils/ImporterUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { WinstonMainLogger } from "@spt/utils/logging/WinstonMainLogger"; +import { WinstonRequestLogger } from "@spt/utils/logging/WinstonRequestLogger"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; +import { VFS } from "@spt/utils/VFS"; +import { Watermark, WatermarkLocale } from "@spt/utils/Watermark"; /** * Handle the registration of classes to be used by the Dependency Injection code @@ -272,8 +272,8 @@ export class Container { public static registerPostLoadTypes(container: DependencyContainer, childContainer: DependencyContainer): void { - container.register("AkiHttpListener", AkiHttpListener, { lifecycle: Lifecycle.Singleton }); - childContainer.registerType("HttpListener", "AkiHttpListener"); + container.register("SptHttpListener", SptHttpListener, { lifecycle: Lifecycle.Singleton }); + childContainer.registerType("HttpListener", "SptHttpListener"); } public static registerTypes(depContainer: DependencyContainer): void @@ -389,10 +389,10 @@ export class Container depContainer.registerType("SptCommand", "ProfileSptCommand"); // WebSocketHandlers - depContainer.registerType("WebSocketConnectionHandler", "AkiWebSocketConnectionHandler"); + depContainer.registerType("WebSocketConnectionHandler", "SptWebSocketConnectionHandler"); // WebSocketMessageHandlers - depContainer.registerType("AkiWebSocketMessageHandler", "DefaultAkiWebSocketMessageHandler"); + depContainer.registerType("SptWebSocketMessageHandler", "DefaultSptWebSocketMessageHandler"); } private static registerUtils(depContainer: DependencyContainer): void @@ -632,8 +632,8 @@ export class Container { // Loaders depContainer.register("BundleLoader", BundleLoader, { lifecycle: Lifecycle.Singleton }); - depContainer.register("PreAkiModLoader", PreAkiModLoader, { lifecycle: Lifecycle.Singleton }); - depContainer.register("PostAkiModLoader", PostAkiModLoader, { + depContainer.register("PreSptModLoader", PreSptModLoader, { lifecycle: Lifecycle.Singleton }); + depContainer.register("PostSptModLoader", PostSptModLoader, { lifecycle: Lifecycle.Singleton, }); } @@ -788,8 +788,8 @@ export class Container depContainer.register("DatabaseServer", DatabaseServer, { lifecycle: Lifecycle.Singleton }); depContainer.register("HttpServer", HttpServer, { lifecycle: Lifecycle.Singleton }); depContainer.register("WebSocketServer", WebSocketServer, { lifecycle: Lifecycle.Singleton }); - depContainer.register("AkiWebSocketConnectionHandler", AkiWebSocketConnectionHandler, { lifecycle: Lifecycle.Singleton }); - depContainer.register("DefaultAkiWebSocketMessageHandler", DefaultAkiWebSocketMessageHandler, { lifecycle: Lifecycle.Singleton }); + depContainer.register("SptWebSocketConnectionHandler", SptWebSocketConnectionHandler, { lifecycle: Lifecycle.Singleton }); + depContainer.register("DefaultSptWebSocketMessageHandler", DefaultSptWebSocketMessageHandler, { lifecycle: Lifecycle.Singleton }); depContainer.register("RagfairServer", RagfairServer); depContainer.register("SaveServer", SaveServer, { lifecycle: Lifecycle.Singleton }); depContainer.register("ConfigServer", ConfigServer, { lifecycle: Lifecycle.Singleton }); diff --git a/project/src/di/Router.ts b/project/src/di/Router.ts index a7fcac6e..eb79eead 100644 --- a/project/src/di/Router.ts +++ b/project/src/di/Router.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; export class Router { @@ -8,7 +8,7 @@ export class Router public getTopLevelRoute(): string { - return "aki"; + return "spt"; } protected getHandledRoutes(): HandledRoute[] @@ -93,7 +93,7 @@ export class ItemEventRouterDefinition extends Router export class SaveLoadRouter extends Router { - public handleLoad(profile: IAkiProfile): IAkiProfile + public handleLoad(profile: ISptProfile): ISptProfile { throw new Error("This method needs to be overrode by the router classes"); } diff --git a/project/src/generators/BotEquipmentModGenerator.ts b/project/src/generators/BotEquipmentModGenerator.ts index 5c9c256d..0bff0a10 100644 --- a/project/src/generators/BotEquipmentModGenerator.ts +++ b/project/src/generators/BotEquipmentModGenerator.ts @@ -1,33 +1,33 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProbabilityHelper } from "@spt-aki/helpers/ProbabilityHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { Mods, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem, Slot } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ModSpawn } from "@spt-aki/models/enums/ModSpawn"; -import { IChooseRandomCompatibleModResult } from "@spt-aki/models/spt/bots/IChooseRandomCompatibleModResult"; -import { EquipmentFilterDetails, EquipmentFilters, IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { ExhaustableArray } from "@spt-aki/models/spt/server/ExhaustableArray"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; -import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; -import { BotModLimits, BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProbabilityHelper } from "@spt/helpers/ProbabilityHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { Mods, ModsChances } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem, Slot } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ModSpawn } from "@spt/models/enums/ModSpawn"; +import { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult"; +import { EquipmentFilterDetails, EquipmentFilters, IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { ExhaustableArray } from "@spt/models/spt/server/ExhaustableArray"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService"; +import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService"; +import { BotModLimits, BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; import { IGenerateEquipmentProperties } from "./BotInventoryGenerator"; import { IFilterPlateModsForSlotByLevelResult, Result } from "./IFilterPlateModsForSlotByLevelResult"; diff --git a/project/src/generators/BotGenerator.ts b/project/src/generators/BotGenerator.ts index abc1f685..83e3f419 100644 --- a/project/src/generators/BotGenerator.ts +++ b/project/src/generators/BotGenerator.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { BotInventoryGenerator } from "@spt-aki/generators/BotInventoryGenerator"; -import { BotLevelGenerator } from "@spt-aki/generators/BotLevelGenerator"; -import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IWildBody } from "@spt-aki/models/eft/common/IGlobals"; +import { BotInventoryGenerator } from "@spt/generators/BotInventoryGenerator"; +import { BotLevelGenerator } from "@spt/generators/BotLevelGenerator"; +import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IWildBody } from "@spt/models/eft/common/IGlobals"; import { Common, IBaseJsonSkills, @@ -14,25 +14,25 @@ import { Info, Health as PmcHealth, Skills as botSkills, -} from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/eft/common/tables/IBotBase"; +import { Appearance, Health, IBotType } from "@spt/models/eft/common/tables/IBotType"; +import { Item, Upd } from "@spt/models/eft/common/tables/IItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class BotGenerator diff --git a/project/src/generators/BotInventoryGenerator.ts b/project/src/generators/BotInventoryGenerator.ts index 4993c19e..af515319 100644 --- a/project/src/generators/BotInventoryGenerator.ts +++ b/project/src/generators/BotInventoryGenerator.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; -import { BotLootGenerator } from "@spt-aki/generators/BotLootGenerator"; -import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Chances, Generation, IBotType, Inventory, Mods } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator"; +import { BotLootGenerator } from "@spt/generators/BotLootGenerator"; +import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase"; +import { Chances, Generation, IBotType, Inventory, Mods } from "@spt/models/eft/common/tables/IBotType"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; import { EquipmentFilterDetails, EquipmentFilters, IBotConfig, RandomisationDetails, -} from "@spt-aki/models/spt/config/IBotConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +} from "@spt/models/spt/config/IBotConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotInventoryGenerator diff --git a/project/src/generators/BotLevelGenerator.ts b/project/src/generators/BotLevelGenerator.ts index e81e8f9b..703d31a0 100644 --- a/project/src/generators/BotLevelGenerator.ts +++ b/project/src/generators/BotLevelGenerator.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IRandomisedBotLevelResult } from "@spt-aki/models/eft/bot/IRandomisedBotLevelResult"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IRandomisedBotLevelResult } from "@spt/models/eft/bot/IRandomisedBotLevelResult"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotLevelGenerator diff --git a/project/src/generators/BotLootGenerator.ts b/project/src/generators/BotLootGenerator.ts index 7ebcb3d5..ced3d451 100644 --- a/project/src/generators/BotLootGenerator.ts +++ b/project/src/generators/BotLootGenerator.ts @@ -1,31 +1,31 @@ import { inject, injectable } from "tsyringe"; -import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IBotType, Inventory, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; -import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; -import { LootCacheType } from "@spt-aki/models/spt/bots/IBotLootCache"; -import { IItemSpawnLimitSettings } from "@spt-aki/models/spt/bots/IItemSpawnLimitSettings"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase"; +import { IBotType, Inventory, ModsChances } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult"; +import { LootCacheType } from "@spt/models/spt/bots/IBotLootCache"; +import { IItemSpawnLimitSettings } from "@spt/models/spt/bots/IItemSpawnLimitSettings"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotLootCacheService } from "@spt/services/BotLootCacheService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotLootGenerator diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index c2265535..46bea5b5 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -1,31 +1,31 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; -import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { GenerationData, Inventory, ModsChances } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; -import { GenerateWeaponResult } from "@spt-aki/models/spt/bots/GenerateWeaponResult"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { BotWeaponModLimitService } from "@spt-aki/services/BotWeaponModLimitService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RepairService } from "@spt-aki/services/RepairService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator"; +import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase"; +import { GenerationData, Inventory, ModsChances } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; +import { GenerateWeaponResult } from "@spt/models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RepairService } from "@spt/services/RepairService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotWeaponGenerator diff --git a/project/src/generators/FenceBaseAssortGenerator.ts b/project/src/generators/FenceBaseAssortGenerator.ts index 1e0393b5..3694cce8 100644 --- a/project/src/generators/FenceBaseAssortGenerator.ts +++ b/project/src/generators/FenceBaseAssortGenerator.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { Traders } from "@spt/models/enums/Traders"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { FenceService } from "@spt/services/FenceService"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class FenceBaseAssortGenerator diff --git a/project/src/generators/LocationGenerator.ts b/project/src/generators/LocationGenerator.ts index d924e2d0..b0e0f5b4 100644 --- a/project/src/generators/LocationGenerator.ts +++ b/project/src/generators/LocationGenerator.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; +import { ContainerHelper } from "@spt/helpers/ContainerHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; import { IContainerMinMax, ILocation, @@ -10,23 +10,23 @@ import { IStaticContainerData, IStaticForcedProps, IStaticLootDetails, -} from "@spt-aki/models/eft/common/ILocation"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "@spt-aki/models/eft/common/ILooseLoot"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; +} from "@spt/models/eft/common/ILocation"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "@spt/models/eft/common/ILooseLoot"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; export interface IContainerItem { diff --git a/project/src/generators/LootGenerator.ts b/project/src/generators/LootGenerator.ts index 47e13d63..2943b2e8 100644 --- a/project/src/generators/LootGenerator.ts +++ b/project/src/generators/LootGenerator.ts @@ -1,22 +1,22 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ISealedAirdropContainerSettings, RewardDetails } from "@spt-aki/models/spt/config/IInventoryConfig"; -import { LootItem } from "@spt-aki/models/spt/services/LootItem"; -import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ISealedAirdropContainerSettings, RewardDetails } from "@spt/models/spt/config/IInventoryConfig"; +import { LootItem } from "@spt/models/spt/services/LootItem"; +import { LootRequest } from "@spt/models/spt/services/LootRequest"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RagfairLinkedItemService } from "@spt/services/RagfairLinkedItemService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; type ItemLimit = { current: number, max: number }; diff --git a/project/src/generators/PMCLootGenerator.ts b/project/src/generators/PMCLootGenerator.ts index 89612697..249275ad 100644 --- a/project/src/generators/PMCLootGenerator.ts +++ b/project/src/generators/PMCLootGenerator.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; /** * Handle the generation of dynamic PMC loot in pockets and backpacks diff --git a/project/src/generators/PlayerScavGenerator.ts b/project/src/generators/PlayerScavGenerator.ts index e107242a..02222315 100644 --- a/project/src/generators/PlayerScavGenerator.ts +++ b/project/src/generators/PlayerScavGenerator.ts @@ -1,30 +1,30 @@ import { inject, injectable } from "tsyringe"; -import { BotGenerator } from "@spt-aki/generators/BotGenerator"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IBotBase, Settings, Skills, Stats } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { AccountTypes } from "@spt-aki/models/enums/AccountTypes"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IPlayerScavConfig, KarmaLevel } from "@spt-aki/models/spt/config/IPlayerScavConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { BotLootCacheService } from "@spt-aki/services/BotLootCacheService"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotGenerator } from "@spt/generators/BotGenerator"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IBotBase, Settings, Skills, Stats } from "@spt/models/eft/common/tables/IBotBase"; +import { IBotType } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { AccountTypes } from "@spt/models/enums/AccountTypes"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { Traders } from "@spt/models/enums/Traders"; +import { IPlayerScavConfig, KarmaLevel } from "@spt/models/spt/config/IPlayerScavConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { BotLootCacheService } from "@spt/services/BotLootCacheService"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class PlayerScavGenerator diff --git a/project/src/generators/RagfairAssortGenerator.ts b/project/src/generators/RagfairAssortGenerator.ts index 49935b19..9ce49b7e 100644 --- a/project/src/generators/RagfairAssortGenerator.ts +++ b/project/src/generators/RagfairAssortGenerator.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class RagfairAssortGenerator diff --git a/project/src/generators/RagfairOfferGenerator.ts b/project/src/generators/RagfairOfferGenerator.ts index 2f980df1..9f2fdfee 100644 --- a/project/src/generators/RagfairOfferGenerator.ts +++ b/project/src/generators/RagfairOfferGenerator.ts @@ -1,36 +1,36 @@ import { inject, injectable } from "tsyringe"; -import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IRagfairOffer, OfferRequirement } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { Money } from "@spt-aki/models/enums/Money"; +import { RagfairAssortGenerator } from "@spt/generators/RagfairAssortGenerator"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader"; +import { IRagfairOffer, OfferRequirement } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { Money } from "@spt/models/enums/Money"; import { Condition, Dynamic, IArmorPlateBlacklistSettings, IRagfairConfig, -} from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class RagfairOfferGenerator @@ -943,8 +943,8 @@ export class RagfairOfferGenerator ): IBarterScheme[] { const currency = this.ragfairServerHelper.getDynamicOfferCurrency(); - const price - = this.ragfairPriceService.getDynamicOfferPriceForOffer(offerWithChildren, currency, isPackOffer) * multipler; + const price = this.ragfairPriceService.getDynamicOfferPriceForOffer(offerWithChildren, currency, isPackOffer) + * multipler; return [{ count: price, _tpl: currency }]; } diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts index 00b04f05..f8e52af5 100644 --- a/project/src/generators/RepeatableQuestGenerator.ts +++ b/project/src/generators/RepeatableQuestGenerator.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { RepeatableQuestRewardGenerator } from "@spt-aki/generators/RepeatableQuestRewardGenerator"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper"; -import { Exit } from "@spt-aki/models/eft/common/ILocationBase"; -import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IQuestCondition, IQuestConditionCounterCondition } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; +import { RepeatableQuestRewardGenerator } from "@spt/generators/RepeatableQuestRewardGenerator"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper"; +import { Exit } from "@spt/models/eft/common/ILocationBase"; +import { TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; +import { IQuestCondition, IQuestConditionCounterCondition } from "@spt/models/eft/common/tables/IQuest"; +import { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Traders } from "@spt/models/enums/Traders"; import { IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig, -} from "@spt-aki/models/spt/config/IQuestConfig"; -import { IQuestTypePool } from "@spt-aki/models/spt/repeatable/IQuestTypePool"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; +} from "@spt/models/spt/config/IQuestConfig"; +import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class RepeatableQuestGenerator diff --git a/project/src/generators/RepeatableQuestRewardGenerator.ts b/project/src/generators/RepeatableQuestRewardGenerator.ts index 167534b0..bf2667b9 100644 --- a/project/src/generators/RepeatableQuestRewardGenerator.ts +++ b/project/src/generators/RepeatableQuestRewardGenerator.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IQuestReward, IQuestRewards } from "@spt-aki/models/eft/common/tables/IQuest"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { QuestRewardType } from "@spt-aki/models/enums/QuestRewardType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IBaseQuestConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { ExhaustableArray } from "@spt-aki/models/spt/server/ExhaustableArray"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IQuestReward, IQuestRewards } from "@spt/models/eft/common/tables/IQuest"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { QuestRewardType } from "@spt/models/enums/QuestRewardType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IBaseQuestConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { ExhaustableArray } from "@spt/models/spt/server/ExhaustableArray"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class RepeatableQuestRewardGenerator diff --git a/project/src/generators/ScavCaseRewardGenerator.ts b/project/src/generators/ScavCaseRewardGenerator.ts index 73dee1fd..438bcc03 100644 --- a/project/src/generators/ScavCaseRewardGenerator.ts +++ b/project/src/generators/ScavCaseRewardGenerator.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { IScavCaseConfig } from "@spt-aki/models/spt/config/IScavCaseConfig"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig"; import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices, -} from "@spt-aki/models/spt/hideout/ScavCaseRewardCountsAndPrices"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +} from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; /** * Handle the creation of randomised scav case rewards diff --git a/project/src/generators/WeatherGenerator.ts b/project/src/generators/WeatherGenerator.ts index 54ab5cb9..17f0002d 100644 --- a/project/src/generators/WeatherGenerator.ts +++ b/project/src/generators/WeatherGenerator.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IWeather, IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { WindDirection } from "@spt-aki/models/enums/WindDirection"; -import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IWeather, IWeatherData } from "@spt/models/eft/weather/IWeatherData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { WindDirection } from "@spt/models/enums/WindDirection"; +import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { SeasonalEventService } from "@spt/services/SeasonalEventService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class WeatherGenerator diff --git a/project/src/generators/weapongen/IInventoryMagGen.ts b/project/src/generators/weapongen/IInventoryMagGen.ts index 68b36969..e2edfe3d 100644 --- a/project/src/generators/weapongen/IInventoryMagGen.ts +++ b/project/src/generators/weapongen/IInventoryMagGen.ts @@ -1,4 +1,4 @@ -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; export interface IInventoryMagGen { diff --git a/project/src/generators/weapongen/InventoryMagGen.ts b/project/src/generators/weapongen/InventoryMagGen.ts index 21ae076f..3df71c4e 100644 --- a/project/src/generators/weapongen/InventoryMagGen.ts +++ b/project/src/generators/weapongen/InventoryMagGen.ts @@ -1,6 +1,6 @@ -import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { Inventory } from "@spt/models/eft/common/tables/IBotBase"; +import { GenerationData } from "@spt/models/eft/common/tables/IBotType"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; export class InventoryMagGen { diff --git a/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts b/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts index 0419762a..eced6be8 100644 --- a/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BarrelInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts index 911bbe73..0579bd7b 100644 --- a/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; -import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class ExternalInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts b/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts index 8f985c4d..3905fef5 100644 --- a/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts +++ b/project/src/generators/weapongen/implementations/InternalMagazineInventoryMagGen.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; +import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; @injectable() export class InternalMagazineInventoryMagGen implements IInventoryMagGen diff --git a/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts b/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts index 60b20ec5..dbcdefa8 100644 --- a/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts +++ b/project/src/generators/weapongen/implementations/UbglExternalMagGen.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; -import { InventoryMagGen } from "@spt-aki/generators/weapongen/InventoryMagGen"; -import { BotWeaponGeneratorHelper } from "@spt-aki/helpers/BotWeaponGeneratorHelper"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; +import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen"; +import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen"; +import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; @injectable() export class UbglExternalMagGen implements IInventoryMagGen diff --git a/project/src/helpers/AssortHelper.ts b/project/src/helpers/AssortHelper.ts index 06893af9..ffabeddf 100644 --- a/project/src/helpers/AssortHelper.ts +++ b/project/src/helpers/AssortHelper.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class AssortHelper diff --git a/project/src/helpers/BotDifficultyHelper.ts b/project/src/helpers/BotDifficultyHelper.ts index 088d0413..c7ddd6f7 100644 --- a/project/src/helpers/BotDifficultyHelper.ts +++ b/project/src/helpers/BotDifficultyHelper.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { Difficulty } from "@spt/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotDifficultyHelper diff --git a/project/src/helpers/BotGeneratorHelper.ts b/project/src/helpers/BotGeneratorHelper.ts index 601696bd..f0238bf2 100644 --- a/project/src/helpers/BotGeneratorHelper.ts +++ b/project/src/helpers/BotGeneratorHelper.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; -import { DurabilityLimitsHelper } from "@spt-aki/helpers/DurabilityLimitsHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item, Repairable, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { Grid, ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; -import { IChooseRandomCompatibleModResult } from "@spt-aki/models/spt/bots/IChooseRandomCompatibleModResult"; -import { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { ContainerHelper } from "@spt/helpers/ContainerHelper"; +import { DurabilityLimitsHelper } from "@spt/helpers/DurabilityLimitsHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Inventory } from "@spt/models/eft/common/tables/IBotBase"; +import { Item, Repairable, Upd } from "@spt/models/eft/common/tables/IItem"; +import { Grid, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult"; +import { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult"; +import { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotGeneratorHelper diff --git a/project/src/helpers/BotHelper.ts b/project/src/helpers/BotHelper.ts index 1867bf67..55949ad2 100644 --- a/project/src/helpers/BotHelper.ts +++ b/project/src/helpers/BotHelper.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Difficulty, IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { EquipmentFilters, IBotConfig, RandomisationDetails } from "@spt-aki/models/spt/config/IBotConfig"; -import { IPmcConfig } from "@spt-aki/models/spt/config/IPmcConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { MinMax } from "@spt/models/common/MinMax"; +import { Difficulty, IBotType } from "@spt/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { EquipmentFilters, IBotConfig, RandomisationDetails } from "@spt/models/spt/config/IBotConfig"; +import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotHelper diff --git a/project/src/helpers/BotWeaponGeneratorHelper.ts b/project/src/helpers/BotWeaponGeneratorHelper.ts index 3c37d800..13500330 100644 --- a/project/src/helpers/BotWeaponGeneratorHelper.ts +++ b/project/src/helpers/BotWeaponGeneratorHelper.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; -import { ItemAddedResult } from "@spt-aki/models/enums/ItemAddedResult"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { Inventory } from "@spt/models/eft/common/tables/IBotBase"; +import { GenerationData } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; +import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotWeaponGeneratorHelper diff --git a/project/src/helpers/Dialogue/AbstractDialogueChatBot.ts b/project/src/helpers/Dialogue/AbstractDialogueChatBot.ts index 9380c096..623e6183 100644 --- a/project/src/helpers/Dialogue/AbstractDialogueChatBot.ts +++ b/project/src/helpers/Dialogue/AbstractDialogueChatBot.ts @@ -1,9 +1,9 @@ -import { IChatCommand, ICommandoCommand } from "@spt-aki/helpers/Dialogue/Commando/IChatCommand"; -import { IDialogueChatBot } from "@spt-aki/helpers/Dialogue/IDialogueChatBot"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { MailSendService } from "@spt-aki/services/MailSendService"; +import { IChatCommand, ICommandoCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand"; +import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { MailSendService } from "@spt/services/MailSendService"; export abstract class AbstractDialogueChatBot implements IDialogueChatBot { diff --git a/project/src/helpers/Dialogue/Commando/IChatCommand.ts b/project/src/helpers/Dialogue/Commando/IChatCommand.ts index 7ddd16a8..cd8d6809 100644 --- a/project/src/helpers/Dialogue/Commando/IChatCommand.ts +++ b/project/src/helpers/Dialogue/Commando/IChatCommand.ts @@ -1,5 +1,5 @@ -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; /** * @deprecated As of v3.7.6. Use IChatCommand. Will be removed in v3.9.0. diff --git a/project/src/helpers/Dialogue/Commando/SptCommandoCommands.ts b/project/src/helpers/Dialogue/Commando/SptCommandoCommands.ts index 5e202c63..14b608ce 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommandoCommands.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommandoCommands.ts @@ -1,11 +1,11 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { IChatCommand } from "@spt-aki/helpers/Dialogue/Commando/IChatCommand"; -import { ISptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/ISptCommand"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand"; +import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class SptCommandoCommands implements IChatCommand diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts index 4fe2dbba..d721b7d6 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.ts @@ -1,21 +1,21 @@ import { stringSimilarity } from "string-similarity-js"; import { inject, injectable } from "tsyringe"; -import { SavedCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; -import { ISptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/ISptCommand"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; +import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocaleService } from "@spt/services/LocaleService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class GiveSptCommand implements ISptCommand diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/ISptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/ISptCommand.ts index 9f8e3a1b..0c76ffb3 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/ISptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/ISptCommand.ts @@ -1,5 +1,5 @@ -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; export interface ISptCommand { diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts index 8b3f54d3..ba572716 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { SavedCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; -import { ISptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/ISptCommand"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IProfileChangeEvent, ProfileChangeEventType } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; +import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IProfileChangeEvent, ProfileChangeEventType } from "@spt/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class ProfileSptCommand implements ISptCommand diff --git a/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts b/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts index e95c1477..9c5daf41 100644 --- a/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts +++ b/project/src/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.ts @@ -1,16 +1,16 @@ import { inject, injectable } from "tsyringe"; -import { SavedCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; -import { ISptCommand } from "@spt-aki/helpers/Dialogue/Commando/SptCommands/ISptCommand"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IProfileChangeEvent, ProfileChangeEventType } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand"; +import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { IProfileChangeEvent, ProfileChangeEventType } from "@spt/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class TraderSptCommand implements ISptCommand diff --git a/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts b/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts index 7d8a71d2..58e52611 100644 --- a/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts +++ b/project/src/helpers/Dialogue/CommandoDialogueChatBot.ts @@ -1,10 +1,10 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { AbstractDialogueChatBot } from "@spt-aki/helpers/Dialogue/AbstractDialogueChatBot"; -import { IChatCommand } from "@spt-aki/helpers/Dialogue/Commando/IChatCommand"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { MailSendService } from "@spt-aki/services/MailSendService"; +import { AbstractDialogueChatBot } from "@spt/helpers/Dialogue/AbstractDialogueChatBot"; +import { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { MailSendService } from "@spt/services/MailSendService"; @injectable() export class CommandoDialogueChatBot extends AbstractDialogueChatBot diff --git a/project/src/helpers/Dialogue/IDialogueChatBot.ts b/project/src/helpers/Dialogue/IDialogueChatBot.ts index 7bc288e5..677d1e63 100644 --- a/project/src/helpers/Dialogue/IDialogueChatBot.ts +++ b/project/src/helpers/Dialogue/IDialogueChatBot.ts @@ -1,5 +1,5 @@ -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; export interface IDialogueChatBot { diff --git a/project/src/helpers/Dialogue/SptDialogueChatBot.ts b/project/src/helpers/Dialogue/SptDialogueChatBot.ts index 874533b0..7d453f56 100644 --- a/project/src/helpers/Dialogue/SptDialogueChatBot.ts +++ b/project/src/helpers/Dialogue/SptDialogueChatBot.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { IDialogueChatBot } from "@spt-aki/helpers/Dialogue/IDialogueChatBot"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { GiftSentResult } from "@spt-aki/models/enums/GiftSentResult"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { Season } from "@spt-aki/models/enums/Season"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { GiftService } from "@spt-aki/services/GiftService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { GiftSentResult } from "@spt/models/enums/GiftSentResult"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { Season } from "@spt/models/enums/Season"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { GiftService } from "@spt/services/GiftService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class SptDialogueChatBot implements IDialogueChatBot diff --git a/project/src/helpers/DialogueHelper.ts b/project/src/helpers/DialogueHelper.ts index 34f47a67..a97c2b39 100644 --- a/project/src/helpers/DialogueHelper.ts +++ b/project/src/helpers/DialogueHelper.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; -import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { Dialogue, MessagePreview } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt/helpers/NotifierHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { Dialogue, MessagePreview } from "@spt/models/eft/profile/ISptProfile"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class DialogueHelper diff --git a/project/src/helpers/DurabilityLimitsHelper.ts b/project/src/helpers/DurabilityLimitsHelper.ts index 3c42783c..f3fc9eaa 100644 --- a/project/src/helpers/DurabilityLimitsHelper.ts +++ b/project/src/helpers/DurabilityLimitsHelper.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class DurabilityLimitsHelper diff --git a/project/src/helpers/GameEventHelper.ts b/project/src/helpers/GameEventHelper.ts index aaaea768..330a299e 100644 --- a/project/src/helpers/GameEventHelper.ts +++ b/project/src/helpers/GameEventHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ISeasonalEventConfig } from "@spt-aki/models/spt/config/ISeasonalEventConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ISeasonalEventConfig } from "@spt/models/spt/config/ISeasonalEventConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; @injectable() export class GameEventHelper diff --git a/project/src/helpers/HandbookHelper.ts b/project/src/helpers/HandbookHelper.ts index a7ee3f76..082cbabe 100644 --- a/project/src/helpers/HandbookHelper.ts +++ b/project/src/helpers/HandbookHelper.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { Category } from "@spt-aki/models/eft/common/tables/IHandbookBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { IItemConfig } from "@spt-aki/models/spt/config/IItemConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { Category } from "@spt/models/eft/common/tables/IHandbookBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { IItemConfig } from "@spt/models/spt/config/IItemConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; class LookupItem { diff --git a/project/src/helpers/HealthHelper.ts b/project/src/helpers/HealthHelper.ts index e9f9f065..91a40e7c 100644 --- a/project/src/helpers/HealthHelper.ts +++ b/project/src/helpers/HealthHelper.ts @@ -1,14 +1,14 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; -import { Effects, IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHealthConfig } from "@spt-aki/models/spt/config/IHealthConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData"; +import { Effects, ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class HealthHelper @@ -31,7 +31,7 @@ export class HealthHelper * @param sessionID Session Id * @returns updated profile */ - public resetVitality(sessionID: string): IAkiProfile + public resetVitality(sessionID: string): ISptProfile { const profile = this.saveServer.getProfile(sessionID); diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts index b0083dd4..96cbca90 100644 --- a/project/src/helpers/HideoutHelper.ts +++ b/project/src/helpers/HideoutHelper.ts @@ -1,32 +1,32 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { HideoutArea, IHideoutImprovement, Production, Productive } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { StageBonus } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IHideoutConfig } from "@spt-aki/models/spt/config/IHideoutConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { HideoutArea, IHideoutImprovement, Production, Productive } from "@spt/models/eft/common/tables/IBotBase"; +import { Item, Upd } from "@spt/models/eft/common/tables/IItem"; +import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class HideoutHelper diff --git a/project/src/helpers/HttpServerHelper.ts b/project/src/helpers/HttpServerHelper.ts index e07182e2..5c5de069 100644 --- a/project/src/helpers/HttpServerHelper.ts +++ b/project/src/helpers/HttpServerHelper.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class HttpServerHelper diff --git a/project/src/helpers/InRaidHelper.ts b/project/src/helpers/InRaidHelper.ts index 1f8bc321..df50d985 100644 --- a/project/src/helpers/InRaidHelper.ts +++ b/project/src/helpers/InRaidHelper.ts @@ -1,27 +1,27 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { QuestHelper } from "@spt-aki/helpers/QuestHelper"; -import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; -import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig"; -import { ILostOnDeathConfig } from "@spt-aki/models/spt/config/ILostOnDeathConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { QuestHelper } from "@spt/helpers/QuestHelper"; +import { IPmcData, IPostRaidPmcData } from "@spt/models/eft/common/IPmcData"; +import { IQuestStatus, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData"; +import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { Traders } from "@spt/models/enums/Traders"; +import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig"; +import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; import { ProfileHelper } from "./ProfileHelper"; @injectable() diff --git a/project/src/helpers/InventoryHelper.ts b/project/src/helpers/InventoryHelper.ts index 358cbd29..341f924d 100644 --- a/project/src/helpers/InventoryHelper.ts +++ b/project/src/helpers/InventoryHelper.ts @@ -1,37 +1,37 @@ import { inject, injectable } from "tsyringe"; -import { ContainerHelper } from "@spt-aki/helpers/ContainerHelper"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Inventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item, Location, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { IAddItemDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemDirectRequest"; -import { AddItem } from "@spt-aki/models/eft/inventory/IAddItemRequestData"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IAddItemTempObject } from "@spt-aki/models/eft/inventory/IAddItemTempObject"; -import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; -import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IInventoryConfig, RewardDetails } from "@spt-aki/models/spt/config/IInventoryConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { ContainerHelper } from "@spt/helpers/ContainerHelper"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Inventory } from "@spt/models/eft/common/tables/IBotBase"; +import { Item, Location, Upd } from "@spt/models/eft/common/tables/IItem"; +import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest"; +import { AddItem } from "@spt/models/eft/inventory/IAddItemRequestData"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IAddItemTempObject } from "@spt/models/eft/inventory/IAddItemTempObject"; +import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData"; +import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IInventoryConfig, RewardDetails } from "@spt/models/spt/config/IInventoryConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; export interface IOwnerInventoryItems { diff --git a/project/src/helpers/ItemHelper.ts b/project/src/helpers/ItemHelper.ts index e2db92e6..8ad2ebe2 100644 --- a/project/src/helpers/ItemHelper.ts +++ b/project/src/helpers/ItemHelper.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { IStaticAmmoDetails } from "@spt-aki/models/eft/common/ILocation"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { InsuredItem } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item, Location, Repairable, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { EquipmentSlots } from "@spt-aki/models/enums/EquipmentSlots"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { CompareUtil } from "@spt-aki/utils/CompareUtil"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ObjectId } from "@spt-aki/utils/ObjectId"; -import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { IStaticAmmoDetails } from "@spt/models/eft/common/ILocation"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { InsuredItem } from "@spt/models/eft/common/tables/IBotBase"; +import { Item, Location, Repairable, Upd } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { CompareUtil } from "@spt/utils/CompareUtil"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ObjectId } from "@spt/utils/ObjectId"; +import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class ItemHelper diff --git a/project/src/helpers/NotificationSendHelper.ts b/project/src/helpers/NotificationSendHelper.ts index 9c798d67..1cfa396e 100644 --- a/project/src/helpers/NotificationSendHelper.ts +++ b/project/src/helpers/NotificationSendHelper.ts @@ -1,20 +1,20 @@ import { inject, injectable } from "tsyringe"; -import { Dialogue, IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IWsChatMessageReceived } from "@spt-aki/models/eft/ws/IWsChatMessageReceived"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { NotificationEventType } from "@spt-aki/models/enums/NotificationEventType"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { AkiWebSocketConnectionHandler } from "@spt-aki/servers/ws/AkiWebSocketConnectionHandler"; -import { NotificationService } from "@spt-aki/services/NotificationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { Dialogue, IUserDialogInfo, Message } from "@spt/models/eft/profile/ISptProfile"; +import { IWsChatMessageReceived } from "@spt/models/eft/ws/IWsChatMessageReceived"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { NotificationEventType } from "@spt/models/enums/NotificationEventType"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { SptWebSocketConnectionHandler } from "@spt/servers/ws/SptWebSocketConnectionHandler"; +import { NotificationService } from "@spt/services/NotificationService"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class NotificationSendHelper { constructor( - @inject("AkiWebSocketConnectionHandler") protected akiWebSocketConnection: AkiWebSocketConnectionHandler, + @inject("SptWebSocketConnectionHandler") protected sptWebSocketConnection: SptWebSocketConnectionHandler, @inject("HashUtil") protected hashUtil: HashUtil, @inject("SaveServer") protected saveServer: SaveServer, @inject("NotificationService") protected notificationService: NotificationService, @@ -28,9 +28,9 @@ export class NotificationSendHelper */ public sendMessage(sessionID: string, notificationMessage: IWsNotificationEvent): void { - if (this.akiWebSocketConnection.isConnectionWebSocket(sessionID)) + if (this.sptWebSocketConnection.isConnectionWebSocket(sessionID)) { - this.akiWebSocketConnection.sendMessage(sessionID, notificationMessage); + this.sptWebSocketConnection.sendMessage(sessionID, notificationMessage); } else { diff --git a/project/src/helpers/NotifierHelper.ts b/project/src/helpers/NotifierHelper.ts index 7775879d..ae8aa9e6 100644 --- a/project/src/helpers/NotifierHelper.ts +++ b/project/src/helpers/NotifierHelper.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { Message, MessageContentRagfair } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IWsChatMessageReceived } from "@spt-aki/models/eft/ws/IWsChatMessageReceived"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; -import { IWsRagfairOfferSold } from "@spt-aki/models/eft/ws/IWsRagfairOfferSold"; -import { NotificationEventType } from "@spt-aki/models/enums/NotificationEventType"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { Message, MessageContentRagfair } from "@spt/models/eft/profile/ISptProfile"; +import { IWsChatMessageReceived } from "@spt/models/eft/ws/IWsChatMessageReceived"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; +import { IWsRagfairOfferSold } from "@spt/models/eft/ws/IWsRagfairOfferSold"; +import { NotificationEventType } from "@spt/models/enums/NotificationEventType"; @injectable() export class NotifierHelper diff --git a/project/src/helpers/PaymentHelper.ts b/project/src/helpers/PaymentHelper.ts index f12fdc59..0f4dd6e7 100644 --- a/project/src/helpers/PaymentHelper.ts +++ b/project/src/helpers/PaymentHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { IInventoryConfig } from "@spt-aki/models/spt/config/IInventoryConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class PaymentHelper diff --git a/project/src/helpers/PresetHelper.ts b/project/src/helpers/PresetHelper.ts index 09c48e31..03667a7c 100644 --- a/project/src/helpers/PresetHelper.ts +++ b/project/src/helpers/PresetHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; @injectable() diff --git a/project/src/helpers/ProbabilityHelper.ts b/project/src/helpers/ProbabilityHelper.ts index abca707b..6d782f80 100644 --- a/project/src/helpers/ProbabilityHelper.ts +++ b/project/src/helpers/ProbabilityHelper.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class ProbabilityHelper diff --git a/project/src/helpers/ProfileHelper.ts b/project/src/helpers/ProfileHelper.ts index 96ca4f3e..bc05d262 100644 --- a/project/src/helpers/ProfileHelper.ts +++ b/project/src/helpers/ProfileHelper.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Common, CounterKeyValue, Stats } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; -import { AccountTypes } from "@spt-aki/models/enums/AccountTypes"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IInventoryConfig } from "@spt-aki/models/spt/config/IInventoryConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ProfileSnapshotService } from "@spt-aki/services/ProfileSnapshotService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; -import { Watermark } from "@spt-aki/utils/Watermark"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Common, CounterKeyValue, Stats } from "@spt/models/eft/common/tables/IBotBase"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData"; +import { AccountTypes } from "@spt/models/enums/AccountTypes"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; +import { Watermark } from "@spt/utils/Watermark"; @injectable() export class ProfileHelper @@ -68,7 +68,7 @@ export class ProfileHelper * Get all profiles from server * @returns Dictionary of profiles */ - public getProfiles(): Record + public getProfiles(): Record { return this.saveServer.getProfiles(); } @@ -170,7 +170,7 @@ export class ProfileHelper return false; } - protected profileHasInfoProperty(profile: IAkiProfile): boolean + protected profileHasInfoProperty(profile: ISptProfile): boolean { return !!profile?.characters?.pmc?.Info; } @@ -244,7 +244,7 @@ export class ProfileHelper return this.databaseServer.getTables().globals.config.exp.level.exp_table.length - 1; } - public getDefaultAkiDataObject(): any + public getDefaultSptDataObject(): any { return { version: this.getServerVersion() }; } @@ -252,9 +252,9 @@ export class ProfileHelper /** * Get full representation of a players profile json * @param sessionID Profile id to get - * @returns IAkiProfile object + * @returns ISptProfile object */ - public getFullProfile(sessionID: string): IAkiProfile + public getFullProfile(sessionID: string): ISptProfile { if (this.saveServer.getProfile(sessionID) === undefined) { @@ -357,20 +357,20 @@ export class ProfileHelper /** * Flag a profile as having received a gift - * Store giftid in profile aki object + * Store giftid in profile spt object * @param playerId Player to add gift flag to * @param giftId Gift player received */ public addGiftReceivedFlagToProfile(playerId: string, giftId: string): void { const profileToUpdate = this.getFullProfile(playerId); - const giftHistory = profileToUpdate.aki.receivedGifts; + const giftHistory = profileToUpdate.spt.receivedGifts; if (!giftHistory) { - profileToUpdate.aki.receivedGifts = []; + profileToUpdate.spt.receivedGifts = []; } - profileToUpdate.aki.receivedGifts.push({ giftId: giftId, timestampAccepted: this.timeUtil.getTimestamp() }); + profileToUpdate.spt.receivedGifts.push({ giftId: giftId, timestampAccepted: this.timeUtil.getTimestamp() }); } /** @@ -388,12 +388,12 @@ export class ProfileHelper return false; } - if (!profile.aki.receivedGifts) + if (!profile.spt.receivedGifts) { return false; } - return !!profile.aki.receivedGifts.find((x) => x.giftId === giftId); + return !!profile.spt.receivedGifts.find((x) => x.giftId === giftId); } /** diff --git a/project/src/helpers/QuestConditionHelper.ts b/project/src/helpers/QuestConditionHelper.ts index 83892dea..d93742cd 100644 --- a/project/src/helpers/QuestConditionHelper.ts +++ b/project/src/helpers/QuestConditionHelper.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import { IQuestCondition } from "@spt-aki/models/eft/common/tables/IQuest"; +import { IQuestCondition } from "@spt/models/eft/common/tables/IQuest"; @injectable() export class QuestConditionHelper diff --git a/project/src/helpers/QuestHelper.ts b/project/src/helpers/QuestHelper.ts index d9973741..8b1bafb8 100644 --- a/project/src/helpers/QuestHelper.ts +++ b/project/src/helpers/QuestHelper.ts @@ -1,35 +1,35 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestConditionHelper } from "@spt-aki/helpers/QuestConditionHelper"; -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Common, IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IQuest, IQuestCondition, IQuestReward } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; -import { IFailQuestRequestData } from "@spt-aki/models/eft/quests/IFailQuestRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { QuestRewardType } from "@spt-aki/models/enums/QuestRewardType"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Common, IQuestStatus } from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IQuest, IQuestCondition, IQuestReward } from "@spt/models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData"; +import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { QuestRewardType } from "@spt/models/enums/QuestRewardType"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class QuestHelper diff --git a/project/src/helpers/RagfairHelper.ts b/project/src/helpers/RagfairHelper.ts index afcd82b9..e5c787d8 100644 --- a/project/src/helpers/RagfairHelper.ts +++ b/project/src/helpers/RagfairHelper.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { UtilityHelper } from "@spt-aki/helpers/UtilityHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RagfairLinkedItemService } from "@spt-aki/services/RagfairLinkedItemService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { UtilityHelper } from "@spt/helpers/UtilityHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RagfairLinkedItemService } from "@spt/services/RagfairLinkedItemService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class RagfairHelper diff --git a/project/src/helpers/RagfairOfferHelper.ts b/project/src/helpers/RagfairOfferHelper.ts index 9306a904..7567fdce 100644 --- a/project/src/helpers/RagfairOfferHelper.ts +++ b/project/src/helpers/RagfairOfferHelper.ts @@ -1,38 +1,38 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { RagfairHelper } from "@spt-aki/helpers/RagfairHelper"; -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { RagfairSortHelper } from "@spt-aki/helpers/RagfairSortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAkiProfile, ISystemData } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData, OfferOwnerType } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairHelper } from "@spt/helpers/RagfairHelper"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ISptProfile, ISystemData } from "@spt/models/eft/profile/ISptProfile"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData, OfferOwnerType } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { RagfairSort } from "@spt/models/enums/RagfairSort"; +import { Traders } from "@spt/models/enums/Traders"; +import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { RagfairRequiredItemsService } from "@spt/services/RagfairRequiredItemsService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; import { QuestHelper } from "./QuestHelper"; @injectable() @@ -350,7 +350,7 @@ export class RagfairOfferHelper * @param sessionId Profile to update * @param amountToIncrementBy Raw amount to add to players ragfair rating (excluding the reputation gain multiplier) */ - public increaseProfileRagfairRating(profile: IAkiProfile, amountToIncrementBy: number): void + public increaseProfileRagfairRating(profile: ISptProfile, amountToIncrementBy: number): void { const ragfairConfig = this.databaseServer.getTables().globals.config.RagFair; diff --git a/project/src/helpers/RagfairSellHelper.ts b/project/src/helpers/RagfairSellHelper.ts index dc9fa84d..27d7ecfd 100644 --- a/project/src/helpers/RagfairSellHelper.ts +++ b/project/src/helpers/RagfairSellHelper.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { SellResult } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { SellResult } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class RagfairSellHelper diff --git a/project/src/helpers/RagfairServerHelper.ts b/project/src/helpers/RagfairServerHelper.ts index 2cd852b3..612320c3 100644 --- a/project/src/helpers/RagfairServerHelper.ts +++ b/project/src/helpers/RagfairServerHelper.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { ItemFilterService } from "@spt/services/ItemFilterService"; +import { LocaleService } from "@spt/services/LocaleService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** * Helper class for common ragfair server actions diff --git a/project/src/helpers/RagfairSortHelper.ts b/project/src/helpers/RagfairSortHelper.ts index 951bf49c..39a3a7db 100644 --- a/project/src/helpers/RagfairSortHelper.ts +++ b/project/src/helpers/RagfairSortHelper.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { RagfairSort } from "@spt/models/enums/RagfairSort"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; @injectable() export class RagfairSortHelper diff --git a/project/src/helpers/RepairHelper.ts b/project/src/helpers/RepairHelper.ts index 0f5cf257..14f41975 100644 --- a/project/src/helpers/RepairHelper.ts +++ b/project/src/helpers/RepairHelper.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class RepairHelper diff --git a/project/src/helpers/RepeatableQuestHelper.ts b/project/src/helpers/RepeatableQuestHelper.ts index a79342c0..8508dc7b 100644 --- a/project/src/helpers/RepeatableQuestHelper.ts +++ b/project/src/helpers/RepeatableQuestHelper.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { ProbabilityObject, ProbabilityObjectArray } from "@spt-aki/utils/RandomUtil"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil"; @injectable() export class RepeatableQuestHelper diff --git a/project/src/helpers/SecureContainerHelper.ts b/project/src/helpers/SecureContainerHelper.ts index 40982f82..f893d397 100644 --- a/project/src/helpers/SecureContainerHelper.ts +++ b/project/src/helpers/SecureContainerHelper.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface OwnerInventoryItems { diff --git a/project/src/helpers/TradeHelper.ts b/project/src/helpers/TradeHelper.ts index f59a02b7..eb4f652b 100644 --- a/project/src/helpers/TradeHelper.ts +++ b/project/src/helpers/TradeHelper.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IInventoryConfig } from "@spt-aki/models/spt/config/IInventoryConfig"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { RagfairServer } from "@spt-aki/servers/RagfairServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { RagfairServer } from "@spt/servers/RagfairServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class TradeHelper diff --git a/project/src/helpers/TraderAssortHelper.ts b/project/src/helpers/TraderAssortHelper.ts index 981dc675..bf53c8ed 100644 --- a/project/src/helpers/TraderAssortHelper.ts +++ b/project/src/helpers/TraderAssortHelper.ts @@ -1,25 +1,25 @@ import { inject, injectable } from "tsyringe"; -import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; -import { AssortHelper } from "@spt-aki/helpers/AssortHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITrader, ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; -import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { RagfairAssortGenerator } from "@spt/generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator"; +import { AssortHelper } from "@spt/helpers/AssortHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { TraderAssortService } from "@spt/services/TraderAssortService"; +import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class TraderAssortHelper diff --git a/project/src/helpers/TraderHelper.ts b/project/src/helpers/TraderHelper.ts index 73f84c41..ac760934 100644 --- a/project/src/helpers/TraderHelper.ts +++ b/project/src/helpers/TraderHelper.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ProfileTraderTemplate } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; -import { ITraderAssort, ITraderBase, LoyaltyLevel } from "@spt-aki/models/eft/common/tables/ITrader"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { FenceService } from "@spt-aki/services/FenceService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PlayerService } from "@spt-aki/services/PlayerService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ProfileTraderTemplate } from "@spt/models/eft/common/tables/IProfileTemplate"; +import { ITraderAssort, ITraderBase, LoyaltyLevel } from "@spt/models/eft/common/tables/ITrader"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { Traders } from "@spt/models/enums/Traders"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { FenceService } from "@spt/services/FenceService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PlayerService } from "@spt/services/PlayerService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class TraderHelper diff --git a/project/src/ide/BleedingEdgeEntry.ts b/project/src/ide/BleedingEdgeEntry.ts index 94cdafdd..32a4111b 100644 --- a/project/src/ide/BleedingEdgeEntry.ts +++ b/project/src/ide/BleedingEdgeEntry.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "@spt-aki/Program"; +import { Program } from "@spt/Program"; import * as buildInfo from "./build.json"; globalThis.G_DEBUG_CONFIGURATION = true; @@ -11,7 +11,7 @@ globalThis.G_MODS_TRANSPILE_TS = true; globalThis.G_LOG_REQUESTS = true; globalThis.G_WATERMARK_ENABLED = true; -globalThis.G_AKIVERSION = buildInfo.akiVersion; +globalThis.G_SPTVERSION = buildInfo.sptVersion; globalThis.G_COMMIT = buildInfo.commit; globalThis.G_BUILDTIME = buildInfo.buildTime; diff --git a/project/src/ide/BleedingEdgeModsEntry.ts b/project/src/ide/BleedingEdgeModsEntry.ts index badeb416..8595b53c 100644 --- a/project/src/ide/BleedingEdgeModsEntry.ts +++ b/project/src/ide/BleedingEdgeModsEntry.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "@spt-aki/Program"; +import { Program } from "@spt/Program"; import * as buildInfo from "./build.json"; globalThis.G_DEBUG_CONFIGURATION = true; @@ -11,7 +11,7 @@ globalThis.G_MODS_TRANSPILE_TS = true; globalThis.G_LOG_REQUESTS = true; globalThis.G_WATERMARK_ENABLED = true; -globalThis.G_AKIVERSION = buildInfo.akiVersion; +globalThis.G_SPTVERSION = buildInfo.sptVersion; globalThis.G_COMMIT = buildInfo.commit; globalThis.G_BUILDTIME = buildInfo.buildTime; diff --git a/project/src/ide/DebugEntry.ts b/project/src/ide/DebugEntry.ts index 5c4377ea..20e8136c 100644 --- a/project/src/ide/DebugEntry.ts +++ b/project/src/ide/DebugEntry.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "@spt-aki/Program"; +import { Program } from "@spt/Program"; import * as buildInfo from "./build.json"; globalThis.G_DEBUG_CONFIGURATION = true; @@ -11,7 +11,7 @@ globalThis.G_MODS_TRANSPILE_TS = true; globalThis.G_LOG_REQUESTS = true; globalThis.G_WATERMARK_ENABLED = false; -globalThis.G_AKIVERSION = buildInfo.akiVersion; +globalThis.G_SPTVERSION = buildInfo.sptVersion; globalThis.G_COMMIT = buildInfo.commit; globalThis.G_BUILDTIME = buildInfo.buildTime; diff --git a/project/src/ide/ReleaseEntry.ts b/project/src/ide/ReleaseEntry.ts index 230e7d32..b16252bf 100644 --- a/project/src/ide/ReleaseEntry.ts +++ b/project/src/ide/ReleaseEntry.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "@spt-aki/Program"; +import { Program } from "@spt/Program"; import * as buildInfo from "./build.json"; globalThis.G_DEBUG_CONFIGURATION = false; @@ -11,7 +11,7 @@ globalThis.G_MODS_TRANSPILE_TS = true; globalThis.G_LOG_REQUESTS = false; globalThis.G_WATERMARK_ENABLED = false; -globalThis.G_AKIVERSION = buildInfo.akiVersion; +globalThis.G_SPTVERSION = buildInfo.sptVersion; globalThis.G_COMMIT = buildInfo.commit; globalThis.G_BUILDTIME = buildInfo.buildTime; diff --git a/project/src/ide/TestEntry.ts b/project/src/ide/TestEntry.ts index dc4ca2a9..d37d4685 100644 --- a/project/src/ide/TestEntry.ts +++ b/project/src/ide/TestEntry.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import "source-map-support/register"; -import { Program } from "@spt-aki/Program"; +import { Program } from "@spt/Program"; // target run:profiler doesnt work with this here // since this is the Test entry we can just remove // it and leave those empty @@ -14,7 +14,7 @@ globalThis.G_MODS_TRANSPILE_TS = false; globalThis.G_LOG_REQUESTS = true; globalThis.G_WATERMARK_ENABLED = false; -globalThis.G_AKIVERSION = ""; +globalThis.G_SPTVERSION = ""; globalThis.G_COMMIT = ""; globalThis.G_BUILDTIME = ""; diff --git a/project/src/ide/build.json b/project/src/ide/build.json index 999634cd..e02485fc 100644 --- a/project/src/ide/build.json +++ b/project/src/ide/build.json @@ -1,5 +1,5 @@ { - "akiVersion": "", + "sptVersion": "", "commit": "", "buildTime": 0 } diff --git a/project/src/loaders/BundleLoader.ts b/project/src/loaders/BundleLoader.ts index 0d9f35ef..64df8f19 100644 --- a/project/src/loaders/BundleLoader.ts +++ b/project/src/loaders/BundleLoader.ts @@ -1,10 +1,10 @@ import path from "node:path"; import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { BundleHashCacheService } from "@spt-aki/services/cache/BundleHashCacheService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; export class BundleInfo { diff --git a/project/src/loaders/ModLoadOrder.ts b/project/src/loaders/ModLoadOrder.ts index 90c393c7..0bfcf0c0 100644 --- a/project/src/loaders/ModLoadOrder.ts +++ b/project/src/loaders/ModLoadOrder.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class ModLoadOrder diff --git a/project/src/loaders/ModTypeCheck.ts b/project/src/loaders/ModTypeCheck.ts index 05b42e1c..9af891af 100644 --- a/project/src/loaders/ModTypeCheck.ts +++ b/project/src/loaders/ModTypeCheck.ts @@ -1,64 +1,64 @@ import { injectable } from "tsyringe"; -import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; -import { IPostAkiLoadModAsync } from "@spt-aki/models/external/IPostAkiLoadModAsync"; -import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; -import { IPostDBLoadModAsync } from "@spt-aki/models/external/IPostDBLoadModAsync"; -import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { IPreAkiLoadModAsync } from "@spt-aki/models/external/IPreAkiLoadModAsync"; +import { IPostDBLoadMod } from "@spt/models/external/IPostDBLoadMod"; +import { IPostDBLoadModAsync } from "@spt/models/external/IPostDBLoadModAsync"; +import { IPostSptLoadMod } from "@spt/models/external/IPostSptLoadMod"; +import { IPostSptLoadModAsync } from "@spt/models/external/IPostSptLoadModAsync"; +import { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod"; +import { IPreSptLoadModAsync } from "@spt/models/external/IPreSptLoadModAsync"; @injectable() export class ModTypeCheck { /** - * Use defined safe guard to check if the mod is a IPreAkiLoadMod + * Use defined safe guard to check if the mod is a IPreSptLoadMod * @returns boolean */ - public isPreAkiLoad(mod: any): mod is IPreAkiLoadMod + public isPreSptLoad(mod: any): mod is IPreSptLoadMod { - return mod?.preAkiLoad; + return mod?.preSptLoad; } /** - * Use defined safe guard to check if the mod is a IPostAkiLoadMod + * Use defined safe guard to check if the mod is a IPostSptLoadMod * @returns boolean */ - public isPostAkiLoad(mod: any): mod is IPostAkiLoadMod + public isPostSptLoad(mod: any): mod is IPostSptLoadMod { - return mod?.postAkiLoad; + return mod?.postSptLoad; } /** * Use defined safe guard to check if the mod is a IPostDBLoadMod * @returns boolean */ - public isPostDBAkiLoad(mod: any): mod is IPostDBLoadMod + public isPostDBLoad(mod: any): mod is IPostDBLoadMod { return mod?.postDBLoad; } /** - * Use defined safe guard to check if the mod is a IPreAkiLoadModAsync + * Use defined safe guard to check if the mod is a IPreSptLoadModAsync * @returns boolean */ - public isPreAkiLoadAsync(mod: any): mod is IPreAkiLoadModAsync + public isPreSptLoadAsync(mod: any): mod is IPreSptLoadModAsync { - return mod?.preAkiLoadAsync; + return mod?.preSptLoadAsync; } /** - * Use defined safe guard to check if the mod is a IPostAkiLoadModAsync + * Use defined safe guard to check if the mod is a IPostSptLoadModAsync * @returns boolean */ - public isPostAkiLoadAsync(mod: any): mod is IPostAkiLoadModAsync + public isPostSptLoadAsync(mod: any): mod is IPostSptLoadModAsync { - return mod?.postAkiLoadAsync; + return mod?.postSptLoadAsync; } /** * Use defined safe guard to check if the mod is a IPostDBLoadModAsync * @returns boolean */ - public isPostDBAkiLoadAsync(mod: any): mod is IPostDBLoadModAsync + public isPostDBLoadAsync(mod: any): mod is IPostDBLoadModAsync { return mod?.postDBLoadAsync; } @@ -70,12 +70,12 @@ export class ModTypeCheck public isPostV3Compatible(mod: any): boolean { return ( - this.isPreAkiLoad(mod) - || this.isPostAkiLoad(mod) - || this.isPostDBAkiLoad(mod) - || this.isPreAkiLoadAsync(mod) - || this.isPostAkiLoadAsync(mod) - || this.isPostDBAkiLoadAsync(mod) + this.isPreSptLoad(mod) + || this.isPostSptLoad(mod) + || this.isPostDBLoad(mod) + || this.isPreSptLoadAsync(mod) + || this.isPostSptLoadAsync(mod) + || this.isPostDBLoadAsync(mod) ); } } diff --git a/project/src/loaders/PostDBModLoader.ts b/project/src/loaders/PostDBModLoader.ts index d9ac6758..071e3755 100644 --- a/project/src/loaders/PostDBModLoader.ts +++ b/project/src/loaders/PostDBModLoader.ts @@ -1,12 +1,12 @@ import { DependencyContainer, inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; -import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; -import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; -import { IPostDBLoadModAsync } from "@spt-aki/models/external/IPostDBLoadModAsync"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { OnLoad } from "@spt/di/OnLoad"; +import { BundleLoader } from "@spt/loaders/BundleLoader"; +import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; +import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { IPostDBLoadMod } from "@spt/models/external/IPostDBLoadMod"; +import { IPostDBLoadModAsync } from "@spt/models/external/IPostDBLoadModAsync"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class PostDBModLoader implements OnLoad @@ -16,7 +16,7 @@ export class PostDBModLoader implements OnLoad constructor( @inject("WinstonLogger") protected logger: ILogger, @inject("BundleLoader") protected bundleLoader: BundleLoader, - @inject("PreAkiModLoader") protected preAkiModLoader: PreAkiModLoader, + @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ModTypeCheck") protected modTypeCheck: ModTypeCheck, ) @@ -26,7 +26,7 @@ export class PostDBModLoader implements OnLoad { if (globalThis.G_MODS_ENABLED) { - this.container = this.preAkiModLoader.getContainer(); + this.container = this.preSptModLoader.getContainer(); await this.executeModsAsync(); this.addBundles(); } @@ -34,28 +34,28 @@ export class PostDBModLoader implements OnLoad public getRoute(): string { - return "aki-mods"; + return "spt-mods"; } public getModPath(mod: string): string { - return this.preAkiModLoader.getModPath(mod); + return this.preSptModLoader.getModPath(mod); } protected async executeModsAsync(): Promise { - const mods = this.preAkiModLoader.sortModsLoadOrder(); + const mods = this.preSptModLoader.sortModsLoadOrder(); for (const modName of mods) { // import class - const filepath = `${this.preAkiModLoader.getModPath(modName)}${ - this.preAkiModLoader.getImportedModDetails()[modName].main + const filepath = `${this.preSptModLoader.getModPath(modName)}${ + this.preSptModLoader.getImportedModDetails()[modName].main }`; const modpath = `${process.cwd()}/${filepath}`; // eslint-disable-next-line @typescript-eslint/no-var-requires const mod = require(modpath); - if (this.modTypeCheck.isPostDBAkiLoadAsync(mod.mod)) + if (this.modTypeCheck.isPostDBLoadAsync(mod.mod)) { try { @@ -72,7 +72,7 @@ export class PostDBModLoader implements OnLoad } } - if (this.modTypeCheck.isPostDBAkiLoad(mod.mod)) + if (this.modTypeCheck.isPostDBLoad(mod.mod)) { (mod.mod as IPostDBLoadMod).postDBLoad(this.container); } @@ -81,10 +81,10 @@ export class PostDBModLoader implements OnLoad protected addBundles(): void { - const importedMods = this.preAkiModLoader.getImportedModDetails(); + const importedMods = this.preSptModLoader.getImportedModDetails(); for (const [mod, pkg] of Object.entries(importedMods)) { - const modPath = this.preAkiModLoader.getModPath(mod); + const modPath = this.preSptModLoader.getModPath(mod); if (pkg.isBundleMod ?? false) { diff --git a/project/src/loaders/PostAkiModLoader.ts b/project/src/loaders/PostSptModLoader.ts similarity index 54% rename from project/src/loaders/PostAkiModLoader.ts rename to project/src/loaders/PostSptModLoader.ts index 1695d864..5f11424c 100644 --- a/project/src/loaders/PostAkiModLoader.ts +++ b/project/src/loaders/PostSptModLoader.ts @@ -1,20 +1,20 @@ import { DependencyContainer, inject, injectable } from "tsyringe"; -import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; -import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; -import { IPostAkiLoadMod } from "@spt-aki/models/external/IPostAkiLoadMod"; -import { IPostAkiLoadModAsync } from "@spt-aki/models/external/IPostAkiLoadModAsync"; -import { IModLoader } from "@spt-aki/models/spt/mod/IModLoader"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; +import { PreSptModLoader } from "@spt/loaders/PreSptModLoader"; +import { IPostSptLoadMod } from "@spt/models/external/IPostSptLoadMod"; +import { IPostSptLoadModAsync } from "@spt/models/external/IPostSptLoadModAsync"; +import { IModLoader } from "@spt/models/spt/mod/IModLoader"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() -export class PostAkiModLoader implements IModLoader +export class PostSptModLoader implements IModLoader { protected container: DependencyContainer; constructor( @inject("WinstonLogger") protected logger: ILogger, - @inject("PreAkiModLoader") protected preAkiModLoader: PreAkiModLoader, + @inject("PreSptModLoader") protected preSptModLoader: PreSptModLoader, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ModTypeCheck") protected modTypeCheck: ModTypeCheck, ) @@ -22,36 +22,36 @@ export class PostAkiModLoader implements IModLoader public getModPath(mod: string): string { - return this.preAkiModLoader.getModPath(mod); + return this.preSptModLoader.getModPath(mod); } public async load(): Promise { if (globalThis.G_MODS_ENABLED) { - this.container = this.preAkiModLoader.getContainer(); + this.container = this.preSptModLoader.getContainer(); await this.executeModsAsync(); } } protected async executeModsAsync(): Promise { - const mods = this.preAkiModLoader.sortModsLoadOrder(); + const mods = this.preSptModLoader.sortModsLoadOrder(); for (const modName of mods) { // // import class - const filepath = `${this.preAkiModLoader.getModPath(modName)}${ - this.preAkiModLoader.getImportedModDetails()[modName].main + const filepath = `${this.preSptModLoader.getModPath(modName)}${ + this.preSptModLoader.getImportedModDetails()[modName].main }`; const modpath = `${process.cwd()}/${filepath}`; // eslint-disable-next-line @typescript-eslint/no-var-requires const mod = require(modpath); - if (this.modTypeCheck.isPostAkiLoadAsync(mod.mod)) + if (this.modTypeCheck.isPostSptLoadAsync(mod.mod)) { try { - await (mod.mod as IPostAkiLoadModAsync).postAkiLoadAsync(this.container); + await (mod.mod as IPostSptLoadModAsync).postSptLoadAsync(this.container); } catch (err) { @@ -64,9 +64,9 @@ export class PostAkiModLoader implements IModLoader } } - if (this.modTypeCheck.isPostAkiLoad(mod.mod)) + if (this.modTypeCheck.isPostSptLoad(mod.mod)) { - (mod.mod as IPostAkiLoadMod).postAkiLoad(this.container); + (mod.mod as IPostSptLoadMod).postSptLoad(this.container); } } } diff --git a/project/src/loaders/PreAkiModLoader.ts b/project/src/loaders/PreSptModLoader.ts similarity index 90% rename from project/src/loaders/PreAkiModLoader.ts rename to project/src/loaders/PreSptModLoader.ts index 16f1f57f..3f149199 100644 --- a/project/src/loaders/PreAkiModLoader.ts +++ b/project/src/loaders/PreSptModLoader.ts @@ -3,24 +3,24 @@ import os from "node:os"; import path from "node:path"; import { maxSatisfying, valid, validRange, satisfies } from "semver"; import { DependencyContainer, inject, injectable } from "tsyringe"; -import { ModLoadOrder } from "@spt-aki/loaders/ModLoadOrder"; -import { ModTypeCheck } from "@spt-aki/loaders/ModTypeCheck"; -import { ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { IPreAkiLoadModAsync } from "@spt-aki/models/external/IPreAkiLoadModAsync"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IModLoader } from "@spt-aki/models/spt/mod/IModLoader"; -import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ModCompilerService } from "@spt-aki/services/ModCompilerService"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ModLoadOrder } from "@spt/loaders/ModLoadOrder"; +import { ModTypeCheck } from "@spt/loaders/ModTypeCheck"; +import { ModDetails } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod"; +import { IPreSptLoadModAsync } from "@spt/models/external/IPreSptLoadModAsync"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { IModLoader } from "@spt/models/spt/mod/IModLoader"; +import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ModCompilerService } from "@spt/services/ModCompilerService"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() -export class PreAkiModLoader implements IModLoader +export class PreSptModLoader implements IModLoader { protected container: DependencyContainer; @@ -28,7 +28,7 @@ export class PreAkiModLoader implements IModLoader protected readonly modOrderPath = "user/mods/order.json"; protected order: Record = {}; protected imported: Record = {}; - protected akiConfig: ICoreConfig; + protected sptConfig: ICoreConfig; protected serverDependencies: Record; protected skippedMods: Set; @@ -43,7 +43,7 @@ export class PreAkiModLoader implements IModLoader @inject("ModTypeCheck") protected modTypeCheck: ModTypeCheck, ) { - this.akiConfig = this.configServer.getConfig(ConfigTypes.CORE); + this.sptConfig = this.configServer.getConfig(ConfigTypes.CORE); const packageJsonPath: string = path.join(__dirname, "../../package.json"); this.serverDependencies = JSON.parse(this.vfs.readFile(packageJsonPath)).dependencies; @@ -194,8 +194,8 @@ export class PreAkiModLoader implements IModLoader errorsFound = true; } - // Returns if mod isnt compatible with this verison of aki - if (!this.isModCombatibleWithAki(modToValidate)) + // Returns if mod isnt compatible with this verison of spt + if (!this.isModCombatibleWithSpt(modToValidate)) { errorsFound = true; } @@ -324,34 +324,34 @@ export class PreAkiModLoader implements IModLoader /** * Is the passed in mod compatible with the running server version - * @param mod Mod to check compatibiltiy with AKI + * @param mod Mod to check compatibiltiy with SPT * @returns True if compatible */ - protected isModCombatibleWithAki(mod: IPackageJsonData): boolean + protected isModCombatibleWithSpt(mod: IPackageJsonData): boolean { - const akiVersion = globalThis.G_AKIVERSION || this.akiConfig.akiVersion; + const sptVersion = globalThis.G_SPTVERSION || this.sptConfig.sptVersion; const modName = `${mod.author}-${mod.name}`; - // Error and prevent loading If no akiVersion property exists - if (!mod.akiVersion) + // Error and prevent loading If no sptVersion property exists + if (!mod.sptVersion) { - this.logger.error(this.localisationService.getText("modloader-missing_akiversion_field", modName)); + this.logger.error(this.localisationService.getText("modloader-missing_sptversion_field", modName)); return false; } - // Error and prevent loading if akiVersion property is not a valid semver string - if (!(valid(mod.akiVersion) || validRange(mod.akiVersion))) + // Error and prevent loading if sptVersion property is not a valid semver string + if (!(valid(mod.sptVersion) || validRange(mod.sptVersion))) { - this.logger.error(this.localisationService.getText("modloader-invalid_akiversion_field", modName)); + this.logger.error(this.localisationService.getText("modloader-invalid_sptversion_field", modName)); return false; } // Warning and allow loading if semver is not satisfied - if (!satisfies(akiVersion, mod.akiVersion)) + if (!satisfies(sptVersion, mod.sptVersion)) { - this.logger.warning(this.localisationService.getText("modloader-outdated_akiversion_field", modName)); + this.logger.warning(this.localisationService.getText("modloader-outdated_sptversion_field", modName)); return true; } @@ -394,11 +394,11 @@ export class PreAkiModLoader implements IModLoader } // Perform async load of mod - if (this.modTypeCheck.isPreAkiLoadAsync(requiredMod.mod)) + if (this.modTypeCheck.isPreSptLoadAsync(requiredMod.mod)) { try { - await (requiredMod.mod as IPreAkiLoadModAsync).preAkiLoadAsync(this.container); + await (requiredMod.mod as IPreSptLoadModAsync).preSptLoadAsync(this.container); globalThis[mod] = requiredMod; } catch (err) @@ -415,9 +415,9 @@ export class PreAkiModLoader implements IModLoader } // Perform sync load of mod - if (this.modTypeCheck.isPreAkiLoad(requiredMod.mod)) + if (this.modTypeCheck.isPreSptLoad(requiredMod.mod)) { - (requiredMod.mod as IPreAkiLoadMod).preAkiLoad(this.container); + (requiredMod.mod as IPreSptLoadMod).preSptLoad(this.container); globalThis[mod] = requiredMod; } } @@ -513,14 +513,14 @@ export class PreAkiModLoader implements IModLoader } // If this feature flag is set to false, we warn the user he has a mod that requires extra dependencies and might not work, point them in the right direction on how to enable this feature. - if (!this.akiConfig.features.autoInstallModDependencies) + if (!this.sptConfig.features.autoInstallModDependencies) { this.logger.warning( this.localisationService.getText("modloader-installing_external_dependencies_disabled", { name: pkg.name, author: pkg.author, configPath: path.join( - globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/configs" : "assets/configs", + globalThis.G_RELEASE_CONFIGURATION ? "SPT_Data/Server/configs" : "assets/configs", "core.json", ), configOption: "autoInstallModDependencies", @@ -544,7 +544,7 @@ export class PreAkiModLoader implements IModLoader const pnpmPath = path.join( process.cwd(), - globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/@pnpm/exe" : "node_modules/@pnpm/exe", + globalThis.G_RELEASE_CONFIGURATION ? "SPT_Data/Server/@pnpm/exe" : "node_modules/@pnpm/exe", os.platform() === "win32" ? "pnpm.exe" : "pnpm", ); diff --git a/project/src/models/eft/builds/ISetMagazineRequest.ts b/project/src/models/eft/builds/ISetMagazineRequest.ts index 74257227..19653fcf 100644 --- a/project/src/models/eft/builds/ISetMagazineRequest.ts +++ b/project/src/models/eft/builds/ISetMagazineRequest.ts @@ -1,4 +1,4 @@ -import { IMagazineTemplateAmmoItem } from "../profile/IAkiProfile"; +import { IMagazineTemplateAmmoItem } from "../profile/ISptProfile"; export interface ISetMagazineRequest { diff --git a/project/src/models/eft/common/IGlobals.ts b/project/src/models/eft/common/IGlobals.ts index 388534e8..9e92494d 100644 --- a/project/src/models/eft/common/IGlobals.ts +++ b/project/src/models/eft/common/IGlobals.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Ixyz } from "@spt/models/eft/common/Ixyz"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface IGlobals { @@ -1861,5 +1861,5 @@ export interface IPreset export interface IQuestSettings { GlobalRewardRepModifierDailyQuestPvE: number - GlobalRewardRepModifierQuestPvE: number + GlobalRewardRepModifierQuestPvE: number } diff --git a/project/src/models/eft/common/ILocation.ts b/project/src/models/eft/common/ILocation.ts index dd56b004..d6c156d2 100644 --- a/project/src/models/eft/common/ILocation.ts +++ b/project/src/models/eft/common/ILocation.ts @@ -1,5 +1,5 @@ -import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot"; +import { Exit, ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ILooseLoot } from "@spt/models/eft/common/ILooseLoot"; import { Ixyz } from "./Ixyz"; import { Item } from "./tables/IItem"; diff --git a/project/src/models/eft/common/ILocationBase.ts b/project/src/models/eft/common/ILocationBase.ts index 9f40d29b..58f148a6 100644 --- a/project/src/models/eft/common/ILocationBase.ts +++ b/project/src/models/eft/common/ILocationBase.ts @@ -1,5 +1,5 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { MinMax } from "@spt/models/common/MinMax"; +import { Ixyz } from "@spt/models/eft/common/Ixyz"; /* eslint-disable @typescript-eslint/naming-convention */ export interface ILocationBase diff --git a/project/src/models/eft/common/ILocationsSourceDestinationBase.ts b/project/src/models/eft/common/ILocationsSourceDestinationBase.ts index 113e5a90..60f43d89 100644 --- a/project/src/models/eft/common/ILocationsSourceDestinationBase.ts +++ b/project/src/models/eft/common/ILocationsSourceDestinationBase.ts @@ -1,4 +1,4 @@ -import { ILocations } from "@spt-aki/models/spt/server/ILocations"; +import { ILocations } from "@spt/models/spt/server/ILocations"; export interface ILocationsGenerateAllResponse { diff --git a/project/src/models/eft/common/ILooseLoot.ts b/project/src/models/eft/common/ILooseLoot.ts index 1ce3ffd7..61441726 100644 --- a/project/src/models/eft/common/ILooseLoot.ts +++ b/project/src/models/eft/common/ILooseLoot.ts @@ -1,5 +1,5 @@ -import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Ixyz } from "@spt/models/eft/common/Ixyz"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface ILooseLoot { diff --git a/project/src/models/eft/common/IPmcData.ts b/project/src/models/eft/common/IPmcData.ts index c8d5ec32..a0373418 100644 --- a/project/src/models/eft/common/IPmcData.ts +++ b/project/src/models/eft/common/IPmcData.ts @@ -1,4 +1,4 @@ -import { IBotBase, IEftStats } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { IBotBase, IEftStats } from "@spt/models/eft/common/tables/IBotBase"; export interface IPmcData extends IBotBase {} diff --git a/project/src/models/eft/common/tables/IBotBase.ts b/project/src/models/eft/common/tables/IBotBase.ts index e1465b83..ce2bc9dc 100644 --- a/project/src/models/eft/common/tables/IBotBase.ts +++ b/project/src/models/eft/common/tables/IBotBase.ts @@ -1,11 +1,11 @@ -import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { BonusSkillType } from "@spt-aki/models/enums/BonusSkillType"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; +import { Item, Upd } from "@spt/models/eft/common/tables/IItem"; +import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { BonusSkillType } from "@spt/models/enums/BonusSkillType"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; export interface IBotBase { diff --git a/project/src/models/eft/common/tables/IBotType.ts b/project/src/models/eft/common/tables/IBotType.ts index 4a7012d8..68b691f3 100644 --- a/project/src/models/eft/common/tables/IBotType.ts +++ b/project/src/models/eft/common/tables/IBotType.ts @@ -1,5 +1,5 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { MinMax } from "@spt/models/common/MinMax"; +import { Skills } from "@spt/models/eft/common/tables/IBotBase"; export interface IBotType { diff --git a/project/src/models/eft/common/tables/ICustomizationItem.ts b/project/src/models/eft/common/tables/ICustomizationItem.ts index 80acd5c1..1adda1fb 100644 --- a/project/src/models/eft/common/tables/ICustomizationItem.ts +++ b/project/src/models/eft/common/tables/ICustomizationItem.ts @@ -1,4 +1,4 @@ -import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { Ixyz } from "@spt/models/eft/common/Ixyz"; export interface ICustomizationItem { diff --git a/project/src/models/eft/common/tables/IProfileTemplate.ts b/project/src/models/eft/common/tables/IProfileTemplate.ts index f9f2ec1d..7e6c3d0d 100644 --- a/project/src/models/eft/common/tables/IProfileTemplate.ts +++ b/project/src/models/eft/common/tables/IProfileTemplate.ts @@ -1,5 +1,5 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Dialogue, IUserBuilds } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; export interface IProfileTemplates { diff --git a/project/src/models/eft/common/tables/IQuest.ts b/project/src/models/eft/common/tables/IQuest.ts index 657b0a83..dcaff424 100644 --- a/project/src/models/eft/common/tables/IQuest.ts +++ b/project/src/models/eft/common/tables/IQuest.ts @@ -1,7 +1,7 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { QuestRewardType } from "@spt-aki/models/enums/QuestRewardType"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { QuestTypeEnum } from "@spt-aki/models/enums/QuestTypeEnum"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { QuestRewardType } from "@spt/models/enums/QuestRewardType"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { QuestTypeEnum } from "@spt/models/enums/QuestTypeEnum"; export interface IQuest { diff --git a/project/src/models/eft/common/tables/ITemplateItem.ts b/project/src/models/eft/common/tables/ITemplateItem.ts index 30eda3b8..fdd1c42e 100644 --- a/project/src/models/eft/common/tables/ITemplateItem.ts +++ b/project/src/models/eft/common/tables/ITemplateItem.ts @@ -1,4 +1,4 @@ -import { Ixyz } from "@spt-aki/models/eft/common/Ixyz"; +import { Ixyz } from "@spt/models/eft/common/Ixyz"; export interface ITemplateItem { diff --git a/project/src/models/eft/common/tables/ITrader.ts b/project/src/models/eft/common/tables/ITrader.ts index 8dc93778..53e449e2 100644 --- a/project/src/models/eft/common/tables/ITrader.ts +++ b/project/src/models/eft/common/tables/ITrader.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderServiceModel } from "@spt-aki/models/spt/services/ITraderServiceModel"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; export interface ITrader { diff --git a/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts b/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts index 29a71198..1cab6c7c 100644 --- a/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts +++ b/project/src/models/eft/dialog/IGetAllAttachmentsResponse.ts @@ -1,4 +1,4 @@ -import { Message } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { Message } from "@spt/models/eft/profile/ISptProfile"; export interface IGetAllAttachmentsResponse { diff --git a/project/src/models/eft/dialog/IGetFriendListDataResponse.ts b/project/src/models/eft/dialog/IGetFriendListDataResponse.ts index 0b901a06..531a8f45 100644 --- a/project/src/models/eft/dialog/IGetFriendListDataResponse.ts +++ b/project/src/models/eft/dialog/IGetFriendListDataResponse.ts @@ -1,4 +1,4 @@ -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; export interface IGetFriendListDataResponse { diff --git a/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts b/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts index b5bb0b70..f461bc36 100644 --- a/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts +++ b/project/src/models/eft/dialog/IGetMailDialogViewRequestData.ts @@ -1,4 +1,4 @@ -import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { MessageType } from "@spt/models/enums/MessageType"; export interface IGetMailDialogViewRequestData { diff --git a/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts b/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts index 58ec2259..ec29719d 100644 --- a/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts +++ b/project/src/models/eft/dialog/IGetMailDialogViewResponseData.ts @@ -1,4 +1,4 @@ -import { IUserDialogInfo, Message } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IUserDialogInfo, Message } from "@spt/models/eft/profile/ISptProfile"; export interface IGetMailDialogViewResponseData { diff --git a/project/src/models/eft/dialog/ISendMessageRequest.ts b/project/src/models/eft/dialog/ISendMessageRequest.ts index 6bbc2748..2f823355 100644 --- a/project/src/models/eft/dialog/ISendMessageRequest.ts +++ b/project/src/models/eft/dialog/ISendMessageRequest.ts @@ -1,4 +1,4 @@ -import { MessageType } from "@spt-aki/models/enums/MessageType"; +import { MessageType } from "@spt/models/enums/MessageType"; export interface ISendMessageRequest { diff --git a/project/src/models/eft/game/ICurrentGroupResponse.ts b/project/src/models/eft/game/ICurrentGroupResponse.ts index 0e543a9d..d5c1141f 100644 --- a/project/src/models/eft/game/ICurrentGroupResponse.ts +++ b/project/src/models/eft/game/ICurrentGroupResponse.ts @@ -1,4 +1,4 @@ -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface ICurrentGroupResponse { diff --git a/project/src/models/eft/health/IOffraidEatRequestData.ts b/project/src/models/eft/health/IOffraidEatRequestData.ts index c095f08f..dcac5f1f 100644 --- a/project/src/models/eft/health/IOffraidEatRequestData.ts +++ b/project/src/models/eft/health/IOffraidEatRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface IOffraidEatRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/health/IOffraidHealRequestData.ts b/project/src/models/eft/health/IOffraidHealRequestData.ts index fd6b1029..49ddda99 100644 --- a/project/src/models/eft/health/IOffraidHealRequestData.ts +++ b/project/src/models/eft/health/IOffraidHealRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface IOffraidHealRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/hideout/IHideoutArea.ts b/project/src/models/eft/hideout/IHideoutArea.ts index 29a1b368..eeebd5c9 100644 --- a/project/src/models/eft/hideout/IHideoutArea.ts +++ b/project/src/models/eft/hideout/IHideoutArea.ts @@ -1,5 +1,5 @@ -import { BonusSkillType } from "@spt-aki/models/enums/BonusSkillType"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; +import { BonusSkillType } from "@spt/models/enums/BonusSkillType"; +import { BonusType } from "@spt/models/enums/BonusType"; export interface IHideoutArea { diff --git a/project/src/models/eft/hideout/IHideoutScavCase.ts b/project/src/models/eft/hideout/IHideoutScavCase.ts index 52c387c8..783cb761 100644 --- a/project/src/models/eft/hideout/IHideoutScavCase.ts +++ b/project/src/models/eft/hideout/IHideoutScavCase.ts @@ -1,4 +1,4 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MinMax } from "@spt/models/common/MinMax"; export interface IHideoutScavCase { diff --git a/project/src/models/eft/hideout/IQteData.ts b/project/src/models/eft/hideout/IQteData.ts index 9318d008..b5a4d979 100644 --- a/project/src/models/eft/hideout/IQteData.ts +++ b/project/src/models/eft/hideout/IQteData.ts @@ -1,14 +1,14 @@ -import { Effect } from "@spt-aki/models/eft/health/Effect"; -import { BodyPart } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; -import { QteActivityType } from "@spt-aki/models/enums/hideout/QteActivityType"; -import { QteEffectType } from "@spt-aki/models/enums/hideout/QteEffectType"; -import { QteResultType } from "@spt-aki/models/enums/hideout/QteResultType"; -import { QteRewardType } from "@spt-aki/models/enums/hideout/QteRewardType"; -import { QteType } from "@spt-aki/models/enums/hideout/QteType"; -import { RequirementType } from "@spt-aki/models/enums/hideout/RequirementType"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; +import { Effect } from "@spt/models/eft/health/Effect"; +import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType"; +import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType"; +import { QteResultType } from "@spt/models/enums/hideout/QteResultType"; +import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType"; +import { QteType } from "@spt/models/enums/hideout/QteType"; +import { RequirementType } from "@spt/models/enums/hideout/RequirementType"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { Traders } from "@spt/models/enums/Traders"; export interface IQteData { diff --git a/project/src/models/eft/inRaid/ISaveProgressRequestData.ts b/project/src/models/eft/inRaid/ISaveProgressRequestData.ts index 26b2b55b..e79af2c1 100644 --- a/project/src/models/eft/inRaid/ISaveProgressRequestData.ts +++ b/project/src/models/eft/inRaid/ISaveProgressRequestData.ts @@ -1,7 +1,7 @@ -import { IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; -import { IInsuredItemsData } from "@spt-aki/models/eft/inRaid/IInsuredItemsData"; -import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState"; +import { IPostRaidPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData"; +import { IInsuredItemsData } from "@spt/models/eft/inRaid/IInsuredItemsData"; +import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState"; export interface ISaveProgressRequestData { diff --git a/project/src/models/eft/insurance/IInsureRequestData.ts b/project/src/models/eft/insurance/IInsureRequestData.ts index 783cbf01..e4c20536 100644 --- a/project/src/models/eft/insurance/IInsureRequestData.ts +++ b/project/src/models/eft/insurance/IInsureRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface IInsureRequestData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/inventory/IAddItemTempObject.ts b/project/src/models/eft/inventory/IAddItemTempObject.ts index d271a3e2..df788934 100644 --- a/project/src/models/eft/inventory/IAddItemTempObject.ts +++ b/project/src/models/eft/inventory/IAddItemTempObject.ts @@ -1,4 +1,4 @@ -import { Item, Location } from "@spt-aki/models/eft/common/tables/IItem"; +import { Item, Location } from "@spt/models/eft/common/tables/IItem"; export interface IAddItemTempObject { diff --git a/project/src/models/eft/inventory/IInventoryAddRequestData.ts b/project/src/models/eft/inventory/IInventoryAddRequestData.ts index 183721f9..c90d8e71 100644 --- a/project/src/models/eft/inventory/IInventoryAddRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryAddRequestData.ts @@ -1,7 +1,7 @@ import { Container, IInventoryBaseActionRequestData, -} from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +} from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryAddRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts b/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts index c4603216..7d55529a 100644 --- a/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryBaseActionRequestData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface IInventoryBaseActionRequestData extends IBaseInteractionRequestData {} diff --git a/project/src/models/eft/inventory/IInventoryBindRequestData.ts b/project/src/models/eft/inventory/IInventoryBindRequestData.ts index 8997d95a..b2bba814 100644 --- a/project/src/models/eft/inventory/IInventoryBindRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryBindRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryBindRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts index 3249e223..a1e6899e 100644 --- a/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryCreateMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryCreateMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts index 7cf7096c..9395725e 100644 --- a/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryDeleteMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryDeleteMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts b/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts index 11703df2..42ac492e 100644 --- a/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryEditMarkerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryEditMarkerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryExamineRequestData.ts b/project/src/models/eft/inventory/IInventoryExamineRequestData.ts index 969aaa2b..7ae9c1d7 100644 --- a/project/src/models/eft/inventory/IInventoryExamineRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryExamineRequestData.ts @@ -1,5 +1,5 @@ -import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { OwnerInfo } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryExamineRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryFoldRequestData.ts b/project/src/models/eft/inventory/IInventoryFoldRequestData.ts index d01acf7a..84c29d50 100644 --- a/project/src/models/eft/inventory/IInventoryFoldRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryFoldRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryFoldRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryMergeRequestData.ts b/project/src/models/eft/inventory/IInventoryMergeRequestData.ts index 9985abaf..cbd32774 100644 --- a/project/src/models/eft/inventory/IInventoryMergeRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryMergeRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryMergeRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryMoveRequestData.ts b/project/src/models/eft/inventory/IInventoryMoveRequestData.ts index f1f5d64a..65ad3cec 100644 --- a/project/src/models/eft/inventory/IInventoryMoveRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryMoveRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData, To } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData, To } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryMoveRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts b/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts index 6e44b694..de473b5a 100644 --- a/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryReadEncyclopediaRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryReadEncyclopediaRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts b/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts index 920d2584..0aa68d22 100644 --- a/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryRemoveRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryRemoveRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySortRequestData.ts b/project/src/models/eft/inventory/IInventorySortRequestData.ts index 5eca9b0e..4912cd60 100644 --- a/project/src/models/eft/inventory/IInventorySortRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySortRequestData.ts @@ -1,5 +1,5 @@ -import { Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { Upd } from "@spt/models/eft/common/tables/IItem"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySortRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySplitRequestData.ts b/project/src/models/eft/inventory/IInventorySplitRequestData.ts index 5a4aa06a..86a7b4aa 100644 --- a/project/src/models/eft/inventory/IInventorySplitRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySplitRequestData.ts @@ -1,7 +1,7 @@ import { Container, IInventoryBaseActionRequestData, -} from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +} from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySplitRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventorySwapRequestData.ts b/project/src/models/eft/inventory/IInventorySwapRequestData.ts index 8021500b..a83fc397 100644 --- a/project/src/models/eft/inventory/IInventorySwapRequestData.ts +++ b/project/src/models/eft/inventory/IInventorySwapRequestData.ts @@ -1,5 +1,5 @@ -import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; -import { IInventoryBaseActionRequestData, To } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { OwnerInfo } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; +import { IInventoryBaseActionRequestData, To } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventorySwapRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryTagRequestData.ts b/project/src/models/eft/inventory/IInventoryTagRequestData.ts index efc442d2..531e1aac 100644 --- a/project/src/models/eft/inventory/IInventoryTagRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryTagRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryTagRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryToggleRequestData.ts b/project/src/models/eft/inventory/IInventoryToggleRequestData.ts index 4c44db23..8040bf0c 100644 --- a/project/src/models/eft/inventory/IInventoryToggleRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryToggleRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryToggleRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryTransferRequestData.ts b/project/src/models/eft/inventory/IInventoryTransferRequestData.ts index 2a78c892..848bf14f 100644 --- a/project/src/models/eft/inventory/IInventoryTransferRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryTransferRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryTransferRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IInventoryUnbindRequestData.ts b/project/src/models/eft/inventory/IInventoryUnbindRequestData.ts index 5058a827..d9056d5a 100644 --- a/project/src/models/eft/inventory/IInventoryUnbindRequestData.ts +++ b/project/src/models/eft/inventory/IInventoryUnbindRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IInventoryUnbindRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts b/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts index 49ad8841..50d79805 100644 --- a/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts +++ b/project/src/models/eft/inventory/IOpenRandomLootContainerRequestData.ts @@ -1,4 +1,4 @@ -import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData"; +import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData"; export interface IOpenRandomLootContainerRequestData extends IInventoryBaseActionRequestData { diff --git a/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts b/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts index 74e48d8c..95eb9024 100644 --- a/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts +++ b/project/src/models/eft/itemEvent/IEmptyItemEventRouterResponse.ts @@ -1,4 +1,4 @@ -import { IItemEventRouterBase } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; export interface IEmptyItemEventRouterResponse extends IItemEventRouterBase { diff --git a/project/src/models/eft/itemEvent/IItemEventRouterBase.ts b/project/src/models/eft/itemEvent/IItemEventRouterBase.ts index 140d927b..1fee1c53 100644 --- a/project/src/models/eft/itemEvent/IItemEventRouterBase.ts +++ b/project/src/models/eft/itemEvent/IItemEventRouterBase.ts @@ -1,9 +1,9 @@ -import { Health, IQuestStatus, Productive, Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item, Upd } from "@spt-aki/models/eft/common/tables/IItem"; -import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { EquipmentBuildType } from "@spt-aki/models/enums/EquipmentBuildType"; +import { Health, IQuestStatus, Productive, Skills } from "@spt/models/eft/common/tables/IBotBase"; +import { Item, Upd } from "@spt/models/eft/common/tables/IItem"; +import { IQuest } from "@spt/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { EquipmentBuildType } from "@spt/models/enums/EquipmentBuildType"; export interface IItemEventRouterBase { diff --git a/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts b/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts index 36bd889d..1fe69d91 100644 --- a/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts +++ b/project/src/models/eft/itemEvent/IItemEventRouterResponse.ts @@ -1,4 +1,4 @@ -import { IItemEventRouterBase } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; /** An object sent back to the game client that contains alterations the client must make to ensure server/client are in sync */ export interface IItemEventRouterResponse extends IItemEventRouterBase diff --git a/project/src/models/eft/launcher/IChangeRequestData.ts b/project/src/models/eft/launcher/IChangeRequestData.ts index a402f777..ba53a6a8 100644 --- a/project/src/models/eft/launcher/IChangeRequestData.ts +++ b/project/src/models/eft/launcher/IChangeRequestData.ts @@ -1,4 +1,4 @@ -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; export interface IChangeRequestData extends ILoginRequestData { diff --git a/project/src/models/eft/launcher/IMiniProfile.ts b/project/src/models/eft/launcher/IMiniProfile.ts index 83845ba6..1cc470c8 100644 --- a/project/src/models/eft/launcher/IMiniProfile.ts +++ b/project/src/models/eft/launcher/IMiniProfile.ts @@ -8,10 +8,10 @@ export interface IMiniProfile prevexp: number nextlvl: number maxlvl: number - akiData: AkiData + sptData: SPTData } -export interface AkiData +export interface SPTData { version: string } diff --git a/project/src/models/eft/launcher/IRegisterData.ts b/project/src/models/eft/launcher/IRegisterData.ts index 688ecdb1..4d6ccd06 100644 --- a/project/src/models/eft/launcher/IRegisterData.ts +++ b/project/src/models/eft/launcher/IRegisterData.ts @@ -1,4 +1,4 @@ -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; export interface IRegisterData extends ILoginRequestData { diff --git a/project/src/models/eft/launcher/IRemoveProfileData.ts b/project/src/models/eft/launcher/IRemoveProfileData.ts index f8a12f7b..5df6c235 100644 --- a/project/src/models/eft/launcher/IRemoveProfileData.ts +++ b/project/src/models/eft/launcher/IRemoveProfileData.ts @@ -1,3 +1,3 @@ -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; export type IRemoveProfileData = ILoginRequestData; diff --git a/project/src/models/eft/location/IAirdropLootResult.ts b/project/src/models/eft/location/IAirdropLootResult.ts index c039e910..bce60e2f 100644 --- a/project/src/models/eft/location/IAirdropLootResult.ts +++ b/project/src/models/eft/location/IAirdropLootResult.ts @@ -1,4 +1,4 @@ -import { LootItem } from "@spt-aki/models/spt/services/LootItem"; +import { LootItem } from "@spt/models/spt/services/LootItem"; export interface IAirdropLootResult { diff --git a/project/src/models/eft/match/IGetRaidConfigurationRequestData.ts b/project/src/models/eft/match/IGetRaidConfigurationRequestData.ts index 947762dd..1f72008d 100644 --- a/project/src/models/eft/match/IGetRaidConfigurationRequestData.ts +++ b/project/src/models/eft/match/IGetRaidConfigurationRequestData.ts @@ -1,4 +1,4 @@ -import { IRaidSettings } from "@spt-aki/models/eft/match/IRaidSettings"; +import { IRaidSettings } from "@spt/models/eft/match/IRaidSettings"; export interface IGetRaidConfigurationRequestData extends IRaidSettings { diff --git a/project/src/models/eft/match/IGroupCharacter.ts b/project/src/models/eft/match/IGroupCharacter.ts index 98c61d1e..57eb9416 100644 --- a/project/src/models/eft/match/IGroupCharacter.ts +++ b/project/src/models/eft/match/IGroupCharacter.ts @@ -1,5 +1,5 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IGroupCharacter { diff --git a/project/src/models/eft/match/IMatchGroupCurrentResponse.ts b/project/src/models/eft/match/IMatchGroupCurrentResponse.ts index 7f504cbc..cace98f7 100644 --- a/project/src/models/eft/match/IMatchGroupCurrentResponse.ts +++ b/project/src/models/eft/match/IMatchGroupCurrentResponse.ts @@ -1,4 +1,4 @@ -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; export interface IMatchGroupCurrentResponse { diff --git a/project/src/models/eft/match/IMatchGroupStartGameRequest.ts b/project/src/models/eft/match/IMatchGroupStartGameRequest.ts index 9396124f..dbe6ada3 100644 --- a/project/src/models/eft/match/IMatchGroupStartGameRequest.ts +++ b/project/src/models/eft/match/IMatchGroupStartGameRequest.ts @@ -1,4 +1,4 @@ -import { IServer } from "@spt-aki/models/eft/match/IServer"; +import { IServer } from "@spt/models/eft/match/IServer"; export interface IMatchGroupStartGameRequest { diff --git a/project/src/models/eft/match/IMatchGroupStatusRequest.ts b/project/src/models/eft/match/IMatchGroupStatusRequest.ts index e5587e67..9da6a764 100644 --- a/project/src/models/eft/match/IMatchGroupStatusRequest.ts +++ b/project/src/models/eft/match/IMatchGroupStatusRequest.ts @@ -1,4 +1,4 @@ -import { RaidMode } from "@spt-aki/models/enums/RaidMode"; +import { RaidMode } from "@spt/models/enums/RaidMode"; export interface IMatchGroupStatusRequest { diff --git a/project/src/models/eft/match/IMatchGroupStatusResponse.ts b/project/src/models/eft/match/IMatchGroupStatusResponse.ts index 4890b101..3ef36bc9 100644 --- a/project/src/models/eft/match/IMatchGroupStatusResponse.ts +++ b/project/src/models/eft/match/IMatchGroupStatusResponse.ts @@ -1,4 +1,4 @@ -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; export interface IMatchGroupStatusResponse { diff --git a/project/src/models/eft/match/IProfileStatusResponse.ts b/project/src/models/eft/match/IProfileStatusResponse.ts index 48e85816..69a26d46 100644 --- a/project/src/models/eft/match/IProfileStatusResponse.ts +++ b/project/src/models/eft/match/IProfileStatusResponse.ts @@ -1,4 +1,4 @@ -import { ISessionStatus } from "@spt-aki/models/eft/match/ISessionStatus"; +import { ISessionStatus } from "@spt/models/eft/match/ISessionStatus"; export interface IProfileStatusResponse { diff --git a/project/src/models/eft/match/IRaidSettings.ts b/project/src/models/eft/match/IRaidSettings.ts index 2a14a009..e52d15b0 100644 --- a/project/src/models/eft/match/IRaidSettings.ts +++ b/project/src/models/eft/match/IRaidSettings.ts @@ -1,14 +1,14 @@ -import { DateTime } from "@spt-aki/models/enums/DateTime"; -import { PlayersSpawnPlace } from "@spt-aki/models/enums/PlayersSpawnPlace"; -import { RaidMode } from "@spt-aki/models/enums/RaidMode"; -import { BotAmount } from "@spt-aki/models/enums/RaidSettings/BotAmount"; -import { BotDifficulty } from "@spt-aki/models/enums/RaidSettings/BotDifficulty"; -import { CloudinessType } from "@spt-aki/models/enums/RaidSettings/TimeAndWeather/CloudinessType"; -import { FogType } from "@spt-aki/models/enums/RaidSettings/TimeAndWeather/FogType"; -import { RainType } from "@spt-aki/models/enums/RaidSettings/TimeAndWeather/RainType"; -import { TimeFlowType } from "@spt-aki/models/enums/RaidSettings/TimeAndWeather/TimeFlowType"; -import { WindSpeed } from "@spt-aki/models/enums/RaidSettings/TimeAndWeather/WindSpeed"; -import { SideType } from "@spt-aki/models/enums/SideType"; +import { DateTime } from "@spt/models/enums/DateTime"; +import { PlayersSpawnPlace } from "@spt/models/enums/PlayersSpawnPlace"; +import { RaidMode } from "@spt/models/enums/RaidMode"; +import { BotAmount } from "@spt/models/enums/RaidSettings/BotAmount"; +import { BotDifficulty } from "@spt/models/enums/RaidSettings/BotDifficulty"; +import { CloudinessType } from "@spt/models/enums/RaidSettings/TimeAndWeather/CloudinessType"; +import { FogType } from "@spt/models/enums/RaidSettings/TimeAndWeather/FogType"; +import { RainType } from "@spt/models/enums/RaidSettings/TimeAndWeather/RainType"; +import { TimeFlowType } from "@spt/models/enums/RaidSettings/TimeAndWeather/TimeFlowType"; +import { WindSpeed } from "@spt/models/enums/RaidSettings/TimeAndWeather/WindSpeed"; +import { SideType } from "@spt/models/enums/SideType"; export interface IRaidSettings { diff --git a/project/src/models/eft/notes/INoteActionData.ts b/project/src/models/eft/notes/INoteActionData.ts index c9fb1ce5..1fadc9ca 100644 --- a/project/src/models/eft/notes/INoteActionData.ts +++ b/project/src/models/eft/notes/INoteActionData.ts @@ -1,4 +1,4 @@ -import { IBaseInteractionRequestData } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface INoteActionData extends IBaseInteractionRequestData { diff --git a/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts b/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts index bb876b3f..a04722d6 100644 --- a/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts +++ b/project/src/models/eft/player/IPlayerIncrementSkillLevelRequestData.ts @@ -1,4 +1,4 @@ -import { Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; +import { Skills } from "@spt/models/eft/common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { diff --git a/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts b/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts index 4f10e239..4043e859 100644 --- a/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts +++ b/project/src/models/eft/presetBuild/IPresetBuildActionRequestData.ts @@ -1,4 +1,4 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface IPresetBuildActionRequestData { diff --git a/project/src/models/eft/profile/IGetOtherProfileResponse.ts b/project/src/models/eft/profile/IGetOtherProfileResponse.ts index 3e737116..d0e00e7f 100644 --- a/project/src/models/eft/profile/IGetOtherProfileResponse.ts +++ b/project/src/models/eft/profile/IGetOtherProfileResponse.ts @@ -1,5 +1,5 @@ -import { OverallCounters, Skills } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { OverallCounters, Skills } from "@spt/models/eft/common/tables/IBotBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface IGetOtherProfileResponse { diff --git a/project/src/models/eft/profile/IAkiProfile.ts b/project/src/models/eft/profile/ISptProfile.ts similarity index 91% rename from project/src/models/eft/profile/IAkiProfile.ts rename to project/src/models/eft/profile/ISptProfile.ts index fb273b12..a8212a8e 100644 --- a/project/src/models/eft/profile/IAkiProfile.ts +++ b/project/src/models/eft/profile/ISptProfile.ts @@ -1,11 +1,11 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { EquipmentBuildType } from "@spt-aki/models/enums/EquipmentBuildType"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { IProfileChangeEvent } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { EquipmentBuildType } from "@spt/models/enums/EquipmentBuildType"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails"; -export interface IAkiProfile +export interface ISptProfile { info: Info characters: Characters @@ -13,7 +13,7 @@ export interface IAkiProfile suits: string[] userbuilds: IUserBuilds dialogues: Record - aki: Aki + spt: Spt vitality: Vitality inraid: Inraid insurance: Insurance[] @@ -205,7 +205,7 @@ export interface DateTime time: string } -export interface Aki +export interface Spt { version: string mods?: ModDetails[] diff --git a/project/src/models/eft/ragfair/IGetItemPriceResult.ts b/project/src/models/eft/ragfair/IGetItemPriceResult.ts index 6a771d92..8549d1a8 100644 --- a/project/src/models/eft/ragfair/IGetItemPriceResult.ts +++ b/project/src/models/eft/ragfair/IGetItemPriceResult.ts @@ -1,4 +1,4 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MinMax } from "@spt/models/common/MinMax"; export interface IGetItemPriceResult extends MinMax { diff --git a/project/src/models/eft/ragfair/IGetOffersResult.ts b/project/src/models/eft/ragfair/IGetOffersResult.ts index 549c78d1..03631589 100644 --- a/project/src/models/eft/ragfair/IGetOffersResult.ts +++ b/project/src/models/eft/ragfair/IGetOffersResult.ts @@ -1,4 +1,4 @@ -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; export interface IGetOffersResult { diff --git a/project/src/models/eft/ragfair/IRagfairOffer.ts b/project/src/models/eft/ragfair/IRagfairOffer.ts index 2f0d737b..923d4d71 100644 --- a/project/src/models/eft/ragfair/IRagfairOffer.ts +++ b/project/src/models/eft/ragfair/IRagfairOffer.ts @@ -1,5 +1,5 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; export interface IRagfairOffer { diff --git a/project/src/models/eft/ragfair/ISearchRequestData.ts b/project/src/models/eft/ragfair/ISearchRequestData.ts index 02b2a5a5..58968e44 100644 --- a/project/src/models/eft/ragfair/ISearchRequestData.ts +++ b/project/src/models/eft/ragfair/ISearchRequestData.ts @@ -1,4 +1,4 @@ -import { RagfairSort } from "@spt-aki/models/enums/RagfairSort"; +import { RagfairSort } from "@spt/models/enums/RagfairSort"; export interface ISearchRequestData { diff --git a/project/src/models/eft/repair/IRepairActionDataRequest.ts b/project/src/models/eft/repair/IRepairActionDataRequest.ts index 3f798f27..c6f7a096 100644 --- a/project/src/models/eft/repair/IRepairActionDataRequest.ts +++ b/project/src/models/eft/repair/IRepairActionDataRequest.ts @@ -1,4 +1,4 @@ -import { IBaseRepairActionDataRequest } from "@spt-aki/models/eft/repair/IBaseRepairActionDataRequest"; +import { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest"; export interface IRepairActionDataRequest extends IBaseRepairActionDataRequest { diff --git a/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts b/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts index fbc94b18..69bbbf44 100644 --- a/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts +++ b/project/src/models/eft/repair/ITraderRepairActionDataRequest.ts @@ -1,4 +1,4 @@ -import { IBaseRepairActionDataRequest } from "@spt-aki/models/eft/repair/IBaseRepairActionDataRequest"; +import { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest"; export interface ITraderRepairActionDataRequest extends IBaseRepairActionDataRequest { diff --git a/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts b/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts index 32ec8b86..cbfd4879 100644 --- a/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts +++ b/project/src/models/eft/trade/IProcessBuyTradeRequestData.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData"; export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData { diff --git a/project/src/models/eft/trade/IProcessSellTradeRequestData.ts b/project/src/models/eft/trade/IProcessSellTradeRequestData.ts index 3a876c85..883b0fd0 100644 --- a/project/src/models/eft/trade/IProcessSellTradeRequestData.ts +++ b/project/src/models/eft/trade/IProcessSellTradeRequestData.ts @@ -1,4 +1,4 @@ -import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData"; export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestData { diff --git a/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts b/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts index 6545ac7b..7904974a 100644 --- a/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts +++ b/project/src/models/eft/trade/ISellScavItemsToFenceRequestData.ts @@ -1,4 +1,4 @@ -import { OwnerInfo } from "@spt-aki/models/eft/common/request/IBaseInteractionRequestData"; +import { OwnerInfo } from "@spt/models/eft/common/request/IBaseInteractionRequestData"; export interface ISellScavItemsToFenceRequestData { diff --git a/project/src/models/eft/weather/IWeatherData.ts b/project/src/models/eft/weather/IWeatherData.ts index 2a2cb6c5..ac3b6c59 100644 --- a/project/src/models/eft/weather/IWeatherData.ts +++ b/project/src/models/eft/weather/IWeatherData.ts @@ -1,5 +1,5 @@ -import { Season } from "@spt-aki/models/enums/Season"; -import { WindDirection } from "@spt-aki/models/enums/WindDirection"; +import { Season } from "@spt/models/enums/Season"; +import { WindDirection } from "@spt/models/enums/WindDirection"; export interface IWeatherData { diff --git a/project/src/models/eft/ws/IWsAid.ts b/project/src/models/eft/ws/IWsAid.ts index b602b7fc..69fe7d2f 100644 --- a/project/src/models/eft/ws/IWsAid.ts +++ b/project/src/models/eft/ws/IWsAid.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsAid extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsAidNickname.ts b/project/src/models/eft/ws/IWsAidNickname.ts index 660cd576..3dd74dcd 100644 --- a/project/src/models/eft/ws/IWsAidNickname.ts +++ b/project/src/models/eft/ws/IWsAidNickname.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsAidNickname extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsChatMessageReceived.ts b/project/src/models/eft/ws/IWsChatMessageReceived.ts index 1f4cdb5b..c19b53d5 100644 --- a/project/src/models/eft/ws/IWsChatMessageReceived.ts +++ b/project/src/models/eft/ws/IWsChatMessageReceived.ts @@ -1,5 +1,5 @@ -import { Message } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { Message } from "@spt/models/eft/profile/ISptProfile"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IGroupCharacter } from "../match/IGroupCharacter"; export interface IWsChatMessageReceived extends IWsNotificationEvent diff --git a/project/src/models/eft/ws/IWsGroupId.ts b/project/src/models/eft/ws/IWsGroupId.ts index 7905454f..864e83ae 100644 --- a/project/src/models/eft/ws/IWsGroupId.ts +++ b/project/src/models/eft/ws/IWsGroupId.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupId extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsGroupMatchInviteAccept.ts b/project/src/models/eft/ws/IWsGroupMatchInviteAccept.ts index b99485b2..9db468d8 100644 --- a/project/src/models/eft/ws/IWsGroupMatchInviteAccept.ts +++ b/project/src/models/eft/ws/IWsGroupMatchInviteAccept.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; import { IGroupCharacter } from "../match/IGroupCharacter"; export interface IWsGroupMatchInviteAccept extends IWsNotificationEvent, IGroupCharacter diff --git a/project/src/models/eft/ws/IWsGroupMatchInviteDecline.ts b/project/src/models/eft/ws/IWsGroupMatchInviteDecline.ts index ac27e1be..fc776eea 100644 --- a/project/src/models/eft/ws/IWsGroupMatchInviteDecline.ts +++ b/project/src/models/eft/ws/IWsGroupMatchInviteDecline.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupMatchInviteDecline extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsGroupMatchInviteSend.ts b/project/src/models/eft/ws/IWsGroupMatchInviteSend.ts index 5c623441..2f88c351 100644 --- a/project/src/models/eft/ws/IWsGroupMatchInviteSend.ts +++ b/project/src/models/eft/ws/IWsGroupMatchInviteSend.ts @@ -1,5 +1,5 @@ -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupMatchInviteSend extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsGroupMatchLeaderChanged.ts b/project/src/models/eft/ws/IWsGroupMatchLeaderChanged.ts index b6461547..fd133aa4 100644 --- a/project/src/models/eft/ws/IWsGroupMatchLeaderChanged.ts +++ b/project/src/models/eft/ws/IWsGroupMatchLeaderChanged.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupMatchLeaderChanged extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsGroupMatchRaidReady.ts b/project/src/models/eft/ws/IWsGroupMatchRaidReady.ts index ec58350c..6d5cda19 100644 --- a/project/src/models/eft/ws/IWsGroupMatchRaidReady.ts +++ b/project/src/models/eft/ws/IWsGroupMatchRaidReady.ts @@ -1,5 +1,5 @@ -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupMatchRaidReady extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsGroupMatchRaidSettings.ts b/project/src/models/eft/ws/IWsGroupMatchRaidSettings.ts index ac1f2dae..3629b903 100644 --- a/project/src/models/eft/ws/IWsGroupMatchRaidSettings.ts +++ b/project/src/models/eft/ws/IWsGroupMatchRaidSettings.ts @@ -1,5 +1,5 @@ -import { IRaidSettings } from "@spt-aki/models/eft/match/IRaidSettings"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IRaidSettings } from "@spt/models/eft/match/IRaidSettings"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsGroupMatchRaidSettings extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsPing.ts b/project/src/models/eft/ws/IWsPing.ts index 38fa7700..7275213b 100644 --- a/project/src/models/eft/ws/IWsPing.ts +++ b/project/src/models/eft/ws/IWsPing.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsPing extends IWsNotificationEvent {} diff --git a/project/src/models/eft/ws/IWsRagfairOfferSold.ts b/project/src/models/eft/ws/IWsRagfairOfferSold.ts index dce4e350..927b6bc6 100644 --- a/project/src/models/eft/ws/IWsRagfairOfferSold.ts +++ b/project/src/models/eft/ws/IWsRagfairOfferSold.ts @@ -1,4 +1,4 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; export interface IWsRagfairOfferSold extends IWsNotificationEvent { diff --git a/project/src/models/eft/ws/IWsUserConfirmed.ts b/project/src/models/eft/ws/IWsUserConfirmed.ts index a202e3a6..c08de1ae 100644 --- a/project/src/models/eft/ws/IWsUserConfirmed.ts +++ b/project/src/models/eft/ws/IWsUserConfirmed.ts @@ -1,6 +1,6 @@ -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; -import { ProfileStatus } from "@spt-aki/models/enums/ProfileStatus"; -import { RaidMode } from "@spt-aki/models/enums/RaidMode"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; +import { ProfileStatus } from "@spt/models/enums/ProfileStatus"; +import { RaidMode } from "@spt/models/enums/RaidMode"; export interface IWsUserConfirmed extends IWsNotificationEvent { diff --git a/project/src/models/enums/ConfigTypes.ts b/project/src/models/enums/ConfigTypes.ts index a13251fa..351117aa 100644 --- a/project/src/models/enums/ConfigTypes.ts +++ b/project/src/models/enums/ConfigTypes.ts @@ -1,30 +1,30 @@ export enum ConfigTypes { - AIRDROP = "aki-airdrop", - BOT = "aki-bot", - PMC = "aki-pmc", - CORE = "aki-core", - HEALTH = "aki-health", - HIDEOUT = "aki-hideout", - HTTP = "aki-http", - IN_RAID = "aki-inraid", - INSURANCE = "aki-insurance", - INVENTORY = "aki-inventory", - ITEM = "aki-item", - LOCALE = "aki-locale", - LOCATION = "aki-location", - LOOT = "aki-loot", - MATCH = "aki-match", - PLAYERSCAV = "aki-playerscav", - PMC_CHAT_RESPONSE = "aki-pmcchatresponse", - QUEST = "aki-quest", - RAGFAIR = "aki-ragfair", - REPAIR = "aki-repair", - SCAVCASE = "aki-scavcase", - TRADER = "aki-trader", - WEATHER = "aki-weather", - SEASONAL_EVENT = "aki-seasonalevents", - LOST_ON_DEATH = "aki-lostondeath", - GIFTS = "aki-gifts", - BTR = "aki-btr", + AIRDROP = "spt-airdrop", + BOT = "spt-bot", + PMC = "spt-pmc", + CORE = "spt-core", + HEALTH = "spt-health", + HIDEOUT = "spt-hideout", + HTTP = "spt-http", + IN_RAID = "spt-inraid", + INSURANCE = "spt-insurance", + INVENTORY = "spt-inventory", + ITEM = "spt-item", + LOCALE = "spt-locale", + LOCATION = "spt-location", + LOOT = "spt-loot", + MATCH = "spt-match", + PLAYERSCAV = "spt-playerscav", + PMC_CHAT_RESPONSE = "spt-pmcchatresponse", + QUEST = "spt-quest", + RAGFAIR = "spt-ragfair", + REPAIR = "spt-repair", + SCAVCASE = "spt-scavcase", + TRADER = "spt-trader", + WEATHER = "spt-weather", + SEASONAL_EVENT = "spt-seasonalevents", + LOST_ON_DEATH = "spt-lostondeath", + GIFTS = "spt-gifts", + BTR = "spt-btr", } diff --git a/project/src/models/external/HttpFramework.ts b/project/src/models/external/HttpFramework.ts index 3850f32b..24e9c273 100644 --- a/project/src/models/external/HttpFramework.ts +++ b/project/src/models/external/HttpFramework.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { IncomingMessage, ServerResponse } from "node:http"; import { injectable } from "tsyringe"; -import { HttpMethods } from "@spt-aki/servers/http/HttpMethods"; +import { HttpMethods } from "@spt/servers/http/HttpMethods"; export type HandleFn = (_: string, req: IncomingMessage, resp: ServerResponse) => void; diff --git a/project/src/models/external/IPostAkiLoadMod.ts b/project/src/models/external/IPostAkiLoadMod.ts deleted file mode 100644 index 4dee592e..00000000 --- a/project/src/models/external/IPostAkiLoadMod.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { DependencyContainer } from "tsyringe"; - -export interface IPostAkiLoadMod -{ - postAkiLoad(container: DependencyContainer): void -} diff --git a/project/src/models/external/IPostAkiLoadModAsync.ts b/project/src/models/external/IPostAkiLoadModAsync.ts deleted file mode 100644 index 93a30aba..00000000 --- a/project/src/models/external/IPostAkiLoadModAsync.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { DependencyContainer } from "tsyringe"; - -export interface IPostAkiLoadModAsync -{ - postAkiLoadAsync(container: DependencyContainer): Promise -} diff --git a/project/src/models/external/IPostSptLoadMod.ts b/project/src/models/external/IPostSptLoadMod.ts new file mode 100644 index 00000000..4e97735c --- /dev/null +++ b/project/src/models/external/IPostSptLoadMod.ts @@ -0,0 +1,6 @@ +import type { DependencyContainer } from "tsyringe"; + +export interface IPostSptLoadMod +{ + postSptLoad(container: DependencyContainer): void +} diff --git a/project/src/models/external/IPostSptLoadModAsync.ts b/project/src/models/external/IPostSptLoadModAsync.ts new file mode 100644 index 00000000..30b1e459 --- /dev/null +++ b/project/src/models/external/IPostSptLoadModAsync.ts @@ -0,0 +1,6 @@ +import type { DependencyContainer } from "tsyringe"; + +export interface IPostSptLoadModAsync +{ + postSptLoadAsync(container: DependencyContainer): Promise +} diff --git a/project/src/models/external/IPreAkiLoadMod.ts b/project/src/models/external/IPreAkiLoadMod.ts deleted file mode 100644 index 3800719e..00000000 --- a/project/src/models/external/IPreAkiLoadMod.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { DependencyContainer } from "tsyringe"; - -export interface IPreAkiLoadMod -{ - preAkiLoad(container: DependencyContainer): void -} diff --git a/project/src/models/external/IPreAkiLoadModAsync.ts b/project/src/models/external/IPreAkiLoadModAsync.ts deleted file mode 100644 index b0ecf9e0..00000000 --- a/project/src/models/external/IPreAkiLoadModAsync.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { DependencyContainer } from "tsyringe"; - -export interface IPreAkiLoadModAsync -{ - preAkiLoadAsync(container: DependencyContainer): Promise -} diff --git a/project/src/models/external/IPreSptLoadMod.ts b/project/src/models/external/IPreSptLoadMod.ts new file mode 100644 index 00000000..f798ba01 --- /dev/null +++ b/project/src/models/external/IPreSptLoadMod.ts @@ -0,0 +1,6 @@ +import type { DependencyContainer } from "tsyringe"; + +export interface IPreSptLoadMod +{ + preSptLoad(container: DependencyContainer): void +} diff --git a/project/src/models/external/IPreSptLoadModAsync.ts b/project/src/models/external/IPreSptLoadModAsync.ts new file mode 100644 index 00000000..307ab76a --- /dev/null +++ b/project/src/models/external/IPreSptLoadModAsync.ts @@ -0,0 +1,6 @@ +import type { DependencyContainer } from "tsyringe"; + +export interface IPreSptLoadModAsync +{ + preSptLoadAsync(container: DependencyContainer): Promise +} diff --git a/project/src/models/spt/bindings/Route.ts b/project/src/models/spt/bindings/Route.ts index 591023e2..a3b0fd7c 100644 --- a/project/src/models/spt/bindings/Route.ts +++ b/project/src/models/spt/bindings/Route.ts @@ -1,4 +1,4 @@ export interface IRoute { - aki: any + spt: any } diff --git a/project/src/models/spt/bots/BotGenerationDetails.ts b/project/src/models/spt/bots/BotGenerationDetails.ts index 0110c1b1..f6499058 100644 --- a/project/src/models/spt/bots/BotGenerationDetails.ts +++ b/project/src/models/spt/bots/BotGenerationDetails.ts @@ -1,4 +1,4 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MinMax } from "@spt/models/common/MinMax"; export interface BotGenerationDetails { diff --git a/project/src/models/spt/bots/GenerateWeaponResult.ts b/project/src/models/spt/bots/GenerateWeaponResult.ts index c720383e..5667a713 100644 --- a/project/src/models/spt/bots/GenerateWeaponResult.ts +++ b/project/src/models/spt/bots/GenerateWeaponResult.ts @@ -1,6 +1,6 @@ -import { Mods } from "@spt-aki/models/eft/common/tables/IBotType"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { Mods } from "@spt/models/eft/common/tables/IBotType"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; export class GenerateWeaponResult { diff --git a/project/src/models/spt/callbacks/IBotCallbacks.ts b/project/src/models/spt/callbacks/IBotCallbacks.ts index 3856bc05..1a448766 100644 --- a/project/src/models/spt/callbacks/IBotCallbacks.ts +++ b/project/src/models/spt/callbacks/IBotCallbacks.ts @@ -1,7 +1,7 @@ -import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; export interface IBotCallbacks { diff --git a/project/src/models/spt/callbacks/ICustomizationCallbacks.ts b/project/src/models/spt/callbacks/ICustomizationCallbacks.ts index f9a18894..f3dd7205 100644 --- a/project/src/models/spt/callbacks/ICustomizationCallbacks.ts +++ b/project/src/models/spt/callbacks/ICustomizationCallbacks.ts @@ -1,9 +1,9 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IBuyClothingRequestData } from "@spt-aki/models/eft/customization/IBuyClothingRequestData"; -import { IWearClothingRequestData } from "@spt-aki/models/eft/customization/IWearClothingRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISuit } from "@spt/models/eft/common/tables/ITrader"; +import { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData"; +import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; export interface ICustomizationCallbacks { diff --git a/project/src/models/spt/callbacks/IDataCallbacks.ts b/project/src/models/spt/callbacks/IDataCallbacks.ts index e846e969..c7909ad5 100644 --- a/project/src/models/spt/callbacks/IDataCallbacks.ts +++ b/project/src/models/spt/callbacks/IDataCallbacks.ts @@ -1,11 +1,11 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; -import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGlobals } from "@spt/models/eft/common/IGlobals"; +import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase"; export interface IDataCallbacks { diff --git a/project/src/models/spt/callbacks/IDialogueCallbacks.ts b/project/src/models/spt/callbacks/IDialogueCallbacks.ts index 0c13c158..555f77dc 100644 --- a/project/src/models/spt/callbacks/IDialogueCallbacks.ts +++ b/project/src/models/spt/callbacks/IDialogueCallbacks.ts @@ -1,20 +1,20 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; -import { IGetAllAttachmentsRequestData } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsRequestData"; -import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetChatServerListRequestData } from "@spt-aki/models/eft/dialog/IGetChatServerListRequestData"; -import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogInfoRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogInfoRequestData"; -import { IGetMailDialogListRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogListRequestData"; -import { IGetMailDialogViewRequestData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewRequestData"; -import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; -import { IPinDialogRequestData } from "@spt-aki/models/eft/dialog/IPinDialogRequestData"; -import { IRemoveDialogRequestData } from "@spt-aki/models/eft/dialog/IRemoveDialogRequestData"; -import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; -import { ISetDialogReadRequestData } from "@spt-aki/models/eft/dialog/ISetDialogReadRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData"; +import { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData"; +import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData"; +import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData"; +import { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData"; +import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData"; +import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData"; +import { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData"; +import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; +import { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "@spt/models/eft/profile/ISptProfile"; export interface IDialogueCallbacks { diff --git a/project/src/models/spt/callbacks/IGameCallbacks.ts b/project/src/models/spt/callbacks/IGameCallbacks.ts index ce90a466..9c4ca087 100644 --- a/project/src/models/spt/callbacks/IGameCallbacks.ts +++ b/project/src/models/spt/callbacks/IGameCallbacks.ts @@ -1,9 +1,9 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; -import { IGameEmptyCrcRequestData } from "@spt-aki/models/eft/game/IGameEmptyCrcRequestData"; -import { IVersionValidateRequestData } from "@spt-aki/models/eft/game/IVersionValidateRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse"; +import { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData"; +import { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; export interface IGameCallbacks { diff --git a/project/src/models/spt/callbacks/IHealthCallbacks.ts b/project/src/models/spt/callbacks/IHealthCallbacks.ts index 903873d4..292fffaf 100644 --- a/project/src/models/spt/callbacks/IHealthCallbacks.ts +++ b/project/src/models/spt/callbacks/IHealthCallbacks.ts @@ -1,13 +1,13 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; -import { IOffraidEatRequestData } from "@spt-aki/models/eft/health/IOffraidEatRequestData"; -import { IOffraidHealRequestData } from "@spt-aki/models/eft/health/IOffraidHealRequestData"; -import { ISyncHealthRequestData } from "@spt-aki/models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData"; +import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData"; +import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData"; +import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; export interface IHealthCallbacks { - onLoad(sessionID: string): IAkiProfile + onLoad(sessionID: string): ISptProfile syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): any offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): any offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): any diff --git a/project/src/models/spt/callbacks/IHideoutCallbacks.ts b/project/src/models/spt/callbacks/IHideoutCallbacks.ts index f2da0c94..2aa18b9d 100644 --- a/project/src/models/spt/callbacks/IHideoutCallbacks.ts +++ b/project/src/models/spt/callbacks/IHideoutCallbacks.ts @@ -1,14 +1,14 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHideoutContinuousProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; -import { IHideoutPutItemInRequestData } from "@spt-aki/models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCaseStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutScavCaseStartRequestData"; -import { IHideoutSingleProductionStartRequestData } from "@spt-aki/models/eft/hideout/IHideoutSingleProductionStartRequestData"; -import { IHideoutTakeItemOutRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeItemOutRequestData"; -import { IHideoutTakeProductionRequestData } from "@spt-aki/models/eft/hideout/IHideoutTakeProductionRequestData"; -import { IHideoutToggleAreaRequestData } from "@spt-aki/models/eft/hideout/IHideoutToggleAreaRequestData"; -import { IHideoutUpgradeCompleteRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; -import { IHideoutUpgradeRequestData } from "@spt-aki/models/eft/hideout/IHideoutUpgradeRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData"; +import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData"; +import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData"; +import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData"; +import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; +import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; +import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; export interface IHideoutCallbacks { diff --git a/project/src/models/spt/callbacks/IInraidCallbacks.ts b/project/src/models/spt/callbacks/IInraidCallbacks.ts index 3afe8d88..3bbb3bca 100644 --- a/project/src/models/spt/callbacks/IInraidCallbacks.ts +++ b/project/src/models/spt/callbacks/IInraidCallbacks.ts @@ -1,12 +1,12 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IRegisterPlayerRequestData } from "@spt-aki/models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; export interface IInraidCallbacks { - onLoad(sessionID: string): IAkiProfile + onLoad(sessionID: string): ISptProfile registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData getRaidEndState(): string diff --git a/project/src/models/spt/callbacks/IInsuranceCallbacks.ts b/project/src/models/spt/callbacks/IInsuranceCallbacks.ts index 8c5f33c3..091e8778 100644 --- a/project/src/models/spt/callbacks/IInsuranceCallbacks.ts +++ b/project/src/models/spt/callbacks/IInsuranceCallbacks.ts @@ -1,11 +1,11 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostRequestData"; -import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData"; +import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; export interface IInsuranceCallbacks { - onLoad(sessionID: string): IAkiProfile + onLoad(sessionID: string): ISptProfile getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): any insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): any update(secondsSinceLastRun: number): boolean diff --git a/project/src/models/spt/callbacks/IInventoryCallbacks.ts b/project/src/models/spt/callbacks/IInventoryCallbacks.ts index 5e4473c7..289d37ed 100644 --- a/project/src/models/spt/callbacks/IInventoryCallbacks.ts +++ b/project/src/models/spt/callbacks/IInventoryCallbacks.ts @@ -1,21 +1,21 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IInventoryBindRequestData } from "@spt-aki/models/eft/inventory/IInventoryBindRequestData"; -import { IInventoryCreateMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryCreateMarkerRequestData"; -import { IInventoryDeleteMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryDeleteMarkerRequestData"; -import { IInventoryEditMarkerRequestData } from "@spt-aki/models/eft/inventory/IInventoryEditMarkerRequestData"; -import { IInventoryExamineRequestData } from "@spt-aki/models/eft/inventory/IInventoryExamineRequestData"; -import { IInventoryFoldRequestData } from "@spt-aki/models/eft/inventory/IInventoryFoldRequestData"; -import { IInventoryMergeRequestData } from "@spt-aki/models/eft/inventory/IInventoryMergeRequestData"; -import { IInventoryMoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryMoveRequestData"; -import { IInventoryReadEncyclopediaRequestData } from "@spt-aki/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; -import { IInventoryRemoveRequestData } from "@spt-aki/models/eft/inventory/IInventoryRemoveRequestData"; -import { IInventorySortRequestData } from "@spt-aki/models/eft/inventory/IInventorySortRequestData"; -import { IInventorySplitRequestData } from "@spt-aki/models/eft/inventory/IInventorySplitRequestData"; -import { IInventorySwapRequestData } from "@spt-aki/models/eft/inventory/IInventorySwapRequestData"; -import { IInventoryTagRequestData } from "@spt-aki/models/eft/inventory/IInventoryTagRequestData"; -import { IInventoryToggleRequestData } from "@spt-aki/models/eft/inventory/IInventoryToggleRequestData"; -import { IInventoryTransferRequestData } from "@spt-aki/models/eft/inventory/IInventoryTransferRequestData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData"; +import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData"; +import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData"; +import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData"; +import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData"; +import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData"; +import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData"; +import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData"; +import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData"; +import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData"; +import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData"; +import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData"; +import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData"; +import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData"; +import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData"; +import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; export interface IInventoryCallbacks { diff --git a/project/src/models/spt/callbacks/IItemEventCallbacks.ts b/project/src/models/spt/callbacks/IItemEventCallbacks.ts index a7530d08..abac02d9 100644 --- a/project/src/models/spt/callbacks/IItemEventCallbacks.ts +++ b/project/src/models/spt/callbacks/IItemEventCallbacks.ts @@ -1,6 +1,6 @@ -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; export interface IItemEventCallbacks { diff --git a/project/src/models/spt/callbacks/ILauncherCallbacks.ts b/project/src/models/spt/callbacks/ILauncherCallbacks.ts index 862a95fb..dc33a5ac 100644 --- a/project/src/models/spt/callbacks/ILauncherCallbacks.ts +++ b/project/src/models/spt/callbacks/ILauncherCallbacks.ts @@ -1,8 +1,8 @@ -import { IChangeRequestData } from "@spt-aki/models/eft/launcher/IChangeRequestData"; -import { IGetMiniProfileRequestData } from "@spt-aki/models/eft/launcher/IGetMiniProfileRequestData"; -import { ILoginRequestData } from "@spt-aki/models/eft/launcher/ILoginRequestData"; -import { IRegisterData } from "@spt-aki/models/eft/launcher/IRegisterData"; -import { IRemoveProfileData } from "@spt-aki/models/eft/launcher/IRemoveProfileData"; +import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData"; +import { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData"; +import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData"; +import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData"; +import { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData"; export interface ILauncherCallbacks { diff --git a/project/src/models/spt/callbacks/ILocationCallbacks.ts b/project/src/models/spt/callbacks/ILocationCallbacks.ts index 28083092..89000585 100644 --- a/project/src/models/spt/callbacks/ILocationCallbacks.ts +++ b/project/src/models/spt/callbacks/ILocationCallbacks.ts @@ -1,7 +1,7 @@ -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData"; export interface ILocationCallbacks { diff --git a/project/src/models/spt/callbacks/INoteCallbacks.ts b/project/src/models/spt/callbacks/INoteCallbacks.ts index aca10ad3..f8034ea8 100644 --- a/project/src/models/spt/callbacks/INoteCallbacks.ts +++ b/project/src/models/spt/callbacks/INoteCallbacks.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt/models/eft/notes/INoteActionData"; export interface INoteCallbacks { diff --git a/project/src/models/spt/callbacks/INotifierCallbacks.ts b/project/src/models/spt/callbacks/INotifierCallbacks.ts index b953dc4a..1f77bdab 100644 --- a/project/src/models/spt/callbacks/INotifierCallbacks.ts +++ b/project/src/models/spt/callbacks/INotifierCallbacks.ts @@ -1,7 +1,7 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUIDRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INotifierChannel } from "@spt/models/eft/notifier/INotifier"; export interface INotifierCallbacks { diff --git a/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts b/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts index e84717a8..f7969fb1 100644 --- a/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts +++ b/project/src/models/spt/callbacks/IPresetBuildCallbacks.ts @@ -1,8 +1,8 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IPresetBuildActionRequestData } from "@spt-aki/models/eft/presetBuild/IPresetBuildActionRequestData"; -import { IWeaponBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData"; +import { IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; export interface IPresetBuildCallbacks { diff --git a/project/src/models/spt/callbacks/IProfileCallbacks.ts b/project/src/models/spt/callbacks/IProfileCallbacks.ts index 92ee67e5..a76d4e2a 100644 --- a/project/src/models/spt/callbacks/IProfileCallbacks.ts +++ b/project/src/models/spt/callbacks/IProfileCallbacks.ts @@ -1,12 +1,12 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IProfileChangeNicknameRequestData } from "@spt-aki/models/eft/profile/IProfileChangeNicknameRequestData"; -import { IProfileChangeVoiceRequestData } from "@spt-aki/models/eft/profile/IProfileChangeVoiceRequestData"; -import { IProfileCreateRequestData } from "@spt-aki/models/eft/profile/IProfileCreateRequestData"; -import { ISearchFriendRequestData } from "@spt-aki/models/eft/profile/ISearchFriendRequestData"; -import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; -import { IValidateNicknameRequestData } from "@spt-aki/models/eft/profile/IValidateNicknameRequestData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData"; +import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData"; +import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData"; +import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData"; +import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse"; +import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData"; export interface IProfileCallbacks { diff --git a/project/src/models/spt/callbacks/IQuestCallbacks.ts b/project/src/models/spt/callbacks/IQuestCallbacks.ts index 0b7901d3..0a6cbdc4 100644 --- a/project/src/models/spt/callbacks/IQuestCallbacks.ts +++ b/project/src/models/spt/callbacks/IQuestCallbacks.ts @@ -1,14 +1,14 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "@spt-aki/models/eft/quests/IHandoverQuestRequestData"; -import { IListQuestsRequestData } from "@spt-aki/models/eft/quests/IListQuestsRequestData"; -import { IRepeatableQuestChangeRequest } from "@spt-aki/models/eft/quests/IRepeatableQuestChangeRequest"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IQuest } from "@spt/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData"; +import { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData"; +import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest"; export interface IQuestCallbacks { diff --git a/project/src/models/spt/callbacks/IRagfairCallbacks.ts b/project/src/models/spt/callbacks/IRagfairCallbacks.ts index a7afb07e..4ef25bf3 100644 --- a/project/src/models/spt/callbacks/IRagfairCallbacks.ts +++ b/project/src/models/spt/callbacks/IRagfairCallbacks.ts @@ -1,13 +1,13 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IAddOfferRequestData } from "@spt-aki/models/eft/ragfair/IAddOfferRequestData"; -import { IExtendOfferRequestData } from "@spt-aki/models/eft/ragfair/IExtendOfferRequestData"; -import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; -import { IGetMarketPriceRequestData } from "@spt-aki/models/eft/ragfair/IGetMarketPriceRequestData"; -import { IRemoveOfferRequestData } from "@spt-aki/models/eft/ragfair/IRemoveOfferRequestData"; -import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData"; +import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData"; +import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult"; +import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData"; +import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData"; +import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData"; export interface IRagfairCallbacks { diff --git a/project/src/models/spt/callbacks/IRepairCallbacks.ts b/project/src/models/spt/callbacks/IRepairCallbacks.ts index 3f8be6c5..f177c851 100644 --- a/project/src/models/spt/callbacks/IRepairCallbacks.ts +++ b/project/src/models/spt/callbacks/IRepairCallbacks.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IRepairActionDataRequest } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; -import { ITraderRepairActionDataRequest } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest"; +import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest"; export interface IRepairCallbacks { diff --git a/project/src/models/spt/callbacks/ITradeCallbacks.ts b/project/src/models/spt/callbacks/ITradeCallbacks.ts index 5f615678..e2564bdc 100644 --- a/project/src/models/spt/callbacks/ITradeCallbacks.ts +++ b/project/src/models/spt/callbacks/ITradeCallbacks.ts @@ -1,7 +1,7 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData"; -import { IProcessRagfairTradeRequestData } from "@spt-aki/models/eft/trade/IProcessRagfairTradeRequestData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData"; +import { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData"; export interface ITradeCallbacks { diff --git a/project/src/models/spt/callbacks/ITraderCallbacks.ts b/project/src/models/spt/callbacks/ITraderCallbacks.ts index a61c7b19..91e6c63a 100644 --- a/project/src/models/spt/callbacks/ITraderCallbacks.ts +++ b/project/src/models/spt/callbacks/ITraderCallbacks.ts @@ -2,9 +2,9 @@ * File generated by Interface generator (dotup.dotup-vscode-interface-generator) * Date: 2022-04-28 14:22:44 */ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; export interface ITraderCallbacks { diff --git a/project/src/models/spt/callbacks/IWeatherCallbacks.ts b/project/src/models/spt/callbacks/IWeatherCallbacks.ts index 04a6e3ba..593c305a 100644 --- a/project/src/models/spt/callbacks/IWeatherCallbacks.ts +++ b/project/src/models/spt/callbacks/IWeatherCallbacks.ts @@ -1,5 +1,5 @@ -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; export interface IWeatherCallbacks { diff --git a/project/src/models/spt/callbacks/IWishlistCallbacks.ts b/project/src/models/spt/callbacks/IWishlistCallbacks.ts index c3aac691..cc1b1a30 100644 --- a/project/src/models/spt/callbacks/IWishlistCallbacks.ts +++ b/project/src/models/spt/callbacks/IWishlistCallbacks.ts @@ -1,6 +1,6 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IWishlistActionData } from "@spt-aki/models/eft/wishlist/IWishlistActionData"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IWishlistActionData } from "@spt/models/eft/wishlist/IWishlistActionData"; export interface IWishlistCallbacks { diff --git a/project/src/models/spt/config/IAirdropConfig.ts b/project/src/models/spt/config/IAirdropConfig.ts index 0ccbeb4c..e48f7dcd 100644 --- a/project/src/models/spt/config/IAirdropConfig.ts +++ b/project/src/models/spt/config/IAirdropConfig.ts @@ -1,10 +1,10 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { AirdropTypeEnum } from "@spt-aki/models/enums/AirdropType"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { AirdropTypeEnum } from "@spt/models/enums/AirdropType"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IAirdropConfig extends IBaseConfig { - kind: "aki-airdrop" + kind: "spt-airdrop" airdropChancePercent: AirdropChancePercent airdropTypeWeightings: Record /** Lowest point plane will fly at */ diff --git a/project/src/models/spt/config/IBTRConfig.ts b/project/src/models/spt/config/IBTRConfig.ts index a1f1a0f7..2c3b3efb 100644 --- a/project/src/models/spt/config/IBTRConfig.ts +++ b/project/src/models/spt/config/IBTRConfig.ts @@ -1,9 +1,9 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MinMax } from "@spt/models/common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBTRConfig extends IBaseConfig { - kind: "aki-btr" + kind: "spt-btr" /** How fast the BTR moves */ moveSpeed: number /** How long the cover fire service lasts for */ diff --git a/project/src/models/spt/config/IBotConfig.ts b/project/src/models/spt/config/IBotConfig.ts index cc811264..c731df0e 100644 --- a/project/src/models/spt/config/IBotConfig.ts +++ b/project/src/models/spt/config/IBotConfig.ts @@ -1,11 +1,11 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; -import { IBotDurability } from "@spt-aki/models/spt/config/IBotDurability"; +import { MinMax } from "@spt/models/common/MinMax"; +import { GenerationData } from "@spt/models/eft/common/tables/IBotType"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; +import { IBotDurability } from "@spt/models/spt/config/IBotDurability"; export interface IBotConfig extends IBaseConfig { - kind: "aki-bot" + kind: "spt-bot" /** How many variants of each bot should be generated on raid start */ presetBatch: PresetBatch /** Bot roles that should not have PMC types (sptBear/sptUsec) added as enemies to */ diff --git a/project/src/models/spt/config/ICoreConfig.ts b/project/src/models/spt/config/ICoreConfig.ts index 374655bb..53096600 100644 --- a/project/src/models/spt/config/ICoreConfig.ts +++ b/project/src/models/spt/config/ICoreConfig.ts @@ -1,9 +1,9 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ICoreConfig extends IBaseConfig { - kind: "aki-core" - akiVersion: string + kind: "spt-core" + sptVersion: string projectName: string compatibleTarkovVersion: string serverName: string diff --git a/project/src/models/spt/config/IGiftsConfig.ts b/project/src/models/spt/config/IGiftsConfig.ts index 6e335bc4..1119b759 100644 --- a/project/src/models/spt/config/IGiftsConfig.ts +++ b/project/src/models/spt/config/IGiftsConfig.ts @@ -1,14 +1,14 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { GiftSenderType } from "@spt-aki/models/enums/GiftSenderType"; -import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { GiftSenderType } from "@spt/models/enums/GiftSenderType"; +import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; import { IProfileChangeEvent } from "../dialog/ISendMessageDetails"; export interface IGiftsConfig extends IBaseConfig { - kind: "aki-gifts" + kind: "spt-gifts" gifts: Record } diff --git a/project/src/models/spt/config/IHealthConfig.ts b/project/src/models/spt/config/IHealthConfig.ts index 913e2727..31ea1011 100644 --- a/project/src/models/spt/config/IHealthConfig.ts +++ b/project/src/models/spt/config/IHealthConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IHealthConfig extends IBaseConfig { - kind: "aki-health" + kind: "spt-health" healthMultipliers: HealthMultipliers save: Save } diff --git a/project/src/models/spt/config/IHideoutConfig.ts b/project/src/models/spt/config/IHideoutConfig.ts index 84493dd7..e106b42c 100644 --- a/project/src/models/spt/config/IHideoutConfig.ts +++ b/project/src/models/spt/config/IHideoutConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig, IRunIntervalValues } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { - kind: "aki-hideout" + kind: "spt-hideout" /** How many seconds should pass before hideout crafts / fuel usage is checked and procesed */ runIntervalSeconds: number /** Default values used to hydrate `runIntervalSeconds` with */ diff --git a/project/src/models/spt/config/IHttpConfig.ts b/project/src/models/spt/config/IHttpConfig.ts index b27e3ffc..6e7eb2ee 100644 --- a/project/src/models/spt/config/IHttpConfig.ts +++ b/project/src/models/spt/config/IHttpConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IHttpConfig extends IBaseConfig { - kind: "aki-http" + kind: "spt-http" /** Address used by webserver */ ip: string port: number @@ -11,6 +11,6 @@ export interface IHttpConfig extends IBaseConfig backendPort: string webSocketPingDelayMs: number logRequests: boolean - /** e.g. "Aki_Data/Server/images/traders/579dc571d53a0658a154fbec.png": "Aki_Data/Server/images/traders/NewTraderImage.png" */ + /** e.g. "SPT_Data/Server/images/traders/579dc571d53a0658a154fbec.png": "SPT_Data/Server/images/traders/NewTraderImage.png" */ serverImagePathOverride: Record } diff --git a/project/src/models/spt/config/IInRaidConfig.ts b/project/src/models/spt/config/IInRaidConfig.ts index d77aff9b..b8ce4608 100644 --- a/project/src/models/spt/config/IInRaidConfig.ts +++ b/project/src/models/spt/config/IInRaidConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IInRaidConfig extends IBaseConfig { - kind: "aki-inraid" + kind: "spt-inraid" MIAOnRaidEnd: boolean /** Overrides to apply to the pre-raid settings screen */ raidMenuSettings: RaidMenuSettings diff --git a/project/src/models/spt/config/IInsuranceConfig.ts b/project/src/models/spt/config/IInsuranceConfig.ts index a6d9fbb1..05370b7b 100644 --- a/project/src/models/spt/config/IInsuranceConfig.ts +++ b/project/src/models/spt/config/IInsuranceConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IInsuranceConfig extends IBaseConfig { - kind: "aki-insurance" + kind: "spt-insurance" /** Insurance price multiplier */ insuranceMultiplier: Record /** Chance item is returned as insurance, keyed by trader id */ diff --git a/project/src/models/spt/config/IInventoryConfig.ts b/project/src/models/spt/config/IInventoryConfig.ts index d2d4ac8b..bb0977a6 100644 --- a/project/src/models/spt/config/IInventoryConfig.ts +++ b/project/src/models/spt/config/IInventoryConfig.ts @@ -1,9 +1,9 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IInventoryConfig extends IBaseConfig { - kind: "aki-inventory" + kind: "spt-inventory" /** Should new items purchased by flagged as found in raid */ newItemsMarkedFound: boolean randomLootContainers: Record diff --git a/project/src/models/spt/config/IItemConfig.ts b/project/src/models/spt/config/IItemConfig.ts index 44301552..1f8dc7fb 100644 --- a/project/src/models/spt/config/IItemConfig.ts +++ b/project/src/models/spt/config/IItemConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IItemConfig extends IBaseConfig { - kind: "aki-item" + kind: "spt-item" /** Items that should be globally blacklisted */ blacklist: string[] /** items that should not be given as rewards */ diff --git a/project/src/models/spt/config/ILocaleConfig.ts b/project/src/models/spt/config/ILocaleConfig.ts index ca216494..1df8428b 100644 --- a/project/src/models/spt/config/ILocaleConfig.ts +++ b/project/src/models/spt/config/ILocaleConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ILocaleConfig extends IBaseConfig { - kind: "aki-locale" + kind: "spt-locale" /** e.g. ru/en/cn/fr etc, or 'system', will take computer locale setting */ gameLocale: string /** e.g. ru/en/cn/fr etc, or 'system', will take computer locale setting */ diff --git a/project/src/models/spt/config/ILocationConfig.ts b/project/src/models/spt/config/ILocationConfig.ts index 4694d744..ee231159 100644 --- a/project/src/models/spt/config/ILocationConfig.ts +++ b/project/src/models/spt/config/ILocationConfig.ts @@ -1,10 +1,10 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { BossLocationSpawn, Wave } from "@spt-aki/models/eft/common/ILocationBase"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ILocationConfig extends IBaseConfig { - kind: "aki-location" + kind: "spt-location" /** Waves with a min/max of the same value don't spawn any bots, bsg only spawn the difference between min and max */ fixEmptyBotWavesSettings: IFixEmptyBotWavesSettings /** Rogues are classified as bosses and spawn immediatly, this can result in no scavs spawning, delay rogues spawning to allow scavs to spawn first */ diff --git a/project/src/models/spt/config/ILootConfig.ts b/project/src/models/spt/config/ILootConfig.ts index 6bc1b328..815aca99 100644 --- a/project/src/models/spt/config/ILootConfig.ts +++ b/project/src/models/spt/config/ILootConfig.ts @@ -1,9 +1,9 @@ -import { Spawnpoint } from "@spt-aki/models/eft/common/ILooseLoot"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { Spawnpoint } from "@spt/models/eft/common/ILooseLoot"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ILootConfig extends IBaseConfig { - kind: "aki-loot" + kind: "spt-loot" /** Spawn positions to add into a map, key=mapid */ looseLoot: Record /** Loose loot probability adjustments to apply on game start */ diff --git a/project/src/models/spt/config/ILostOnDeathConfig.ts b/project/src/models/spt/config/ILostOnDeathConfig.ts index 029f426d..ec950273 100644 --- a/project/src/models/spt/config/ILostOnDeathConfig.ts +++ b/project/src/models/spt/config/ILostOnDeathConfig.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ILostOnDeathConfig extends IBaseConfig { - kind: "aki-lostondeath" + kind: "spt-lostondeath" /** What equipment in each slot should be lost on death */ equipment: Equipment /** Should special slot items be removed from quest inventory on death e.g. wifi camera/markers */ diff --git a/project/src/models/spt/config/IMatchConfig.ts b/project/src/models/spt/config/IMatchConfig.ts index 61bccbe2..46a04763 100644 --- a/project/src/models/spt/config/IMatchConfig.ts +++ b/project/src/models/spt/config/IMatchConfig.ts @@ -1,7 +1,7 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IMatchConfig extends IBaseConfig { - kind: "aki-match" + kind: "spt-match" enabled: boolean } diff --git a/project/src/models/spt/config/IPlayerScavConfig.ts b/project/src/models/spt/config/IPlayerScavConfig.ts index 2f853075..470d4597 100644 --- a/project/src/models/spt/config/IPlayerScavConfig.ts +++ b/project/src/models/spt/config/IPlayerScavConfig.ts @@ -1,9 +1,9 @@ -import { GenerationData } from "@spt-aki/models/eft/common/tables/IBotType"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { GenerationData } from "@spt/models/eft/common/tables/IBotType"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IPlayerScavConfig extends IBaseConfig { - kind: "aki-playerscav" + kind: "spt-playerscav" karmaLevel: Record } diff --git a/project/src/models/spt/config/IPmChatResponse.ts b/project/src/models/spt/config/IPmChatResponse.ts index 39995c2b..de0f776c 100644 --- a/project/src/models/spt/config/IPmChatResponse.ts +++ b/project/src/models/spt/config/IPmChatResponse.ts @@ -1,8 +1,8 @@ -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IPmcChatResponse extends IBaseConfig { - kind: "aki-pmcchatresponse" + kind: "spt-pmcchatresponse" victim: IResponseSettings killer: IResponseSettings } diff --git a/project/src/models/spt/config/IPmcConfig.ts b/project/src/models/spt/config/IPmcConfig.ts index 71632591..08aa17a5 100644 --- a/project/src/models/spt/config/IPmcConfig.ts +++ b/project/src/models/spt/config/IPmcConfig.ts @@ -1,10 +1,10 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IPmcConfig extends IBaseConfig { - kind: "aki-pmc" + kind: "spt-pmc" /** What game version should the PMC have */ gameVersionWeight: Record /** What account type should the PMC have */ diff --git a/project/src/models/spt/config/IQuestConfig.ts b/project/src/models/spt/config/IQuestConfig.ts index 53067fa6..f1dd286a 100644 --- a/project/src/models/spt/config/IQuestConfig.ts +++ b/project/src/models/spt/config/IQuestConfig.ts @@ -1,11 +1,11 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { ELocationName } from "@spt-aki/models/enums/ELocationName"; -import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { ELocationName } from "@spt/models/enums/ELocationName"; +import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IQuestConfig extends IBaseConfig { - kind: "aki-quest" + kind: "spt-quest" // Hours to get/redeem items from quest mail keyed by profile type mailRedeemTimeHours: Record questTemplateIds: IPlayerTypeQuestIds diff --git a/project/src/models/spt/config/IRagfairConfig.ts b/project/src/models/spt/config/IRagfairConfig.ts index 99df9af0..fca429d7 100644 --- a/project/src/models/spt/config/IRagfairConfig.ts +++ b/project/src/models/spt/config/IRagfairConfig.ts @@ -1,9 +1,9 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IBaseConfig, IRunIntervalValues } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { - kind: "aki-ragfair" + kind: "spt-ragfair" /** How many seconds should pass before expired offers and procesed + player offers checked if sold */ runIntervalSeconds: number /** Default values used to hydrate `runIntervalSeconds` with */ diff --git a/project/src/models/spt/config/IRepairConfig.ts b/project/src/models/spt/config/IRepairConfig.ts index b8a7a2e7..64496f27 100644 --- a/project/src/models/spt/config/IRepairConfig.ts +++ b/project/src/models/spt/config/IRepairConfig.ts @@ -1,9 +1,9 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IRepairConfig extends IBaseConfig { - kind: "aki-repair" + kind: "spt-repair" priceMultiplier: number applyRandomizeDurabilityLoss: boolean weaponSkillRepairGain: number diff --git a/project/src/models/spt/config/IScavCaseConfig.ts b/project/src/models/spt/config/IScavCaseConfig.ts index 81e9fc6f..11118759 100644 --- a/project/src/models/spt/config/IScavCaseConfig.ts +++ b/project/src/models/spt/config/IScavCaseConfig.ts @@ -1,9 +1,9 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IScavCaseConfig extends IBaseConfig { - kind: "aki-scavcase" + kind: "spt-scavcase" rewardItemValueRangeRub: Record moneyRewards: MoneyRewards ammoRewards: AmmoRewards diff --git a/project/src/models/spt/config/ISeasonalEventConfig.ts b/project/src/models/spt/config/ISeasonalEventConfig.ts index ac05df15..7172aeb7 100644 --- a/project/src/models/spt/config/ISeasonalEventConfig.ts +++ b/project/src/models/spt/config/ISeasonalEventConfig.ts @@ -1,10 +1,10 @@ -import { BossLocationSpawn } from "@spt-aki/models/eft/common/ILocationBase"; -import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { BossLocationSpawn } from "@spt/models/eft/common/ILocationBase"; +import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ISeasonalEventConfig extends IBaseConfig { - kind: "aki-seasonalevents" + kind: "spt-seasonalevents" enableSeasonalEventDetection: boolean /** event / botType / equipSlot / itemid */ eventGear: Record>>> diff --git a/project/src/models/spt/config/ITraderConfig.ts b/project/src/models/spt/config/ITraderConfig.ts index f5bba0a5..de2e8756 100644 --- a/project/src/models/spt/config/ITraderConfig.ts +++ b/project/src/models/spt/config/ITraderConfig.ts @@ -1,10 +1,10 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; -import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; +import { LootRequest } from "@spt/models/spt/services/LootRequest"; export interface ITraderConfig extends IBaseConfig { - kind: "aki-trader" + kind: "spt-trader" updateTime: UpdateTime[] purchasesAreFoundInRaid: boolean /** Should trader reset times be set based on server start time (false = bsg time - on the hour) */ diff --git a/project/src/models/spt/config/IWeatherConfig.ts b/project/src/models/spt/config/IWeatherConfig.ts index e27c1469..c1808f86 100644 --- a/project/src/models/spt/config/IWeatherConfig.ts +++ b/project/src/models/spt/config/IWeatherConfig.ts @@ -1,11 +1,11 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Season } from "@spt-aki/models/enums/Season"; -import { WindDirection } from "@spt-aki/models/enums/WindDirection"; -import { IBaseConfig } from "@spt-aki/models/spt/config/IBaseConfig"; +import { MinMax } from "@spt/models/common/MinMax"; +import { Season } from "@spt/models/enums/Season"; +import { WindDirection } from "@spt/models/enums/WindDirection"; +import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { - kind: "aki-weather" + kind: "spt-weather" acceleration: number weather: Weather seasonDates: ISeasonDateTimes[] diff --git a/project/src/models/spt/controllers/IBotController.ts b/project/src/models/spt/controllers/IBotController.ts index 55e85698..9bed3e55 100644 --- a/project/src/models/spt/controllers/IBotController.ts +++ b/project/src/models/spt/controllers/IBotController.ts @@ -1,7 +1,7 @@ -import { IGenerateBotsRequestData } from "@spt-aki/models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; -import { Difficulty } from "@spt-aki/models/eft/common/tables/IBotType"; +import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt/models/eft/common/tables/IBotCore"; +import { Difficulty } from "@spt/models/eft/common/tables/IBotType"; export interface IBotController { diff --git a/project/src/models/spt/dialog/ISendMessageDetails.ts b/project/src/models/spt/dialog/ISendMessageDetails.ts index ee90a621..2aee57b8 100644 --- a/project/src/models/spt/dialog/ISendMessageDetails.ts +++ b/project/src/models/spt/dialog/ISendMessageDetails.ts @@ -1,7 +1,7 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ISystemData, IUserDialogInfo, MessageContentRagfair } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ISystemData, IUserDialogInfo, MessageContentRagfair } from "@spt/models/eft/profile/ISptProfile"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; export interface ISendMessageDetails { diff --git a/project/src/models/spt/fence/ICreateFenceAssortsResult.ts b/project/src/models/spt/fence/ICreateFenceAssortsResult.ts index fc6a4350..71c4239f 100644 --- a/project/src/models/spt/fence/ICreateFenceAssortsResult.ts +++ b/project/src/models/spt/fence/ICreateFenceAssortsResult.ts @@ -1,5 +1,5 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader"; export interface ICreateFenceAssortsResult { diff --git a/project/src/models/spt/generators/IBotGenerator.ts b/project/src/models/spt/generators/IBotGenerator.ts index 7a12b84d..cb61fec4 100644 --- a/project/src/models/spt/generators/IBotGenerator.ts +++ b/project/src/models/spt/generators/IBotGenerator.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { Chances, Generation, Inventory } from "@spt-aki/models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase"; +import { Chances, Generation, Inventory } from "@spt/models/eft/common/tables/IBotType"; export interface IBotGenerator { diff --git a/project/src/models/spt/generators/ILocationGenerator.ts b/project/src/models/spt/generators/ILocationGenerator.ts index 5b5c1734..5693a54b 100644 --- a/project/src/models/spt/generators/ILocationGenerator.ts +++ b/project/src/models/spt/generators/ILocationGenerator.ts @@ -3,8 +3,8 @@ import { IStaticContainerProps, IStaticForcedProps, IStaticLootDetails, -} from "@spt-aki/models/eft/common/ILocation"; -import { ILooseLoot, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot"; +} from "@spt/models/eft/common/ILocation"; +import { ILooseLoot, SpawnpointTemplate } from "@spt/models/eft/common/ILooseLoot"; export interface ILocationGenerator { diff --git a/project/src/models/spt/generators/IRagfairAssortGenerator.ts b/project/src/models/spt/generators/IRagfairAssortGenerator.ts index 64f23a48..99dc16ff 100644 --- a/project/src/models/spt/generators/IRagfairAssortGenerator.ts +++ b/project/src/models/spt/generators/IRagfairAssortGenerator.ts @@ -1,4 +1,4 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface IRagfairAssortGenerator { diff --git a/project/src/models/spt/generators/IRagfairOfferGenerator.ts b/project/src/models/spt/generators/IRagfairOfferGenerator.ts index f1b208be..755292d2 100644 --- a/project/src/models/spt/generators/IRagfairOfferGenerator.ts +++ b/project/src/models/spt/generators/IRagfairOfferGenerator.ts @@ -1,6 +1,6 @@ -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; export interface IRagfairOfferGenerator { diff --git a/project/src/models/spt/logging/IClientLogRequest.ts b/project/src/models/spt/logging/IClientLogRequest.ts index fa8b82af..887c46ce 100644 --- a/project/src/models/spt/logging/IClientLogRequest.ts +++ b/project/src/models/spt/logging/IClientLogRequest.ts @@ -1,4 +1,4 @@ -import { LogLevel } from "@spt-aki/models/spt/logging/LogLevel"; +import { LogLevel } from "@spt/models/spt/logging/LogLevel"; export interface IClientLogRequest { diff --git a/project/src/models/spt/mod/IPackageJsonData.ts b/project/src/models/spt/mod/IPackageJsonData.ts index dd6a8ca8..9563d867 100644 --- a/project/src/models/spt/mod/IPackageJsonData.ts +++ b/project/src/models/spt/mod/IPackageJsonData.ts @@ -9,7 +9,7 @@ export interface IPackageJsonData url: string author: string version: string - akiVersion: string + sptVersion: string /** We deliberately purge this data */ scripts: Record devDependencies: Record diff --git a/project/src/models/spt/mod/NewItemDetails.ts b/project/src/models/spt/mod/NewItemDetails.ts index 3ba66224..b991a794 100644 --- a/project/src/models/spt/mod/NewItemDetails.ts +++ b/project/src/models/spt/mod/NewItemDetails.ts @@ -1,4 +1,4 @@ -import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateItem"; export abstract class NewItemDetailsBase { diff --git a/project/src/models/spt/repeatable/IQuestTypePool.ts b/project/src/models/spt/repeatable/IQuestTypePool.ts index 51d4f3e5..ce0a7104 100644 --- a/project/src/models/spt/repeatable/IQuestTypePool.ts +++ b/project/src/models/spt/repeatable/IQuestTypePool.ts @@ -1,4 +1,4 @@ -import { ELocationName } from "@spt-aki/models/enums/ELocationName"; +import { ELocationName } from "@spt/models/enums/ELocationName"; export interface IQuestTypePool { diff --git a/project/src/models/spt/server/ExhaustableArray.ts b/project/src/models/spt/server/ExhaustableArray.ts index 4562d38b..2b87caf0 100644 --- a/project/src/models/spt/server/ExhaustableArray.ts +++ b/project/src/models/spt/server/ExhaustableArray.ts @@ -1,5 +1,5 @@ -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; export class ExhaustableArray implements IExhaustableArray { diff --git a/project/src/models/spt/server/IDatabaseTables.ts b/project/src/models/spt/server/IDatabaseTables.ts index bb0cf980..db2a7178 100644 --- a/project/src/models/spt/server/IDatabaseTables.ts +++ b/project/src/models/spt/server/IDatabaseTables.ts @@ -1,26 +1,26 @@ -import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; -import { IAchievement } from "@spt-aki/models/eft/common/tables/IAchievement"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IBotCore } from "@spt-aki/models/eft/common/tables/IBotCore"; -import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ICustomizationItem } from "@spt-aki/models/eft/common/tables/ICustomizationItem"; -import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; -import { IMatch } from "@spt-aki/models/eft/common/tables/IMatch"; -import { IProfileTemplates } from "@spt-aki/models/eft/common/tables/IProfileTemplate"; -import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IRepeatableQuestDatabase } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ITrader } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; -import { IQteData } from "@spt-aki/models/eft/hideout/IQteData"; -import { IDefaultEquipmentPreset } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ILocaleBase } from "@spt-aki/models/spt/server/ILocaleBase"; -import { ILocations } from "@spt-aki/models/spt/server/ILocations"; -import { IServerBase } from "@spt-aki/models/spt/server/IServerBase"; -import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; +import { IGlobals } from "@spt/models/eft/common/IGlobals"; +import { IAchievement } from "@spt/models/eft/common/tables/IAchievement"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { IBotCore } from "@spt/models/eft/common/tables/IBotCore"; +import { IBotType } from "@spt/models/eft/common/tables/IBotType"; +import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem"; +import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase"; +import { IMatch } from "@spt/models/eft/common/tables/IMatch"; +import { IProfileTemplates } from "@spt/models/eft/common/tables/IProfileTemplate"; +import { IQuest } from "@spt/models/eft/common/tables/IQuest"; +import { IRepeatableQuestDatabase } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ITrader } from "@spt/models/eft/common/tables/ITrader"; +import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase"; +import { IQteData } from "@spt/models/eft/hideout/IQteData"; +import { IDefaultEquipmentPreset } from "@spt/models/eft/profile/ISptProfile"; +import { ILocaleBase } from "@spt/models/spt/server/ILocaleBase"; +import { ILocations } from "@spt/models/spt/server/ILocations"; +import { IServerBase } from "@spt/models/spt/server/IServerBase"; +import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase"; export interface IDatabaseTables { diff --git a/project/src/models/spt/server/ILocations.ts b/project/src/models/spt/server/ILocations.ts index c5933fe6..b239c112 100644 --- a/project/src/models/spt/server/ILocations.ts +++ b/project/src/models/spt/server/ILocations.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { ILocation } from "@spt-aki/models/eft/common/ILocation"; -import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase"; +import { ILocation } from "@spt/models/eft/common/ILocation"; +import { ILocationsBase } from "@spt/models/eft/common/tables/ILocationsBase"; export interface ILocations { diff --git a/project/src/models/spt/services/CustomPreset.ts b/project/src/models/spt/services/CustomPreset.ts index 276e18a4..da00ddc3 100644 --- a/project/src/models/spt/services/CustomPreset.ts +++ b/project/src/models/spt/services/CustomPreset.ts @@ -1,4 +1,4 @@ -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; export interface CustomPreset { diff --git a/project/src/models/spt/services/CustomTraderAssortData.ts b/project/src/models/spt/services/CustomTraderAssortData.ts index 935a3be8..e27fe344 100644 --- a/project/src/models/spt/services/CustomTraderAssortData.ts +++ b/project/src/models/spt/services/CustomTraderAssortData.ts @@ -1,5 +1,5 @@ -import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { Traders } from "@spt-aki/models/enums/Traders"; +import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { Traders } from "@spt/models/enums/Traders"; export interface CustomTraderAssortData { diff --git a/project/src/models/spt/services/IInsuranceEquipmentPkg.ts b/project/src/models/spt/services/IInsuranceEquipmentPkg.ts index c902a686..4b35672f 100644 --- a/project/src/models/spt/services/IInsuranceEquipmentPkg.ts +++ b/project/src/models/spt/services/IInsuranceEquipmentPkg.ts @@ -1,5 +1,5 @@ -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; export interface IInsuranceEquipmentPkg { diff --git a/project/src/models/spt/services/ITraderServiceModel.ts b/project/src/models/spt/services/ITraderServiceModel.ts index 489af54b..2e24982b 100644 --- a/project/src/models/spt/services/ITraderServiceModel.ts +++ b/project/src/models/spt/services/ITraderServiceModel.ts @@ -1,4 +1,4 @@ -import { TraderServiceType } from "@spt-aki/models/enums/TraderServiceType"; +import { TraderServiceType } from "@spt/models/enums/TraderServiceType"; export interface ITraderServiceModel { diff --git a/project/src/models/spt/services/LootRequest.ts b/project/src/models/spt/services/LootRequest.ts index 8bb33b0e..69b47ebd 100644 --- a/project/src/models/spt/services/LootRequest.ts +++ b/project/src/models/spt/services/LootRequest.ts @@ -1,4 +1,4 @@ -import { MinMax } from "@spt-aki/models/common/MinMax"; +import { MinMax } from "@spt/models/common/MinMax"; export interface LootRequest { diff --git a/project/src/models/spt/utils/IAsyncQueue.ts b/project/src/models/spt/utils/IAsyncQueue.ts index 1ea0824e..7c64f0e8 100644 --- a/project/src/models/spt/utils/IAsyncQueue.ts +++ b/project/src/models/spt/utils/IAsyncQueue.ts @@ -1,4 +1,4 @@ -import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; +import { ICommand } from "@spt/models/spt/utils/ICommand"; export interface IAsyncQueue { diff --git a/project/src/models/spt/utils/ILogger.ts b/project/src/models/spt/utils/ILogger.ts index 78153231..886e08bd 100644 --- a/project/src/models/spt/utils/ILogger.ts +++ b/project/src/models/spt/utils/ILogger.ts @@ -1,6 +1,6 @@ -import { Daum } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; +import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; export interface ILogger { diff --git a/project/src/routers/EventOutputHolder.ts b/project/src/routers/EventOutputHolder.ts index 35c31b3b..adb7661d 100644 --- a/project/src/routers/EventOutputHolder.ts +++ b/project/src/routers/EventOutputHolder.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHideoutImprovement, Productive, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { ProfileChange, TraderData } from "@spt-aki/models/eft/itemEvent/IItemEventRouterBase"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase"; +import { ProfileChange, TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class EventOutputHolder diff --git a/project/src/routers/HttpRouter.ts b/project/src/routers/HttpRouter.ts index 09da1027..ac8e7017 100644 --- a/project/src/routers/HttpRouter.ts +++ b/project/src/routers/HttpRouter.ts @@ -1,6 +1,6 @@ import { IncomingMessage } from "node:http"; import { injectAll, injectable } from "tsyringe"; -import { DynamicRouter, Router, StaticRouter } from "@spt-aki/di/Router"; +import { DynamicRouter, Router, StaticRouter } from "@spt/di/Router"; @injectable() export class HttpRouter diff --git a/project/src/routers/ImageRouter.ts b/project/src/routers/ImageRouter.ts index da4bbdd4..d6419b08 100644 --- a/project/src/routers/ImageRouter.ts +++ b/project/src/routers/ImageRouter.ts @@ -1,8 +1,8 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; -import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ImageRouteService } from "@spt/services/mod/image/ImageRouteService"; +import { HttpFileUtil } from "@spt/utils/HttpFileUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class ImageRouter diff --git a/project/src/routers/ItemEventRouter.ts b/project/src/routers/ItemEventRouter.ts index 2a597cd5..b1d0b01c 100644 --- a/project/src/routers/ItemEventRouter.ts +++ b/project/src/routers/ItemEventRouter.ts @@ -1,12 +1,12 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IItemEventRouterRequest } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { ItemEventRouterDefinition } from "@spt/di/Router"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class ItemEventRouter diff --git a/project/src/routers/dynamic/BotDynamicRouter.ts b/project/src/routers/dynamic/BotDynamicRouter.ts index e6574245..c827357d 100644 --- a/project/src/routers/dynamic/BotDynamicRouter.ts +++ b/project/src/routers/dynamic/BotDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { Difficulties } from "@spt-aki/models/eft/common/tables/IBotType"; +import { BotCallbacks } from "@spt/callbacks/BotCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { Difficulties } from "@spt/models/eft/common/tables/IBotType"; @injectable() export class BotDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/BundleDynamicRouter.ts b/project/src/routers/dynamic/BundleDynamicRouter.ts index 3dc757da..7b96f5a3 100644 --- a/project/src/routers/dynamic/BundleDynamicRouter.ts +++ b/project/src/routers/dynamic/BundleDynamicRouter.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; +import { BundleCallbacks } from "@spt/callbacks/BundleCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; @injectable() export class BundleDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/CustomizationDynamicRouter.ts b/project/src/routers/dynamic/CustomizationDynamicRouter.ts index 493d7469..fcd2bced 100644 --- a/project/src/routers/dynamic/CustomizationDynamicRouter.ts +++ b/project/src/routers/dynamic/CustomizationDynamicRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { ISuit } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { CustomizationCallbacks } from "@spt/callbacks/CustomizationCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { ISuit } from "@spt/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class CustomizationDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/DataDynamicRouter.ts b/project/src/routers/dynamic/DataDynamicRouter.ts index 046d9acb..a2420bf8 100644 --- a/project/src/routers/dynamic/DataDynamicRouter.ts +++ b/project/src/routers/dynamic/DataDynamicRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { IGetItemPricesResponse } from "@spt-aki/models/eft/game/IGetItemPricesResponse"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { DataCallbacks } from "@spt/callbacks/DataCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class DataDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/HttpDynamicRouter.ts b/project/src/routers/dynamic/HttpDynamicRouter.ts index 9a7b117f..f8fedca4 100644 --- a/project/src/routers/dynamic/HttpDynamicRouter.ts +++ b/project/src/routers/dynamic/HttpDynamicRouter.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { ImageRouter } from "@spt-aki/routers/ImageRouter"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { ImageRouter } from "@spt/routers/ImageRouter"; @injectable() export class HttpDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/InraidDynamicRouter.ts b/project/src/routers/dynamic/InraidDynamicRouter.ts index 72f0c9da..8080c461 100644 --- a/project/src/routers/dynamic/InraidDynamicRouter.ts +++ b/project/src/routers/dynamic/InraidDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { InraidCallbacks } from "@spt/callbacks/InraidCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; @injectable() export class InraidDynamicRouter extends DynamicRouter @@ -28,6 +28,6 @@ export class InraidDynamicRouter extends DynamicRouter public override getTopLevelRoute(): string { - return "aki-name"; + return "spt-name"; } } diff --git a/project/src/routers/dynamic/LocationDynamicRouter.ts b/project/src/routers/dynamic/LocationDynamicRouter.ts index 71497b66..a4354725 100644 --- a/project/src/routers/dynamic/LocationDynamicRouter.ts +++ b/project/src/routers/dynamic/LocationDynamicRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { LocationCallbacks } from "@spt/callbacks/LocationCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class LocationDynamicRouter extends DynamicRouter @@ -27,6 +27,6 @@ export class LocationDynamicRouter extends DynamicRouter public override getTopLevelRoute(): string { - return "aki-loot"; + return "spt-loot"; } } diff --git a/project/src/routers/dynamic/NotifierDynamicRouter.ts b/project/src/routers/dynamic/NotifierDynamicRouter.ts index 1a32834d..bb3397b4 100644 --- a/project/src/routers/dynamic/NotifierDynamicRouter.ts +++ b/project/src/routers/dynamic/NotifierDynamicRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { NotifierCallbacks } from "@spt/callbacks/NotifierCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class NotifierDynamicRouter extends DynamicRouter diff --git a/project/src/routers/dynamic/TraderDynamicRouter.ts b/project/src/routers/dynamic/TraderDynamicRouter.ts index 8593aac0..c215672f 100644 --- a/project/src/routers/dynamic/TraderDynamicRouter.ts +++ b/project/src/routers/dynamic/TraderDynamicRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; -import { ITraderAssort, ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { TraderCallbacks } from "@spt/callbacks/TraderCallbacks"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; +import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class TraderDynamicRouter extends DynamicRouter diff --git a/project/src/routers/item_events/CustomizationItemEventRouter.ts b/project/src/routers/item_events/CustomizationItemEventRouter.ts index 7fcd2b3f..3da445bd 100644 --- a/project/src/routers/item_events/CustomizationItemEventRouter.ts +++ b/project/src/routers/item_events/CustomizationItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { CustomizationCallbacks } from "@spt/callbacks/CustomizationCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class CustomizationItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/HealthItemEventRouter.ts b/project/src/routers/item_events/HealthItemEventRouter.ts index ecddee69..67051c54 100644 --- a/project/src/routers/item_events/HealthItemEventRouter.ts +++ b/project/src/routers/item_events/HealthItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { HealthCallbacks } from "@spt/callbacks/HealthCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class HealthItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/HideoutItemEventRouter.ts b/project/src/routers/item_events/HideoutItemEventRouter.ts index d3dd877a..a0fa3384 100644 --- a/project/src/routers/item_events/HideoutItemEventRouter.ts +++ b/project/src/routers/item_events/HideoutItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { HideoutEventActions } from "@spt-aki/models/enums/HideoutEventActions"; +import { HideoutCallbacks } from "@spt/callbacks/HideoutCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { HideoutEventActions } from "@spt/models/enums/HideoutEventActions"; @injectable() export class HideoutItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/InsuranceItemEventRouter.ts b/project/src/routers/item_events/InsuranceItemEventRouter.ts index 0996d8f6..3d50e98f 100644 --- a/project/src/routers/item_events/InsuranceItemEventRouter.ts +++ b/project/src/routers/item_events/InsuranceItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class InsuranceItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/InventoryItemEventRouter.ts b/project/src/routers/item_events/InventoryItemEventRouter.ts index 1f08afe4..4a86e9d1 100644 --- a/project/src/routers/item_events/InventoryItemEventRouter.ts +++ b/project/src/routers/item_events/InventoryItemEventRouter.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { HideoutCallbacks } from "@spt-aki/callbacks/HideoutCallbacks"; -import { InventoryCallbacks } from "@spt-aki/callbacks/InventoryCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ItemEventActions } from "@spt-aki/models/enums/ItemEventActions"; +import { HideoutCallbacks } from "@spt/callbacks/HideoutCallbacks"; +import { InventoryCallbacks } from "@spt/callbacks/InventoryCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ItemEventActions } from "@spt/models/enums/ItemEventActions"; @injectable() export class InventoryItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/NoteItemEventRouter.ts b/project/src/routers/item_events/NoteItemEventRouter.ts index a363aaf2..98b8837b 100644 --- a/project/src/routers/item_events/NoteItemEventRouter.ts +++ b/project/src/routers/item_events/NoteItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { NoteCallbacks } from "@spt-aki/callbacks/NoteCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { INoteActionData } from "@spt-aki/models/eft/notes/INoteActionData"; +import { NoteCallbacks } from "@spt/callbacks/NoteCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { INoteActionData } from "@spt/models/eft/notes/INoteActionData"; @injectable() export class NoteItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/QuestItemEventRouter.ts b/project/src/routers/item_events/QuestItemEventRouter.ts index f5373f4c..366b407e 100644 --- a/project/src/routers/item_events/QuestItemEventRouter.ts +++ b/project/src/routers/item_events/QuestItemEventRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { QuestCallbacks } from "@spt/callbacks/QuestCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; @injectable() export class QuestItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/RagfairItemEventRouter.ts b/project/src/routers/item_events/RagfairItemEventRouter.ts index 713fe81b..61b16182 100644 --- a/project/src/routers/item_events/RagfairItemEventRouter.ts +++ b/project/src/routers/item_events/RagfairItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { RagfairCallbacks } from "@spt/callbacks/RagfairCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class RagfairItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/RepairItemEventRouter.ts b/project/src/routers/item_events/RepairItemEventRouter.ts index 0aa0f7fb..04a52fea 100644 --- a/project/src/routers/item_events/RepairItemEventRouter.ts +++ b/project/src/routers/item_events/RepairItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { RepairCallbacks } from "@spt-aki/callbacks/RepairCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { RepairCallbacks } from "@spt/callbacks/RepairCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class RepairItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/TradeItemEventRouter.ts b/project/src/routers/item_events/TradeItemEventRouter.ts index a6065b39..edc60b29 100644 --- a/project/src/routers/item_events/TradeItemEventRouter.ts +++ b/project/src/routers/item_events/TradeItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { TradeCallbacks } from "@spt-aki/callbacks/TradeCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { TradeCallbacks } from "@spt/callbacks/TradeCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class TradeItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/item_events/WishlistItemEventRouter.ts b/project/src/routers/item_events/WishlistItemEventRouter.ts index dc012afc..69166a56 100644 --- a/project/src/routers/item_events/WishlistItemEventRouter.ts +++ b/project/src/routers/item_events/WishlistItemEventRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { WishlistCallbacks } from "@spt-aki/callbacks/WishlistCallbacks"; -import { HandledRoute, ItemEventRouterDefinition } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { WishlistCallbacks } from "@spt/callbacks/WishlistCallbacks"; +import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class WishlistItemEventRouter extends ItemEventRouterDefinition diff --git a/project/src/routers/save_load/HealthSaveLoadRouter.ts b/project/src/routers/save_load/HealthSaveLoadRouter.ts index a334b2cb..8192d36c 100644 --- a/project/src/routers/save_load/HealthSaveLoadRouter.ts +++ b/project/src/routers/save_load/HealthSaveLoadRouter.ts @@ -1,16 +1,16 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt/di/Router"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class HealthSaveLoadRouter extends SaveLoadRouter { public override getHandledRoutes(): HandledRoute[] { - return [new HandledRoute("aki-health", false)]; + return [new HandledRoute("spt-health", false)]; } - public override handleLoad(profile: IAkiProfile): IAkiProfile + public override handleLoad(profile: ISptProfile): ISptProfile { if (!profile.vitality) { diff --git a/project/src/routers/save_load/InraidSaveLoadRouter.ts b/project/src/routers/save_load/InraidSaveLoadRouter.ts index 32c8e1fd..157d0969 100644 --- a/project/src/routers/save_load/InraidSaveLoadRouter.ts +++ b/project/src/routers/save_load/InraidSaveLoadRouter.ts @@ -1,16 +1,16 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt/di/Router"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class InraidSaveLoadRouter extends SaveLoadRouter { public override getHandledRoutes(): HandledRoute[] { - return [new HandledRoute("aki-inraid", false)]; + return [new HandledRoute("spt-inraid", false)]; } - public override handleLoad(profile: IAkiProfile): IAkiProfile + public override handleLoad(profile: ISptProfile): ISptProfile { if (profile.inraid === undefined) { diff --git a/project/src/routers/save_load/InsuranceSaveLoadRouter.ts b/project/src/routers/save_load/InsuranceSaveLoadRouter.ts index bac149dd..c8976784 100644 --- a/project/src/routers/save_load/InsuranceSaveLoadRouter.ts +++ b/project/src/routers/save_load/InsuranceSaveLoadRouter.ts @@ -1,16 +1,16 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt/di/Router"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class InsuranceSaveLoadRouter extends SaveLoadRouter { public override getHandledRoutes(): HandledRoute[] { - return [new HandledRoute("aki-insurance", false)]; + return [new HandledRoute("spt-insurance", false)]; } - public override handleLoad(profile: IAkiProfile): IAkiProfile + public override handleLoad(profile: ISptProfile): ISptProfile { if (profile.insurance === undefined) { diff --git a/project/src/routers/save_load/ProfileSaveLoadRouter.ts b/project/src/routers/save_load/ProfileSaveLoadRouter.ts index a50ec171..330201dd 100644 --- a/project/src/routers/save_load/ProfileSaveLoadRouter.ts +++ b/project/src/routers/save_load/ProfileSaveLoadRouter.ts @@ -1,17 +1,17 @@ import { injectable } from "tsyringe"; -import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { HandledRoute, SaveLoadRouter } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class ProfileSaveLoadRouter extends SaveLoadRouter { public override getHandledRoutes(): HandledRoute[] { - return [new HandledRoute("aki-profile", false)]; + return [new HandledRoute("spt-profile", false)]; } - public override handleLoad(profile: IAkiProfile): IAkiProfile + public override handleLoad(profile: ISptProfile): ISptProfile { if (profile.characters === null) { diff --git a/project/src/routers/serializers/BundleSerializer.ts b/project/src/routers/serializers/BundleSerializer.ts index 7a16cab5..b9e97e36 100644 --- a/project/src/routers/serializers/BundleSerializer.ts +++ b/project/src/routers/serializers/BundleSerializer.ts @@ -1,9 +1,9 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { Serializer } from "@spt-aki/di/Serializer"; -import { BundleLoader } from "@spt-aki/loaders/BundleLoader"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; +import { Serializer } from "@spt/di/Serializer"; +import { BundleLoader } from "@spt/loaders/BundleLoader"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { HttpFileUtil } from "@spt/utils/HttpFileUtil"; @injectable() export class BundleSerializer extends Serializer diff --git a/project/src/routers/serializers/ImageSerializer.ts b/project/src/routers/serializers/ImageSerializer.ts index 3b70e504..4ac0d611 100644 --- a/project/src/routers/serializers/ImageSerializer.ts +++ b/project/src/routers/serializers/ImageSerializer.ts @@ -1,7 +1,7 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { Serializer } from "@spt-aki/di/Serializer"; -import { ImageRouter } from "@spt-aki/routers/ImageRouter"; +import { Serializer } from "@spt/di/Serializer"; +import { ImageRouter } from "@spt/routers/ImageRouter"; @injectable() export class ImageSerializer extends Serializer diff --git a/project/src/routers/serializers/NotifySerializer.ts b/project/src/routers/serializers/NotifySerializer.ts index 32a99e9f..45e30f69 100644 --- a/project/src/routers/serializers/NotifySerializer.ts +++ b/project/src/routers/serializers/NotifySerializer.ts @@ -1,9 +1,9 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { NotifierController } from "@spt-aki/controllers/NotifierController"; -import { Serializer } from "@spt-aki/di/Serializer"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { NotifierController } from "@spt/controllers/NotifierController"; +import { Serializer } from "@spt/di/Serializer"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { JsonUtil } from "@spt/utils/JsonUtil"; @injectable() export class NotifySerializer extends Serializer diff --git a/project/src/routers/static/AchievementStaticRouter.ts b/project/src/routers/static/AchievementStaticRouter.ts index 9e191f56..d97d9d60 100644 --- a/project/src/routers/static/AchievementStaticRouter.ts +++ b/project/src/routers/static/AchievementStaticRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { AchievementCallbacks } from "@spt-aki/callbacks/AchievementCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { ICompletedAchievementsResponse } from "@spt-aki/models/eft/profile/ICompletedAchievementsResponse"; -import { IGetAchievementsResponse } from "@spt-aki/models/eft/profile/IGetAchievementsResponse"; +import { AchievementCallbacks } from "@spt/callbacks/AchievementCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse"; +import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse"; @injectable() export class AchievementStaticRouter extends StaticRouter diff --git a/project/src/routers/static/BotStaticRouter.ts b/project/src/routers/static/BotStaticRouter.ts index 73d96ccd..96241942 100644 --- a/project/src/routers/static/BotStaticRouter.ts +++ b/project/src/routers/static/BotStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { BotCallbacks } from "@spt-aki/callbacks/BotCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { BotCallbacks } from "@spt/callbacks/BotCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class BotStaticRouter extends StaticRouter diff --git a/project/src/routers/static/BuildStaticRouter.ts b/project/src/routers/static/BuildStaticRouter.ts index 6c1404d4..f8f52eb1 100644 --- a/project/src/routers/static/BuildStaticRouter.ts +++ b/project/src/routers/static/BuildStaticRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { BuildsCallbacks } from "@spt-aki/callbacks/BuildsCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IUserBuilds } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { BuildsCallbacks } from "@spt/callbacks/BuildsCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class BuildsStaticRouter extends StaticRouter diff --git a/project/src/routers/static/BundleStaticRouter.ts b/project/src/routers/static/BundleStaticRouter.ts index 25de6072..72181d38 100644 --- a/project/src/routers/static/BundleStaticRouter.ts +++ b/project/src/routers/static/BundleStaticRouter.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { BundleCallbacks } from "@spt-aki/callbacks/BundleCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; +import { BundleCallbacks } from "@spt/callbacks/BundleCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; @injectable() export class BundleStaticRouter extends StaticRouter diff --git a/project/src/routers/static/ClientLogStaticRouter.ts b/project/src/routers/static/ClientLogStaticRouter.ts index fc2564c5..c1ee0ef3 100644 --- a/project/src/routers/static/ClientLogStaticRouter.ts +++ b/project/src/routers/static/ClientLogStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ClientLogCallbacks } from "@spt-aki/callbacks/ClientLogCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { ClientLogCallbacks } from "@spt/callbacks/ClientLogCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; @injectable() export class ClientLogStaticRouter extends StaticRouter diff --git a/project/src/routers/static/CustomizationStaticRouter.ts b/project/src/routers/static/CustomizationStaticRouter.ts index 2acea017..1cefed52 100644 --- a/project/src/routers/static/CustomizationStaticRouter.ts +++ b/project/src/routers/static/CustomizationStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { CustomizationCallbacks } from "@spt-aki/callbacks/CustomizationCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetSuitsResponse } from "@spt-aki/models/eft/customization/IGetSuitsResponse"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { CustomizationCallbacks } from "@spt/callbacks/CustomizationCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetSuitsResponse } from "@spt/models/eft/customization/IGetSuitsResponse"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class CustomizationStaticRouter extends StaticRouter diff --git a/project/src/routers/static/DataStaticRouter.ts b/project/src/routers/static/DataStaticRouter.ts index 7ee611fb..e6e6ed87 100644 --- a/project/src/routers/static/DataStaticRouter.ts +++ b/project/src/routers/static/DataStaticRouter.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { DataCallbacks } from "@spt-aki/callbacks/DataCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGlobals } from "@spt-aki/models/eft/common/IGlobals"; -import { ICustomizationItem } from "@spt-aki/models/eft/common/tables/ICustomizationItem"; -import { IHandbookBase } from "@spt-aki/models/eft/common/tables/IHandbookBase"; -import { IHideoutArea } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IHideoutProduction } from "@spt-aki/models/eft/hideout/IHideoutProduction"; -import { IHideoutScavCase } from "@spt-aki/models/eft/hideout/IHideoutScavCase"; -import { IHideoutSettingsBase } from "@spt-aki/models/eft/hideout/IHideoutSettingsBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { ISettingsBase } from "@spt-aki/models/spt/server/ISettingsBase"; +import { DataCallbacks } from "@spt/callbacks/DataCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGlobals } from "@spt/models/eft/common/IGlobals"; +import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem"; +import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase"; +import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea"; +import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction"; +import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase"; +import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase"; @injectable() export class DataStaticRouter extends StaticRouter diff --git a/project/src/routers/static/DialogStaticRouter.ts b/project/src/routers/static/DialogStaticRouter.ts index 37eb5159..bf2a309f 100644 --- a/project/src/routers/static/DialogStaticRouter.ts +++ b/project/src/routers/static/DialogStaticRouter.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { DialogueCallbacks } from "@spt-aki/callbacks/DialogueCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; -import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; -import { IChatServer } from "@spt-aki/models/eft/dialog/IChatServer"; -import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; -import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; -import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; -import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; -import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; -import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { DialogueCallbacks } from "@spt/callbacks/DialogueCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IAddUserGroupMailRequest } from "@spt/models/eft/dialog/IAddUserGroupMailRequest"; +import { IChangeGroupMailOwnerRequest } from "@spt/models/eft/dialog/IChangeGroupMailOwnerRequest"; +import { IChatServer } from "@spt/models/eft/dialog/IChatServer"; +import { ICreateGroupMailRequest } from "@spt/models/eft/dialog/ICreateGroupMailRequest"; +import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse"; +import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse"; +import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse"; +import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IRemoveUserGroupMailRequest } from "@spt/models/eft/dialog/IRemoveUserGroupMailRequest"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { DialogueInfo } from "@spt/models/eft/profile/ISptProfile"; @injectable() export class DialogStaticRouter extends StaticRouter diff --git a/project/src/routers/static/GameStaticRouter.ts b/project/src/routers/static/GameStaticRouter.ts index 0b0bfb75..60f1f1c6 100644 --- a/project/src/routers/static/GameStaticRouter.ts +++ b/project/src/routers/static/GameStaticRouter.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { GameCallbacks } from "@spt-aki/callbacks/GameCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; -import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; -import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; -import { IGameKeepAliveResponse } from "@spt-aki/models/eft/game/IGameKeepAliveResponse"; -import { IGameLogoutResponseData } from "@spt-aki/models/eft/game/IGameLogoutResponseData"; -import { IGameModeResponse } from "@spt-aki/models/eft/game/IGameModeResponse"; -import { IGameStartResponse } from "@spt-aki/models/eft/game/IGameStartResponse"; -import { IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; -import { ISendReportRequest } from "@spt-aki/models/eft/game/ISendReportRequest"; -import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { GameCallbacks } from "@spt/callbacks/GameCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse"; +import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse"; +import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse"; +import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse"; +import { IGameLogoutResponseData } from "@spt/models/eft/game/IGameLogoutResponseData"; +import { IGameModeResponse } from "@spt/models/eft/game/IGameModeResponse"; +import { IGameStartResponse } from "@spt/models/eft/game/IGameStartResponse"; +import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse"; +import { ISendReportRequest } from "@spt/models/eft/game/ISendReportRequest"; +import { IServerDetails } from "@spt/models/eft/game/IServerDetails"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; @injectable() export class GameStaticRouter extends StaticRouter diff --git a/project/src/routers/static/HealthStaticRouter.ts b/project/src/routers/static/HealthStaticRouter.ts index 6faaedb0..29133267 100644 --- a/project/src/routers/static/HealthStaticRouter.ts +++ b/project/src/routers/static/HealthStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { HealthCallbacks } from "@spt-aki/callbacks/HealthCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { HealthCallbacks } from "@spt/callbacks/HealthCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class HealthStaticRouter extends StaticRouter diff --git a/project/src/routers/static/InraidStaticRouter.ts b/project/src/routers/static/InraidStaticRouter.ts index 563a956f..0bf08cd5 100644 --- a/project/src/routers/static/InraidStaticRouter.ts +++ b/project/src/routers/static/InraidStaticRouter.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { InraidCallbacks } from "@spt-aki/callbacks/InraidCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; +import { InraidCallbacks } from "@spt/callbacks/InraidCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; @injectable() export class InraidStaticRouter extends StaticRouter diff --git a/project/src/routers/static/InsuranceStaticRouter.ts b/project/src/routers/static/InsuranceStaticRouter.ts index 6a750887..a0fdba05 100644 --- a/project/src/routers/static/InsuranceStaticRouter.ts +++ b/project/src/routers/static/InsuranceStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { InsuranceCallbacks } from "@spt-aki/callbacks/InsuranceCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; +import { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData"; @injectable() export class InsuranceStaticRouter extends StaticRouter diff --git a/project/src/routers/static/ItemEventStaticRouter.ts b/project/src/routers/static/ItemEventStaticRouter.ts index ab0fc68d..18a4ff79 100644 --- a/project/src/routers/static/ItemEventStaticRouter.ts +++ b/project/src/routers/static/ItemEventStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ItemEventCallbacks } from "@spt-aki/callbacks/ItemEventCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; +import { ItemEventCallbacks } from "@spt/callbacks/ItemEventCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; @injectable() export class ItemEventStaticRouter extends StaticRouter diff --git a/project/src/routers/static/LauncherStaticRouter.ts b/project/src/routers/static/LauncherStaticRouter.ts index c4147c09..37f691da 100644 --- a/project/src/routers/static/LauncherStaticRouter.ts +++ b/project/src/routers/static/LauncherStaticRouter.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { LauncherCallbacks } from "@spt-aki/callbacks/LauncherCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; +import { LauncherCallbacks } from "@spt/callbacks/LauncherCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; @injectable() export class LauncherStaticRouter extends StaticRouter diff --git a/project/src/routers/static/LocationStaticRouter.ts b/project/src/routers/static/LocationStaticRouter.ts index 867291ca..cd264fe0 100644 --- a/project/src/routers/static/LocationStaticRouter.ts +++ b/project/src/routers/static/LocationStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { LocationCallbacks } from "@spt-aki/callbacks/LocationCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { LocationCallbacks } from "@spt/callbacks/LocationCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class LocationStaticRouter extends StaticRouter diff --git a/project/src/routers/static/MatchStaticRouter.ts b/project/src/routers/static/MatchStaticRouter.ts index d2da2b89..4fe378a0 100644 --- a/project/src/routers/static/MatchStaticRouter.ts +++ b/project/src/routers/static/MatchStaticRouter.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { MatchCallbacks } from "@spt-aki/callbacks/MatchCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IGroupCharacter } from "@spt-aki/models/eft/match/IGroupCharacter"; -import { IMatchGroupCurrentResponse } from "@spt-aki/models/eft/match/IMatchGroupCurrentResponse"; -import { IMatchGroupStatusResponse } from "@spt-aki/models/eft/match/IMatchGroupStatusResponse"; -import { IProfileStatusResponse } from "@spt-aki/models/eft/match/IProfileStatusResponse"; +import { MatchCallbacks } from "@spt/callbacks/MatchCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; +import { IMatchGroupCurrentResponse } from "@spt/models/eft/match/IMatchGroupCurrentResponse"; +import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse"; +import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse"; @injectable() export class MatchStaticRouter extends StaticRouter diff --git a/project/src/routers/static/NotifierStaticRouter.ts b/project/src/routers/static/NotifierStaticRouter.ts index d0d0e4ae..623c9c53 100644 --- a/project/src/routers/static/NotifierStaticRouter.ts +++ b/project/src/routers/static/NotifierStaticRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { NotifierCallbacks } from "@spt-aki/callbacks/NotifierCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; -import { ISelectProfileResponse } from "@spt-aki/models/eft/notifier/ISelectProfileResponse"; +import { NotifierCallbacks } from "@spt/callbacks/NotifierCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INotifierChannel } from "@spt/models/eft/notifier/INotifier"; +import { ISelectProfileResponse } from "@spt/models/eft/notifier/ISelectProfileResponse"; @injectable() export class NotifierStaticRouter extends StaticRouter diff --git a/project/src/routers/static/ProfileStaticRouter.ts b/project/src/routers/static/ProfileStaticRouter.ts index e2a46194..7b17ba00 100644 --- a/project/src/routers/static/ProfileStaticRouter.ts +++ b/project/src/routers/static/ProfileStaticRouter.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ProfileCallbacks } from "@spt-aki/callbacks/ProfileCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { GetProfileStatusResponseData } from "@spt-aki/models/eft/profile/GetProfileStatusResponseData"; -import { ICreateProfileResponse } from "@spt-aki/models/eft/profile/ICreateProfileResponse"; -import { IGetOtherProfileResponse } from "@spt-aki/models/eft/profile/IGetOtherProfileResponse"; -import { ISearchFriendResponse } from "@spt-aki/models/eft/profile/ISearchFriendResponse"; +import { ProfileCallbacks } from "@spt/callbacks/ProfileCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { GetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData"; +import { ICreateProfileResponse } from "@spt/models/eft/profile/ICreateProfileResponse"; +import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse"; +import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse"; @injectable() export class ProfileStaticRouter extends StaticRouter diff --git a/project/src/routers/static/QuestStaticRouter.ts b/project/src/routers/static/QuestStaticRouter.ts index 71e8ed91..f6e049a4 100644 --- a/project/src/routers/static/QuestStaticRouter.ts +++ b/project/src/routers/static/QuestStaticRouter.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { QuestCallbacks } from "@spt-aki/callbacks/QuestCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IQuest } from "@spt-aki/models/eft/common/tables/IQuest"; -import { IPmcDataRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { QuestCallbacks } from "@spt/callbacks/QuestCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IQuest } from "@spt/models/eft/common/tables/IQuest"; +import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class QuestStaticRouter extends StaticRouter diff --git a/project/src/routers/static/RagfairStaticRouter.ts b/project/src/routers/static/RagfairStaticRouter.ts index b532ff5d..25865ff6 100644 --- a/project/src/routers/static/RagfairStaticRouter.ts +++ b/project/src/routers/static/RagfairStaticRouter.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { RagfairCallbacks } from "@spt-aki/callbacks/RagfairCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IGetItemPriceResult } from "@spt-aki/models/eft/ragfair/IGetItemPriceResult"; -import { IGetOffersResult } from "@spt-aki/models/eft/ragfair/IGetOffersResult"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { RagfairCallbacks } from "@spt/callbacks/RagfairCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult"; +import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; @injectable() export class RagfairStaticRouter extends StaticRouter diff --git a/project/src/routers/static/TraderStaticRouter.ts b/project/src/routers/static/TraderStaticRouter.ts index 8298a486..1fedc2b5 100644 --- a/project/src/routers/static/TraderStaticRouter.ts +++ b/project/src/routers/static/TraderStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { TraderCallbacks } from "@spt-aki/callbacks/TraderCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; +import { TraderCallbacks } from "@spt/callbacks/TraderCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; @injectable() export class TraderStaticRouter extends StaticRouter diff --git a/project/src/routers/static/WeatherStaticRouter.ts b/project/src/routers/static/WeatherStaticRouter.ts index 5f93a205..dac05b6e 100644 --- a/project/src/routers/static/WeatherStaticRouter.ts +++ b/project/src/routers/static/WeatherStaticRouter.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { WeatherCallbacks } from "@spt-aki/callbacks/WeatherCallbacks"; -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { IWeatherData } from "@spt-aki/models/eft/weather/IWeatherData"; +import { WeatherCallbacks } from "@spt/callbacks/WeatherCallbacks"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { IWeatherData } from "@spt/models/eft/weather/IWeatherData"; @injectable() export class WeatherStaticRouter extends StaticRouter diff --git a/project/src/servers/ConfigServer.ts b/project/src/servers/ConfigServer.ts index eeb5ea9d..ab10568c 100644 --- a/project/src/servers/ConfigServer.ts +++ b/project/src/servers/ConfigServer.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class ConfigServer @@ -34,7 +34,7 @@ export class ConfigServer this.logger.debug("Importing configs..."); // Get all filepaths - const filepath = globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/configs/" : "./assets/configs/"; + const filepath = globalThis.G_RELEASE_CONFIGURATION ? "SPT_Data/Server/configs/" : "./assets/configs/"; const files = this.vfs.getFiles(filepath); // Add file content to result @@ -44,7 +44,7 @@ export class ConfigServer { const fileName = this.vfs.stripExtension(file); const filePathAndName = `${filepath}${file}`; - this.configs[`aki-${fileName}`] = this.jsonUtil.deserializeJsonC( + this.configs[`spt-${fileName}`] = this.jsonUtil.deserializeJsonC( this.vfs.readFile(filePathAndName), filePathAndName, ); diff --git a/project/src/servers/DatabaseServer.ts b/project/src/servers/DatabaseServer.ts index 29eb9620..7ec83643 100644 --- a/project/src/servers/DatabaseServer.ts +++ b/project/src/servers/DatabaseServer.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; +import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables"; @injectable() export class DatabaseServer diff --git a/project/src/servers/HttpServer.ts b/project/src/servers/HttpServer.ts index 3a07e1de..6ffca615 100644 --- a/project/src/servers/HttpServer.ts +++ b/project/src/servers/HttpServer.ts @@ -1,16 +1,16 @@ import http, { IncomingMessage, ServerResponse, Server } from "node:http"; import { inject, injectAll, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; -import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; +import { WebSocketServer } from "@spt/servers/WebSocketServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class HttpServer diff --git a/project/src/servers/RagfairServer.ts b/project/src/servers/RagfairServer.ts index 4628aa5b..5bdd50ae 100644 --- a/project/src/servers/RagfairServer.ts +++ b/project/src/servers/RagfairServer.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; -import { TraderAssortHelper } from "@spt-aki/helpers/TraderAssortHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RagfairCategoriesService } from "@spt-aki/services/RagfairCategoriesService"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; -import { RagfairRequiredItemsService } from "@spt-aki/services/RagfairRequiredItemsService"; +import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator"; +import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Traders } from "@spt/models/enums/Traders"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RagfairCategoriesService } from "@spt/services/RagfairCategoriesService"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; +import { RagfairRequiredItemsService } from "@spt/services/RagfairRequiredItemsService"; @injectable() export class RagfairServer diff --git a/project/src/servers/SaveServer.ts b/project/src/servers/SaveServer.ts index 73e3941c..dcf5c32e 100644 --- a/project/src/servers/SaveServer.ts +++ b/project/src/servers/SaveServer.ts @@ -1,13 +1,13 @@ import { inject, injectAll, injectable } from "tsyringe"; -import { SaveLoadRouter } from "@spt-aki/di/Router"; -import { IAkiProfile, Info } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { SaveLoadRouter } from "@spt/di/Router"; +import { ISptProfile, Info } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; import { ConfigServer } from "./ConfigServer"; @injectable() @@ -35,7 +35,7 @@ export class SaveServer * @param id Id for save callback * @param callback Callback to execute prior to running SaveServer.saveProfile() */ - public addBeforeSaveCallback(id: string, callback: (profile: Partial) => Partial): void + public addBeforeSaveCallback(id: string, callback: (profile: Partial) => Partial): void { this.onBeforeSaveCallbacks[id] = callback; } @@ -93,9 +93,9 @@ export class SaveServer /** * Get a player profile from memory * @param sessionId Session id - * @returns IAkiProfile + * @returns ISptProfile */ - public getProfile(sessionId: string): IAkiProfile + public getProfile(sessionId: string): ISptProfile { if (!sessionId) { @@ -117,9 +117,9 @@ export class SaveServer /** * Get all profiles from memory - * @returns Dictionary of IAkiProfile + * @returns Dictionary of ISptProfile */ - public getProfiles(): Record + public getProfiles(): Record { return this.profiles; } @@ -158,7 +158,7 @@ export class SaveServer * Add full profile in memory by key (info.id) * @param profileDetails Profile to save */ - public addProfile(profileDetails: IAkiProfile): void + public addProfile(profileDetails: ISptProfile): void { this.profiles[profileDetails.info.id] = profileDetails; } diff --git a/project/src/servers/WebSocketServer.ts b/project/src/servers/WebSocketServer.ts index 004ae6ca..aaa7873f 100644 --- a/project/src/servers/WebSocketServer.ts +++ b/project/src/servers/WebSocketServer.ts @@ -1,11 +1,11 @@ import http, { IncomingMessage } from "node:http"; import { inject, injectAll, injectable } from "tsyringe"; import { WebSocket, Server } from "ws"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; import { IWebSocketConnectionHandler } from "./ws/IWebSocketConnectionHandler"; @injectable() diff --git a/project/src/servers/http/AkiHttpListener.ts b/project/src/servers/http/SptHttpListener.ts similarity index 93% rename from project/src/servers/http/AkiHttpListener.ts rename to project/src/servers/http/SptHttpListener.ts index 24e5af65..36472b83 100644 --- a/project/src/servers/http/AkiHttpListener.ts +++ b/project/src/servers/http/SptHttpListener.ts @@ -1,16 +1,16 @@ import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from "node:http"; import zlib from "node:zlib"; import { inject, injectAll, injectable } from "tsyringe"; -import { Serializer } from "@spt-aki/di/Serializer"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { HttpRouter } from "@spt-aki/routers/HttpRouter"; -import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { Serializer } from "@spt/di/Serializer"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { HttpRouter } from "@spt/routers/HttpRouter"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; @injectable() -export class AkiHttpListener implements IHttpListener +export class SptHttpListener implements IHttpListener { constructor( @inject("HttpRouter") protected httpRouter: HttpRouter, // TODO: delay required diff --git a/project/src/servers/ws/AkiWebSocketConnectionHandler.ts b/project/src/servers/ws/SptWebSocketConnectionHandler.ts similarity index 75% rename from project/src/servers/ws/AkiWebSocketConnectionHandler.ts rename to project/src/servers/ws/SptWebSocketConnectionHandler.ts index ca2caa61..150eb513 100644 --- a/project/src/servers/ws/AkiWebSocketConnectionHandler.ts +++ b/project/src/servers/ws/SptWebSocketConnectionHandler.ts @@ -1,20 +1,20 @@ import { IncomingMessage } from "http"; import { inject, injectAll, injectable } from "tsyringe"; import { WebSocket } from "ws"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { NotificationEventType } from "@spt-aki/models/enums/NotificationEventType"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { IWebSocketConnectionHandler } from "@spt-aki/servers/ws/IWebSocketConnectionHandler"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { IAkiWebSocketMessageHandler } from "./message/IAkiWebSocketMessageHandler"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { NotificationEventType } from "@spt/models/enums/NotificationEventType"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { ISptWebSocketMessageHandler } from "./message/ISptWebSocketMessageHandler"; @injectable() -export class AkiWebSocketConnectionHandler implements IWebSocketConnectionHandler +export class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler { protected httpConfig: IHttpConfig; protected webSockets: Map = new Map(); @@ -27,7 +27,7 @@ export class AkiWebSocketConnectionHandler implements IWebSocketConnectionHandle @inject("LocalisationService") protected localisationService: LocalisationService, @inject("ConfigServer") protected configServer: ConfigServer, @inject("JsonUtil") protected jsonUtil: JsonUtil, - @injectAll("AkiWebSocketMessageHandler") protected akiWebSocketMessageHandlers: IAkiWebSocketMessageHandler[], + @injectAll("SptWebSocketMessageHandler") protected sptWebSocketMessageHandlers: ISptWebSocketMessageHandler[], ) { this.httpConfig = this.configServer.getConfig(ConfigTypes.HTTP); @@ -35,7 +35,7 @@ export class AkiWebSocketConnectionHandler implements IWebSocketConnectionHandle public getSocketId(): string { - return "AKI WebSocket Handler"; + return "SPT WebSocket Handler"; } public getHookUrl(): string @@ -61,7 +61,7 @@ export class AkiWebSocketConnectionHandler implements IWebSocketConnectionHandle clearInterval(this.websocketPingHandler); } - ws.on("message", (msg) => this.akiWebSocketMessageHandlers.forEach((wsmh) => wsmh.onAkiMessage(sessionID, this.webSockets.get(sessionID), msg))); + ws.on("message", (msg) => this.sptWebSocketMessageHandlers.forEach((wsmh) => wsmh.onSptMessage(sessionID, this.webSockets.get(sessionID), msg))); this.websocketPingHandler = setInterval(() => { diff --git a/project/src/servers/ws/message/DefaultAkiWebSocketMessageHandler.ts b/project/src/servers/ws/message/DefaultAkiWebSocketMessageHandler.ts deleted file mode 100644 index 0b8b4f2b..00000000 --- a/project/src/servers/ws/message/DefaultAkiWebSocketMessageHandler.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { inject, injectable } from "tsyringe"; -import { RawData, WebSocket } from "ws"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { IAkiWebSocketMessageHandler } from "@spt-aki/servers/ws/message/IAkiWebSocketMessageHandler"; - -@injectable() -export class DefaultAkiWebSocketMessageHandler implements IAkiWebSocketMessageHandler -{ - constructor(@inject("WinstonLogger") protected logger: ILogger) - {} - - public onAkiMessage(sessionId: string, client: WebSocket, message: RawData): void - { - this.logger.debug(`[${sessionId}] AKI message received: ${message}`); - } -} diff --git a/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts b/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts new file mode 100644 index 00000000..6e1f0d4b --- /dev/null +++ b/project/src/servers/ws/message/DefaultSptWebSocketMessageHandler.ts @@ -0,0 +1,16 @@ +import { inject, injectable } from "tsyringe"; +import { RawData, WebSocket } from "ws"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler"; + +@injectable() +export class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler +{ + constructor(@inject("WinstonLogger") protected logger: ILogger) + {} + + public onSptMessage(sessionId: string, client: WebSocket, message: RawData): void + { + this.logger.debug(`[${sessionId}] SPT message received: ${message}`); + } +} diff --git a/project/src/servers/ws/message/IAkiWebSocketMessageHandler.ts b/project/src/servers/ws/message/IAkiWebSocketMessageHandler.ts deleted file mode 100644 index b766c117..00000000 --- a/project/src/servers/ws/message/IAkiWebSocketMessageHandler.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { RawData, WebSocket } from "ws"; - -export interface IAkiWebSocketMessageHandler -{ - onAkiMessage(sessionID: string, client: WebSocket, message: RawData): void -} diff --git a/project/src/servers/ws/message/ISptWebSocketMessageHandler.ts b/project/src/servers/ws/message/ISptWebSocketMessageHandler.ts new file mode 100644 index 00000000..ddc7cfec --- /dev/null +++ b/project/src/servers/ws/message/ISptWebSocketMessageHandler.ts @@ -0,0 +1,6 @@ +import { RawData, WebSocket } from "ws"; + +export interface ISptWebSocketMessageHandler +{ + onSptMessage(sessionID: string, client: WebSocket, message: RawData): void +} diff --git a/project/src/services/BotEquipmentFilterService.ts b/project/src/services/BotEquipmentFilterService.ts index bc2be4ac..e25930ac 100644 --- a/project/src/services/BotEquipmentFilterService.ts +++ b/project/src/services/BotEquipmentFilterService.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { EquipmentChances, Generation, GenerationData, IBotType, ModsChances, -} from "@spt-aki/models/eft/common/tables/IBotType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; +} from "@spt/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; import { EquipmentFilterDetails, EquipmentFilters, IAdjustmentDetails, IBotConfig, WeightingAdjustmentDetails, -} from "@spt-aki/models/spt/config/IBotConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +} from "@spt/models/spt/config/IBotConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; @injectable() export class BotEquipmentFilterService diff --git a/project/src/services/BotEquipmentModPoolService.ts b/project/src/services/BotEquipmentModPoolService.ts index a3feccf9..f9ba2c14 100644 --- a/project/src/services/BotEquipmentModPoolService.ts +++ b/project/src/services/BotEquipmentModPoolService.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Mods } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Mods } from "@spt/models/eft/common/tables/IBotType"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @injectable() diff --git a/project/src/services/BotGenerationCacheService.ts b/project/src/services/BotGenerationCacheService.ts index dd9cacf0..b2a671c9 100644 --- a/project/src/services/BotGenerationCacheService.ts +++ b/project/src/services/BotGenerationCacheService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class BotGenerationCacheService diff --git a/project/src/services/BotLootCacheService.ts b/project/src/services/BotLootCacheService.ts index be1acca8..364e0348 100644 --- a/project/src/services/BotLootCacheService.ts +++ b/project/src/services/BotLootCacheService.ts @@ -1,15 +1,15 @@ import { inject, injectable } from "tsyringe"; -import { PMCLootGenerator } from "@spt-aki/generators/PMCLootGenerator"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { IBotType } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { IBotLootCache, LootCacheType } from "@spt-aki/models/spt/bots/IBotLootCache"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { PMCLootGenerator } from "@spt/generators/PMCLootGenerator"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { IBotType } from "@spt/models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { IBotLootCache, LootCacheType } from "@spt/models/spt/bots/IBotLootCache"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class BotLootCacheService diff --git a/project/src/services/BotWeaponModLimitService.ts b/project/src/services/BotWeaponModLimitService.ts index 119d948c..b9b44602 100644 --- a/project/src/services/BotWeaponModLimitService.ts +++ b/project/src/services/BotWeaponModLimitService.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; export class BotModLimits { diff --git a/project/src/services/CustomLocationWaveService.ts b/project/src/services/CustomLocationWaveService.ts index 27ca2e0f..e6efe6cf 100644 --- a/project/src/services/CustomLocationWaveService.ts +++ b/project/src/services/CustomLocationWaveService.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { BossLocationSpawn, ILocationBase, Wave } from "@spt-aki/models/eft/common/ILocationBase"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { BossLocationSpawn, ILocationBase, Wave } from "@spt/models/eft/common/ILocationBase"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class CustomLocationWaveService diff --git a/project/src/services/FenceService.ts b/project/src/services/FenceService.ts index 7f315e70..a23d258c 100644 --- a/project/src/services/FenceService.ts +++ b/project/src/services/FenceService.ts @@ -1,29 +1,29 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { IFenceLevel } from "@spt-aki/models/eft/common/IGlobals"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item, Repairable } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IBarterScheme, ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IItemDurabilityCurrentMax, ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ICreateFenceAssortsResult } from "@spt-aki/models/spt/fence/ICreateFenceAssortsResult"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { IFenceLevel } from "@spt/models/eft/common/IGlobals"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item, Repairable } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IBarterScheme, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { Traders } from "@spt/models/enums/Traders"; +import { IItemDurabilityCurrentMax, ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ICreateFenceAssortsResult } from "@spt/models/spt/fence/ICreateFenceAssortsResult"; import { IFenceAssortGenerationValues, IGenerationAssortValues, -} from "@spt-aki/models/spt/fence/IFenceAssortGenerationValues"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +} from "@spt/models/spt/fence/IFenceAssortGenerationValues"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** * Handle actions surrounding Fence diff --git a/project/src/services/GiftService.ts b/project/src/services/GiftService.ts index 2bdda269..0c03bdcf 100644 --- a/project/src/services/GiftService.ts +++ b/project/src/services/GiftService.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { GiftSenderType } from "@spt-aki/models/enums/GiftSenderType"; -import { GiftSentResult } from "@spt-aki/models/enums/GiftSentResult"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { Gift, IGiftsConfig } from "@spt-aki/models/spt/config/IGiftsConfig"; -import { ISendMessageDetails } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { GiftSenderType } from "@spt/models/enums/GiftSenderType"; +import { GiftSentResult } from "@spt/models/enums/GiftSentResult"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; +import { Gift, IGiftsConfig } from "@spt/models/spt/config/IGiftsConfig"; +import { ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class GiftService diff --git a/project/src/services/InsuranceService.ts b/project/src/services/InsuranceService.ts index 80a4366b..4bb8ee10 100644 --- a/project/src/services/InsuranceService.ts +++ b/project/src/services/InsuranceService.ts @@ -1,31 +1,31 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { SecureContainerHelper } from "@spt-aki/helpers/SecureContainerHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IInsuredItemsData } from "@spt-aki/models/eft/inRaid/IInsuredItemsData"; -import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { IInsuranceConfig } from "@spt-aki/models/spt/config/IInsuranceConfig"; -import { ILostOnDeathConfig } from "@spt-aki/models/spt/config/ILostOnDeathConfig"; -import { IInsuranceEquipmentPkg } from "@spt-aki/models/spt/services/IInsuranceEquipmentPkg"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MailSendService } from "@spt-aki/services/MailSendService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { SecureContainerHelper } from "@spt/helpers/SecureContainerHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IInsuredItemsData } from "@spt/models/eft/inRaid/IInsuredItemsData"; +import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig"; +import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; +import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MailSendService } from "@spt/services/MailSendService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class InsuranceService diff --git a/project/src/services/ItemBaseClassService.ts b/project/src/services/ItemBaseClassService.ts index e0dd17fd..78aff19b 100644 --- a/project/src/services/ItemBaseClassService.ts +++ b/project/src/services/ItemBaseClassService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; /** * Cache the baseids for each item in the tiems db inside a dictionary diff --git a/project/src/services/ItemFilterService.ts b/project/src/services/ItemFilterService.ts index 15238801..a7ca508d 100644 --- a/project/src/services/ItemFilterService.ts +++ b/project/src/services/ItemFilterService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IItemConfig } from "@spt-aki/models/spt/config/IItemConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IItemConfig } from "@spt/models/spt/config/IItemConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; /** Centralise the handling of blacklisting items, uses blacklist found in config/item.json, stores items that should not be used by players / broken items */ @injectable() diff --git a/project/src/services/LocaleService.ts b/project/src/services/LocaleService.ts index 1b6c0bca..7f7d5335 100644 --- a/project/src/services/LocaleService.ts +++ b/project/src/services/LocaleService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ILocaleConfig } from "@spt-aki/models/spt/config/ILocaleConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ILocaleConfig } from "@spt/models/spt/config/ILocaleConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; /** * Handles getting locales from config or users machine diff --git a/project/src/services/LocalisationService.ts b/project/src/services/LocalisationService.ts index ac42371e..90de2b62 100644 --- a/project/src/services/LocalisationService.ts +++ b/project/src/services/LocalisationService.ts @@ -1,10 +1,10 @@ import path from "node:path"; import { I18n } from "i18n"; import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocaleService } from "@spt-aki/services/LocaleService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocaleService } from "@spt/services/LocaleService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; /** * Handles translating server text into different langauges @@ -24,7 +24,7 @@ export class LocalisationService const localeFileDirectory = path.join( process.cwd(), globalThis.G_RELEASE_CONFIGURATION - ? "Aki_Data/Server/database/locales/server" + ? "SPT_Data/Server/database/locales/server" : "./assets/database/locales/server", ); this.i18n = new I18n({ diff --git a/project/src/services/MailSendService.ts b/project/src/services/MailSendService.ts index dcff18fc..c0f6e9ff 100644 --- a/project/src/services/MailSendService.ts +++ b/project/src/services/MailSendService.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { DialogueHelper } from "@spt-aki/helpers/DialogueHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; -import { NotifierHelper } from "@spt-aki/helpers/NotifierHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { Dialogue, IUserDialogInfo, Message, MessageItems } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { IProfileChangeEvent, ISendMessageDetails } from "@spt-aki/models/spt/dialog/ISendMessageDetails"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { DialogueHelper } from "@spt/helpers/DialogueHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper"; +import { NotifierHelper } from "@spt/helpers/NotifierHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { Dialogue, IUserDialogInfo, Message, MessageItems } from "@spt/models/eft/profile/ISptProfile"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { Traders } from "@spt/models/enums/Traders"; +import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class MailSendService diff --git a/project/src/services/MatchBotDetailsCacheService.ts b/project/src/services/MatchBotDetailsCacheService.ts index 04fa38b4..33e5515c 100644 --- a/project/src/services/MatchBotDetailsCacheService.ts +++ b/project/src/services/MatchBotDetailsCacheService.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { IBotBase } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { IBotBase } from "@spt/models/eft/common/tables/IBotBase"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { LocalisationService } from "@spt/services/LocalisationService"; /** Cache bots in a dictionary, keyed by the bots name, keying by name isnt ideal as its not unique but this is used by the post-raid system which doesnt have any bot ids, only name */ @injectable() diff --git a/project/src/services/MatchLocationService.ts b/project/src/services/MatchLocationService.ts index ad93afc7..c79cad0a 100644 --- a/project/src/services/MatchLocationService.ts +++ b/project/src/services/MatchLocationService.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class MatchLocationService diff --git a/project/src/services/ModCompilerService.ts b/project/src/services/ModCompilerService.ts index f56ea4e8..0cb12776 100644 --- a/project/src/services/ModCompilerService.ts +++ b/project/src/services/ModCompilerService.ts @@ -2,10 +2,10 @@ import fs from "node:fs"; import path from "node:path"; import { inject, injectable } from "tsyringe"; -import ts from "typescript"; -import type { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ModHashCacheService } from "@spt-aki/services/cache/ModHashCacheService"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ScriptTarget, ModuleKind, ModuleResolutionKind, transpileModule, CompilerOptions } from "typescript"; +import type { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ModHashCacheService } from "@spt/services/cache/ModHashCacheService"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class ModCompilerService @@ -63,9 +63,9 @@ export class ModCompilerService return this.compile(modTypeScriptFiles, { noEmitOnError: true, noImplicitAny: false, - target: ts.ScriptTarget.ES2022, - module: ts.ModuleKind.CommonJS, - moduleResolution: ts.ModuleResolutionKind.Node10, + target: ScriptTarget.ES2022, + module: ModuleKind.CommonJS, + moduleResolution: ModuleResolutionKind.Node10, sourceMap: true, resolveJsonModule: true, allowJs: true, @@ -82,7 +82,7 @@ export class ModCompilerService * @param fileNames Paths to TS files * @param options Compiler options */ - protected async compile(fileNames: string[], options: ts.CompilerOptions): Promise + protected async compile(fileNames: string[], options: CompilerOptions): Promise { // C:/snapshot/project || /snapshot/project const baseDir: string = __dirname.replace(/\\/g, "/").split("/").slice(0, 3).join("/"); @@ -97,7 +97,7 @@ export class ModCompilerService if (globalThis.G_RELEASE_CONFIGURATION) { - replacedText = text.replace(/(@spt-aki)/g, `${baseDir}/obj`); + replacedText = text.replace(/(@spt)/g, `${baseDir}/obj`); for (const dependency of this.serverDependencies) { replacedText = replacedText.replace(`"${dependency}"`, `"${baseDir}/node_modules/${dependency}"`); @@ -105,10 +105,10 @@ export class ModCompilerService } else { - replacedText = text.replace(/(@spt-aki)/g, path.join(__dirname, "..").replace(/\\/g, "/")); + replacedText = text.replace(/(@spt)/g, path.join(__dirname, "..").replace(/\\/g, "/")); } - const output = ts.transpileModule(replacedText, { compilerOptions: options }); + const output = transpileModule(replacedText, { compilerOptions: options }); if (output.sourceMapText) { diff --git a/project/src/services/NotificationService.ts b/project/src/services/NotificationService.ts index 57d89aa4..3f00ae3d 100644 --- a/project/src/services/NotificationService.ts +++ b/project/src/services/NotificationService.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import { IWsNotificationEvent } from "@spt-aki/models/eft/ws/IWsNotificationEvent"; +import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent"; @injectable() export class NotificationService diff --git a/project/src/services/OpenZoneService.ts b/project/src/services/OpenZoneService.ts index 4b207f16..b42dd21d 100644 --- a/project/src/services/OpenZoneService.ts +++ b/project/src/services/OpenZoneService.ts @@ -1,12 +1,12 @@ import { inject, injectable } from "tsyringe"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ @injectable() diff --git a/project/src/services/PaymentService.ts b/project/src/services/PaymentService.ts index f2a8219d..594b9229 100644 --- a/project/src/services/PaymentService.ts +++ b/project/src/services/PaymentService.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @injectable() export class PaymentService diff --git a/project/src/services/PlayerService.ts b/project/src/services/PlayerService.ts index d8fd5bf1..da9f3c2b 100644 --- a/project/src/services/PlayerService.ts +++ b/project/src/services/PlayerService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class PlayerService diff --git a/project/src/services/PmcChatResponseService.ts b/project/src/services/PmcChatResponseService.ts index 22f15283..fb24249d 100644 --- a/project/src/services/PmcChatResponseService.ts +++ b/project/src/services/PmcChatResponseService.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { NotificationSendHelper } from "@spt-aki/helpers/NotificationSendHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Aggressor, Victim } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IUserDialogInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; -import { IPmcChatResponse } from "@spt-aki/models/spt/config/IPmChatResponse"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Aggressor, Victim } from "@spt/models/eft/common/tables/IBotBase"; +import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { MessageType } from "@spt/models/enums/MessageType"; +import { IPmcChatResponse } from "@spt/models/spt/config/IPmChatResponse"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class PmcChatResponseService diff --git a/project/src/services/ProfileFixerService.ts b/project/src/services/ProfileFixerService.ts index 16e1e051..969f1c0e 100644 --- a/project/src/services/ProfileFixerService.ts +++ b/project/src/services/ProfileFixerService.ts @@ -1,31 +1,31 @@ import { inject, injectable } from "tsyringe"; -import { HideoutHelper } from "@spt-aki/helpers/HideoutHelper"; -import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Bonus, HideoutSlot, IQuestStatus, IHideoutImprovement } from "@spt-aki/models/eft/common/tables/IBotBase"; -import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { StageBonus } from "@spt-aki/models/eft/hideout/IHideoutArea"; -import { IAkiProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { HideoutAreas } from "@spt-aki/models/enums/HideoutAreas"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { Traders } from "@spt-aki/models/enums/Traders"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; -import { Watermark } from "@spt-aki/utils/Watermark"; +import { HideoutHelper } from "@spt/helpers/HideoutHelper"; +import { InventoryHelper } from "@spt/helpers/InventoryHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Bonus, HideoutSlot, IQuestStatus, IHideoutImprovement } from "@spt/models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea"; +import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { HideoutAreas } from "@spt/models/enums/HideoutAreas"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { Traders } from "@spt/models/enums/Traders"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; +import { Watermark } from "@spt/utils/Watermark"; @injectable() export class ProfileFixerService @@ -395,12 +395,12 @@ export class ProfileFixerService * Add tag to profile to indicate when it was made * @param fullProfile */ - public addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void + public addMissingSptVersionTagToProfile(fullProfile: ISptProfile): void { - if (!fullProfile.aki) + if (!fullProfile.spt) { - this.logger.debug("Adding aki object to profile"); - fullProfile.aki = { version: this.watermark.getVersionTag(), receivedGifts: [] }; + this.logger.debug("Adding spt object to profile"); + fullProfile.spt = { version: this.watermark.getVersionTag(), receivedGifts: [] }; } } @@ -869,7 +869,7 @@ export class ProfileFixerService * @param sessionId Session id * @param pmcProfile Profile to check inventory of */ - public checkForOrphanedModdedItems(sessionId: string, fullProfile: IAkiProfile): void + public checkForOrphanedModdedItems(sessionId: string, fullProfile: ISptProfile): void { const itemsDb = this.databaseServer.getTables().templates.items; const pmcProfile = fullProfile.characters.pmc; @@ -1257,7 +1257,7 @@ export class ProfileFixerService * Iterate over associated profile template and check all hideout areas exist, add if not * @param fullProfile Profile to update */ - public addMissingHideoutAreasToProfile(fullProfile: IAkiProfile): void + public addMissingHideoutAreasToProfile(fullProfile: ISptProfile): void { const pmcProfile = fullProfile.characters.pmc; // No profile, probably new account being created @@ -1309,7 +1309,7 @@ export class ProfileFixerService * We store the old AID value in new field `sessionId` * @param fullProfile Profile to update */ - public fixIncorrectAidValue(fullProfile: IAkiProfile): void + public fixIncorrectAidValue(fullProfile: ISptProfile): void { // Not a number, regenerate // biome-ignore lint/suspicious/noGlobalIsNan: @@ -1333,7 +1333,7 @@ export class ProfileFixerService * Bsg nested `stats` into a sub object called 'eft' * @param fullProfile Profile to check for and migrate stats data */ - public migrateStatsToNewStructure(fullProfile: IAkiProfile): void + public migrateStatsToNewStructure(fullProfile: ISptProfile): void { // Data is in old structure, migrate if ("OverallCounters" in fullProfile.characters.pmc.Stats) diff --git a/project/src/services/ProfileSnapshotService.ts b/project/src/services/ProfileSnapshotService.ts index 5f5b4a81..935a0d15 100644 --- a/project/src/services/ProfileSnapshotService.ts +++ b/project/src/services/ProfileSnapshotService.ts @@ -1,11 +1,11 @@ import { inject, injectable } from "tsyringe"; -import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { ISptProfile } from "@spt/models/eft/profile/ISptProfile"; +import { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class ProfileSnapshotService { - protected storedProfileSnapshots: Record = {}; + protected storedProfileSnapshots: Record = {}; constructor(@inject("RecursiveCloner") protected cloner: ICloner) {} @@ -15,7 +15,7 @@ export class ProfileSnapshotService * @param sessionID session id - acts as the key * @param profile - profile to save */ - public storeProfileSnapshot(sessionID: string, profile: IAkiProfile): void + public storeProfileSnapshot(sessionID: string, profile: ISptProfile): void { this.storedProfileSnapshots[sessionID] = this.cloner.clone(profile); } @@ -25,7 +25,7 @@ export class ProfileSnapshotService * @param sessionID key * @returns A player profile object */ - public getProfileSnapshot(sessionID: string): IAkiProfile + public getProfileSnapshot(sessionID: string): ISptProfile { if (this.storedProfileSnapshots[sessionID]) { diff --git a/project/src/services/RagfairCategoriesService.ts b/project/src/services/RagfairCategoriesService.ts index ccc17b7d..4df0ac74 100644 --- a/project/src/services/RagfairCategoriesService.ts +++ b/project/src/services/RagfairCategoriesService.ts @@ -1,9 +1,9 @@ import { inject, injectable } from "tsyringe"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ISearchRequestData, OfferOwnerType } from "@spt-aki/models/eft/ragfair/ISearchRequestData"; -import { MemberCategory } from "@spt-aki/models/enums/MemberCategory"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ISearchRequestData, OfferOwnerType } from "@spt/models/eft/ragfair/ISearchRequestData"; +import { MemberCategory } from "@spt/models/enums/MemberCategory"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; @injectable() export class RagfairCategoriesService diff --git a/project/src/services/RagfairLinkedItemService.ts b/project/src/services/RagfairLinkedItemService.ts index 1953075f..078eec3b 100644 --- a/project/src/services/RagfairLinkedItemService.ts +++ b/project/src/services/RagfairLinkedItemService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; @injectable() export class RagfairLinkedItemService diff --git a/project/src/services/RagfairOfferService.ts b/project/src/services/RagfairOfferService.ts index dbceb2c3..e172ebc7 100644 --- a/project/src/services/RagfairOfferService.ts +++ b/project/src/services/RagfairOfferService.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { SaveServer } from "@spt-aki/servers/SaveServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; -import { RagfairOfferHolder } from "@spt-aki/utils/RagfairOfferHolder"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { SaveServer } from "@spt/servers/SaveServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; +import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class RagfairOfferService diff --git a/project/src/services/RagfairPriceService.ts b/project/src/services/RagfairPriceService.ts index f8f7ed5e..b42b48c6 100644 --- a/project/src/services/RagfairPriceService.ts +++ b/project/src/services/RagfairPriceService.ts @@ -1,24 +1,24 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { IPreset } from "@spt-aki/models/eft/common/IGlobals"; -import { HandbookItem } from "@spt-aki/models/eft/common/tables/IHandbookBase"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { IBarterScheme } from "@spt-aki/models/eft/common/tables/ITrader"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Money } from "@spt-aki/models/enums/Money"; -import { IRagfairConfig, IUnreasonableModPrices } from "@spt-aki/models/spt/config/IRagfairConfig"; -import { IRagfairServerPrices } from "@spt-aki/models/spt/ragfair/IRagfairServerPrices"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { OnLoad } from "@spt/di/OnLoad"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { PresetHelper } from "@spt/helpers/PresetHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { MinMax } from "@spt/models/common/MinMax"; +import { IPreset } from "@spt/models/eft/common/IGlobals"; +import { HandbookItem } from "@spt/models/eft/common/tables/IHandbookBase"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Money } from "@spt/models/enums/Money"; +import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; /** * Stores flea prices for items as well as methods to interact with them diff --git a/project/src/services/RagfairRequiredItemsService.ts b/project/src/services/RagfairRequiredItemsService.ts index 7040c99b..c76dc784 100644 --- a/project/src/services/RagfairRequiredItemsService.ts +++ b/project/src/services/RagfairRequiredItemsService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService"; +import { PaymentHelper } from "@spt/helpers/PaymentHelper"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { RagfairOfferService } from "@spt/services/RagfairOfferService"; @injectable() export class RagfairRequiredItemsService diff --git a/project/src/services/RagfairTaxService.ts b/project/src/services/RagfairTaxService.ts index 5ee546de..7d856ee7 100644 --- a/project/src/services/RagfairTaxService.ts +++ b/project/src/services/RagfairTaxService.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IStorePlayerOfferTaxAmountRequestData } from "@spt-aki/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; @injectable() export class RagfairTaxService diff --git a/project/src/services/RaidTimeAdjustmentService.ts b/project/src/services/RaidTimeAdjustmentService.ts index efdcd963..34130563 100644 --- a/project/src/services/RaidTimeAdjustmentService.ts +++ b/project/src/services/RaidTimeAdjustmentService.ts @@ -1,21 +1,21 @@ import { inject, injectable } from "tsyringe"; -import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; -import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { IGetRaidTimeRequest } from "@spt-aki/models/eft/game/IGetRaidTimeRequest"; -import { ExtractChange, IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; +import { ApplicationContext } from "@spt/context/ApplicationContext"; +import { ContextVariableType } from "@spt/context/ContextVariableType"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; +import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest"; +import { ExtractChange, IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier, -} from "@spt-aki/models/spt/config/ILocationConfig"; -import { IRaidChanges } from "@spt-aki/models/spt/location/IRaidChanges"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +} from "@spt/models/spt/config/ILocationConfig"; +import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class RaidTimeAdjustmentService diff --git a/project/src/services/RepairService.ts b/project/src/services/RepairService.ts index c9d12f39..292ee77b 100644 --- a/project/src/services/RepairService.ts +++ b/project/src/services/RepairService.ts @@ -1,28 +1,28 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { RepairHelper } from "@spt-aki/helpers/RepairHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper"; -import { IArmorType } from "@spt-aki/models/eft/common/IGlobals"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { RepairKitsInfo } from "@spt-aki/models/eft/repair/IRepairActionDataRequest"; -import { RepairItem } from "@spt-aki/models/eft/repair/ITraderRepairActionDataRequest"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; -import { BonusType } from "@spt-aki/models/enums/BonusType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { SkillTypes } from "@spt-aki/models/enums/SkillTypes"; -import { BonusSettings, IRepairConfig } from "@spt-aki/models/spt/config/IRepairConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { PaymentService } from "@spt-aki/services/PaymentService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { RepairHelper } from "@spt/helpers/RepairHelper"; +import { TraderHelper } from "@spt/helpers/TraderHelper"; +import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; +import { IArmorType } from "@spt/models/eft/common/IGlobals"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { RepairKitsInfo } from "@spt/models/eft/repair/IRepairActionDataRequest"; +import { RepairItem } from "@spt/models/eft/repair/ITraderRepairActionDataRequest"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; +import { BonusType } from "@spt/models/enums/BonusType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { SkillTypes } from "@spt/models/enums/SkillTypes"; +import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { PaymentService } from "@spt/services/PaymentService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; @injectable() export class RepairService diff --git a/project/src/services/SeasonalEventService.ts b/project/src/services/SeasonalEventService.ts index f4c2f2b1..34763a90 100644 --- a/project/src/services/SeasonalEventService.ts +++ b/project/src/services/SeasonalEventService.ts @@ -1,23 +1,23 @@ import { inject, injectable } from "tsyringe"; -import { BotHelper } from "@spt-aki/helpers/BotHelper"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { IConfig } from "@spt-aki/models/eft/common/IGlobals"; -import { ILocation } from "@spt-aki/models/eft/common/ILocation"; -import { BossLocationSpawn } from "@spt-aki/models/eft/common/ILocationBase"; -import { Inventory } from "@spt-aki/models/eft/common/tables/IBotType"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { Season } from "@spt-aki/models/enums/Season"; -import { SeasonalEventType } from "@spt-aki/models/enums/SeasonalEventType"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { IQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig"; -import { ISeasonalEvent, ISeasonalEventConfig } from "@spt-aki/models/spt/config/ISeasonalEventConfig"; -import { IWeatherConfig } from "@spt-aki/models/spt/config/IWeatherConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { GiftService } from "@spt-aki/services/GiftService"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { DatabaseImporter } from "@spt-aki/utils/DatabaseImporter"; +import { BotHelper } from "@spt/helpers/BotHelper"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { IConfig } from "@spt/models/eft/common/IGlobals"; +import { ILocation } from "@spt/models/eft/common/ILocation"; +import { BossLocationSpawn } from "@spt/models/eft/common/ILocationBase"; +import { Inventory } from "@spt/models/eft/common/tables/IBotType"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { Season } from "@spt/models/enums/Season"; +import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; +import { ISeasonalEvent, ISeasonalEventConfig } from "@spt/models/spt/config/ISeasonalEventConfig"; +import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { GiftService } from "@spt/services/GiftService"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { DatabaseImporter } from "@spt/utils/DatabaseImporter"; @injectable() export class SeasonalEventService diff --git a/project/src/services/TraderAssortService.ts b/project/src/services/TraderAssortService.ts index 77e6cd0b..ec7b9835 100644 --- a/project/src/services/TraderAssortService.ts +++ b/project/src/services/TraderAssortService.ts @@ -1,4 +1,4 @@ -import { ITraderAssort } from "@spt-aki/models/eft/common/tables/ITrader"; +import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; export class TraderAssortService { diff --git a/project/src/services/TraderPurchasePersisterService.ts b/project/src/services/TraderPurchasePersisterService.ts index 81f94c98..a6318238 100644 --- a/project/src/services/TraderPurchasePersisterService.ts +++ b/project/src/services/TraderPurchasePersisterService.ts @@ -1,13 +1,13 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { TraderPurchaseData } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ITraderConfig } from "@spt-aki/models/spt/config/ITraderConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { RandomUtil } from "@spt-aki/utils/RandomUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { TraderPurchaseData } from "@spt/models/eft/profile/ISptProfile"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { RandomUtil } from "@spt/utils/RandomUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; /** * Help with storing limited item purchases from traders in profile to persist them over server restarts diff --git a/project/src/services/TraderServicesService.ts b/project/src/services/TraderServicesService.ts index 15cb77fd..e8b476ff 100644 --- a/project/src/services/TraderServicesService.ts +++ b/project/src/services/TraderServicesService.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; -import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; -import { ITraderServiceModel } from "@spt-aki/models/spt/services/ITraderServiceModel"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import { ProfileHelper } from "@spt/helpers/ProfileHelper"; +import { QuestStatus } from "@spt/models/enums/QuestStatus"; +import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class TraderServicesService diff --git a/project/src/services/cache/BundleHashCacheService.ts b/project/src/services/cache/BundleHashCacheService.ts index 034a97d4..2cc7421b 100644 --- a/project/src/services/cache/BundleHashCacheService.ts +++ b/project/src/services/cache/BundleHashCacheService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class BundleHashCacheService diff --git a/project/src/services/cache/ModHashCacheService.ts b/project/src/services/cache/ModHashCacheService.ts index 3cbe2f15..cd11d3cf 100644 --- a/project/src/services/cache/ModHashCacheService.ts +++ b/project/src/services/cache/ModHashCacheService.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class ModHashCacheService diff --git a/project/src/services/mod/CustomItemService.ts b/project/src/services/mod/CustomItemService.ts index e28dce4c..25b2bc01 100644 --- a/project/src/services/mod/CustomItemService.ts +++ b/project/src/services/mod/CustomItemService.ts @@ -1,19 +1,19 @@ import { inject, injectable } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { ITemplateItem, Props } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateItem"; +import { BaseClasses } from "@spt/models/enums/BaseClasses"; import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails, -} from "@spt-aki/models/spt/mod/NewItemDetails"; -import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +} from "@spt/models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { HashUtil } from "@spt/utils/HashUtil"; @injectable() export class CustomItemService diff --git a/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts b/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts index f2b1054c..65b9e928 100644 --- a/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts +++ b/project/src/services/mod/dynamicRouter/DynamicRouterMod.ts @@ -1,4 +1,4 @@ -import { DynamicRouter, RouteAction } from "@spt-aki/di/Router"; +import { DynamicRouter, RouteAction } from "@spt/di/Router"; export class DynamicRouterMod extends DynamicRouter { diff --git a/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts b/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts index 7c2b4839..e300bb4e 100644 --- a/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts +++ b/project/src/services/mod/dynamicRouter/DynamicRouterModService.ts @@ -1,6 +1,6 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { RouteAction } from "@spt-aki/di/Router"; -import { DynamicRouterMod } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterMod"; +import { RouteAction } from "@spt/di/Router"; +import { DynamicRouterMod } from "@spt/services/mod/dynamicRouter/DynamicRouterMod"; @injectable() export class DynamicRouterModService diff --git a/project/src/services/mod/httpListener/HttpListenerMod.ts b/project/src/services/mod/httpListener/HttpListenerMod.ts index 8a2905e3..bf563e19 100644 --- a/project/src/services/mod/httpListener/HttpListenerMod.ts +++ b/project/src/services/mod/httpListener/HttpListenerMod.ts @@ -1,5 +1,5 @@ import { IncomingMessage, ServerResponse } from "node:http"; -import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; export class HttpListenerMod implements IHttpListener { diff --git a/project/src/services/mod/httpListener/HttpListenerModService.ts b/project/src/services/mod/httpListener/HttpListenerModService.ts index a5c72ef5..a7086b7b 100644 --- a/project/src/services/mod/httpListener/HttpListenerModService.ts +++ b/project/src/services/mod/httpListener/HttpListenerModService.ts @@ -1,7 +1,7 @@ import { IncomingMessage, ServerResponse } from "node:http"; import { DependencyContainer, injectable } from "tsyringe"; -import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; -import { HttpListenerMod } from "@spt-aki/services/mod/httpListener/HttpListenerMod"; +import { IHttpListener } from "@spt/servers/http/IHttpListener"; +import { HttpListenerMod } from "@spt/services/mod/httpListener/HttpListenerMod"; @injectable() export class HttpListenerModService diff --git a/project/src/services/mod/onLoad/OnLoadMod.ts b/project/src/services/mod/onLoad/OnLoadMod.ts index b70b4644..5cb2fbeb 100644 --- a/project/src/services/mod/onLoad/OnLoadMod.ts +++ b/project/src/services/mod/onLoad/OnLoadMod.ts @@ -1,4 +1,4 @@ -import { OnLoad } from "@spt-aki/di/OnLoad"; +import { OnLoad } from "@spt/di/OnLoad"; export class OnLoadMod implements OnLoad { diff --git a/project/src/services/mod/onLoad/OnLoadModService.ts b/project/src/services/mod/onLoad/OnLoadModService.ts index 8d009c22..03bbb267 100644 --- a/project/src/services/mod/onLoad/OnLoadModService.ts +++ b/project/src/services/mod/onLoad/OnLoadModService.ts @@ -1,5 +1,5 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { OnLoadMod } from "@spt-aki/services/mod/onLoad/OnLoadMod"; +import { OnLoadMod } from "@spt/services/mod/onLoad/OnLoadMod"; @injectable() export class OnLoadModService diff --git a/project/src/services/mod/onUpdate/OnUpdateMod.ts b/project/src/services/mod/onUpdate/OnUpdateMod.ts index ac405571..50b7b3a8 100644 --- a/project/src/services/mod/onUpdate/OnUpdateMod.ts +++ b/project/src/services/mod/onUpdate/OnUpdateMod.ts @@ -1,4 +1,4 @@ -import { OnUpdate } from "@spt-aki/di/OnUpdate"; +import { OnUpdate } from "@spt/di/OnUpdate"; export class OnUpdateMod implements OnUpdate { diff --git a/project/src/services/mod/onUpdate/OnUpdateModService.ts b/project/src/services/mod/onUpdate/OnUpdateModService.ts index bd77bdcf..d8ce2e1e 100644 --- a/project/src/services/mod/onUpdate/OnUpdateModService.ts +++ b/project/src/services/mod/onUpdate/OnUpdateModService.ts @@ -1,5 +1,5 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { OnUpdateMod } from "@spt-aki/services/mod/onUpdate/OnUpdateMod"; +import { OnUpdateMod } from "@spt/services/mod/onUpdate/OnUpdateMod"; @injectable() export class OnUpdateModService diff --git a/project/src/services/mod/staticRouter/StaticRouterMod.ts b/project/src/services/mod/staticRouter/StaticRouterMod.ts index 01977a6f..b9002bff 100644 --- a/project/src/services/mod/staticRouter/StaticRouterMod.ts +++ b/project/src/services/mod/staticRouter/StaticRouterMod.ts @@ -1,4 +1,4 @@ -import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; +import { RouteAction, StaticRouter } from "@spt/di/Router"; export class StaticRouterMod extends StaticRouter { diff --git a/project/src/services/mod/staticRouter/StaticRouterModService.ts b/project/src/services/mod/staticRouter/StaticRouterModService.ts index 0b7dfe70..9afd6afe 100644 --- a/project/src/services/mod/staticRouter/StaticRouterModService.ts +++ b/project/src/services/mod/staticRouter/StaticRouterModService.ts @@ -1,6 +1,6 @@ import { DependencyContainer, injectable } from "tsyringe"; -import { RouteAction } from "@spt-aki/di/Router"; -import { StaticRouterMod } from "@spt-aki/services/mod/staticRouter/StaticRouterMod"; +import { RouteAction } from "@spt/di/Router"; +import { StaticRouterMod } from "@spt/services/mod/staticRouter/StaticRouterMod"; @injectable() export class StaticRouterModService diff --git a/project/src/utils/App.ts b/project/src/utils/App.ts index 27c984cf..8730ba0b 100644 --- a/project/src/utils/App.ts +++ b/project/src/utils/App.ts @@ -1,15 +1,15 @@ import os from "node:os"; import { inject, injectAll, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { OnUpdate } from "@spt-aki/di/OnUpdate"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { HttpServer } from "@spt-aki/servers/HttpServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { OnLoad } from "@spt/di/OnLoad"; +import { OnUpdate } from "@spt/di/OnUpdate"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { HttpServer } from "@spt/servers/HttpServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { EncodingUtil } from "@spt/utils/EncodingUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class App @@ -41,7 +41,7 @@ export class App this.logger.debug(`RAM: ${(os.totalmem() / 1024 / 1024 / 1024).toFixed(2)}GB`); this.logger.debug(`PATH: ${this.encodingUtil.toBase64(process.argv[0])}`); this.logger.debug(`PATH: ${this.encodingUtil.toBase64(process.execPath)}`); - this.logger.debug(`Server: ${globalThis.G_AKIVERSION || this.coreConfig.akiVersion}`); + this.logger.debug(`Server: ${globalThis.G_SPTVERSION || this.coreConfig.sptVersion}`); if (globalThis.G_BUILDTIME) { this.logger.debug(`Date: ${globalThis.G_BUILDTIME}`); diff --git a/project/src/utils/AsyncQueue.ts b/project/src/utils/AsyncQueue.ts index 86ef0701..abc45516 100644 --- a/project/src/utils/AsyncQueue.ts +++ b/project/src/utils/AsyncQueue.ts @@ -1,5 +1,5 @@ -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { ICommand } from "@spt/models/spt/utils/ICommand"; export class AsyncQueue implements IAsyncQueue { diff --git a/project/src/utils/DatabaseImporter.ts b/project/src/utils/DatabaseImporter.ts index 63f14f61..1b056712 100644 --- a/project/src/utils/DatabaseImporter.ts +++ b/project/src/utils/DatabaseImporter.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; -import { OnLoad } from "@spt-aki/di/OnLoad"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; -import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ImageRouter } from "@spt-aki/routers/ImageRouter"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { EncodingUtil } from "@spt-aki/utils/EncodingUtil"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { OnLoad } from "@spt/di/OnLoad"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; +import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ImageRouter } from "@spt/routers/ImageRouter"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { EncodingUtil } from "@spt/utils/EncodingUtil"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { ImporterUtil } from "@spt/utils/ImporterUtil"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class DatabaseImporter implements OnLoad @@ -39,12 +39,12 @@ export class DatabaseImporter implements OnLoad } /** - * Get path to aki data + * Get path to spt data * @returns path to data */ public getSptDataPath(): string { - return globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/" : "./assets/"; + return globalThis.G_RELEASE_CONFIGURATION ? "SPT_Data/Server/" : "./assets/"; } public async onLoad(): Promise @@ -124,7 +124,7 @@ export class DatabaseImporter implements OnLoad public getRoute(): string { - return "aki-database"; + return "spt-database"; } protected validateFile(filePathAndName: string, fileData: any): boolean diff --git a/project/src/utils/HashUtil.ts b/project/src/utils/HashUtil.ts index a6e59a06..546f3a51 100644 --- a/project/src/utils/HashUtil.ts +++ b/project/src/utils/HashUtil.ts @@ -2,7 +2,7 @@ import crypto from "node:crypto"; import fs from "node:fs"; import crc32 from "buffer-crc32"; import { inject, injectable } from "tsyringe"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class HashUtil diff --git a/project/src/utils/HttpFileUtil.ts b/project/src/utils/HttpFileUtil.ts index b070b08a..f7ad475c 100644 --- a/project/src/utils/HttpFileUtil.ts +++ b/project/src/utils/HttpFileUtil.ts @@ -1,7 +1,7 @@ import fs from "node:fs"; import { ServerResponse } from "node:http"; import { inject, injectable } from "tsyringe"; -import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; +import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; @injectable() export class HttpFileUtil diff --git a/project/src/utils/HttpResponseUtil.ts b/project/src/utils/HttpResponseUtil.ts index 31da3100..94fccf55 100644 --- a/project/src/utils/HttpResponseUtil.ts +++ b/project/src/utils/HttpResponseUtil.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { BackendErrorCodes } from "@spt-aki/models/enums/BackendErrorCodes"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; +import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes"; +import { LocalisationService } from "@spt/services/LocalisationService"; +import { JsonUtil } from "@spt/utils/JsonUtil"; @injectable() export class HttpResponseUtil diff --git a/project/src/utils/ImporterUtil.ts b/project/src/utils/ImporterUtil.ts index f72da7d7..0840e3d9 100644 --- a/project/src/utils/ImporterUtil.ts +++ b/project/src/utils/ImporterUtil.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { Queue } from "@spt-aki/utils/collections/queue/Queue"; -import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { Queue } from "@spt/utils/collections/queue/Queue"; +import { JsonUtil } from "@spt/utils/JsonUtil"; +import { VFS } from "@spt/utils/VFS"; /* eslint-disable @typescript-eslint/no-empty-function */ /* eslint-disable @typescript-eslint/brace-style */ diff --git a/project/src/utils/JsonUtil.ts b/project/src/utils/JsonUtil.ts index 74c9d227..d5002f96 100644 --- a/project/src/utils/JsonUtil.ts +++ b/project/src/utils/JsonUtil.ts @@ -1,11 +1,11 @@ import fixJson from "json-fixer"; -import JSON5 from "json5"; +import { stringify, parse } from "json5"; import { jsonc } from "jsonc"; import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces"; import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; -import { VFS } from "@spt-aki/utils/VFS"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { HashUtil } from "@spt/utils/HashUtil"; +import { VFS } from "@spt/utils/VFS"; @injectable() export class JsonUtil @@ -80,10 +80,10 @@ export class JsonUtil { if (prettify) { - return JSON5.stringify(data, null, "\t"); + return stringify(data, null, "\t"); } - return JSON5.stringify(data); + return stringify(data); } catch (error) { @@ -138,7 +138,7 @@ export class JsonUtil { try { - return JSON5.parse(jsonString); + return parse(jsonString); } catch (error) { diff --git a/project/src/utils/ObjectId.ts b/project/src/utils/ObjectId.ts index 48118f70..7489bbfc 100644 --- a/project/src/utils/ObjectId.ts +++ b/project/src/utils/ObjectId.ts @@ -1,6 +1,6 @@ import crypto from "node:crypto"; import { inject, injectable } from "tsyringe"; -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; @injectable() export class ObjectId diff --git a/project/src/utils/RagfairOfferHolder.ts b/project/src/utils/RagfairOfferHolder.ts index d04eb76e..6645157f 100644 --- a/project/src/utils/RagfairOfferHolder.ts +++ b/project/src/utils/RagfairOfferHolder.ts @@ -1,5 +1,5 @@ -import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; -import { IRagfairOffer } from "@spt-aki/models/eft/ragfair/IRagfairOffer"; +import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper"; +import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer"; export class RagfairOfferHolder { diff --git a/project/src/utils/RandomUtil.ts b/project/src/utils/RandomUtil.ts index 485a81db..79d92e03 100644 --- a/project/src/utils/RandomUtil.ts +++ b/project/src/utils/RandomUtil.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "tsyringe"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ICloner } from "@spt-aki/utils/cloners/ICloner"; -import { MathUtil } from "@spt-aki/utils/MathUtil"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ICloner } from "@spt/utils/cloners/ICloner"; +import { MathUtil } from "@spt/utils/MathUtil"; /** * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects diff --git a/project/src/utils/VFS.ts b/project/src/utils/VFS.ts index d8d538e1..d887bb7a 100644 --- a/project/src/utils/VFS.ts +++ b/project/src/utils/VFS.ts @@ -5,9 +5,9 @@ import fs from "node:fs"; import path, { resolve } from "node:path"; import { promisify } from "node:util"; import { writeFileSync } from "atomically"; -import lockfile from "proper-lockfile"; +import { lockSync, checkSync, unlockSync } from "proper-lockfile"; import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; @injectable() export class VFS @@ -307,17 +307,17 @@ export class VFS protected lockFileSync(filepath: any): () => void { - return lockfile.lockSync(filepath); + return lockSync(filepath); } protected checkFileSync(filepath: any): boolean { - return lockfile.checkSync(filepath); + return checkSync(filepath); } protected unlockFileSync(filepath: any): void { - lockfile.unlockSync(filepath); + unlockSync(filepath); } public getFileExtension(filepath: string): string diff --git a/project/src/utils/Watermark.ts b/project/src/utils/Watermark.ts index 231be4b5..581ad1b2 100644 --- a/project/src/utils/Watermark.ts +++ b/project/src/utils/Watermark.ts @@ -1,10 +1,10 @@ import { inject, injectable } from "tsyringe"; -import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; -import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig"; -import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -import { ConfigServer } from "@spt-aki/servers/ConfigServer"; -import { LocalisationService } from "@spt-aki/services/LocalisationService"; +import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; +import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; +import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; +import { ConfigServer } from "@spt/servers/ConfigServer"; +import { LocalisationService } from "@spt/services/LocalisationService"; @injectable() export class WatermarkLocale @@ -60,7 +60,7 @@ export class WatermarkLocale @injectable() export class Watermark { - protected akiConfig: ICoreConfig; + protected sptConfig: ICoreConfig; protected text: string[] = []; protected versionLabel = ""; @@ -71,7 +71,7 @@ export class Watermark @inject("WatermarkLocale") protected watermarkLocale?: WatermarkLocale, ) { - this.akiConfig = this.configServer.getConfig(ConfigTypes.CORE); + this.sptConfig = this.configServer.getConfig(ConfigTypes.CORE); } public initialize(): void @@ -81,7 +81,7 @@ export class Watermark const modding = this.watermarkLocale.getModding(); const versionTag = this.getVersionTag(); - this.versionLabel = `${this.akiConfig.projectName} ${versionTag}`; + this.versionLabel = `${this.sptConfig.projectName} ${versionTag}`; this.text = [this.versionLabel]; this.text = [...this.text, ...description]; @@ -107,14 +107,14 @@ export class Watermark */ public getVersionTag(withEftVersion = false): string { - const akiVersion = globalThis.G_AKIVERSION || this.akiConfig.akiVersion; + const sptVersion = globalThis.G_SPTVERSION || this.sptConfig.sptVersion; const versionTag = globalThis.G_DEBUG_CONFIGURATION - ? `${akiVersion} - ${this.localisationService.getText("bleeding_edge_build")}` - : akiVersion; + ? `${sptVersion} - ${this.localisationService.getText("bleeding_edge_build")}` + : sptVersion; if (withEftVersion) { - const tarkovVersion = this.akiConfig.compatibleTarkovVersion.split(".").pop(); + const tarkovVersion = this.sptConfig.compatibleTarkovVersion.split(".").pop(); return `${versionTag} (${tarkovVersion})`; } @@ -128,12 +128,12 @@ export class Watermark */ public getInGameVersionLabel(): string { - const akiVersion = globalThis.G_AKIVERSION || this.akiConfig.akiVersion; + const sptVersion = globalThis.G_SPTVERSION || this.sptConfig.sptVersion; const versionTag = globalThis.G_DEBUG_CONFIGURATION - ? `${akiVersion} - BLEEDINGEDGE ${globalThis.G_COMMIT?.slice(0, 6) ?? ""}` - : `${akiVersion} - ${globalThis.G_COMMIT?.slice(0, 6) ?? ""}`; + ? `${sptVersion} - BLEEDINGEDGE ${globalThis.G_COMMIT?.slice(0, 6) ?? ""}` + : `${sptVersion} - ${globalThis.G_COMMIT?.slice(0, 6) ?? ""}`; - return `${this.akiConfig.projectName} ${versionTag}`; + return `${this.sptConfig.projectName} ${versionTag}`; } /** Set window title */ diff --git a/project/src/utils/cloners/JsonCloner.ts b/project/src/utils/cloners/JsonCloner.ts index c727801a..619af8c1 100644 --- a/project/src/utils/cloners/JsonCloner.ts +++ b/project/src/utils/cloners/JsonCloner.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import type { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import type { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class JsonCloner implements ICloner diff --git a/project/src/utils/cloners/RecursiveCloner.ts b/project/src/utils/cloners/RecursiveCloner.ts index 16a7a164..93a763b7 100644 --- a/project/src/utils/cloners/RecursiveCloner.ts +++ b/project/src/utils/cloners/RecursiveCloner.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import type { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import type { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class RecursiveCloner implements ICloner diff --git a/project/src/utils/cloners/StructuredCloner.ts b/project/src/utils/cloners/StructuredCloner.ts index 89daf567..977cd2dd 100644 --- a/project/src/utils/cloners/StructuredCloner.ts +++ b/project/src/utils/cloners/StructuredCloner.ts @@ -1,5 +1,5 @@ import { injectable } from "tsyringe"; -import type { ICloner } from "@spt-aki/utils/cloners/ICloner"; +import type { ICloner } from "@spt/utils/cloners/ICloner"; @injectable() export class StructuredCloner implements ICloner diff --git a/project/src/utils/logging/AbstractWinstonLogger.ts b/project/src/utils/logging/AbstractWinstonLogger.ts index af0417bc..5d0415b5 100644 --- a/project/src/utils/logging/AbstractWinstonLogger.ts +++ b/project/src/utils/logging/AbstractWinstonLogger.ts @@ -1,16 +1,16 @@ import crypto from "node:crypto"; import fs from "node:fs"; import { promisify } from "node:util"; -import winston, { createLogger, format, transports } from "winston"; +import winston, { createLogger, format, transports, addColors } from "winston"; // eslint-disable-next-line @typescript-eslint/naming-convention import DailyRotateFile from "winston-daily-rotate-file"; -import { Daum } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; -import { SptLogger } from "@spt-aki/models/spt/logging/SptLogger"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { ICommand } from "@spt-aki/models/spt/utils/ICommand"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; +import { SptLogger } from "@spt/models/spt/logging/SptLogger"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { ICommand } from "@spt/models/spt/utils/ICommand"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; export abstract class AbstractWinstonLogger implements ILogger { @@ -86,7 +86,7 @@ export abstract class AbstractWinstonLogger implements ILogger ); } - winston.addColors(this.logLevels.colors); + addColors(this.logLevels.colors); this.logger = createLogger({ levels: this.logLevels.levels, transports: [...transportsList] }); if (this.isLogExceptions()) diff --git a/project/src/utils/logging/WinstonMainLogger.ts b/project/src/utils/logging/WinstonMainLogger.ts index d4c61e90..a2a4b304 100644 --- a/project/src/utils/logging/WinstonMainLogger.ts +++ b/project/src/utils/logging/WinstonMainLogger.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { AbstractWinstonLogger } from "@spt-aki/utils/logging/AbstractWinstonLogger"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { AbstractWinstonLogger } from "@spt/utils/logging/AbstractWinstonLogger"; @injectable() export class WinstonMainLogger extends AbstractWinstonLogger diff --git a/project/src/utils/logging/WinstonRequestLogger.ts b/project/src/utils/logging/WinstonRequestLogger.ts index 30ec7180..7e31c330 100644 --- a/project/src/utils/logging/WinstonRequestLogger.ts +++ b/project/src/utils/logging/WinstonRequestLogger.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { AbstractWinstonLogger } from "@spt-aki/utils/logging/AbstractWinstonLogger"; +import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue"; +import { AbstractWinstonLogger } from "@spt/utils/logging/AbstractWinstonLogger"; @injectable() export class WinstonRequestLogger extends AbstractWinstonLogger diff --git a/project/tests/CustomEnvironment.ts b/project/tests/CustomEnvironment.ts index e295b1aa..a813414c 100644 --- a/project/tests/CustomEnvironment.ts +++ b/project/tests/CustomEnvironment.ts @@ -1,18 +1,18 @@ import "reflect-metadata"; -import { DependencyContainer, Lifecycle, container } from "tsyringe"; import path from "node:path"; -import { Container } from "@spt-aki/di/Container"; -import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; +import { DependencyContainer, Lifecycle, container } from "tsyringe"; import type { Environment } from "vitest"; +import { Container } from "@spt/di/Container"; +import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { ImporterUtil } from "@spt/utils/ImporterUtil"; // Manually mock the logger. import { WinstonLogger } from "@tests/__mocks__/WinstonLogger.mock"; export default { - name: "spt-aki-server", + name: "spt-server", transformMode: "ssr", async setup() { diff --git a/project/tests/__factories__/ProfileInsurance.factory.ts b/project/tests/__factories__/ProfileInsurance.factory.ts index 66679c11..1ff0366b 100644 --- a/project/tests/__factories__/ProfileInsurance.factory.ts +++ b/project/tests/__factories__/ProfileInsurance.factory.ts @@ -1,12 +1,12 @@ import "reflect-metadata"; -import { container } from "tsyringe"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Insurance } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { profileInsuranceFixture } from "@tests/__fixture__/profileInsurance.fixture"; import { format } from "date-fns"; +import { container } from "tsyringe"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Insurance } from "@spt/models/eft/profile/ISptProfile"; +import { profileInsuranceFixture } from "@tests/__fixture__/profileInsurance.fixture"; -type DateInput = number | number[] | { [index: number]: number; }; +type DateInput = number | number[] | { [index: number]: number }; export class ProfileInsuranceFactory { diff --git a/project/tests/__fixture__/profileInsurance.fixture.ts b/project/tests/__fixture__/profileInsurance.fixture.ts index 348194e0..d67395b1 100644 --- a/project/tests/__fixture__/profileInsurance.fixture.ts +++ b/project/tests/__fixture__/profileInsurance.fixture.ts @@ -1,4 +1,4 @@ -import { Insurance } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { Insurance } from "@spt/models/eft/profile/ISptProfile"; export const profileInsuranceFixture: Insurance[] = [{ scheduledTime: 1712950044.4, diff --git a/project/tests/__mocks__/WinstonLogger.mock.ts b/project/tests/__mocks__/WinstonLogger.mock.ts index 5733d4d6..a19c59bf 100644 --- a/project/tests/__mocks__/WinstonLogger.mock.ts +++ b/project/tests/__mocks__/WinstonLogger.mock.ts @@ -1,7 +1,7 @@ -import { Daum } from "@spt-aki/models/eft/itemEvent/IItemEventRouterRequest"; -import { LogBackgroundColor } from "@spt-aki/models/spt/logging/LogBackgroundColor"; -import { LogTextColor } from "@spt-aki/models/spt/logging/LogTextColor"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "@spt/models/spt/logging/LogTextColor"; +import { ILogger } from "@spt/models/spt/utils/ILogger"; export class WinstonLogger implements ILogger { diff --git a/project/tests/controllers/HealthController.test.ts b/project/tests/controllers/HealthController.test.ts index 4aa1b0b0..6d403988 100644 --- a/project/tests/controllers/HealthController.test.ts +++ b/project/tests/controllers/HealthController.test.ts @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/naming-convention */ import "reflect-metadata"; + import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { HealthController } from "@spt-aki/controllers/HealthController"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { IHealthTreatmentRequestData } from "@spt-aki/models/eft/health/IHealthTreatmentRequestData"; +import { HealthController } from "@spt/controllers/HealthController"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData"; describe("HealthController", () => { @@ -56,13 +56,13 @@ describe("HealthController", () => // Mock output generation vi.spyOn((healthController as any).eventOutputHolder, "getOutput").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); // Mock payment vi.spyOn((healthController as any).paymentService, "payMoney").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); const result = healthController.healthTreatment( @@ -111,13 +111,13 @@ describe("HealthController", () => // Mock output generation vi.spyOn((healthController as any).eventOutputHolder, "getOutput").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); // Mock payment vi.spyOn((healthController as any).paymentService, "payMoney").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); const result = healthController.healthTreatment( @@ -167,13 +167,13 @@ describe("HealthController", () => // Mock output generation vi.spyOn((healthController as any).eventOutputHolder, "getOutput").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); // Mock payment vi.spyOn((healthController as any).paymentService, "payMoney").mockReturnValue({ warnings: {}, - profileChanges: { "12345": { health: {} } }, + profileChanges: { 12345: { health: {} } }, }); const result = healthController.healthTreatment( diff --git a/project/tests/controllers/InsuranceController.test.ts b/project/tests/controllers/InsuranceController.test.ts index c36911d7..659fe15f 100644 --- a/project/tests/controllers/InsuranceController.test.ts +++ b/project/tests/controllers/InsuranceController.test.ts @@ -1,17 +1,14 @@ /* eslint-disable @typescript-eslint/naming-convention */ import "reflect-metadata"; + import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { InsuranceController } from "@spt-aki/controllers/InsuranceController"; +import { InsuranceController } from "@spt/controllers/InsuranceController"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { Insurance } from "@spt/models/eft/profile/ISptProfile"; +import { MessageType } from "@spt/models/enums/MessageType"; import { ProfileInsuranceFactory } from "@tests/__factories__/ProfileInsurance.factory"; -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { Insurance } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { MessageType } from "@spt-aki/models/enums/MessageType"; - describe("InsuranceController", () => { let insuranceController: any; // Using "any" to access private/protected methods without type errors. diff --git a/project/tests/generators/BotGenerator.test.ts b/project/tests/generators/BotGenerator.test.ts index 6562bcae..e33d0327 100644 --- a/project/tests/generators/BotGenerator.test.ts +++ b/project/tests/generators/BotGenerator.test.ts @@ -1,9 +1,8 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { BotGenerator } from "@spt-aki/generators/BotGenerator"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { BotGenerator } from "@spt/generators/BotGenerator"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; describe("BotGenerator", () => { diff --git a/project/tests/generators/BotLevelGenerator.test.ts b/project/tests/generators/BotLevelGenerator.test.ts index 400cbe0a..82b69b4f 100644 --- a/project/tests/generators/BotLevelGenerator.test.ts +++ b/project/tests/generators/BotLevelGenerator.test.ts @@ -1,11 +1,11 @@ import "reflect-metadata"; + import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { BotLevelGenerator } from "@spt-aki/generators/BotLevelGenerator"; -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { BotLevelGenerator } from "@spt/generators/BotLevelGenerator"; +import { MinMax } from "@spt/models/common/MinMax"; +import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; describe("BotLevelGenerator", () => { @@ -61,7 +61,7 @@ describe("BotLevelGenerator", () => playerLevel: 5, botCountToGenerate: 0, botDifficulty: "", - isPlayerScav: false + isPlayerScav: false, }; const result = botLevelGenerator.getHighestRelativeBotLevel(botGenDetails, levelDetails, 79); @@ -81,13 +81,13 @@ describe("BotLevelGenerator", () => playerLevel: 100, botCountToGenerate: 0, botDifficulty: "", - isPlayerScav: false + isPlayerScav: false, }; const result = botLevelGenerator.getHighestRelativeBotLevel( botGenDetails, levelDetails, - 79 + 79, ); expect(result).toBe(79); diff --git a/project/tests/helpers/BotDifficultyHelper.test.ts b/project/tests/helpers/BotDifficultyHelper.test.ts index e0d1543b..407144fa 100644 --- a/project/tests/helpers/BotDifficultyHelper.test.ts +++ b/project/tests/helpers/BotDifficultyHelper.test.ts @@ -1,10 +1,7 @@ - - import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; +import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper"; describe("BotHelper", () => { @@ -40,7 +37,7 @@ describe("BotHelper", () => it("should return randomised value when random passed in", () => { vi.spyOn(botDifficultyHelper, "chooseRandomDifficulty").mockReturnValue( - "randomValue" + "randomValue", ); expect(botDifficultyHelper.convertBotDifficultyDropdownToBotDifficulty("random")).toBe("randomValue"); @@ -48,21 +45,20 @@ describe("BotHelper", () => }); describe("getBotDifficultySettings", () => + { + it("should return assault bot if invalid bot type provided", () => { - - it("should return assault bot if invalid bot type provided", () => - { - vi.spyOn(botDifficultyHelper, "convertBotDifficultyDropdownToBotDifficulty").mockReturnValue( - "normal" - ); - vi.spyOn(botDifficultyHelper.botHelper, "getBotTemplate").mockReturnValue( - { difficulty: {normal: "test"}} - ); - const warningLogSpy = vi.spyOn(botDifficultyHelper.logger, "warning"); - - const result = botDifficultyHelper.getBotDifficultySettings("INVALID_TYPE", "normal") - expect(result).toBe("test"); - expect(warningLogSpy).toHaveBeenCalledTimes(1); - }); + vi.spyOn(botDifficultyHelper, "convertBotDifficultyDropdownToBotDifficulty").mockReturnValue( + "normal", + ); + vi.spyOn(botDifficultyHelper.botHelper, "getBotTemplate").mockReturnValue( + { difficulty: { normal: "test" } }, + ); + const warningLogSpy = vi.spyOn(botDifficultyHelper.logger, "warning"); + + const result = botDifficultyHelper.getBotDifficultySettings("INVALID_TYPE", "normal"); + expect(result).toBe("test"); + expect(warningLogSpy).toHaveBeenCalledTimes(1); }); + }); }); diff --git a/project/tests/helpers/BotHelper.test.ts b/project/tests/helpers/BotHelper.test.ts index 9e48473b..8a56aa6e 100644 --- a/project/tests/helpers/BotHelper.test.ts +++ b/project/tests/helpers/BotHelper.test.ts @@ -1,8 +1,7 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { BotHelper } from "@spt-aki/helpers/BotHelper"; +import { BotHelper } from "@spt/helpers/BotHelper"; describe("BotHelper", () => { diff --git a/project/tests/helpers/HandbookHelper.test.ts b/project/tests/helpers/HandbookHelper.test.ts index 9509a02f..9bf1be59 100644 --- a/project/tests/helpers/HandbookHelper.test.ts +++ b/project/tests/helpers/HandbookHelper.test.ts @@ -1,9 +1,8 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { HandbookHelper } from "@spt-aki/helpers/HandbookHelper"; -import { Money } from "@spt-aki/models/enums/Money"; +import { HandbookHelper } from "@spt/helpers/HandbookHelper"; +import { Money } from "@spt/models/enums/Money"; describe("HandbookHelper", () => { diff --git a/project/tests/helpers/InRaidHelper.test.ts b/project/tests/helpers/InRaidHelper.test.ts index b9bf02ad..df41ea9b 100644 --- a/project/tests/helpers/InRaidHelper.test.ts +++ b/project/tests/helpers/InRaidHelper.test.ts @@ -1,10 +1,8 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { InRaidHelper } from "@spt-aki/helpers/InRaidHelper"; - -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; +import { InRaidHelper } from "@spt/helpers/InRaidHelper"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; describe("InRaidHelper", () => { diff --git a/project/tests/helpers/ItemHelper.test.ts b/project/tests/helpers/ItemHelper.test.ts index 1b953cf0..6a500bdb 100644 --- a/project/tests/helpers/ItemHelper.test.ts +++ b/project/tests/helpers/ItemHelper.test.ts @@ -1,12 +1,12 @@ import "reflect-metadata"; + import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; -import { Item, Repairable } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { ItemHelper } from "@spt/helpers/ItemHelper"; +import { Item, Repairable } from "@spt/models/eft/common/tables/IItem"; +import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; +import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { HashUtil } from "@spt/utils/HashUtil"; describe("ItemHelper", () => { diff --git a/project/tests/services/ItemBaseClassService.test.ts b/project/tests/services/ItemBaseClassService.test.ts index 1fedba8d..e911f446 100644 --- a/project/tests/services/ItemBaseClassService.test.ts +++ b/project/tests/services/ItemBaseClassService.test.ts @@ -1,8 +1,7 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; +import { ItemBaseClassService } from "@spt/services/ItemBaseClassService"; describe("ItemBaseClassService", () => { diff --git a/project/tests/services/LocaleService.test.ts b/project/tests/services/LocaleService.test.ts index 6c712797..8fd94a0f 100644 --- a/project/tests/services/LocaleService.test.ts +++ b/project/tests/services/LocaleService.test.ts @@ -1,6 +1,6 @@ import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import type { LocaleService } from "@spt-aki/services/LocaleService"; +import type { LocaleService } from "@spt/services/LocaleService"; describe("LocaleService", () => { diff --git a/project/tests/services/PaymentService.test.ts b/project/tests/services/PaymentService.test.ts index 9f97f17c..1c19dae2 100644 --- a/project/tests/services/PaymentService.test.ts +++ b/project/tests/services/PaymentService.test.ts @@ -1,16 +1,15 @@ /* eslint-disable @typescript-eslint/naming-convention */ import "reflect-metadata"; + import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { PaymentService } from "@spt-aki/services/PaymentService"; - -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ITraderBase } from "@spt-aki/models/eft/common/tables/ITrader"; -import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; -import { HashUtil } from "@spt-aki/utils/HashUtil"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { Item } from "@spt/models/eft/common/tables/IItem"; +import { ITraderBase } from "@spt/models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; +import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; +import { PaymentService } from "@spt/services/PaymentService"; +import { HashUtil } from "@spt/utils/HashUtil"; describe("PaymentService", () => { diff --git a/project/tests/services/PlayerService.test.ts b/project/tests/services/PlayerService.test.ts index fd03934c..4f90db00 100644 --- a/project/tests/services/PlayerService.test.ts +++ b/project/tests/services/PlayerService.test.ts @@ -2,9 +2,8 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; -import { PlayerService } from "@spt-aki/services/PlayerService"; +import { IPmcData } from "@spt/models/eft/common/IPmcData"; +import { PlayerService } from "@spt/services/PlayerService"; describe("PlayerService", () => { diff --git a/project/tests/services/ProfileFixerService.test.ts b/project/tests/services/ProfileFixerService.test.ts index bc9b6c89..c5f0003e 100644 --- a/project/tests/services/ProfileFixerService.test.ts +++ b/project/tests/services/ProfileFixerService.test.ts @@ -1,6 +1,6 @@ -import { ProfileFixerService } from "@spt-aki/services/ProfileFixerService"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { ProfileFixerService } from "@spt/services/ProfileFixerService"; describe("ProfileFixerService", () => { diff --git a/project/tests/services/RagfairPriceService.test.ts b/project/tests/services/RagfairPriceService.test.ts index 8ae6fee2..0dc25683 100644 --- a/project/tests/services/RagfairPriceService.test.ts +++ b/project/tests/services/RagfairPriceService.test.ts @@ -2,11 +2,8 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService"; - -import { MinMax } from "@spt-aki/models/common/MinMax"; -import { Money } from "@spt-aki/models/enums/Money"; +import { Money } from "@spt/models/enums/Money"; +import { RagfairPriceService } from "@spt/services/RagfairPriceService"; describe("RagfairPriceService", () => { @@ -408,8 +405,8 @@ describe("RagfairPriceService", () => }; // Mock the Disable unreasonableModPrices config. Disable other adjustments for isolation. - ragfairPriceService.ragfairConfig.dynamic.unreasonableModPrices[mockBaseClassTemplateId] = - mockUnreasonableModPrices; + ragfairPriceService.ragfairConfig.dynamic.unreasonableModPrices[mockBaseClassTemplateId] + = mockUnreasonableModPrices; ragfairPriceService.ragfairConfig.dynamic.offerAdjustment.adjustPriceWhenBelowHandbookPrice = false; ragfairPriceService.ragfairConfig.dynamic.useTraderPriceForOffersIfHigher = false; ragfairPriceService.ragfairConfig.dynamic.itemPriceMultiplier[itemTemplateId] = null; diff --git a/project/tests/utils/TimeUtil.test.ts b/project/tests/utils/TimeUtil.test.ts index 03e026b5..d5d079a3 100644 --- a/project/tests/utils/TimeUtil.test.ts +++ b/project/tests/utils/TimeUtil.test.ts @@ -1,8 +1,7 @@ import "reflect-metadata"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -import { TimeUtil } from "@spt-aki/utils/TimeUtil"; +import { TimeUtil } from "@spt/utils/TimeUtil"; describe("TimeUtil", () => { diff --git a/project/tests/utils/collections/lists/LinkedList.test.ts b/project/tests/utils/collections/lists/LinkedList.test.ts index a4c06278..c193de29 100644 --- a/project/tests/utils/collections/lists/LinkedList.test.ts +++ b/project/tests/utils/collections/lists/LinkedList.test.ts @@ -1,7 +1,6 @@ import "reflect-metadata"; import { describe, expect, it } from "vitest"; - -import { LinkedList } from "@spt-aki/utils/collections/lists/LinkedList"; +import { LinkedList } from "@spt/utils/collections/lists/LinkedList"; describe("LinkedList", () => { diff --git a/project/tests/utils/collections/queue/Queue.test.ts b/project/tests/utils/collections/queue/Queue.test.ts index 77018a7c..46f7972c 100644 --- a/project/tests/utils/collections/queue/Queue.test.ts +++ b/project/tests/utils/collections/queue/Queue.test.ts @@ -1,7 +1,6 @@ import "reflect-metadata"; import { describe, expect, it } from "vitest"; - -import { Queue } from "@spt-aki/utils/collections/queue/Queue"; +import { Queue } from "@spt/utils/collections/queue/Queue"; describe("LinkedList", () => { diff --git a/project/tsconfig.base.json b/project/tsconfig.base.json index 03483d97..8326a5d6 100644 --- a/project/tsconfig.base.json +++ b/project/tsconfig.base.json @@ -11,7 +11,7 @@ "emitDecoratorMetadata": true, "baseUrl": ".", "paths": { - "@spt-aki/*": [ + "@spt/*": [ "src/*" ], "@tests/*": [ diff --git a/project/vitest.config.ts b/project/vitest.config.ts index d3290ec2..66fb6ead 100644 --- a/project/vitest.config.ts +++ b/project/vitest.config.ts @@ -21,6 +21,6 @@ export default defineConfig({ }, pool: "threads", poolOptions: { threads: { singleThread: true, isolate: false } }, - alias: { "@spt-aki": path.resolve(__dirname, "src"), "@tests": path.resolve(__dirname, "tests") }, + alias: { "@spt": path.resolve(__dirname, "src"), "@tests": path.resolve(__dirname, "tests") }, }, });