diff --git a/ExampleMods/ExampleMods.csproj b/ExampleMods/ExampleMods.csproj index 65d2924e..807c933a 100644 --- a/ExampleMods/ExampleMods.csproj +++ b/ExampleMods/ExampleMods.csproj @@ -1,14 +1,29 @@  - - Exe - net9.0 - enable - enable - + + Exe + net9.0 + enable + enable + Library + - - - + + + false + false + false + + + false + false + false + + + false + false + false + + diff --git a/ExampleMods/Mods/EditConfigs.cs b/ExampleMods/Mods/EditConfigs.cs index a5f1e9bd..3900334e 100644 --- a/ExampleMods/Mods/EditConfigs.cs +++ b/ExampleMods/Mods/EditConfigs.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Servers; diff --git a/ExampleMods/Mods/EditDatabaseValues.cs b/ExampleMods/Mods/EditDatabaseValues.cs index a2c86d46..0eec9848 100644 --- a/ExampleMods/Mods/EditDatabaseValues.cs +++ b/ExampleMods/Mods/EditDatabaseValues.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Hideout; using Core.Models.Enums; using Core.Models.Utils; diff --git a/ExampleMods/Mods/Logging.cs b/ExampleMods/Mods/Logging.cs index 5ecd1763..f7ce0aa7 100644 --- a/ExampleMods/Mods/Logging.cs +++ b/ExampleMods/Mods/Logging.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Logging; using Core.Models.Utils; diff --git a/ExampleMods/Mods/Override/WatermarkOverride.cs b/ExampleMods/Mods/Override/WatermarkOverride.cs index 45c92ea6..fc87e805 100644 --- a/ExampleMods/Mods/Override/WatermarkOverride.cs +++ b/ExampleMods/Mods/Override/WatermarkOverride.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; using Core.Servers; using Core.Services; diff --git a/ExampleMods/Program.cs b/ExampleMods/Program.cs deleted file mode 100644 index 3751555c..00000000 --- a/ExampleMods/Program.cs +++ /dev/null @@ -1,2 +0,0 @@ -// See https://aka.ms/new-console-template for more information -Console.WriteLine("Hello, World!"); diff --git a/Core/Callbacks/AchievementCallbacks.cs b/Libraries/Core/Callbacks/AchievementCallbacks.cs similarity index 97% rename from Core/Callbacks/AchievementCallbacks.cs rename to Libraries/Core/Callbacks/AchievementCallbacks.cs index 6c09b5b0..cd434fa0 100644 --- a/Core/Callbacks/AchievementCallbacks.cs +++ b/Libraries/Core/Callbacks/AchievementCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Utils; diff --git a/Core/Callbacks/BotCallbacks.cs b/Libraries/Core/Callbacks/BotCallbacks.cs similarity index 95% rename from Core/Callbacks/BotCallbacks.cs rename to Libraries/Core/Callbacks/BotCallbacks.cs index d6dac877..0b9570f2 100644 --- a/Core/Callbacks/BotCallbacks.cs +++ b/Libraries/Core/Callbacks/BotCallbacks.cs @@ -1,16 +1,15 @@ -using Core.Annotations; using Core.Context; using Core.Controllers; using Core.Models.Eft.Bot; using Core.Models.Eft.Common; using Core.Models.Eft.Match; using Core.Utils; +using SptCommon.Annotations; namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(BotCallbacks))] -public class BotCallbacks -( +public class BotCallbacks( BotController _botController, HttpResponseUtil _httpResponseUtil, ApplicationContext _applicationContext @@ -47,7 +46,8 @@ public class BotCallbacks if (difficulty == "core") return _httpResponseUtil.NoBody(_botController.GetBotCoreDifficulty()); - var raidConfig = _applicationContext.GetLatestValue(ContextVariableType.RAID_CONFIGURATION)?.GetValue(); + var raidConfig = _applicationContext.GetLatestValue(ContextVariableType.RAID_CONFIGURATION) + ?.GetValue(); return _httpResponseUtil.NoBody(_botController.GetBotDifficulty(type, difficulty, raidConfig)); } diff --git a/Core/Callbacks/BuildsCallbacks.cs b/Libraries/Core/Callbacks/BuildsCallbacks.cs similarity index 98% rename from Core/Callbacks/BuildsCallbacks.cs rename to Libraries/Core/Callbacks/BuildsCallbacks.cs index 4fff4e5d..cfd8f64e 100644 --- a/Core/Callbacks/BuildsCallbacks.cs +++ b/Libraries/Core/Callbacks/BuildsCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Builds; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/BundleCallbacks.cs b/Libraries/Core/Callbacks/BundleCallbacks.cs similarity index 96% rename from Core/Callbacks/BundleCallbacks.cs rename to Libraries/Core/Callbacks/BundleCallbacks.cs index d5928014..fa0b4549 100644 --- a/Core/Callbacks/BundleCallbacks.cs +++ b/Libraries/Core/Callbacks/BundleCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Utils; diff --git a/Core/Callbacks/ClientLogCallbacks.cs b/Libraries/Core/Callbacks/ClientLogCallbacks.cs similarity index 98% rename from Core/Callbacks/ClientLogCallbacks.cs rename to Libraries/Core/Callbacks/ClientLogCallbacks.cs index 2916e2e4..1f2aa17d 100644 --- a/Core/Callbacks/ClientLogCallbacks.cs +++ b/Libraries/Core/Callbacks/ClientLogCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Spt.Config; using Core.Models.Spt.Logging; diff --git a/Core/Callbacks/CustomizationCallbacks.cs b/Libraries/Core/Callbacks/CustomizationCallbacks.cs similarity index 99% rename from Core/Callbacks/CustomizationCallbacks.cs rename to Libraries/Core/Callbacks/CustomizationCallbacks.cs index dab108b8..bbc5ddd1 100644 --- a/Core/Callbacks/CustomizationCallbacks.cs +++ b/Libraries/Core/Callbacks/CustomizationCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Customization; diff --git a/Core/Callbacks/DataCallbacks.cs b/Libraries/Core/Callbacks/DataCallbacks.cs similarity index 99% rename from Core/Callbacks/DataCallbacks.cs rename to Libraries/Core/Callbacks/DataCallbacks.cs index de89d10c..186e21d0 100644 --- a/Core/Callbacks/DataCallbacks.cs +++ b/Libraries/Core/Callbacks/DataCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Services; diff --git a/Core/Callbacks/DialogueCallbacks.cs b/Libraries/Core/Callbacks/DialogueCallbacks.cs similarity index 99% rename from Core/Callbacks/DialogueCallbacks.cs rename to Libraries/Core/Callbacks/DialogueCallbacks.cs index aa82014f..bf38b2ec 100644 --- a/Core/Callbacks/DialogueCallbacks.cs +++ b/Libraries/Core/Callbacks/DialogueCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/GameCallbacks.cs b/Libraries/Core/Callbacks/GameCallbacks.cs similarity index 99% rename from Core/Callbacks/GameCallbacks.cs rename to Libraries/Core/Callbacks/GameCallbacks.cs index c2b2f389..1d514791 100644 --- a/Core/Callbacks/GameCallbacks.cs +++ b/Libraries/Core/Callbacks/GameCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/HandbookCallbacks.cs b/Libraries/Core/Callbacks/HandbookCallbacks.cs similarity index 93% rename from Core/Callbacks/HandbookCallbacks.cs rename to Libraries/Core/Callbacks/HandbookCallbacks.cs index 7337216d..d5e5a1cf 100644 --- a/Core/Callbacks/HandbookCallbacks.cs +++ b/Libraries/Core/Callbacks/HandbookCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; diff --git a/Core/Callbacks/HealthCallbacks.cs b/Libraries/Core/Callbacks/HealthCallbacks.cs similarity index 98% rename from Core/Callbacks/HealthCallbacks.cs rename to Libraries/Core/Callbacks/HealthCallbacks.cs index f2a3050f..4952d15e 100644 --- a/Core/Callbacks/HealthCallbacks.cs +++ b/Libraries/Core/Callbacks/HealthCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/HideoutCallbacks.cs b/Libraries/Core/Callbacks/HideoutCallbacks.cs similarity index 99% rename from Core/Callbacks/HideoutCallbacks.cs rename to Libraries/Core/Callbacks/HideoutCallbacks.cs index 8ab84e96..567347b2 100644 --- a/Core/Callbacks/HideoutCallbacks.cs +++ b/Libraries/Core/Callbacks/HideoutCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/HttpCallbacks.cs b/Libraries/Core/Callbacks/HttpCallbacks.cs similarity index 96% rename from Core/Callbacks/HttpCallbacks.cs rename to Libraries/Core/Callbacks/HttpCallbacks.cs index 737b51b2..62a2da92 100644 --- a/Core/Callbacks/HttpCallbacks.cs +++ b/Libraries/Core/Callbacks/HttpCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.DI; using Core.Servers; diff --git a/Core/Callbacks/InraidCallbacks.cs b/Libraries/Core/Callbacks/InraidCallbacks.cs similarity index 98% rename from Core/Callbacks/InraidCallbacks.cs rename to Libraries/Core/Callbacks/InraidCallbacks.cs index 2a065030..242f1c56 100644 --- a/Core/Callbacks/InraidCallbacks.cs +++ b/Libraries/Core/Callbacks/InraidCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.InRaid; diff --git a/Core/Callbacks/InsuranceCallbacks.cs b/Libraries/Core/Callbacks/InsuranceCallbacks.cs similarity index 98% rename from Core/Callbacks/InsuranceCallbacks.cs rename to Libraries/Core/Callbacks/InsuranceCallbacks.cs index 195660f8..eed0fbde 100644 --- a/Core/Callbacks/InsuranceCallbacks.cs +++ b/Libraries/Core/Callbacks/InsuranceCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/InventoryCallbacks.cs b/Libraries/Core/Callbacks/InventoryCallbacks.cs similarity index 99% rename from Core/Callbacks/InventoryCallbacks.cs rename to Libraries/Core/Callbacks/InventoryCallbacks.cs index cfe5b7fe..74fb7022 100644 --- a/Core/Callbacks/InventoryCallbacks.cs +++ b/Libraries/Core/Callbacks/InventoryCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Inventory; diff --git a/Core/Callbacks/ItemEventCallbacks.cs b/Libraries/Core/Callbacks/ItemEventCallbacks.cs similarity index 98% rename from Core/Callbacks/ItemEventCallbacks.cs rename to Libraries/Core/Callbacks/ItemEventCallbacks.cs index 555cc24d..38d9cf26 100644 --- a/Core/Callbacks/ItemEventCallbacks.cs +++ b/Libraries/Core/Callbacks/ItemEventCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.ItemEvent; using Core.Models.Enums; using Core.Routers; diff --git a/Core/Callbacks/LauncherCallbacks.cs b/Libraries/Core/Callbacks/LauncherCallbacks.cs similarity index 98% rename from Core/Callbacks/LauncherCallbacks.cs rename to Libraries/Core/Callbacks/LauncherCallbacks.cs index 6c0cbd05..37c30082 100644 --- a/Core/Callbacks/LauncherCallbacks.cs +++ b/Libraries/Core/Callbacks/LauncherCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Launcher; diff --git a/Core/Callbacks/LauncherV2Callbacks.cs b/Libraries/Core/Callbacks/LauncherV2Callbacks.cs similarity index 98% rename from Core/Callbacks/LauncherV2Callbacks.cs rename to Libraries/Core/Callbacks/LauncherV2Callbacks.cs index 9411cb14..b4adfc5c 100644 --- a/Core/Callbacks/LauncherV2Callbacks.cs +++ b/Libraries/Core/Callbacks/LauncherV2Callbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Launcher; using Core.Models.Spt.Launcher; diff --git a/Core/Callbacks/LocationCallbacks.cs b/Libraries/Core/Callbacks/LocationCallbacks.cs similarity index 97% rename from Core/Callbacks/LocationCallbacks.cs rename to Libraries/Core/Callbacks/LocationCallbacks.cs index 70f7e98f..e9a76430 100644 --- a/Core/Callbacks/LocationCallbacks.cs +++ b/Libraries/Core/Callbacks/LocationCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Location; diff --git a/Core/Callbacks/MatchCallbacks.cs b/Libraries/Core/Callbacks/MatchCallbacks.cs similarity index 99% rename from Core/Callbacks/MatchCallbacks.cs rename to Libraries/Core/Callbacks/MatchCallbacks.cs index 491a0850..5e86a157 100644 --- a/Core/Callbacks/MatchCallbacks.cs +++ b/Libraries/Core/Callbacks/MatchCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Match; diff --git a/Core/Callbacks/NoteCallbacks.cs b/Libraries/Core/Callbacks/NoteCallbacks.cs similarity index 98% rename from Core/Callbacks/NoteCallbacks.cs rename to Libraries/Core/Callbacks/NoteCallbacks.cs index 6dc27252..243a1fc2 100644 --- a/Core/Callbacks/NoteCallbacks.cs +++ b/Libraries/Core/Callbacks/NoteCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; diff --git a/Core/Callbacks/NotifierCallbacks.cs b/Libraries/Core/Callbacks/NotifierCallbacks.cs similarity index 98% rename from Core/Callbacks/NotifierCallbacks.cs rename to Libraries/Core/Callbacks/NotifierCallbacks.cs index ba1a3845..b82ff0d8 100644 --- a/Core/Callbacks/NotifierCallbacks.cs +++ b/Libraries/Core/Callbacks/NotifierCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Request; diff --git a/Core/Callbacks/PresetCallbacks.cs b/Libraries/Core/Callbacks/PresetCallbacks.cs similarity index 93% rename from Core/Callbacks/PresetCallbacks.cs rename to Libraries/Core/Callbacks/PresetCallbacks.cs index eed0ea7f..96209026 100644 --- a/Core/Callbacks/PresetCallbacks.cs +++ b/Libraries/Core/Callbacks/PresetCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; diff --git a/Core/Callbacks/PrestigeCallbacks.cs b/Libraries/Core/Callbacks/PrestigeCallbacks.cs similarity index 97% rename from Core/Callbacks/PrestigeCallbacks.cs rename to Libraries/Core/Callbacks/PrestigeCallbacks.cs index eb43e66d..d85d0af4 100644 --- a/Core/Callbacks/PrestigeCallbacks.cs +++ b/Libraries/Core/Callbacks/PrestigeCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Prestige; diff --git a/Core/Callbacks/ProfileCallbacks.cs b/Libraries/Core/Callbacks/ProfileCallbacks.cs similarity index 99% rename from Core/Callbacks/ProfileCallbacks.cs rename to Libraries/Core/Callbacks/ProfileCallbacks.cs index 56c35eee..d4e30e7a 100644 --- a/Core/Callbacks/ProfileCallbacks.cs +++ b/Libraries/Core/Callbacks/ProfileCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.Launcher; diff --git a/Core/Callbacks/QuestCallbacks.cs b/Libraries/Core/Callbacks/QuestCallbacks.cs similarity index 99% rename from Core/Callbacks/QuestCallbacks.cs rename to Libraries/Core/Callbacks/QuestCallbacks.cs index 74493479..ea3b6eee 100644 --- a/Core/Callbacks/QuestCallbacks.cs +++ b/Libraries/Core/Callbacks/QuestCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; diff --git a/Core/Callbacks/RagfairCallbacks.cs b/Libraries/Core/Callbacks/RagfairCallbacks.cs similarity index 99% rename from Core/Callbacks/RagfairCallbacks.cs rename to Libraries/Core/Callbacks/RagfairCallbacks.cs index b6de2a9c..ce8dfed3 100644 --- a/Core/Callbacks/RagfairCallbacks.cs +++ b/Libraries/Core/Callbacks/RagfairCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/RepairCallbacks.cs b/Libraries/Core/Callbacks/RepairCallbacks.cs similarity index 97% rename from Core/Callbacks/RepairCallbacks.cs rename to Libraries/Core/Callbacks/RepairCallbacks.cs index 9a6ab818..9082c99c 100644 --- a/Core/Callbacks/RepairCallbacks.cs +++ b/Libraries/Core/Callbacks/RepairCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; diff --git a/Core/Callbacks/SaveCallbacks.cs b/Libraries/Core/Callbacks/SaveCallbacks.cs similarity index 96% rename from Core/Callbacks/SaveCallbacks.cs rename to Libraries/Core/Callbacks/SaveCallbacks.cs index ad267046..dba662dd 100644 --- a/Core/Callbacks/SaveCallbacks.cs +++ b/Libraries/Core/Callbacks/SaveCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Spt.Config; using Core.Servers; diff --git a/Core/Callbacks/TradeCallbacks.cs b/Libraries/Core/Callbacks/TradeCallbacks.cs similarity index 97% rename from Core/Callbacks/TradeCallbacks.cs rename to Libraries/Core/Callbacks/TradeCallbacks.cs index 697b4c36..a063338e 100644 --- a/Core/Callbacks/TradeCallbacks.cs +++ b/Libraries/Core/Callbacks/TradeCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; diff --git a/Core/Callbacks/TraderCallbacks.cs b/Libraries/Core/Callbacks/TraderCallbacks.cs similarity index 98% rename from Core/Callbacks/TraderCallbacks.cs rename to Libraries/Core/Callbacks/TraderCallbacks.cs index 06807886..36b9adc9 100644 --- a/Core/Callbacks/TraderCallbacks.cs +++ b/Libraries/Core/Callbacks/TraderCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Callbacks/WeatherCallbacks.cs b/Libraries/Core/Callbacks/WeatherCallbacks.cs similarity index 96% rename from Core/Callbacks/WeatherCallbacks.cs rename to Libraries/Core/Callbacks/WeatherCallbacks.cs index ce3339b6..f7ba10cc 100644 --- a/Core/Callbacks/WeatherCallbacks.cs +++ b/Libraries/Core/Callbacks/WeatherCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Utils; diff --git a/Core/Callbacks/WishlistCallbacks.cs b/Libraries/Core/Callbacks/WishlistCallbacks.cs similarity index 97% rename from Core/Callbacks/WishlistCallbacks.cs rename to Libraries/Core/Callbacks/WishlistCallbacks.cs index b9f68a31..843ad9ae 100644 --- a/Core/Callbacks/WishlistCallbacks.cs +++ b/Libraries/Core/Callbacks/WishlistCallbacks.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; diff --git a/Core/Context/ApplicationContext.cs b/Libraries/Core/Context/ApplicationContext.cs similarity index 97% rename from Core/Context/ApplicationContext.cs rename to Libraries/Core/Context/ApplicationContext.cs index 7837697d..80d5cae8 100644 --- a/Core/Context/ApplicationContext.cs +++ b/Libraries/Core/Context/ApplicationContext.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Context; diff --git a/Core/Context/ContextVariable.cs b/Libraries/Core/Context/ContextVariable.cs similarity index 100% rename from Core/Context/ContextVariable.cs rename to Libraries/Core/Context/ContextVariable.cs diff --git a/Core/Context/ContextVariableType.cs b/Libraries/Core/Context/ContextVariableType.cs similarity index 100% rename from Core/Context/ContextVariableType.cs rename to Libraries/Core/Context/ContextVariableType.cs diff --git a/Core/Controllers/AchievementController.cs b/Libraries/Core/Controllers/AchievementController.cs similarity index 96% rename from Core/Controllers/AchievementController.cs rename to Libraries/Core/Controllers/AchievementController.cs index 86e94d16..39b58603 100644 --- a/Core/Controllers/AchievementController.cs +++ b/Libraries/Core/Controllers/AchievementController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Profile; using Core.Services; diff --git a/Core/Controllers/BotController.cs b/Libraries/Core/Controllers/BotController.cs similarity index 99% rename from Core/Controllers/BotController.cs rename to Libraries/Core/Controllers/BotController.cs index 44655d2f..b8389cf8 100644 --- a/Core/Controllers/BotController.cs +++ b/Libraries/Core/Controllers/BotController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.Generators; using Core.Helpers; @@ -14,7 +14,7 @@ using Core.Servers; using Core.Services; using Core.Utils; using Core.Utils.Cloners; -using Core.Utils.Extensions; +using SptCommon.Extensions; namespace Core.Controllers; diff --git a/Core/Controllers/BuildController.cs b/Libraries/Core/Controllers/BuildController.cs similarity index 99% rename from Core/Controllers/BuildController.cs rename to Libraries/Core/Controllers/BuildController.cs index a0358ae7..b06d5135 100644 --- a/Core/Controllers/BuildController.cs +++ b/Libraries/Core/Controllers/BuildController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Builds; using Core.Models.Eft.PresetBuild; diff --git a/Core/Controllers/ClientLogController.cs b/Libraries/Core/Controllers/ClientLogController.cs similarity index 98% rename from Core/Controllers/ClientLogController.cs rename to Libraries/Core/Controllers/ClientLogController.cs index c949baf7..d125ded2 100644 --- a/Core/Controllers/ClientLogController.cs +++ b/Libraries/Core/Controllers/ClientLogController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Logging; using Core.Models.Utils; using LogLevel = Core.Models.Spt.Logging.LogLevel; diff --git a/Core/Controllers/CustomizationController.cs b/Libraries/Core/Controllers/CustomizationController.cs similarity index 99% rename from Core/Controllers/CustomizationController.cs rename to Libraries/Core/Controllers/CustomizationController.cs index 83cf6a47..4d98bdb6 100644 --- a/Core/Controllers/CustomizationController.cs +++ b/Libraries/Core/Controllers/CustomizationController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Controllers/DialogueController.cs b/Libraries/Core/Controllers/DialogueController.cs similarity index 99% rename from Core/Controllers/DialogueController.cs rename to Libraries/Core/Controllers/DialogueController.cs index 3b8b869b..5dd5f133 100644 --- a/Core/Controllers/DialogueController.cs +++ b/Libraries/Core/Controllers/DialogueController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Helpers.Dialogue; using Core.Models.Eft.Dialog; diff --git a/Core/Controllers/GameController.cs b/Libraries/Core/Controllers/GameController.cs similarity index 99% rename from Core/Controllers/GameController.cs rename to Libraries/Core/Controllers/GameController.cs index e692f1ea..6d5164c8 100644 --- a/Core/Controllers/GameController.cs +++ b/Libraries/Core/Controllers/GameController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Controllers/HandBookController.cs b/Libraries/Core/Controllers/HandBookController.cs similarity index 87% rename from Core/Controllers/HandBookController.cs rename to Libraries/Core/Controllers/HandBookController.cs index 15081c8c..ac63f9e0 100644 --- a/Core/Controllers/HandBookController.cs +++ b/Libraries/Core/Controllers/HandBookController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Controllers; diff --git a/Core/Controllers/HealthController.cs b/Libraries/Core/Controllers/HealthController.cs similarity index 98% rename from Core/Controllers/HealthController.cs rename to Libraries/Core/Controllers/HealthController.cs index 970cf0e6..7e7495b2 100644 --- a/Core/Controllers/HealthController.cs +++ b/Libraries/Core/Controllers/HealthController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Health; using Core.Models.Eft.ItemEvent; diff --git a/Core/Controllers/HideoutController.cs b/Libraries/Core/Controllers/HideoutController.cs similarity index 99% rename from Core/Controllers/HideoutController.cs rename to Libraries/Core/Controllers/HideoutController.cs index 47efba4c..dee1aa38 100644 --- a/Core/Controllers/HideoutController.cs +++ b/Libraries/Core/Controllers/HideoutController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Controllers/InRaidController.cs b/Libraries/Core/Controllers/InRaidController.cs similarity index 98% rename from Core/Controllers/InRaidController.cs rename to Libraries/Core/Controllers/InRaidController.cs index a34fb5c4..d10f72e2 100644 --- a/Core/Controllers/InRaidController.cs +++ b/Libraries/Core/Controllers/InRaidController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.Helpers; using Core.Models.Eft.InRaid; diff --git a/Core/Controllers/InsuranceController.cs b/Libraries/Core/Controllers/InsuranceController.cs similarity index 98% rename from Core/Controllers/InsuranceController.cs rename to Libraries/Core/Controllers/InsuranceController.cs index a9e28863..cc3cef2a 100644 --- a/Core/Controllers/InsuranceController.cs +++ b/Libraries/Core/Controllers/InsuranceController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Insurance; diff --git a/Core/Controllers/InventoryController.cs b/Libraries/Core/Controllers/InventoryController.cs similarity index 99% rename from Core/Controllers/InventoryController.cs rename to Libraries/Core/Controllers/InventoryController.cs index d4627e15..3006d8a4 100644 --- a/Core/Controllers/InventoryController.cs +++ b/Libraries/Core/Controllers/InventoryController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Controllers/LauncherController.cs b/Libraries/Core/Controllers/LauncherController.cs similarity index 99% rename from Core/Controllers/LauncherController.cs rename to Libraries/Core/Controllers/LauncherController.cs index 57890386..6f741e1c 100644 --- a/Core/Controllers/LauncherController.cs +++ b/Libraries/Core/Controllers/LauncherController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Launcher; @@ -9,7 +9,7 @@ using Core.Models.Utils; using Core.Servers; using Core.Services; using Core.Utils; -using Core.Utils.Extensions; +using SptCommon.Extensions; using Info = Core.Models.Eft.Profile.Info; namespace Core.Controllers; diff --git a/Core/Controllers/LauncherV2Controller.cs b/Libraries/Core/Controllers/LauncherV2Controller.cs similarity index 98% rename from Core/Controllers/LauncherV2Controller.cs rename to Libraries/Core/Controllers/LauncherV2Controller.cs index 8a0059ba..7bd220bd 100644 --- a/Core/Controllers/LauncherV2Controller.cs +++ b/Libraries/Core/Controllers/LauncherV2Controller.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Launcher; @@ -8,7 +8,7 @@ using Core.Models.Utils; using Core.Servers; using Core.Services; using Core.Utils; -using Core.Utils.Extensions; +using SptCommon.Extensions; using Info = Core.Models.Eft.Profile.Info; namespace Core.Controllers; diff --git a/Core/Controllers/LocationController.cs b/Libraries/Core/Controllers/LocationController.cs similarity index 98% rename from Core/Controllers/LocationController.cs rename to Libraries/Core/Controllers/LocationController.cs index 21f476b0..030e6eac 100644 --- a/Core/Controllers/LocationController.cs +++ b/Libraries/Core/Controllers/LocationController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Location; diff --git a/Core/Controllers/MatchController.cs b/Libraries/Core/Controllers/MatchController.cs similarity index 98% rename from Core/Controllers/MatchController.cs rename to Libraries/Core/Controllers/MatchController.cs index a0d35023..c7f8182b 100644 --- a/Core/Controllers/MatchController.cs +++ b/Libraries/Core/Controllers/MatchController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Match; namespace Core.Controllers; diff --git a/Core/Controllers/NoteController.cs b/Libraries/Core/Controllers/NoteController.cs similarity index 98% rename from Core/Controllers/NoteController.cs rename to Libraries/Core/Controllers/NoteController.cs index 04d96f0b..2345718c 100644 --- a/Core/Controllers/NoteController.cs +++ b/Libraries/Core/Controllers/NoteController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; using Core.Models.Eft.Notes; diff --git a/Core/Controllers/NotifierController.cs b/Libraries/Core/Controllers/NotifierController.cs similarity index 98% rename from Core/Controllers/NotifierController.cs rename to Libraries/Core/Controllers/NotifierController.cs index 5386a344..b10ee4e5 100644 --- a/Core/Controllers/NotifierController.cs +++ b/Libraries/Core/Controllers/NotifierController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Notifier; diff --git a/Core/Controllers/PresetController.cs b/Libraries/Core/Controllers/PresetController.cs similarity index 97% rename from Core/Controllers/PresetController.cs rename to Libraries/Core/Controllers/PresetController.cs index c5269930..7080d82f 100644 --- a/Core/Controllers/PresetController.cs +++ b/Libraries/Core/Controllers/PresetController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Utils; using Core.Services; diff --git a/Core/Controllers/PrestigeController.cs b/Libraries/Core/Controllers/PrestigeController.cs similarity index 99% rename from Core/Controllers/PrestigeController.cs rename to Libraries/Core/Controllers/PrestigeController.cs index 7291f559..d6c11fec 100644 --- a/Core/Controllers/PrestigeController.cs +++ b/Libraries/Core/Controllers/PrestigeController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Controllers/ProfileController.cs b/Libraries/Core/Controllers/ProfileController.cs similarity index 99% rename from Core/Controllers/ProfileController.cs rename to Libraries/Core/Controllers/ProfileController.cs index 1498c585..f58b8afa 100644 --- a/Core/Controllers/ProfileController.cs +++ b/Libraries/Core/Controllers/ProfileController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Controllers/QuestController.cs b/Libraries/Core/Controllers/QuestController.cs similarity index 97% rename from Core/Controllers/QuestController.cs rename to Libraries/Core/Controllers/QuestController.cs index 74a1f8bd..940419f2 100644 --- a/Core/Controllers/QuestController.cs +++ b/Libraries/Core/Controllers/QuestController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Controllers/RagfairController.cs b/Libraries/Core/Controllers/RagfairController.cs similarity index 99% rename from Core/Controllers/RagfairController.cs rename to Libraries/Core/Controllers/RagfairController.cs index 9a0cd083..004c4ed9 100644 --- a/Core/Controllers/RagfairController.cs +++ b/Libraries/Core/Controllers/RagfairController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; @@ -803,7 +803,7 @@ public class RagfairController var sellInOncePiece = playerOffer.SellInOnePiece.GetValueOrDefault(false); if (!sellInOncePiece) { - count = playerOffer.Items.Sum(offerItem => offerItem.Upd?.StackObjectsCount ?? 0); + count = (int) playerOffer.Items.Sum(offerItem => offerItem.Upd?.StackObjectsCount ?? 0); } var tax = _ragfairTaxService.CalculateTax( diff --git a/Core/Controllers/RepairController.cs b/Libraries/Core/Controllers/RepairController.cs similarity index 97% rename from Core/Controllers/RepairController.cs rename to Libraries/Core/Controllers/RepairController.cs index 88dea410..beb9ed43 100644 --- a/Core/Controllers/RepairController.cs +++ b/Libraries/Core/Controllers/RepairController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; using Core.Models.Eft.Repair; diff --git a/Core/Controllers/RepeatableQuestController.cs b/Libraries/Core/Controllers/RepeatableQuestController.cs similarity index 99% rename from Core/Controllers/RepeatableQuestController.cs rename to Libraries/Core/Controllers/RepeatableQuestController.cs index a2e37b1e..b8223c1f 100644 --- a/Core/Controllers/RepeatableQuestController.cs +++ b/Libraries/Core/Controllers/RepeatableQuestController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Controllers/TradeController.cs b/Libraries/Core/Controllers/TradeController.cs similarity index 99% rename from Core/Controllers/TradeController.cs rename to Libraries/Core/Controllers/TradeController.cs index 23c7abf0..539cdd4a 100644 --- a/Core/Controllers/TradeController.cs +++ b/Libraries/Core/Controllers/TradeController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Controllers/TraderController.cs b/Libraries/Core/Controllers/TraderController.cs similarity index 99% rename from Core/Controllers/TraderController.cs rename to Libraries/Core/Controllers/TraderController.cs index c0cebe3d..84adee14 100644 --- a/Core/Controllers/TraderController.cs +++ b/Libraries/Core/Controllers/TraderController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Common.Tables; diff --git a/Core/Controllers/WeatherController.cs b/Libraries/Core/Controllers/WeatherController.cs similarity index 98% rename from Core/Controllers/WeatherController.cs rename to Libraries/Core/Controllers/WeatherController.cs index e3950cb0..89490566 100644 --- a/Core/Controllers/WeatherController.cs +++ b/Libraries/Core/Controllers/WeatherController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Weather; diff --git a/Core/Controllers/WishlistController.cs b/Libraries/Core/Controllers/WishlistController.cs similarity index 98% rename from Core/Controllers/WishlistController.cs rename to Libraries/Core/Controllers/WishlistController.cs index 2e268dbc..3b13fc5b 100644 --- a/Core/Controllers/WishlistController.cs +++ b/Libraries/Core/Controllers/WishlistController.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.ItemEvent; using Core.Models.Eft.Wishlist; diff --git a/Libraries/Core/Core.csproj b/Libraries/Core/Core.csproj new file mode 100644 index 00000000..b3ff2b83 --- /dev/null +++ b/Libraries/Core/Core.csproj @@ -0,0 +1,18 @@ + + + + net9.0 + enable + enable + Library + + + + + + + + + + + diff --git a/Core/DI/ISerializer.cs b/Libraries/Core/DI/ISerializer.cs similarity index 100% rename from Core/DI/ISerializer.cs rename to Libraries/Core/DI/ISerializer.cs diff --git a/Core/DI/OnLoad.cs b/Libraries/Core/DI/OnLoad.cs similarity index 100% rename from Core/DI/OnLoad.cs rename to Libraries/Core/DI/OnLoad.cs diff --git a/Core/DI/OnLoadOrder.cs b/Libraries/Core/DI/OnLoadOrder.cs similarity index 100% rename from Core/DI/OnLoadOrder.cs rename to Libraries/Core/DI/OnLoadOrder.cs diff --git a/Core/DI/OnUpdate.cs b/Libraries/Core/DI/OnUpdate.cs similarity index 100% rename from Core/DI/OnUpdate.cs rename to Libraries/Core/DI/OnUpdate.cs diff --git a/Core/DI/OnUpdateOrder.cs b/Libraries/Core/DI/OnUpdateOrder.cs similarity index 100% rename from Core/DI/OnUpdateOrder.cs rename to Libraries/Core/DI/OnUpdateOrder.cs diff --git a/Core/DI/Router.cs b/Libraries/Core/DI/Router.cs similarity index 100% rename from Core/DI/Router.cs rename to Libraries/Core/DI/Router.cs diff --git a/Core/Generators/BotEquipmentModGenerator.cs b/Libraries/Core/Generators/BotEquipmentModGenerator.cs similarity index 99% rename from Core/Generators/BotEquipmentModGenerator.cs rename to Libraries/Core/Generators/BotEquipmentModGenerator.cs index 7de3f160..2e5c1b21 100644 --- a/Core/Generators/BotEquipmentModGenerator.cs +++ b/Libraries/Core/Generators/BotEquipmentModGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; diff --git a/Core/Generators/BotGenerator.cs b/Libraries/Core/Generators/BotGenerator.cs similarity index 99% rename from Core/Generators/BotGenerator.cs rename to Libraries/Core/Generators/BotGenerator.cs index 6913028c..0e529408 100644 --- a/Core/Generators/BotGenerator.cs +++ b/Libraries/Core/Generators/BotGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Common; using Core.Models.Eft.Common; diff --git a/Core/Generators/BotInventoryGenerator.cs b/Libraries/Core/Generators/BotInventoryGenerator.cs similarity index 99% rename from Core/Generators/BotInventoryGenerator.cs rename to Libraries/Core/Generators/BotInventoryGenerator.cs index b826b86e..49345186 100644 --- a/Core/Generators/BotInventoryGenerator.cs +++ b/Libraries/Core/Generators/BotInventoryGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.Helpers; using Core.Models.Eft.Common.Tables; diff --git a/Core/Generators/BotLevelGenerator.cs b/Libraries/Core/Generators/BotLevelGenerator.cs similarity index 99% rename from Core/Generators/BotLevelGenerator.cs rename to Libraries/Core/Generators/BotLevelGenerator.cs index d36ed3c9..5899bf76 100644 --- a/Core/Generators/BotLevelGenerator.cs +++ b/Libraries/Core/Generators/BotLevelGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Common; using Core.Models.Eft.Bot; using Core.Models.Eft.Common.Tables; diff --git a/Core/Generators/BotLootGenerator.cs b/Libraries/Core/Generators/BotLootGenerator.cs similarity index 99% rename from Core/Generators/BotLootGenerator.cs rename to Libraries/Core/Generators/BotLootGenerator.cs index 8448d3b3..9c5c05e5 100644 --- a/Core/Generators/BotLootGenerator.cs +++ b/Libraries/Core/Generators/BotLootGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; using Core.Models.Spt.Bots; diff --git a/Core/Generators/BotWeaponGenerator.cs b/Libraries/Core/Generators/BotWeaponGenerator.cs similarity index 99% rename from Core/Generators/BotWeaponGenerator.cs rename to Libraries/Core/Generators/BotWeaponGenerator.cs index b7707f02..14d25684 100644 --- a/Core/Generators/BotWeaponGenerator.cs +++ b/Libraries/Core/Generators/BotWeaponGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators.WeaponGen; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Generators/FenceBaseAssortGenerator.cs b/Libraries/Core/Generators/FenceBaseAssortGenerator.cs similarity index 98% rename from Core/Generators/FenceBaseAssortGenerator.cs rename to Libraries/Core/Generators/FenceBaseAssortGenerator.cs index 9b23a45f..1af60341 100644 --- a/Core/Generators/FenceBaseAssortGenerator.cs +++ b/Libraries/Core/Generators/FenceBaseAssortGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; using Core.Servers; diff --git a/Core/Generators/LocationGenerator.cs b/Libraries/Core/Generators/LocationGenerator.cs similarity index 95% rename from Core/Generators/LocationGenerator.cs rename to Libraries/Core/Generators/LocationGenerator.cs index 2f9361c0..47190feb 100644 --- a/Core/Generators/LocationGenerator.cs +++ b/Libraries/Core/Generators/LocationGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; namespace Core.Generators; diff --git a/Core/Generators/LocationLootGenerator.cs b/Libraries/Core/Generators/LocationLootGenerator.cs similarity index 99% rename from Core/Generators/LocationLootGenerator.cs rename to Libraries/Core/Generators/LocationLootGenerator.cs index ac51d665..ea385116 100644 --- a/Core/Generators/LocationLootGenerator.cs +++ b/Libraries/Core/Generators/LocationLootGenerator.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; diff --git a/Core/Generators/LootGenerator.cs b/Libraries/Core/Generators/LootGenerator.cs similarity index 99% rename from Core/Generators/LootGenerator.cs rename to Libraries/Core/Generators/LootGenerator.cs index 00fa2c1c..516c63a3 100644 --- a/Core/Generators/LootGenerator.cs +++ b/Libraries/Core/Generators/LootGenerator.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Common; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Generators/PMCLootGenerator.cs b/Libraries/Core/Generators/PMCLootGenerator.cs similarity index 98% rename from Core/Generators/PMCLootGenerator.cs rename to Libraries/Core/Generators/PMCLootGenerator.cs index 855d3cad..f540fdca 100644 --- a/Core/Generators/PMCLootGenerator.cs +++ b/Libraries/Core/Generators/PMCLootGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Generators; diff --git a/Core/Generators/PlayerScavGenerator.cs b/Libraries/Core/Generators/PlayerScavGenerator.cs similarity index 99% rename from Core/Generators/PlayerScavGenerator.cs rename to Libraries/Core/Generators/PlayerScavGenerator.cs index f2486bf3..e4645ac7 100644 --- a/Core/Generators/PlayerScavGenerator.cs +++ b/Libraries/Core/Generators/PlayerScavGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Generators/RagfairAssortGenerator.cs b/Libraries/Core/Generators/RagfairAssortGenerator.cs similarity index 98% rename from Core/Generators/RagfairAssortGenerator.cs rename to Libraries/Core/Generators/RagfairAssortGenerator.cs index e133b98d..e970342a 100644 --- a/Core/Generators/RagfairAssortGenerator.cs +++ b/Libraries/Core/Generators/RagfairAssortGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Generators/RagfairOfferGenerator.cs b/Libraries/Core/Generators/RagfairOfferGenerator.cs similarity index 99% rename from Core/Generators/RagfairOfferGenerator.cs rename to Libraries/Core/Generators/RagfairOfferGenerator.cs index 62af8b9b..ab76ad2f 100644 --- a/Core/Generators/RagfairOfferGenerator.cs +++ b/Libraries/Core/Generators/RagfairOfferGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; using Core.Models.Spt.Config; diff --git a/Core/Generators/RepeatableQuestGenerator.cs b/Libraries/Core/Generators/RepeatableQuestGenerator.cs similarity index 99% rename from Core/Generators/RepeatableQuestGenerator.cs rename to Libraries/Core/Generators/RepeatableQuestGenerator.cs index b6c90b67..a8d43110 100644 --- a/Core/Generators/RepeatableQuestGenerator.cs +++ b/Libraries/Core/Generators/RepeatableQuestGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; @@ -10,7 +10,7 @@ using Core.Helpers; using Core.Servers; using Core.Services; using Core.Utils.Collections; -using Core.Utils.Extensions; +using SptCommon.Extensions; using BodyPart = Core.Models.Spt.Config.BodyPart; namespace Core.Generators; diff --git a/Core/Generators/RepeatableQuestRewardGenerator.cs b/Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs similarity index 99% rename from Core/Generators/RepeatableQuestRewardGenerator.cs rename to Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs index 3362c508..584a441e 100644 --- a/Core/Generators/RepeatableQuestRewardGenerator.cs +++ b/Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; diff --git a/Core/Generators/ScavCaseRewardGenerator.cs b/Libraries/Core/Generators/ScavCaseRewardGenerator.cs similarity index 99% rename from Core/Generators/ScavCaseRewardGenerator.cs rename to Libraries/Core/Generators/ScavCaseRewardGenerator.cs index 5bf2095f..34456403 100644 --- a/Core/Generators/ScavCaseRewardGenerator.cs +++ b/Libraries/Core/Generators/ScavCaseRewardGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; using Core.Models.Spt.Hideout; diff --git a/Core/Generators/WeaponGen/IInventoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/IInventoryMagGen.cs similarity index 100% rename from Core/Generators/WeaponGen/IInventoryMagGen.cs rename to Libraries/Core/Generators/WeaponGen/IInventoryMagGen.cs diff --git a/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs similarity index 97% rename from Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs rename to Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs index b30c9d18..740eb96c 100644 --- a/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Utils; diff --git a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs similarity index 99% rename from Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs rename to Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs index 53fba2fd..409fe945 100644 --- a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; diff --git a/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs similarity index 96% rename from Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs rename to Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs index b38d0acf..e185ab56 100644 --- a/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; namespace Core.Generators.WeaponGen.Implementations; diff --git a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs similarity index 96% rename from Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs rename to Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs index ae48579f..e058fe4e 100644 --- a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Enums; diff --git a/Core/Generators/WeaponGen/InventoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs similarity index 97% rename from Core/Generators/WeaponGen/InventoryMagGen.cs rename to Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs index bf7788c8..00c3a1b6 100644 --- a/Core/Generators/WeaponGen/InventoryMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Generators.WeaponGen; diff --git a/Core/Generators/WeatherGenerator.cs b/Libraries/Core/Generators/WeatherGenerator.cs similarity index 99% rename from Core/Generators/WeatherGenerator.cs rename to Libraries/Core/Generators/WeatherGenerator.cs index 8ff4dabc..18d658c8 100644 --- a/Core/Generators/WeatherGenerator.cs +++ b/Libraries/Core/Generators/WeatherGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Weather; using Core.Models.Enums; diff --git a/Core/Helpers/AssortHelper.cs b/Libraries/Core/Helpers/AssortHelper.cs similarity index 98% rename from Core/Helpers/AssortHelper.cs rename to Libraries/Core/Helpers/AssortHelper.cs index 56162a87..376abcbc 100644 --- a/Core/Helpers/AssortHelper.cs +++ b/Libraries/Core/Helpers/AssortHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Helpers/BotDifficultyHelper.cs b/Libraries/Core/Helpers/BotDifficultyHelper.cs similarity index 98% rename from Core/Helpers/BotDifficultyHelper.cs rename to Libraries/Core/Helpers/BotDifficultyHelper.cs index 81b4bb06..43b509ae 100644 --- a/Core/Helpers/BotDifficultyHelper.cs +++ b/Libraries/Core/Helpers/BotDifficultyHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; diff --git a/Core/Helpers/BotGeneratorHelper.cs b/Libraries/Core/Helpers/BotGeneratorHelper.cs similarity index 99% rename from Core/Helpers/BotGeneratorHelper.cs rename to Libraries/Core/Helpers/BotGeneratorHelper.cs index 200288a1..85d6e711 100644 --- a/Core/Helpers/BotGeneratorHelper.cs +++ b/Libraries/Core/Helpers/BotGeneratorHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Context; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Match; diff --git a/Core/Helpers/BotHelper.cs b/Libraries/Core/Helpers/BotHelper.cs similarity index 99% rename from Core/Helpers/BotHelper.cs rename to Libraries/Core/Helpers/BotHelper.cs index 5403a33f..3de56ee1 100644 --- a/Core/Helpers/BotHelper.cs +++ b/Libraries/Core/Helpers/BotHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; diff --git a/Core/Helpers/BotWeaponGeneratorHelper.cs b/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs similarity index 99% rename from Core/Helpers/BotWeaponGeneratorHelper.cs rename to Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs index bf100112..38519ced 100644 --- a/Core/Helpers/BotWeaponGeneratorHelper.cs +++ b/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; using Core.Models.Utils; diff --git a/Core/Helpers/ContainerHelper.cs b/Libraries/Core/Helpers/ContainerHelper.cs similarity index 98% rename from Core/Helpers/ContainerHelper.cs rename to Libraries/Core/Helpers/ContainerHelper.cs index 08b0dc55..8942a56e 100644 --- a/Core/Helpers/ContainerHelper.cs +++ b/Libraries/Core/Helpers/ContainerHelper.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Helpers; diff --git a/Core/Helpers/Dialogue/AbstractDialogChatBot.cs b/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs similarity index 100% rename from Core/Helpers/Dialogue/AbstractDialogChatBot.cs rename to Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs diff --git a/Core/Helpers/Dialogue/Commando/IChatCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/IChatCommand.cs similarity index 100% rename from Core/Helpers/Dialogue/Commando/IChatCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/IChatCommand.cs diff --git a/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs similarity index 96% rename from Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs index 4ecc1809..2f15ef44 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers.Dialog.Commando.SptCommands; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs similarity index 97% rename from Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index ec21924a..5493cd88 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs similarity index 78% rename from Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs index ff659bc1..f59272ed 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Helpers.Dialog.Commando.SptCommands.GiveCommand; diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs similarity index 100% rename from Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs similarity index 97% rename from Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs index adc82827..71d24b4e 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; using Core.Models.Spt.Dialog; diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs similarity index 95% rename from Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs rename to Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs index cbb4e6ee..5cbe4995 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs similarity index 97% rename from Core/Helpers/Dialogue/CommandoDialogChatBot.cs rename to Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs index 061472ba..7d9e0128 100644 --- a/Core/Helpers/Dialogue/CommandoDialogChatBot.cs +++ b/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers.Dialog.Commando; using Core.Models.Eft.Profile; using Core.Models.Enums; diff --git a/Core/Helpers/Dialogue/IDialogueChatBot.cs b/Libraries/Core/Helpers/Dialogue/IDialogueChatBot.cs similarity index 100% rename from Core/Helpers/Dialogue/IDialogueChatBot.cs rename to Libraries/Core/Helpers/Dialogue/IDialogueChatBot.cs diff --git a/Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs similarity index 97% rename from Core/Helpers/Dialogue/SptDialogueChatBot.cs rename to Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs index 812f603c..9c5c107e 100644 --- a/Core/Helpers/Dialogue/SptDialogueChatBot.cs +++ b/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers.Dialog.Commando; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/DialogueHelper.cs b/Libraries/Core/Helpers/DialogueHelper.cs similarity index 99% rename from Core/Helpers/DialogueHelper.cs rename to Libraries/Core/Helpers/DialogueHelper.cs index 20ff165a..a3c1df58 100644 --- a/Core/Helpers/DialogueHelper.cs +++ b/Libraries/Core/Helpers/DialogueHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; using Core.Models.Utils; diff --git a/Core/Helpers/DurabilityLimitsHelper.cs b/Libraries/Core/Helpers/DurabilityLimitsHelper.cs similarity index 99% rename from Core/Helpers/DurabilityLimitsHelper.cs rename to Libraries/Core/Helpers/DurabilityLimitsHelper.cs index cede4caa..3a1ba1e5 100644 --- a/Core/Helpers/DurabilityLimitsHelper.cs +++ b/Libraries/Core/Helpers/DurabilityLimitsHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/GameEventHelper.cs b/Libraries/Core/Helpers/GameEventHelper.cs similarity index 70% rename from Core/Helpers/GameEventHelper.cs rename to Libraries/Core/Helpers/GameEventHelper.cs index dc897d3a..cffa3e82 100644 --- a/Core/Helpers/GameEventHelper.cs +++ b/Libraries/Core/Helpers/GameEventHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Helpers; diff --git a/Core/Helpers/HandbookHelper.cs b/Libraries/Core/Helpers/HandbookHelper.cs similarity index 98% rename from Core/Helpers/HandbookHelper.cs rename to Libraries/Core/Helpers/HandbookHelper.cs index dfc6188b..4aef8514 100644 --- a/Core/Helpers/HandbookHelper.cs +++ b/Libraries/Core/Helpers/HandbookHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/HealthHelper.cs b/Libraries/Core/Helpers/HealthHelper.cs similarity index 99% rename from Core/Helpers/HealthHelper.cs rename to Libraries/Core/Helpers/HealthHelper.cs index b95c5a07..09020663 100644 --- a/Core/Helpers/HealthHelper.cs +++ b/Libraries/Core/Helpers/HealthHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Health; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/HideoutHelper.cs b/Libraries/Core/Helpers/HideoutHelper.cs similarity index 99% rename from Core/Helpers/HideoutHelper.cs rename to Libraries/Core/Helpers/HideoutHelper.cs index 4b8e255f..6f0ec933 100644 --- a/Core/Helpers/HideoutHelper.cs +++ b/Libraries/Core/Helpers/HideoutHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; diff --git a/Core/Helpers/HttpServerHelper.cs b/Libraries/Core/Helpers/HttpServerHelper.cs similarity index 97% rename from Core/Helpers/HttpServerHelper.cs rename to Libraries/Core/Helpers/HttpServerHelper.cs index 9ab22e77..5541aa86 100644 --- a/Core/Helpers/HttpServerHelper.cs +++ b/Libraries/Core/Helpers/HttpServerHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Config; using Core.Servers; diff --git a/Core/Helpers/InRaidHelper.cs b/Libraries/Core/Helpers/InRaidHelper.cs similarity index 99% rename from Core/Helpers/InRaidHelper.cs rename to Libraries/Core/Helpers/InRaidHelper.cs index 4adaa8f3..61db6c9c 100644 --- a/Core/Helpers/InRaidHelper.cs +++ b/Libraries/Core/Helpers/InRaidHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Helpers/InventoryHelper.cs b/Libraries/Core/Helpers/InventoryHelper.cs similarity index 99% rename from Core/Helpers/InventoryHelper.cs rename to Libraries/Core/Helpers/InventoryHelper.cs index a0509791..80c15a51 100644 --- a/Core/Helpers/InventoryHelper.cs +++ b/Libraries/Core/Helpers/InventoryHelper.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Inventory; diff --git a/Core/Helpers/ItemHelper.cs b/Libraries/Core/Helpers/ItemHelper.cs similarity index 99% rename from Core/Helpers/ItemHelper.cs rename to Libraries/Core/Helpers/ItemHelper.cs index bbe128c4..e481db4e 100644 --- a/Core/Helpers/ItemHelper.cs +++ b/Libraries/Core/Helpers/ItemHelper.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; diff --git a/Core/Helpers/NotificationSendHelper.cs b/Libraries/Core/Helpers/NotificationSendHelper.cs similarity index 98% rename from Core/Helpers/NotificationSendHelper.cs rename to Libraries/Core/Helpers/NotificationSendHelper.cs index 6d9467aa..b31b4fdb 100644 --- a/Core/Helpers/NotificationSendHelper.cs +++ b/Libraries/Core/Helpers/NotificationSendHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Profile; using Core.Models.Eft.Ws; using Core.Models.Enums; diff --git a/Core/Helpers/NotifierHelper.cs b/Libraries/Core/Helpers/NotifierHelper.cs similarity index 98% rename from Core/Helpers/NotifierHelper.cs rename to Libraries/Core/Helpers/NotifierHelper.cs index 2a0d4ab2..fe14af5f 100644 --- a/Core/Helpers/NotifierHelper.cs +++ b/Libraries/Core/Helpers/NotifierHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Profile; using Core.Models.Eft.Ws; diff --git a/Core/Helpers/PaymentHelper.cs b/Libraries/Core/Helpers/PaymentHelper.cs similarity index 97% rename from Core/Helpers/PaymentHelper.cs rename to Libraries/Core/Helpers/PaymentHelper.cs index 3bf681e8..ab121852 100644 --- a/Core/Helpers/PaymentHelper.cs +++ b/Libraries/Core/Helpers/PaymentHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Servers; diff --git a/Core/Helpers/PresetHelper.cs b/Libraries/Core/Helpers/PresetHelper.cs similarity index 99% rename from Core/Helpers/PresetHelper.cs rename to Libraries/Core/Helpers/PresetHelper.cs index 49a07cf2..d7887379 100644 --- a/Core/Helpers/PresetHelper.cs +++ b/Libraries/Core/Helpers/PresetHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Enums; using Core.Services; diff --git a/Core/Helpers/ProbabilityHelper.cs b/Libraries/Core/Helpers/ProbabilityHelper.cs similarity index 95% rename from Core/Helpers/ProbabilityHelper.cs rename to Libraries/Core/Helpers/ProbabilityHelper.cs index a203cba8..bd2fad96 100644 --- a/Core/Helpers/ProbabilityHelper.cs +++ b/Libraries/Core/Helpers/ProbabilityHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; using Core.Utils; diff --git a/Core/Helpers/ProfileHelper.cs b/Libraries/Core/Helpers/ProfileHelper.cs similarity index 99% rename from Core/Helpers/ProfileHelper.cs rename to Libraries/Core/Helpers/ProfileHelper.cs index 19b8a365..82fd9b54 100644 --- a/Core/Helpers/ProfileHelper.cs +++ b/Libraries/Core/Helpers/ProfileHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; diff --git a/Core/Helpers/QuestConditionHelper.cs b/Libraries/Core/Helpers/QuestConditionHelper.cs similarity index 98% rename from Core/Helpers/QuestConditionHelper.cs rename to Libraries/Core/Helpers/QuestConditionHelper.cs index ef41ce38..34058924 100644 --- a/Core/Helpers/QuestConditionHelper.cs +++ b/Libraries/Core/Helpers/QuestConditionHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/QuestHelper.cs b/Libraries/Core/Helpers/QuestHelper.cs similarity index 99% rename from Core/Helpers/QuestHelper.cs rename to Libraries/Core/Helpers/QuestHelper.cs index a31522e8..07abbc40 100644 --- a/Core/Helpers/QuestHelper.cs +++ b/Libraries/Core/Helpers/QuestHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Helpers/QuestRewardHelper.cs b/Libraries/Core/Helpers/QuestRewardHelper.cs similarity index 99% rename from Core/Helpers/QuestRewardHelper.cs rename to Libraries/Core/Helpers/QuestRewardHelper.cs index 776f5ca9..ae7d511a 100644 --- a/Core/Helpers/QuestRewardHelper.cs +++ b/Libraries/Core/Helpers/QuestRewardHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; diff --git a/Core/Helpers/RagfairHelper.cs b/Libraries/Core/Helpers/RagfairHelper.cs similarity index 97% rename from Core/Helpers/RagfairHelper.cs rename to Libraries/Core/Helpers/RagfairHelper.cs index 2a66b9f9..8c49d730 100644 --- a/Core/Helpers/RagfairHelper.cs +++ b/Libraries/Core/Helpers/RagfairHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; diff --git a/Core/Helpers/RagfairOfferHelper.cs b/Libraries/Core/Helpers/RagfairOfferHelper.cs similarity index 99% rename from Core/Helpers/RagfairOfferHelper.cs rename to Libraries/Core/Helpers/RagfairOfferHelper.cs index e3707582..26aeb501 100644 --- a/Core/Helpers/RagfairOfferHelper.cs +++ b/Libraries/Core/Helpers/RagfairOfferHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Helpers/RagfairSellHelper.cs b/Libraries/Core/Helpers/RagfairSellHelper.cs similarity index 97% rename from Core/Helpers/RagfairSellHelper.cs rename to Libraries/Core/Helpers/RagfairSellHelper.cs index b7327dd2..40bcec6c 100644 --- a/Core/Helpers/RagfairSellHelper.cs +++ b/Libraries/Core/Helpers/RagfairSellHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ragfair; namespace Core.Helpers; diff --git a/Core/Helpers/RagfairServerHelper.cs b/Libraries/Core/Helpers/RagfairServerHelper.cs similarity index 98% rename from Core/Helpers/RagfairServerHelper.cs rename to Libraries/Core/Helpers/RagfairServerHelper.cs index 8898fbb0..237c4978 100644 --- a/Core/Helpers/RagfairServerHelper.cs +++ b/Libraries/Core/Helpers/RagfairServerHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/RagfairSortHelper.cs b/Libraries/Core/Helpers/RagfairSortHelper.cs similarity index 97% rename from Core/Helpers/RagfairSortHelper.cs rename to Libraries/Core/Helpers/RagfairSortHelper.cs index 303eabeb..caffcdea 100644 --- a/Core/Helpers/RagfairSortHelper.cs +++ b/Libraries/Core/Helpers/RagfairSortHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ragfair; using Core.Models.Enums; diff --git a/Core/Helpers/RepairHelper.cs b/Libraries/Core/Helpers/RepairHelper.cs similarity index 98% rename from Core/Helpers/RepairHelper.cs rename to Libraries/Core/Helpers/RepairHelper.cs index 937d4e18..2bf6d933 100644 --- a/Core/Helpers/RepairHelper.cs +++ b/Libraries/Core/Helpers/RepairHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Props = Core.Models.Eft.Common.Props; diff --git a/Core/Helpers/RepeatableQuestHelper.cs b/Libraries/Core/Helpers/RepeatableQuestHelper.cs similarity index 97% rename from Core/Helpers/RepeatableQuestHelper.cs rename to Libraries/Core/Helpers/RepeatableQuestHelper.cs index a440c23a..b8b9fb5c 100644 --- a/Core/Helpers/RepeatableQuestHelper.cs +++ b/Libraries/Core/Helpers/RepeatableQuestHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Config; using Core.Models.Utils; using Core.Utils; diff --git a/Core/Helpers/SecureContainerHelper.cs b/Libraries/Core/Helpers/SecureContainerHelper.cs similarity index 93% rename from Core/Helpers/SecureContainerHelper.cs rename to Libraries/Core/Helpers/SecureContainerHelper.cs index 18a78125..d0273a18 100644 --- a/Core/Helpers/SecureContainerHelper.cs +++ b/Libraries/Core/Helpers/SecureContainerHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/TradeHelper.cs b/Libraries/Core/Helpers/TradeHelper.cs similarity index 98% rename from Core/Helpers/TradeHelper.cs rename to Libraries/Core/Helpers/TradeHelper.cs index 556e808e..015b3da4 100644 --- a/Core/Helpers/TradeHelper.cs +++ b/Libraries/Core/Helpers/TradeHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Helpers/TraderAssortHelper.cs b/Libraries/Core/Helpers/TraderAssortHelper.cs similarity index 98% rename from Core/Helpers/TraderAssortHelper.cs rename to Libraries/Core/Helpers/TraderAssortHelper.cs index beeb04a4..2f2ba6f7 100644 --- a/Core/Helpers/TraderAssortHelper.cs +++ b/Libraries/Core/Helpers/TraderAssortHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; diff --git a/Core/Helpers/TraderHelper.cs b/Libraries/Core/Helpers/TraderHelper.cs similarity index 99% rename from Core/Helpers/TraderHelper.cs rename to Libraries/Core/Helpers/TraderHelper.cs index 1ba199a2..ff885c1e 100644 --- a/Core/Helpers/TraderHelper.cs +++ b/Libraries/Core/Helpers/TraderHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Common; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Helpers/UtilityHelper.cs b/Libraries/Core/Helpers/UtilityHelper.cs similarity index 85% rename from Core/Helpers/UtilityHelper.cs rename to Libraries/Core/Helpers/UtilityHelper.cs index 8674f6b0..46cbe672 100644 --- a/Core/Helpers/UtilityHelper.cs +++ b/Libraries/Core/Helpers/UtilityHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Helpers; diff --git a/Core/Helpers/WeatherHelper.cs b/Libraries/Core/Helpers/WeatherHelper.cs similarity index 98% rename from Core/Helpers/WeatherHelper.cs rename to Libraries/Core/Helpers/WeatherHelper.cs index a974b45b..259ee11d 100644 --- a/Core/Helpers/WeatherHelper.cs +++ b/Libraries/Core/Helpers/WeatherHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Models.Utils; diff --git a/Core/Helpers/WeightedRandomHelper.cs b/Libraries/Core/Helpers/WeightedRandomHelper.cs similarity index 99% rename from Core/Helpers/WeightedRandomHelper.cs rename to Libraries/Core/Helpers/WeightedRandomHelper.cs index 5d6aa6fd..a33b72ca 100644 --- a/Core/Helpers/WeightedRandomHelper.cs +++ b/Libraries/Core/Helpers/WeightedRandomHelper.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Helper; using Core.Models.Utils; diff --git a/Core/Loaders/PostDBModLoader.cs b/Libraries/Core/Loaders/PostDBModLoader.cs similarity index 95% rename from Core/Loaders/PostDBModLoader.cs rename to Libraries/Core/Loaders/PostDBModLoader.cs index c370d300..26360550 100644 --- a/Core/Loaders/PostDBModLoader.cs +++ b/Libraries/Core/Loaders/PostDBModLoader.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.External; using Core.Models.Utils; diff --git a/Core/Loaders/PostSptModLoader.cs b/Libraries/Core/Loaders/PostSptModLoader.cs similarity index 96% rename from Core/Loaders/PostSptModLoader.cs rename to Libraries/Core/Loaders/PostSptModLoader.cs index 17f54517..a075b0c5 100644 --- a/Core/Loaders/PostSptModLoader.cs +++ b/Libraries/Core/Loaders/PostSptModLoader.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.External; using Core.Models.Utils; diff --git a/Core/Models/Common/MinMax.cs b/Libraries/Core/Models/Common/MinMax.cs similarity index 100% rename from Core/Models/Common/MinMax.cs rename to Libraries/Core/Models/Common/MinMax.cs diff --git a/Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/Core/Models/Eft/Bot/GenerateBotsRequestData.cs similarity index 100% rename from Core/Models/Eft/Bot/GenerateBotsRequestData.cs rename to Libraries/Core/Models/Eft/Bot/GenerateBotsRequestData.cs diff --git a/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs b/Libraries/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs similarity index 100% rename from Core/Models/Eft/Bot/RandomisedBotLevelResult.cs rename to Libraries/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs diff --git a/Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/Core/Models/Eft/Builds/SetMagazineRequest.cs similarity index 100% rename from Core/Models/Eft/Builds/SetMagazineRequest.cs rename to Libraries/Core/Models/Eft/Builds/SetMagazineRequest.cs diff --git a/Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/Core/Models/Eft/Common/EmptyRequestData.cs similarity index 100% rename from Core/Models/Eft/Common/EmptyRequestData.cs rename to Libraries/Core/Models/Eft/Common/EmptyRequestData.cs diff --git a/Core/Models/Eft/Common/Globals.cs b/Libraries/Core/Models/Eft/Common/Globals.cs similarity index 100% rename from Core/Models/Eft/Common/Globals.cs rename to Libraries/Core/Models/Eft/Common/Globals.cs diff --git a/Core/Models/Eft/Common/Location.cs b/Libraries/Core/Models/Eft/Common/Location.cs similarity index 100% rename from Core/Models/Eft/Common/Location.cs rename to Libraries/Core/Models/Eft/Common/Location.cs diff --git a/Core/Models/Eft/Common/LocationBase.cs b/Libraries/Core/Models/Eft/Common/LocationBase.cs similarity index 100% rename from Core/Models/Eft/Common/LocationBase.cs rename to Libraries/Core/Models/Eft/Common/LocationBase.cs diff --git a/Core/Models/Eft/Common/LooseLoot.cs b/Libraries/Core/Models/Eft/Common/LooseLoot.cs similarity index 100% rename from Core/Models/Eft/Common/LooseLoot.cs rename to Libraries/Core/Models/Eft/Common/LooseLoot.cs diff --git a/Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/Core/Models/Eft/Common/MetricsTableData.cs similarity index 100% rename from Core/Models/Eft/Common/MetricsTableData.cs rename to Libraries/Core/Models/Eft/Common/MetricsTableData.cs diff --git a/Core/Models/Eft/Common/PmcData.cs b/Libraries/Core/Models/Eft/Common/PmcData.cs similarity index 100% rename from Core/Models/Eft/Common/PmcData.cs rename to Libraries/Core/Models/Eft/Common/PmcData.cs diff --git a/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs b/Libraries/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs similarity index 100% rename from Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs rename to Libraries/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs diff --git a/Core/Models/Eft/Common/Request/UIDRequestData.cs b/Libraries/Core/Models/Eft/Common/Request/UIDRequestData.cs similarity index 100% rename from Core/Models/Eft/Common/Request/UIDRequestData.cs rename to Libraries/Core/Models/Eft/Common/Request/UIDRequestData.cs diff --git a/Core/Models/Eft/Common/Tables/Achievement.cs b/Libraries/Core/Models/Eft/Common/Tables/Achievement.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Achievement.cs rename to Libraries/Core/Models/Eft/Common/Tables/Achievement.cs diff --git a/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/BotBase.cs rename to Libraries/Core/Models/Eft/Common/Tables/BotBase.cs diff --git a/Core/Models/Eft/Common/Tables/BotCore.cs b/Libraries/Core/Models/Eft/Common/Tables/BotCore.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/BotCore.cs rename to Libraries/Core/Models/Eft/Common/Tables/BotCore.cs diff --git a/Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/Core/Models/Eft/Common/Tables/BotType.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/BotType.cs rename to Libraries/Core/Models/Eft/Common/Tables/BotType.cs diff --git a/Core/Models/Eft/Common/Tables/CustomisationStorage.cs b/Libraries/Core/Models/Eft/Common/Tables/CustomisationStorage.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/CustomisationStorage.cs rename to Libraries/Core/Models/Eft/Common/Tables/CustomisationStorage.cs diff --git a/Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/Core/Models/Eft/Common/Tables/CustomizationItem.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/CustomizationItem.cs rename to Libraries/Core/Models/Eft/Common/Tables/CustomizationItem.cs diff --git a/Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs b/Libraries/Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs rename to Libraries/Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs diff --git a/Core/Models/Eft/Common/Tables/HandbookBase.cs b/Libraries/Core/Models/Eft/Common/Tables/HandbookBase.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/HandbookBase.cs rename to Libraries/Core/Models/Eft/Common/Tables/HandbookBase.cs diff --git a/Core/Models/Eft/Common/Tables/Item.cs b/Libraries/Core/Models/Eft/Common/Tables/Item.cs similarity index 96% rename from Core/Models/Eft/Common/Tables/Item.cs rename to Libraries/Core/Models/Eft/Common/Tables/Item.cs index 2299556f..605126df 100644 --- a/Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/Item.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Utils.Json.Converters; namespace Core.Models.Eft.Common.Tables; @@ -50,7 +51,8 @@ public record Upd public string? SptPresetId { get; set; } public UpdFaceShield? FaceShield { get; set; } - public int? StackObjectsCount { get; set; } // can be a string, double or int + [JsonConverter(typeof(StringToNumberFactoryConverter))] + public double? StackObjectsCount { get; set; } // TODO: LootDumpGen is outputting doubles, we can turn back to int once fixed public bool? UnlimitedCount { get; set; } public UpdRepairable? Repairable { get; set; } public UpdRecodableComponent? RecodableComponent { get; set; } diff --git a/Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/Core/Models/Eft/Common/Tables/LocationServices.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/LocationServices.cs rename to Libraries/Core/Models/Eft/Common/Tables/LocationServices.cs diff --git a/Core/Models/Eft/Common/Tables/LocationsBase.cs b/Libraries/Core/Models/Eft/Common/Tables/LocationsBase.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/LocationsBase.cs rename to Libraries/Core/Models/Eft/Common/Tables/LocationsBase.cs diff --git a/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs b/Libraries/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs rename to Libraries/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs diff --git a/Core/Models/Eft/Common/Tables/Match.cs b/Libraries/Core/Models/Eft/Common/Tables/Match.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Match.cs rename to Libraries/Core/Models/Eft/Common/Tables/Match.cs diff --git a/Core/Models/Eft/Common/Tables/Prestige.cs b/Libraries/Core/Models/Eft/Common/Tables/Prestige.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Prestige.cs rename to Libraries/Core/Models/Eft/Common/Tables/Prestige.cs diff --git a/Core/Models/Eft/Common/Tables/ProfileTemplate.cs b/Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs similarity index 99% rename from Core/Models/Eft/Common/Tables/ProfileTemplate.cs rename to Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs index 20426cf0..c464569b 100644 --- a/Core/Models/Eft/Common/Tables/ProfileTemplate.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; using Core.Models.Eft.Profile; -using Core.Utils.Extensions; +using SptCommon.Extensions; namespace Core.Models.Eft.Common.Tables; diff --git a/Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/Core/Models/Eft/Common/Tables/Quest.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Quest.cs rename to Libraries/Core/Models/Eft/Common/Tables/Quest.cs diff --git a/Core/Models/Eft/Common/Tables/RepeatableQuests.cs b/Libraries/Core/Models/Eft/Common/Tables/RepeatableQuests.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/RepeatableQuests.cs rename to Libraries/Core/Models/Eft/Common/Tables/RepeatableQuests.cs diff --git a/Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/Core/Models/Eft/Common/Tables/Reward.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Reward.cs rename to Libraries/Core/Models/Eft/Common/Tables/Reward.cs diff --git a/Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/Core/Models/Eft/Common/Tables/TemplateItem.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/TemplateItem.cs rename to Libraries/Core/Models/Eft/Common/Tables/TemplateItem.cs diff --git a/Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/Core/Models/Eft/Common/Tables/Trader.cs similarity index 100% rename from Core/Models/Eft/Common/Tables/Trader.cs rename to Libraries/Core/Models/Eft/Common/Tables/Trader.cs diff --git a/Core/Models/Eft/Common/XY.cs b/Libraries/Core/Models/Eft/Common/XY.cs similarity index 100% rename from Core/Models/Eft/Common/XY.cs rename to Libraries/Core/Models/Eft/Common/XY.cs diff --git a/Core/Models/Eft/Common/XYZ.cs b/Libraries/Core/Models/Eft/Common/XYZ.cs similarity index 100% rename from Core/Models/Eft/Common/XYZ.cs rename to Libraries/Core/Models/Eft/Common/XYZ.cs diff --git a/Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/Core/Models/Eft/Customization/BuyClothingRequestData.cs similarity index 100% rename from Core/Models/Eft/Customization/BuyClothingRequestData.cs rename to Libraries/Core/Models/Eft/Customization/BuyClothingRequestData.cs diff --git a/Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/Core/Models/Eft/Customization/CustomizationSetRequest.cs similarity index 100% rename from Core/Models/Eft/Customization/CustomizationSetRequest.cs rename to Libraries/Core/Models/Eft/Customization/CustomizationSetRequest.cs diff --git a/Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/Core/Models/Eft/Customization/WearClothingRequestData.cs similarity index 100% rename from Core/Models/Eft/Customization/WearClothingRequestData.cs rename to Libraries/Core/Models/Eft/Customization/WearClothingRequestData.cs diff --git a/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/AcceptFriendRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs diff --git a/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs rename to Libraries/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs diff --git a/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs rename to Libraries/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs diff --git a/Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/Core/Models/Eft/Dialog/ChatServer.cs similarity index 100% rename from Core/Models/Eft/Dialog/ChatServer.cs rename to Libraries/Core/Models/Eft/Dialog/ChatServer.cs diff --git a/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/ClearMailMessageRequest.cs rename to Libraries/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs diff --git a/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/CreateGroupMailRequest.cs rename to Libraries/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs diff --git a/Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/Core/Models/Eft/Dialog/DeleteFriendRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/DeleteFriendRequest.cs rename to Libraries/Core/Models/Eft/Dialog/DeleteFriendRequest.cs diff --git a/Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/Core/Models/Eft/Dialog/FriendRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/FriendRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/FriendRequestData.cs diff --git a/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs similarity index 100% rename from Core/Models/Eft/Dialog/FriendRequestSendResponse.cs rename to Libraries/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs diff --git a/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs diff --git a/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs rename to Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs diff --git a/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetChatServerListRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs diff --git a/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetFriendListDataResponse.cs rename to Libraries/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs diff --git a/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs diff --git a/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs diff --git a/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs diff --git a/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs similarity index 100% rename from Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs rename to Libraries/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs diff --git a/Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/Core/Models/Eft/Dialog/PinDialogRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/PinDialogRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/PinDialogRequestData.cs diff --git a/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/RemoveDialogRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs diff --git a/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs rename to Libraries/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs diff --git a/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs rename to Libraries/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs diff --git a/Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/Core/Models/Eft/Dialog/SendMessageRequest.cs similarity index 100% rename from Core/Models/Eft/Dialog/SendMessageRequest.cs rename to Libraries/Core/Models/Eft/Dialog/SendMessageRequest.cs diff --git a/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs similarity index 100% rename from Core/Models/Eft/Dialog/SetDialogReadRequestData.cs rename to Libraries/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs diff --git a/Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/Core/Models/Eft/Game/CheckVersionResponse.cs similarity index 100% rename from Core/Models/Eft/Game/CheckVersionResponse.cs rename to Libraries/Core/Models/Eft/Game/CheckVersionResponse.cs diff --git a/Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/Core/Models/Eft/Game/CurrentGroupResponse.cs similarity index 100% rename from Core/Models/Eft/Game/CurrentGroupResponse.cs rename to Libraries/Core/Models/Eft/Game/CurrentGroupResponse.cs diff --git a/Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/Core/Models/Eft/Game/GameConfigResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GameConfigResponse.cs rename to Libraries/Core/Models/Eft/Game/GameConfigResponse.cs diff --git a/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs similarity index 100% rename from Core/Models/Eft/Game/GameEmptyCrcRequestData.cs rename to Libraries/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs diff --git a/Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/Core/Models/Eft/Game/GameKeepAliveResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GameKeepAliveResponse.cs rename to Libraries/Core/Models/Eft/Game/GameKeepAliveResponse.cs diff --git a/Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/Core/Models/Eft/Game/GameLogoutResponseData.cs similarity index 100% rename from Core/Models/Eft/Game/GameLogoutResponseData.cs rename to Libraries/Core/Models/Eft/Game/GameLogoutResponseData.cs diff --git a/Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/Core/Models/Eft/Game/GameModeRequestData.cs similarity index 100% rename from Core/Models/Eft/Game/GameModeRequestData.cs rename to Libraries/Core/Models/Eft/Game/GameModeRequestData.cs diff --git a/Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/Core/Models/Eft/Game/GameModeResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GameModeResponse.cs rename to Libraries/Core/Models/Eft/Game/GameModeResponse.cs diff --git a/Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/Core/Models/Eft/Game/GameStartResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GameStartResponse.cs rename to Libraries/Core/Models/Eft/Game/GameStartResponse.cs diff --git a/Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/Core/Models/Eft/Game/GetItemPricesResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GetItemPricesResponse.cs rename to Libraries/Core/Models/Eft/Game/GetItemPricesResponse.cs diff --git a/Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/Core/Models/Eft/Game/GetRaidTimeRequest.cs similarity index 100% rename from Core/Models/Eft/Game/GetRaidTimeRequest.cs rename to Libraries/Core/Models/Eft/Game/GetRaidTimeRequest.cs diff --git a/Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/Core/Models/Eft/Game/GetRaidTimeResponse.cs similarity index 100% rename from Core/Models/Eft/Game/GetRaidTimeResponse.cs rename to Libraries/Core/Models/Eft/Game/GetRaidTimeResponse.cs diff --git a/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs similarity index 100% rename from Core/Models/Eft/Game/SendSurveyOpinionRequest.cs rename to Libraries/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs diff --git a/Core/Models/Eft/Game/ServerDetails.cs b/Libraries/Core/Models/Eft/Game/ServerDetails.cs similarity index 100% rename from Core/Models/Eft/Game/ServerDetails.cs rename to Libraries/Core/Models/Eft/Game/ServerDetails.cs diff --git a/Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/Core/Models/Eft/Game/SurveyResponseData.cs similarity index 100% rename from Core/Models/Eft/Game/SurveyResponseData.cs rename to Libraries/Core/Models/Eft/Game/SurveyResponseData.cs diff --git a/Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/Core/Models/Eft/Game/VersionValidateRequestData.cs similarity index 100% rename from Core/Models/Eft/Game/VersionValidateRequestData.cs rename to Libraries/Core/Models/Eft/Game/VersionValidateRequestData.cs diff --git a/Core/Models/Eft/Health/Effect.cs b/Libraries/Core/Models/Eft/Health/Effect.cs similarity index 100% rename from Core/Models/Eft/Health/Effect.cs rename to Libraries/Core/Models/Eft/Health/Effect.cs diff --git a/Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs similarity index 100% rename from Core/Models/Eft/Health/HealthTreatmentRequestData.cs rename to Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs diff --git a/Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs similarity index 100% rename from Core/Models/Eft/Health/OffraidEatRequestData.cs rename to Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs diff --git a/Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs similarity index 100% rename from Core/Models/Eft/Health/OffraidHealRequestData.cs rename to Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs diff --git a/Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/Core/Models/Eft/Health/SyncHealthRequestData.cs similarity index 100% rename from Core/Models/Eft/Health/SyncHealthRequestData.cs rename to Libraries/Core/Models/Eft/Health/SyncHealthRequestData.cs diff --git a/Core/Models/Eft/Health/WorkoutData.cs b/Libraries/Core/Models/Eft/Health/WorkoutData.cs similarity index 100% rename from Core/Models/Eft/Health/WorkoutData.cs rename to Libraries/Core/Models/Eft/Health/WorkoutData.cs diff --git a/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutArea.cs b/Libraries/Core/Models/Eft/Hideout/HideoutArea.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutArea.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutArea.cs diff --git a/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCustomisation.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutCustomisation.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutCustomisation.cs diff --git a/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs diff --git a/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutProduction.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs diff --git a/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/Core/Models/Eft/Hideout/HideoutSettingsBase.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutSettingsBase.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutSettingsBase.cs diff --git a/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs diff --git a/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs similarity index 100% rename from Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs rename to Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs diff --git a/Core/Models/Eft/Hideout/QteData.cs b/Libraries/Core/Models/Eft/Hideout/QteData.cs similarity index 100% rename from Core/Models/Eft/Hideout/QteData.cs rename to Libraries/Core/Models/Eft/Hideout/QteData.cs diff --git a/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs similarity index 100% rename from Core/Models/Eft/Hideout/RecordShootingRangePoints.cs rename to Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs diff --git a/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs similarity index 100% rename from Core/Models/Eft/HttpResponse/GetBodyResponseData.cs rename to Libraries/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs diff --git a/Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/Core/Models/Eft/HttpResponse/NullResponseData.cs similarity index 100% rename from Core/Models/Eft/HttpResponse/NullResponseData.cs rename to Libraries/Core/Models/Eft/HttpResponse/NullResponseData.cs diff --git a/Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/Core/Models/Eft/InRaid/InsuredItemsData.cs similarity index 100% rename from Core/Models/Eft/InRaid/InsuredItemsData.cs rename to Libraries/Core/Models/Eft/InRaid/InsuredItemsData.cs diff --git a/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs similarity index 100% rename from Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs rename to Libraries/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs diff --git a/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs similarity index 100% rename from Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs rename to Libraries/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs diff --git a/Core/Models/Eft/InRaid/ScavSaveRequestData.cs b/Libraries/Core/Models/Eft/InRaid/ScavSaveRequestData.cs similarity index 100% rename from Core/Models/Eft/InRaid/ScavSaveRequestData.cs rename to Libraries/Core/Models/Eft/InRaid/ScavSaveRequestData.cs diff --git a/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs similarity index 100% rename from Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs rename to Libraries/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs diff --git a/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs b/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs similarity index 100% rename from Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs rename to Libraries/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs diff --git a/Core/Models/Eft/Insurance/InsureRequestData.cs b/Libraries/Core/Models/Eft/Insurance/InsureRequestData.cs similarity index 100% rename from Core/Models/Eft/Insurance/InsureRequestData.cs rename to Libraries/Core/Models/Eft/Insurance/InsureRequestData.cs diff --git a/Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs similarity index 100% rename from Core/Models/Eft/Inventory/AddItemDirectRequest.cs rename to Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs diff --git a/Core/Models/Eft/Inventory/AddItemRequestData.cs b/Libraries/Core/Models/Eft/Inventory/AddItemRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/AddItemRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/AddItemRequestData.cs diff --git a/Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/Core/Models/Eft/Inventory/AddItemTempObject.cs similarity index 100% rename from Core/Models/Eft/Inventory/AddItemTempObject.cs rename to Libraries/Core/Models/Eft/Inventory/AddItemTempObject.cs diff --git a/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs similarity index 100% rename from Core/Models/Eft/Inventory/AddItemsDirectRequest.cs rename to Libraries/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs diff --git a/Core/Models/Eft/Inventory/InventoryAddRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryAddRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryAddRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryAddRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryBindRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryBindRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryBindRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryExamineRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryFoldRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryMergeRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryMoveRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventorySortRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventorySortRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventorySortRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventorySplitRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventorySplitRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventorySplitRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventorySwapRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventorySwapRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventorySwapRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventorySwapRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryTagRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryTagRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryTagRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryToggleRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryTransferRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs diff --git a/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs b/Libraries/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs diff --git a/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Libraries/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs diff --git a/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs b/Libraries/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs similarity index 100% rename from Core/Models/Eft/Inventory/PinOrLockItemRequest.cs rename to Libraries/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs diff --git a/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Libraries/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs similarity index 100% rename from Core/Models/Eft/Inventory/RedeemProfileRequestData.cs rename to Libraries/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs diff --git a/Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Libraries/Core/Models/Eft/Inventory/SetFavoriteItems.cs similarity index 100% rename from Core/Models/Eft/Inventory/SetFavoriteItems.cs rename to Libraries/Core/Models/Eft/Inventory/SetFavoriteItems.cs diff --git a/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs similarity index 100% rename from Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs rename to Libraries/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs diff --git a/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs similarity index 100% rename from Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs rename to Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs diff --git a/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs similarity index 100% rename from Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs rename to Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs diff --git a/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs similarity index 100% rename from Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs rename to Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs diff --git a/Core/Models/Eft/Launcher/ChangeRequestData.cs b/Libraries/Core/Models/Eft/Launcher/ChangeRequestData.cs similarity index 100% rename from Core/Models/Eft/Launcher/ChangeRequestData.cs rename to Libraries/Core/Models/Eft/Launcher/ChangeRequestData.cs diff --git a/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs similarity index 100% rename from Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs rename to Libraries/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs diff --git a/Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/Core/Models/Eft/Launcher/LoginRequestData.cs similarity index 100% rename from Core/Models/Eft/Launcher/LoginRequestData.cs rename to Libraries/Core/Models/Eft/Launcher/LoginRequestData.cs diff --git a/Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/Core/Models/Eft/Launcher/MiniProfile.cs similarity index 100% rename from Core/Models/Eft/Launcher/MiniProfile.cs rename to Libraries/Core/Models/Eft/Launcher/MiniProfile.cs diff --git a/Core/Models/Eft/Launcher/RegisterData.cs b/Libraries/Core/Models/Eft/Launcher/RegisterData.cs similarity index 100% rename from Core/Models/Eft/Launcher/RegisterData.cs rename to Libraries/Core/Models/Eft/Launcher/RegisterData.cs diff --git a/Core/Models/Eft/Launcher/RemoveProfileData.cs b/Libraries/Core/Models/Eft/Launcher/RemoveProfileData.cs similarity index 100% rename from Core/Models/Eft/Launcher/RemoveProfileData.cs rename to Libraries/Core/Models/Eft/Launcher/RemoveProfileData.cs diff --git a/Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/Core/Models/Eft/Location/AirdropLootResult.cs similarity index 100% rename from Core/Models/Eft/Location/AirdropLootResult.cs rename to Libraries/Core/Models/Eft/Location/AirdropLootResult.cs diff --git a/Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/Core/Models/Eft/Location/GetAirdropLootRequest.cs similarity index 100% rename from Core/Models/Eft/Location/GetAirdropLootRequest.cs rename to Libraries/Core/Models/Eft/Location/GetAirdropLootRequest.cs diff --git a/Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/Core/Models/Eft/Location/GetAirdropLootResponse.cs similarity index 100% rename from Core/Models/Eft/Location/GetAirdropLootResponse.cs rename to Libraries/Core/Models/Eft/Location/GetAirdropLootResponse.cs diff --git a/Core/Models/Eft/Location/GetLocationRequestData.cs b/Libraries/Core/Models/Eft/Location/GetLocationRequestData.cs similarity index 100% rename from Core/Models/Eft/Location/GetLocationRequestData.cs rename to Libraries/Core/Models/Eft/Location/GetLocationRequestData.cs diff --git a/Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/EndLocalRaidRequestData.cs rename to Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs diff --git a/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/EndOfflineRaidRequestData.cs rename to Libraries/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs diff --git a/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs b/Libraries/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs rename to Libraries/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs diff --git a/Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/Core/Models/Eft/Match/GroupCharacter.cs similarity index 100% rename from Core/Models/Eft/Match/GroupCharacter.cs rename to Libraries/Core/Models/Eft/Match/GroupCharacter.cs diff --git a/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupCurrentResponse.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs diff --git a/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs diff --git a/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs diff --git a/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupStartGameRequest.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs diff --git a/Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/Core/Models/Eft/Match/MatchGroupStatusRequest.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupStatusRequest.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupStatusRequest.cs diff --git a/Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/Core/Models/Eft/Match/MatchGroupStatusResponse.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupStatusResponse.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupStatusResponse.cs diff --git a/Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/Core/Models/Eft/Match/MatchGroupTransferRequest.cs similarity index 100% rename from Core/Models/Eft/Match/MatchGroupTransferRequest.cs rename to Libraries/Core/Models/Eft/Match/MatchGroupTransferRequest.cs diff --git a/Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/Core/Models/Eft/Match/ProfileStatusRequest.cs similarity index 100% rename from Core/Models/Eft/Match/ProfileStatusRequest.cs rename to Libraries/Core/Models/Eft/Match/ProfileStatusRequest.cs diff --git a/Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/Core/Models/Eft/Match/ProfileStatusResponse.cs similarity index 100% rename from Core/Models/Eft/Match/ProfileStatusResponse.cs rename to Libraries/Core/Models/Eft/Match/ProfileStatusResponse.cs diff --git a/Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/PutMetricsRequestData.cs rename to Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs diff --git a/Core/Models/Eft/Match/RaidSettings.cs b/Libraries/Core/Models/Eft/Match/RaidSettings.cs similarity index 100% rename from Core/Models/Eft/Match/RaidSettings.cs rename to Libraries/Core/Models/Eft/Match/RaidSettings.cs diff --git a/Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/Core/Models/Eft/Match/RequestIdRequest.cs similarity index 100% rename from Core/Models/Eft/Match/RequestIdRequest.cs rename to Libraries/Core/Models/Eft/Match/RequestIdRequest.cs diff --git a/Core/Models/Eft/Match/Server.cs b/Libraries/Core/Models/Eft/Match/Server.cs similarity index 100% rename from Core/Models/Eft/Match/Server.cs rename to Libraries/Core/Models/Eft/Match/Server.cs diff --git a/Core/Models/Eft/Match/SessionStatus.cs b/Libraries/Core/Models/Eft/Match/SessionStatus.cs similarity index 100% rename from Core/Models/Eft/Match/SessionStatus.cs rename to Libraries/Core/Models/Eft/Match/SessionStatus.cs diff --git a/Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/Core/Models/Eft/Match/StartLocalRaidRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/StartLocalRaidRequestData.cs rename to Libraries/Core/Models/Eft/Match/StartLocalRaidRequestData.cs diff --git a/Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/Core/Models/Eft/Match/StartLocalRaidResponseData.cs similarity index 100% rename from Core/Models/Eft/Match/StartLocalRaidResponseData.cs rename to Libraries/Core/Models/Eft/Match/StartLocalRaidResponseData.cs diff --git a/Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/Core/Models/Eft/Match/UpdatePingRequestData.cs similarity index 100% rename from Core/Models/Eft/Match/UpdatePingRequestData.cs rename to Libraries/Core/Models/Eft/Match/UpdatePingRequestData.cs diff --git a/Core/Models/Eft/Notes/NoteActionData.cs b/Libraries/Core/Models/Eft/Notes/NoteActionData.cs similarity index 100% rename from Core/Models/Eft/Notes/NoteActionData.cs rename to Libraries/Core/Models/Eft/Notes/NoteActionData.cs diff --git a/Core/Models/Eft/Notifier/Notifier.cs b/Libraries/Core/Models/Eft/Notifier/Notifier.cs similarity index 100% rename from Core/Models/Eft/Notifier/Notifier.cs rename to Libraries/Core/Models/Eft/Notifier/Notifier.cs diff --git a/Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/Core/Models/Eft/Notifier/SelectProfileResponse.cs similarity index 100% rename from Core/Models/Eft/Notifier/SelectProfileResponse.cs rename to Libraries/Core/Models/Eft/Notifier/SelectProfileResponse.cs diff --git a/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs b/Libraries/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs similarity index 100% rename from Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs rename to Libraries/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs diff --git a/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Libraries/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs similarity index 100% rename from Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs rename to Libraries/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs diff --git a/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs similarity index 100% rename from Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs rename to Libraries/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs diff --git a/Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/Core/Models/Eft/Prestige/GetPrestigeResponse.cs similarity index 100% rename from Core/Models/Eft/Prestige/GetPrestigeResponse.cs rename to Libraries/Core/Models/Eft/Prestige/GetPrestigeResponse.cs diff --git a/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs similarity index 100% rename from Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs rename to Libraries/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs diff --git a/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/CompletedAchievementsResponse.cs rename to Libraries/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs diff --git a/Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/Core/Models/Eft/Profile/ConnectResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/ConnectResponse.cs rename to Libraries/Core/Models/Eft/Profile/ConnectResponse.cs diff --git a/Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/Core/Models/Eft/Profile/CreateProfileResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/CreateProfileResponse.cs rename to Libraries/Core/Models/Eft/Profile/CreateProfileResponse.cs diff --git a/Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/Core/Models/Eft/Profile/GetAchievementsResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/GetAchievementsResponse.cs rename to Libraries/Core/Models/Eft/Profile/GetAchievementsResponse.cs diff --git a/Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/Core/Models/Eft/Profile/GetOtherProfileRequest.cs similarity index 100% rename from Core/Models/Eft/Profile/GetOtherProfileRequest.cs rename to Libraries/Core/Models/Eft/Profile/GetOtherProfileRequest.cs diff --git a/Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/Core/Models/Eft/Profile/GetOtherProfileResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/GetOtherProfileResponse.cs rename to Libraries/Core/Models/Eft/Profile/GetOtherProfileResponse.cs diff --git a/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs similarity index 100% rename from Core/Models/Eft/Profile/GetProfileSettingsRequest.cs rename to Libraries/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs diff --git a/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Libraries/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs similarity index 100% rename from Core/Models/Eft/Profile/GetProfileStatusResponseData.cs rename to Libraries/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs diff --git a/Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/Core/Models/Eft/Profile/MessageContentRagfair.cs similarity index 100% rename from Core/Models/Eft/Profile/MessageContentRagfair.cs rename to Libraries/Core/Models/Eft/Profile/MessageContentRagfair.cs diff --git a/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs similarity index 100% rename from Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs rename to Libraries/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs diff --git a/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs similarity index 100% rename from Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs rename to Libraries/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs diff --git a/Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/Core/Models/Eft/Profile/ProfileCreateRequestData.cs similarity index 100% rename from Core/Models/Eft/Profile/ProfileCreateRequestData.cs rename to Libraries/Core/Models/Eft/Profile/ProfileCreateRequestData.cs diff --git a/Core/Models/Eft/Profile/SearchFriendRequestData.cs b/Libraries/Core/Models/Eft/Profile/SearchFriendRequestData.cs similarity index 100% rename from Core/Models/Eft/Profile/SearchFriendRequestData.cs rename to Libraries/Core/Models/Eft/Profile/SearchFriendRequestData.cs diff --git a/Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/Core/Models/Eft/Profile/SearchFriendResponse.cs similarity index 100% rename from Core/Models/Eft/Profile/SearchFriendResponse.cs rename to Libraries/Core/Models/Eft/Profile/SearchFriendResponse.cs diff --git a/Core/Models/Eft/Profile/SptProfile.cs b/Libraries/Core/Models/Eft/Profile/SptProfile.cs similarity index 100% rename from Core/Models/Eft/Profile/SptProfile.cs rename to Libraries/Core/Models/Eft/Profile/SptProfile.cs diff --git a/Core/Models/Eft/Profile/SystemData.cs b/Libraries/Core/Models/Eft/Profile/SystemData.cs similarity index 100% rename from Core/Models/Eft/Profile/SystemData.cs rename to Libraries/Core/Models/Eft/Profile/SystemData.cs diff --git a/Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/Core/Models/Eft/Profile/UserDialogInfo.cs similarity index 100% rename from Core/Models/Eft/Profile/UserDialogInfo.cs rename to Libraries/Core/Models/Eft/Profile/UserDialogInfo.cs diff --git a/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs similarity index 100% rename from Core/Models/Eft/Profile/ValidateNicknameRequestData.cs rename to Libraries/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs diff --git a/Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Libraries/Core/Models/Eft/Quests/AcceptQuestRequestData.cs similarity index 100% rename from Core/Models/Eft/Quests/AcceptQuestRequestData.cs rename to Libraries/Core/Models/Eft/Quests/AcceptQuestRequestData.cs diff --git a/Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Libraries/Core/Models/Eft/Quests/CompleteQuestRequestData.cs similarity index 100% rename from Core/Models/Eft/Quests/CompleteQuestRequestData.cs rename to Libraries/Core/Models/Eft/Quests/CompleteQuestRequestData.cs diff --git a/Core/Models/Eft/Quests/FailQuestRequestData.cs b/Libraries/Core/Models/Eft/Quests/FailQuestRequestData.cs similarity index 100% rename from Core/Models/Eft/Quests/FailQuestRequestData.cs rename to Libraries/Core/Models/Eft/Quests/FailQuestRequestData.cs diff --git a/Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs similarity index 100% rename from Core/Models/Eft/Quests/HandoverQuestRequestData.cs rename to Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs diff --git a/Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/Core/Models/Eft/Quests/ListQuestsRequestData.cs similarity index 100% rename from Core/Models/Eft/Quests/ListQuestsRequestData.cs rename to Libraries/Core/Models/Eft/Quests/ListQuestsRequestData.cs diff --git a/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Libraries/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs similarity index 100% rename from Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs rename to Libraries/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs diff --git a/Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/AddOfferRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/AddOfferRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/AddOfferRequestData.cs diff --git a/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs diff --git a/Core/Models/Eft/Ragfair/GetItemPriceResult.cs b/Libraries/Core/Models/Eft/Ragfair/GetItemPriceResult.cs similarity index 100% rename from Core/Models/Eft/Ragfair/GetItemPriceResult.cs rename to Libraries/Core/Models/Eft/Ragfair/GetItemPriceResult.cs diff --git a/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs diff --git a/Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/Core/Models/Eft/Ragfair/GetOffersResult.cs similarity index 100% rename from Core/Models/Eft/Ragfair/GetOffersResult.cs rename to Libraries/Core/Models/Eft/Ragfair/GetOffersResult.cs diff --git a/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs similarity index 100% rename from Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs rename to Libraries/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs diff --git a/Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/Core/Models/Eft/Ragfair/RagfairOffer.cs similarity index 100% rename from Core/Models/Eft/Ragfair/RagfairOffer.cs rename to Libraries/Core/Models/Eft/Ragfair/RagfairOffer.cs diff --git a/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs diff --git a/Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/SearchRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/SearchRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/SearchRequestData.cs diff --git a/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs diff --git a/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs similarity index 100% rename from Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs rename to Libraries/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs diff --git a/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs similarity index 100% rename from Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs rename to Libraries/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs diff --git a/Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/Core/Models/Eft/Repair/RepairActionDataRequest.cs similarity index 100% rename from Core/Models/Eft/Repair/RepairActionDataRequest.cs rename to Libraries/Core/Models/Eft/Repair/RepairActionDataRequest.cs diff --git a/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs b/Libraries/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs similarity index 100% rename from Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs rename to Libraries/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs diff --git a/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs b/Libraries/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs similarity index 100% rename from Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs rename to Libraries/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs diff --git a/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs b/Libraries/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs similarity index 100% rename from Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs rename to Libraries/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs diff --git a/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs similarity index 100% rename from Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs rename to Libraries/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs diff --git a/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs similarity index 100% rename from Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs rename to Libraries/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs diff --git a/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs b/Libraries/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs similarity index 100% rename from Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs rename to Libraries/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs diff --git a/Core/Models/Eft/Weather/WeatherData.cs b/Libraries/Core/Models/Eft/Weather/WeatherData.cs similarity index 100% rename from Core/Models/Eft/Weather/WeatherData.cs rename to Libraries/Core/Models/Eft/Weather/WeatherData.cs diff --git a/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs b/Libraries/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs similarity index 100% rename from Core/Models/Eft/Wishlist/AddToWishlistRequest.cs rename to Libraries/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs diff --git a/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs b/Libraries/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs similarity index 100% rename from Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs rename to Libraries/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs diff --git a/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs b/Libraries/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs similarity index 100% rename from Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs rename to Libraries/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs diff --git a/Core/Models/Eft/Ws/NotificationEventType.cs b/Libraries/Core/Models/Eft/Ws/NotificationEventType.cs similarity index 100% rename from Core/Models/Eft/Ws/NotificationEventType.cs rename to Libraries/Core/Models/Eft/Ws/NotificationEventType.cs diff --git a/Core/Models/Eft/Ws/WsAid.cs b/Libraries/Core/Models/Eft/Ws/WsAid.cs similarity index 100% rename from Core/Models/Eft/Ws/WsAid.cs rename to Libraries/Core/Models/Eft/Ws/WsAid.cs diff --git a/Core/Models/Eft/Ws/WsAidNickname.cs b/Libraries/Core/Models/Eft/Ws/WsAidNickname.cs similarity index 100% rename from Core/Models/Eft/Ws/WsAidNickname.cs rename to Libraries/Core/Models/Eft/Ws/WsAidNickname.cs diff --git a/Core/Models/Eft/Ws/WsChatMessageReceived.cs b/Libraries/Core/Models/Eft/Ws/WsChatMessageReceived.cs similarity index 100% rename from Core/Models/Eft/Ws/WsChatMessageReceived.cs rename to Libraries/Core/Models/Eft/Ws/WsChatMessageReceived.cs diff --git a/Core/Models/Eft/Ws/WsFriendListAccept.cs b/Libraries/Core/Models/Eft/Ws/WsFriendListAccept.cs similarity index 100% rename from Core/Models/Eft/Ws/WsFriendListAccept.cs rename to Libraries/Core/Models/Eft/Ws/WsFriendListAccept.cs diff --git a/Core/Models/Eft/Ws/WsGroupId.cs b/Libraries/Core/Models/Eft/Ws/WsGroupId.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupId.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupId.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs diff --git a/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs b/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs similarity index 100% rename from Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs rename to Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs diff --git a/Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/Core/Models/Eft/Ws/WsNotificationEvent.cs similarity index 100% rename from Core/Models/Eft/Ws/WsNotificationEvent.cs rename to Libraries/Core/Models/Eft/Ws/WsNotificationEvent.cs diff --git a/Core/Models/Eft/Ws/WsPing.cs b/Libraries/Core/Models/Eft/Ws/WsPing.cs similarity index 100% rename from Core/Models/Eft/Ws/WsPing.cs rename to Libraries/Core/Models/Eft/Ws/WsPing.cs diff --git a/Core/Models/Eft/Ws/WsRagfairOfferSold.cs b/Libraries/Core/Models/Eft/Ws/WsRagfairOfferSold.cs similarity index 100% rename from Core/Models/Eft/Ws/WsRagfairOfferSold.cs rename to Libraries/Core/Models/Eft/Ws/WsRagfairOfferSold.cs diff --git a/Core/Models/Eft/Ws/WsUserConfirmed.cs b/Libraries/Core/Models/Eft/Ws/WsUserConfirmed.cs similarity index 100% rename from Core/Models/Eft/Ws/WsUserConfirmed.cs rename to Libraries/Core/Models/Eft/Ws/WsUserConfirmed.cs diff --git a/Core/Models/Enums/AccountTypes.cs b/Libraries/Core/Models/Enums/AccountTypes.cs similarity index 100% rename from Core/Models/Enums/AccountTypes.cs rename to Libraries/Core/Models/Enums/AccountTypes.cs diff --git a/Core/Models/Enums/AirdropType.cs b/Libraries/Core/Models/Enums/AirdropType.cs similarity index 100% rename from Core/Models/Enums/AirdropType.cs rename to Libraries/Core/Models/Enums/AirdropType.cs diff --git a/Core/Models/Enums/BackendErrorCodes.cs b/Libraries/Core/Models/Enums/BackendErrorCodes.cs similarity index 100% rename from Core/Models/Enums/BackendErrorCodes.cs rename to Libraries/Core/Models/Enums/BackendErrorCodes.cs diff --git a/Core/Models/Enums/BaseClasses.cs b/Libraries/Core/Models/Enums/BaseClasses.cs similarity index 100% rename from Core/Models/Enums/BaseClasses.cs rename to Libraries/Core/Models/Enums/BaseClasses.cs diff --git a/Core/Models/Enums/BonusSkillType.cs b/Libraries/Core/Models/Enums/BonusSkillType.cs similarity index 100% rename from Core/Models/Enums/BonusSkillType.cs rename to Libraries/Core/Models/Enums/BonusSkillType.cs diff --git a/Core/Models/Enums/BonusType.cs b/Libraries/Core/Models/Enums/BonusType.cs similarity index 100% rename from Core/Models/Enums/BonusType.cs rename to Libraries/Core/Models/Enums/BonusType.cs diff --git a/Core/Models/Enums/ConfigTypes.cs b/Libraries/Core/Models/Enums/ConfigTypes.cs similarity index 100% rename from Core/Models/Enums/ConfigTypes.cs rename to Libraries/Core/Models/Enums/ConfigTypes.cs diff --git a/Core/Models/Enums/DateTimeEnum.cs b/Libraries/Core/Models/Enums/DateTimeEnum.cs similarity index 100% rename from Core/Models/Enums/DateTimeEnum.cs rename to Libraries/Core/Models/Enums/DateTimeEnum.cs diff --git a/Core/Models/Enums/DogtagExchangeSide.cs b/Libraries/Core/Models/Enums/DogtagExchangeSide.cs similarity index 100% rename from Core/Models/Enums/DogtagExchangeSide.cs rename to Libraries/Core/Models/Enums/DogtagExchangeSide.cs diff --git a/Core/Models/Enums/ELocationName.cs b/Libraries/Core/Models/Enums/ELocationName.cs similarity index 100% rename from Core/Models/Enums/ELocationName.cs rename to Libraries/Core/Models/Enums/ELocationName.cs diff --git a/Core/Models/Enums/EquipmentBuildType.cs b/Libraries/Core/Models/Enums/EquipmentBuildType.cs similarity index 100% rename from Core/Models/Enums/EquipmentBuildType.cs rename to Libraries/Core/Models/Enums/EquipmentBuildType.cs diff --git a/Core/Models/Enums/EquipmentSlots.cs b/Libraries/Core/Models/Enums/EquipmentSlots.cs similarity index 100% rename from Core/Models/Enums/EquipmentSlots.cs rename to Libraries/Core/Models/Enums/EquipmentSlots.cs diff --git a/Core/Models/Enums/ExitStatus.cs b/Libraries/Core/Models/Enums/ExitStatus.cs similarity index 100% rename from Core/Models/Enums/ExitStatus.cs rename to Libraries/Core/Models/Enums/ExitStatus.cs diff --git a/Core/Models/Enums/FleaOfferType.cs b/Libraries/Core/Models/Enums/FleaOfferType.cs similarity index 100% rename from Core/Models/Enums/FleaOfferType.cs rename to Libraries/Core/Models/Enums/FleaOfferType.cs diff --git a/Core/Models/Enums/GameEditions.cs b/Libraries/Core/Models/Enums/GameEditions.cs similarity index 100% rename from Core/Models/Enums/GameEditions.cs rename to Libraries/Core/Models/Enums/GameEditions.cs diff --git a/Core/Models/Enums/GiftSenderType.cs b/Libraries/Core/Models/Enums/GiftSenderType.cs similarity index 100% rename from Core/Models/Enums/GiftSenderType.cs rename to Libraries/Core/Models/Enums/GiftSenderType.cs diff --git a/Core/Models/Enums/GiftSentResult.cs b/Libraries/Core/Models/Enums/GiftSentResult.cs similarity index 100% rename from Core/Models/Enums/GiftSentResult.cs rename to Libraries/Core/Models/Enums/GiftSentResult.cs diff --git a/Core/Models/Enums/Hideout/CircleRewardType.cs b/Libraries/Core/Models/Enums/Hideout/CircleRewardType.cs similarity index 100% rename from Core/Models/Enums/Hideout/CircleRewardType.cs rename to Libraries/Core/Models/Enums/Hideout/CircleRewardType.cs diff --git a/Core/Models/Enums/Hideout/QteActivityType.cs b/Libraries/Core/Models/Enums/Hideout/QteActivityType.cs similarity index 100% rename from Core/Models/Enums/Hideout/QteActivityType.cs rename to Libraries/Core/Models/Enums/Hideout/QteActivityType.cs diff --git a/Core/Models/Enums/Hideout/QteEffectType.cs b/Libraries/Core/Models/Enums/Hideout/QteEffectType.cs similarity index 100% rename from Core/Models/Enums/Hideout/QteEffectType.cs rename to Libraries/Core/Models/Enums/Hideout/QteEffectType.cs diff --git a/Core/Models/Enums/Hideout/QteResultType.cs b/Libraries/Core/Models/Enums/Hideout/QteResultType.cs similarity index 100% rename from Core/Models/Enums/Hideout/QteResultType.cs rename to Libraries/Core/Models/Enums/Hideout/QteResultType.cs diff --git a/Core/Models/Enums/Hideout/QteRewardType.cs b/Libraries/Core/Models/Enums/Hideout/QteRewardType.cs similarity index 100% rename from Core/Models/Enums/Hideout/QteRewardType.cs rename to Libraries/Core/Models/Enums/Hideout/QteRewardType.cs diff --git a/Core/Models/Enums/Hideout/QteType.cs b/Libraries/Core/Models/Enums/Hideout/QteType.cs similarity index 100% rename from Core/Models/Enums/Hideout/QteType.cs rename to Libraries/Core/Models/Enums/Hideout/QteType.cs diff --git a/Core/Models/Enums/Hideout/RequirementType.cs b/Libraries/Core/Models/Enums/Hideout/RequirementType.cs similarity index 100% rename from Core/Models/Enums/Hideout/RequirementType.cs rename to Libraries/Core/Models/Enums/Hideout/RequirementType.cs diff --git a/Core/Models/Enums/HideoutAreas.cs b/Libraries/Core/Models/Enums/HideoutAreas.cs similarity index 100% rename from Core/Models/Enums/HideoutAreas.cs rename to Libraries/Core/Models/Enums/HideoutAreas.cs diff --git a/Core/Models/Enums/HideoutEventActions.cs b/Libraries/Core/Models/Enums/HideoutEventActions.cs similarity index 100% rename from Core/Models/Enums/HideoutEventActions.cs rename to Libraries/Core/Models/Enums/HideoutEventActions.cs diff --git a/Core/Models/Enums/ItemAddedResult.cs b/Libraries/Core/Models/Enums/ItemAddedResult.cs similarity index 100% rename from Core/Models/Enums/ItemAddedResult.cs rename to Libraries/Core/Models/Enums/ItemAddedResult.cs diff --git a/Core/Models/Enums/ItemEventActions.cs b/Libraries/Core/Models/Enums/ItemEventActions.cs similarity index 100% rename from Core/Models/Enums/ItemEventActions.cs rename to Libraries/Core/Models/Enums/ItemEventActions.cs diff --git a/Core/Models/Enums/ItemTpl.cs b/Libraries/Core/Models/Enums/ItemTpl.cs similarity index 100% rename from Core/Models/Enums/ItemTpl.cs rename to Libraries/Core/Models/Enums/ItemTpl.cs diff --git a/Core/Models/Enums/MemberCategory.cs b/Libraries/Core/Models/Enums/MemberCategory.cs similarity index 100% rename from Core/Models/Enums/MemberCategory.cs rename to Libraries/Core/Models/Enums/MemberCategory.cs diff --git a/Core/Models/Enums/MessageType.cs b/Libraries/Core/Models/Enums/MessageType.cs similarity index 100% rename from Core/Models/Enums/MessageType.cs rename to Libraries/Core/Models/Enums/MessageType.cs diff --git a/Core/Models/Enums/ModSpawn.cs b/Libraries/Core/Models/Enums/ModSpawn.cs similarity index 100% rename from Core/Models/Enums/ModSpawn.cs rename to Libraries/Core/Models/Enums/ModSpawn.cs diff --git a/Core/Models/Enums/Money.cs b/Libraries/Core/Models/Enums/Money.cs similarity index 100% rename from Core/Models/Enums/Money.cs rename to Libraries/Core/Models/Enums/Money.cs diff --git a/Core/Models/Enums/PlayersSpawnPlace.cs b/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs similarity index 100% rename from Core/Models/Enums/PlayersSpawnPlace.cs rename to Libraries/Core/Models/Enums/PlayersSpawnPlace.cs diff --git a/Core/Models/Enums/ProfileStatus.cs b/Libraries/Core/Models/Enums/ProfileStatus.cs similarity index 100% rename from Core/Models/Enums/ProfileStatus.cs rename to Libraries/Core/Models/Enums/ProfileStatus.cs diff --git a/Core/Models/Enums/QuestStatusEnum.cs b/Libraries/Core/Models/Enums/QuestStatusEnum.cs similarity index 100% rename from Core/Models/Enums/QuestStatusEnum.cs rename to Libraries/Core/Models/Enums/QuestStatusEnum.cs diff --git a/Core/Models/Enums/QuestTypeEnum.cs b/Libraries/Core/Models/Enums/QuestTypeEnum.cs similarity index 100% rename from Core/Models/Enums/QuestTypeEnum.cs rename to Libraries/Core/Models/Enums/QuestTypeEnum.cs diff --git a/Core/Models/Enums/RagfairSort.cs b/Libraries/Core/Models/Enums/RagfairSort.cs similarity index 100% rename from Core/Models/Enums/RagfairSort.cs rename to Libraries/Core/Models/Enums/RagfairSort.cs diff --git a/Core/Models/Enums/RaidMode.cs b/Libraries/Core/Models/Enums/RaidMode.cs similarity index 100% rename from Core/Models/Enums/RaidMode.cs rename to Libraries/Core/Models/Enums/RaidMode.cs diff --git a/Core/Models/Enums/RaidSettings/BotAmount.cs b/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/BotAmount.cs rename to Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs diff --git a/Core/Models/Enums/RaidSettings/BotDifficulty.cs b/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/BotDifficulty.cs rename to Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs diff --git a/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs rename to Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs diff --git a/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs rename to Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs diff --git a/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs rename to Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs diff --git a/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs rename to Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs diff --git a/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs similarity index 100% rename from Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs rename to Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs diff --git a/Core/Models/Enums/RewardType.cs b/Libraries/Core/Models/Enums/RewardType.cs similarity index 100% rename from Core/Models/Enums/RewardType.cs rename to Libraries/Core/Models/Enums/RewardType.cs diff --git a/Core/Models/Enums/Season.cs b/Libraries/Core/Models/Enums/Season.cs similarity index 100% rename from Core/Models/Enums/Season.cs rename to Libraries/Core/Models/Enums/Season.cs diff --git a/Core/Models/Enums/SeasonalEventType.cs b/Libraries/Core/Models/Enums/SeasonalEventType.cs similarity index 100% rename from Core/Models/Enums/SeasonalEventType.cs rename to Libraries/Core/Models/Enums/SeasonalEventType.cs diff --git a/Core/Models/Enums/SideType.cs b/Libraries/Core/Models/Enums/SideType.cs similarity index 100% rename from Core/Models/Enums/SideType.cs rename to Libraries/Core/Models/Enums/SideType.cs diff --git a/Core/Models/Enums/SkillTypes.cs b/Libraries/Core/Models/Enums/SkillTypes.cs similarity index 100% rename from Core/Models/Enums/SkillTypes.cs rename to Libraries/Core/Models/Enums/SkillTypes.cs diff --git a/Core/Models/Enums/TraderServiceType.cs b/Libraries/Core/Models/Enums/TraderServiceType.cs similarity index 100% rename from Core/Models/Enums/TraderServiceType.cs rename to Libraries/Core/Models/Enums/TraderServiceType.cs diff --git a/Core/Models/Enums/Traders.cs b/Libraries/Core/Models/Enums/Traders.cs similarity index 100% rename from Core/Models/Enums/Traders.cs rename to Libraries/Core/Models/Enums/Traders.cs diff --git a/Core/Models/Enums/TransitionType.cs b/Libraries/Core/Models/Enums/TransitionType.cs similarity index 100% rename from Core/Models/Enums/TransitionType.cs rename to Libraries/Core/Models/Enums/TransitionType.cs diff --git a/Core/Models/Enums/WindDirection.cs b/Libraries/Core/Models/Enums/WindDirection.cs similarity index 100% rename from Core/Models/Enums/WindDirection.cs rename to Libraries/Core/Models/Enums/WindDirection.cs diff --git a/Core/Models/External/IPostDBLoadMod.cs b/Libraries/Core/Models/External/IPostDBLoadMod.cs similarity index 100% rename from Core/Models/External/IPostDBLoadMod.cs rename to Libraries/Core/Models/External/IPostDBLoadMod.cs diff --git a/Core/Models/External/IPostSptLoadMod.cs b/Libraries/Core/Models/External/IPostSptLoadMod.cs similarity index 100% rename from Core/Models/External/IPostSptLoadMod.cs rename to Libraries/Core/Models/External/IPostSptLoadMod.cs diff --git a/Core/Models/External/IPreSptLoadMod.cs b/Libraries/Core/Models/External/IPreSptLoadMod.cs similarity index 100% rename from Core/Models/External/IPreSptLoadMod.cs rename to Libraries/Core/Models/External/IPreSptLoadMod.cs diff --git a/Core/Models/Logging/LogBackgroundColor.cs b/Libraries/Core/Models/Logging/LogBackgroundColor.cs similarity index 100% rename from Core/Models/Logging/LogBackgroundColor.cs rename to Libraries/Core/Models/Logging/LogBackgroundColor.cs diff --git a/Core/Models/Logging/LogTextColor.cs b/Libraries/Core/Models/Logging/LogTextColor.cs similarity index 100% rename from Core/Models/Logging/LogTextColor.cs rename to Libraries/Core/Models/Logging/LogTextColor.cs diff --git a/Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/Core/Models/Spt/Bots/BotGenerationDetails.cs similarity index 100% rename from Core/Models/Spt/Bots/BotGenerationDetails.cs rename to Libraries/Core/Models/Spt/Bots/BotGenerationDetails.cs diff --git a/Core/Models/Spt/Bots/BotLootCache.cs b/Libraries/Core/Models/Spt/Bots/BotLootCache.cs similarity index 100% rename from Core/Models/Spt/Bots/BotLootCache.cs rename to Libraries/Core/Models/Spt/Bots/BotLootCache.cs diff --git a/Core/Models/Spt/Bots/Bots.cs b/Libraries/Core/Models/Spt/Bots/Bots.cs similarity index 100% rename from Core/Models/Spt/Bots/Bots.cs rename to Libraries/Core/Models/Spt/Bots/Bots.cs diff --git a/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs similarity index 100% rename from Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs rename to Libraries/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs diff --git a/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs similarity index 100% rename from Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs rename to Libraries/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs diff --git a/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs similarity index 100% rename from Core/Models/Spt/Bots/GenerateEquipmentProperties.cs rename to Libraries/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs diff --git a/Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/Core/Models/Spt/Bots/GenerateWeaponRequest.cs similarity index 100% rename from Core/Models/Spt/Bots/GenerateWeaponRequest.cs rename to Libraries/Core/Models/Spt/Bots/GenerateWeaponRequest.cs diff --git a/Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/Core/Models/Spt/Bots/GenerateWeaponResult.cs similarity index 100% rename from Core/Models/Spt/Bots/GenerateWeaponResult.cs rename to Libraries/Core/Models/Spt/Bots/GenerateWeaponResult.cs diff --git a/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs similarity index 100% rename from Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs rename to Libraries/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs diff --git a/Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/Core/Models/Spt/Bots/ModToSpawnRequest.cs similarity index 100% rename from Core/Models/Spt/Bots/ModToSpawnRequest.cs rename to Libraries/Core/Models/Spt/Bots/ModToSpawnRequest.cs diff --git a/Core/Models/Spt/Config/AirdropConfig.cs b/Libraries/Core/Models/Spt/Config/AirdropConfig.cs similarity index 100% rename from Core/Models/Spt/Config/AirdropConfig.cs rename to Libraries/Core/Models/Spt/Config/AirdropConfig.cs diff --git a/Core/Models/Spt/Config/BackupConfig.cs b/Libraries/Core/Models/Spt/Config/BackupConfig.cs similarity index 100% rename from Core/Models/Spt/Config/BackupConfig.cs rename to Libraries/Core/Models/Spt/Config/BackupConfig.cs diff --git a/Core/Models/Spt/Config/BaseConfig.cs b/Libraries/Core/Models/Spt/Config/BaseConfig.cs similarity index 100% rename from Core/Models/Spt/Config/BaseConfig.cs rename to Libraries/Core/Models/Spt/Config/BaseConfig.cs diff --git a/Core/Models/Spt/Config/BotConfig.cs b/Libraries/Core/Models/Spt/Config/BotConfig.cs similarity index 100% rename from Core/Models/Spt/Config/BotConfig.cs rename to Libraries/Core/Models/Spt/Config/BotConfig.cs diff --git a/Core/Models/Spt/Config/BotDurability.cs b/Libraries/Core/Models/Spt/Config/BotDurability.cs similarity index 100% rename from Core/Models/Spt/Config/BotDurability.cs rename to Libraries/Core/Models/Spt/Config/BotDurability.cs diff --git a/Core/Models/Spt/Config/CoreConfig.cs b/Libraries/Core/Models/Spt/Config/CoreConfig.cs similarity index 100% rename from Core/Models/Spt/Config/CoreConfig.cs rename to Libraries/Core/Models/Spt/Config/CoreConfig.cs diff --git a/Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/Core/Models/Spt/Config/GiftsConfig.cs similarity index 100% rename from Core/Models/Spt/Config/GiftsConfig.cs rename to Libraries/Core/Models/Spt/Config/GiftsConfig.cs diff --git a/Core/Models/Spt/Config/HealthConfig.cs b/Libraries/Core/Models/Spt/Config/HealthConfig.cs similarity index 100% rename from Core/Models/Spt/Config/HealthConfig.cs rename to Libraries/Core/Models/Spt/Config/HealthConfig.cs diff --git a/Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/Core/Models/Spt/Config/HideoutConfig.cs similarity index 100% rename from Core/Models/Spt/Config/HideoutConfig.cs rename to Libraries/Core/Models/Spt/Config/HideoutConfig.cs diff --git a/Core/Models/Spt/Config/HttpConfig.cs b/Libraries/Core/Models/Spt/Config/HttpConfig.cs similarity index 100% rename from Core/Models/Spt/Config/HttpConfig.cs rename to Libraries/Core/Models/Spt/Config/HttpConfig.cs diff --git a/Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/Core/Models/Spt/Config/InRaidConfig.cs similarity index 100% rename from Core/Models/Spt/Config/InRaidConfig.cs rename to Libraries/Core/Models/Spt/Config/InRaidConfig.cs diff --git a/Core/Models/Spt/Config/InsuranceConfig.cs b/Libraries/Core/Models/Spt/Config/InsuranceConfig.cs similarity index 100% rename from Core/Models/Spt/Config/InsuranceConfig.cs rename to Libraries/Core/Models/Spt/Config/InsuranceConfig.cs diff --git a/Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/Core/Models/Spt/Config/InventoryConfig.cs similarity index 100% rename from Core/Models/Spt/Config/InventoryConfig.cs rename to Libraries/Core/Models/Spt/Config/InventoryConfig.cs diff --git a/Core/Models/Spt/Config/ItemConfig.cs b/Libraries/Core/Models/Spt/Config/ItemConfig.cs similarity index 100% rename from Core/Models/Spt/Config/ItemConfig.cs rename to Libraries/Core/Models/Spt/Config/ItemConfig.cs diff --git a/Core/Models/Spt/Config/LocaleConfig.cs b/Libraries/Core/Models/Spt/Config/LocaleConfig.cs similarity index 100% rename from Core/Models/Spt/Config/LocaleConfig.cs rename to Libraries/Core/Models/Spt/Config/LocaleConfig.cs diff --git a/Core/Models/Spt/Config/LocationConfig.cs b/Libraries/Core/Models/Spt/Config/LocationConfig.cs similarity index 100% rename from Core/Models/Spt/Config/LocationConfig.cs rename to Libraries/Core/Models/Spt/Config/LocationConfig.cs diff --git a/Core/Models/Spt/Config/LootConfig.cs b/Libraries/Core/Models/Spt/Config/LootConfig.cs similarity index 100% rename from Core/Models/Spt/Config/LootConfig.cs rename to Libraries/Core/Models/Spt/Config/LootConfig.cs diff --git a/Core/Models/Spt/Config/LostOnDeathConfig.cs b/Libraries/Core/Models/Spt/Config/LostOnDeathConfig.cs similarity index 100% rename from Core/Models/Spt/Config/LostOnDeathConfig.cs rename to Libraries/Core/Models/Spt/Config/LostOnDeathConfig.cs diff --git a/Core/Models/Spt/Config/MatchConfig.cs b/Libraries/Core/Models/Spt/Config/MatchConfig.cs similarity index 100% rename from Core/Models/Spt/Config/MatchConfig.cs rename to Libraries/Core/Models/Spt/Config/MatchConfig.cs diff --git a/Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/Core/Models/Spt/Config/PlayerScavConfig.cs similarity index 100% rename from Core/Models/Spt/Config/PlayerScavConfig.cs rename to Libraries/Core/Models/Spt/Config/PlayerScavConfig.cs diff --git a/Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/Core/Models/Spt/Config/PmcChatResponse.cs similarity index 100% rename from Core/Models/Spt/Config/PmcChatResponse.cs rename to Libraries/Core/Models/Spt/Config/PmcChatResponse.cs diff --git a/Core/Models/Spt/Config/PmcConfig.cs b/Libraries/Core/Models/Spt/Config/PmcConfig.cs similarity index 100% rename from Core/Models/Spt/Config/PmcConfig.cs rename to Libraries/Core/Models/Spt/Config/PmcConfig.cs diff --git a/Core/Models/Spt/Config/QuestConfig.cs b/Libraries/Core/Models/Spt/Config/QuestConfig.cs similarity index 100% rename from Core/Models/Spt/Config/QuestConfig.cs rename to Libraries/Core/Models/Spt/Config/QuestConfig.cs diff --git a/Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/Core/Models/Spt/Config/RagfairConfig.cs similarity index 100% rename from Core/Models/Spt/Config/RagfairConfig.cs rename to Libraries/Core/Models/Spt/Config/RagfairConfig.cs diff --git a/Core/Models/Spt/Config/RepairConfig.cs b/Libraries/Core/Models/Spt/Config/RepairConfig.cs similarity index 100% rename from Core/Models/Spt/Config/RepairConfig.cs rename to Libraries/Core/Models/Spt/Config/RepairConfig.cs diff --git a/Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/Core/Models/Spt/Config/ScavCaseConfig.cs similarity index 100% rename from Core/Models/Spt/Config/ScavCaseConfig.cs rename to Libraries/Core/Models/Spt/Config/ScavCaseConfig.cs diff --git a/Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/Core/Models/Spt/Config/SeasonalEventConfig.cs similarity index 100% rename from Core/Models/Spt/Config/SeasonalEventConfig.cs rename to Libraries/Core/Models/Spt/Config/SeasonalEventConfig.cs diff --git a/Core/Models/Spt/Config/TraderConfig.cs b/Libraries/Core/Models/Spt/Config/TraderConfig.cs similarity index 100% rename from Core/Models/Spt/Config/TraderConfig.cs rename to Libraries/Core/Models/Spt/Config/TraderConfig.cs diff --git a/Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/Core/Models/Spt/Config/WeatherConfig.cs similarity index 100% rename from Core/Models/Spt/Config/WeatherConfig.cs rename to Libraries/Core/Models/Spt/Config/WeatherConfig.cs diff --git a/Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/Core/Models/Spt/Dialog/SendMessageDetails.cs similarity index 100% rename from Core/Models/Spt/Dialog/SendMessageDetails.cs rename to Libraries/Core/Models/Spt/Dialog/SendMessageDetails.cs diff --git a/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs similarity index 100% rename from Core/Models/Spt/Fence/CreateFenceAssortsResult.cs rename to Libraries/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs diff --git a/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs similarity index 100% rename from Core/Models/Spt/Fence/FenceAssortGenerationValues.cs rename to Libraries/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs diff --git a/Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/Core/Models/Spt/Helper/WeightedRandomResult.cs similarity index 100% rename from Core/Models/Spt/Helper/WeightedRandomResult.cs rename to Libraries/Core/Models/Spt/Helper/WeightedRandomResult.cs diff --git a/Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/Core/Models/Spt/Hideout/CircleCraftDetails.cs similarity index 100% rename from Core/Models/Spt/Hideout/CircleCraftDetails.cs rename to Libraries/Core/Models/Spt/Hideout/CircleCraftDetails.cs diff --git a/Core/Models/Spt/Hideout/Hideout.cs b/Libraries/Core/Models/Spt/Hideout/Hideout.cs similarity index 100% rename from Core/Models/Spt/Hideout/Hideout.cs rename to Libraries/Core/Models/Spt/Hideout/Hideout.cs diff --git a/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs similarity index 100% rename from Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs rename to Libraries/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs diff --git a/Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/Core/Models/Spt/Inventory/OwnerInventoryItems.cs similarity index 100% rename from Core/Models/Spt/Inventory/OwnerInventoryItems.cs rename to Libraries/Core/Models/Spt/Inventory/OwnerInventoryItems.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2PingResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs diff --git a/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs similarity index 100% rename from Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs rename to Libraries/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs diff --git a/Core/Models/Spt/Location/RaidChanges.cs b/Libraries/Core/Models/Spt/Location/RaidChanges.cs similarity index 100% rename from Core/Models/Spt/Location/RaidChanges.cs rename to Libraries/Core/Models/Spt/Location/RaidChanges.cs diff --git a/Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/Core/Models/Spt/Logging/ClientLogRequest.cs similarity index 100% rename from Core/Models/Spt/Logging/ClientLogRequest.cs rename to Libraries/Core/Models/Spt/Logging/ClientLogRequest.cs diff --git a/Core/Models/Spt/Logging/LogBackgroundColor.cs b/Libraries/Core/Models/Spt/Logging/LogBackgroundColor.cs similarity index 100% rename from Core/Models/Spt/Logging/LogBackgroundColor.cs rename to Libraries/Core/Models/Spt/Logging/LogBackgroundColor.cs diff --git a/Core/Models/Spt/Logging/LogLevel.cs b/Libraries/Core/Models/Spt/Logging/LogLevel.cs similarity index 100% rename from Core/Models/Spt/Logging/LogLevel.cs rename to Libraries/Core/Models/Spt/Logging/LogLevel.cs diff --git a/Core/Models/Spt/Logging/LogTextColor.cs b/Libraries/Core/Models/Spt/Logging/LogTextColor.cs similarity index 100% rename from Core/Models/Spt/Logging/LogTextColor.cs rename to Libraries/Core/Models/Spt/Logging/LogTextColor.cs diff --git a/Core/Models/Spt/Logging/SptLogger.cs b/Libraries/Core/Models/Spt/Logging/SptLogger.cs similarity index 100% rename from Core/Models/Spt/Logging/SptLogger.cs rename to Libraries/Core/Models/Spt/Logging/SptLogger.cs diff --git a/Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs similarity index 100% rename from Core/Models/Spt/Mod/NewItemDetails.cs rename to Libraries/Core/Models/Spt/Mod/NewItemDetails.cs diff --git a/Core/Models/Spt/Mod/PackageJsonData.cs b/Libraries/Core/Models/Spt/Mod/PackageJsonData.cs similarity index 100% rename from Core/Models/Spt/Mod/PackageJsonData.cs rename to Libraries/Core/Models/Spt/Mod/PackageJsonData.cs diff --git a/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs similarity index 100% rename from Core/Models/Spt/Quests/GetRepeatableByIdResult.cs rename to Libraries/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs diff --git a/Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/Core/Models/Spt/Ragfair/RagfairServerPrices.cs similarity index 100% rename from Core/Models/Spt/Ragfair/RagfairServerPrices.cs rename to Libraries/Core/Models/Spt/Ragfair/RagfairServerPrices.cs diff --git a/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs similarity index 100% rename from Core/Models/Spt/Ragfair/TplWithFleaPrice.cs rename to Libraries/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs diff --git a/Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/Core/Models/Spt/Repeatable/QuestRewardValues.cs similarity index 100% rename from Core/Models/Spt/Repeatable/QuestRewardValues.cs rename to Libraries/Core/Models/Spt/Repeatable/QuestRewardValues.cs diff --git a/Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/Core/Models/Spt/Repeatable/QuestTypePool.cs similarity index 100% rename from Core/Models/Spt/Repeatable/QuestTypePool.cs rename to Libraries/Core/Models/Spt/Repeatable/QuestTypePool.cs diff --git a/Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/Core/Models/Spt/Server/DatabaseTables.cs similarity index 100% rename from Core/Models/Spt/Server/DatabaseTables.cs rename to Libraries/Core/Models/Spt/Server/DatabaseTables.cs diff --git a/Core/Models/Spt/Server/ExhaustableArray.cs b/Libraries/Core/Models/Spt/Server/ExhaustableArray.cs similarity index 100% rename from Core/Models/Spt/Server/ExhaustableArray.cs rename to Libraries/Core/Models/Spt/Server/ExhaustableArray.cs diff --git a/Core/Models/Spt/Server/LocaleBase.cs b/Libraries/Core/Models/Spt/Server/LocaleBase.cs similarity index 100% rename from Core/Models/Spt/Server/LocaleBase.cs rename to Libraries/Core/Models/Spt/Server/LocaleBase.cs diff --git a/Core/Models/Spt/Server/Locations.cs b/Libraries/Core/Models/Spt/Server/Locations.cs similarity index 100% rename from Core/Models/Spt/Server/Locations.cs rename to Libraries/Core/Models/Spt/Server/Locations.cs diff --git a/Core/Models/Spt/Server/ServerBase.cs b/Libraries/Core/Models/Spt/Server/ServerBase.cs similarity index 100% rename from Core/Models/Spt/Server/ServerBase.cs rename to Libraries/Core/Models/Spt/Server/ServerBase.cs diff --git a/Core/Models/Spt/Server/SettingsBase.cs b/Libraries/Core/Models/Spt/Server/SettingsBase.cs similarity index 100% rename from Core/Models/Spt/Server/SettingsBase.cs rename to Libraries/Core/Models/Spt/Server/SettingsBase.cs diff --git a/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs similarity index 100% rename from Core/Models/Spt/Services/InsuranceEquipmentPkg.cs rename to Libraries/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs diff --git a/Core/Models/Spt/Services/LootItem.cs b/Libraries/Core/Models/Spt/Services/LootItem.cs similarity index 100% rename from Core/Models/Spt/Services/LootItem.cs rename to Libraries/Core/Models/Spt/Services/LootItem.cs diff --git a/Core/Models/Spt/Services/LootRequest.cs b/Libraries/Core/Models/Spt/Services/LootRequest.cs similarity index 100% rename from Core/Models/Spt/Services/LootRequest.cs rename to Libraries/Core/Models/Spt/Services/LootRequest.cs diff --git a/Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/Core/Models/Spt/Services/TraderServiceModel.cs similarity index 100% rename from Core/Models/Spt/Services/TraderServiceModel.cs rename to Libraries/Core/Models/Spt/Services/TraderServiceModel.cs diff --git a/Core/Models/Spt/Templates/Templates.cs b/Libraries/Core/Models/Spt/Templates/Templates.cs similarity index 100% rename from Core/Models/Spt/Templates/Templates.cs rename to Libraries/Core/Models/Spt/Templates/Templates.cs diff --git a/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs similarity index 100% rename from Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs rename to Libraries/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs diff --git a/Core/Models/Utils/IRequestData.cs b/Libraries/Core/Models/Utils/IRequestData.cs similarity index 100% rename from Core/Models/Utils/IRequestData.cs rename to Libraries/Core/Models/Utils/IRequestData.cs diff --git a/Core/Models/Utils/ISptLogger.cs b/Libraries/Core/Models/Utils/ISptLogger.cs similarity index 100% rename from Core/Models/Utils/ISptLogger.cs rename to Libraries/Core/Models/Utils/ISptLogger.cs diff --git a/Core/Routers/Dynamic/BotDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs similarity index 98% rename from Core/Routers/Dynamic/BotDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs index 4e4f9650..0e2f2233 100644 --- a/Core/Routers/Dynamic/BotDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Dynamic/BundleDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs similarity index 96% rename from Core/Routers/Dynamic/BundleDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs index ae8a6ebe..973e8fa4 100644 --- a/Core/Routers/Dynamic/BundleDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Dynamic/CustomizationDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs similarity index 96% rename from Core/Routers/Dynamic/CustomizationDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs index 73f84379..2c142d3c 100644 --- a/Core/Routers/Dynamic/CustomizationDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Dynamic/DataDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs similarity index 97% rename from Core/Routers/Dynamic/DataDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs index 9e10f619..66c02d46 100644 --- a/Core/Routers/Dynamic/DataDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Dynamic/HttpDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs similarity index 94% rename from Core/Routers/Dynamic/HttpDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs index 9c659fdc..3dac2684 100644 --- a/Core/Routers/Dynamic/HttpDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Utils; diff --git a/Core/Routers/Dynamic/InraidDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs similarity index 96% rename from Core/Routers/Dynamic/InraidDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs index a8957640..5442b675 100644 --- a/Core/Routers/Dynamic/InraidDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.InRaid; diff --git a/Core/Routers/Dynamic/LocationDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs similarity index 92% rename from Core/Routers/Dynamic/LocationDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs index a354d590..57b4de66 100644 --- a/Core/Routers/Dynamic/LocationDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Utils; diff --git a/Core/Routers/Dynamic/NotifierDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs similarity index 97% rename from Core/Routers/Dynamic/NotifierDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs index 8a2d66ea..e135522c 100644 --- a/Core/Routers/Dynamic/NotifierDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Utils; diff --git a/Core/Routers/Dynamic/TraderDynamicRouter.cs b/Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs similarity index 97% rename from Core/Routers/Dynamic/TraderDynamicRouter.cs rename to Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs index b2fe30f1..dcd4511f 100644 --- a/Core/Routers/Dynamic/TraderDynamicRouter.cs +++ b/Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/EventOutputHolder.cs b/Libraries/Core/Routers/EventOutputHolder.cs similarity index 99% rename from Core/Routers/EventOutputHolder.cs rename to Libraries/Core/Routers/EventOutputHolder.cs index f08f7ab5..6a433c66 100644 --- a/Core/Routers/EventOutputHolder.cs +++ b/Libraries/Core/Routers/EventOutputHolder.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Routers/HttpRouter.cs b/Libraries/Core/Routers/HttpRouter.cs similarity index 98% rename from Core/Routers/HttpRouter.cs rename to Libraries/Core/Routers/HttpRouter.cs index 66616ad8..6ff60783 100644 --- a/Core/Routers/HttpRouter.cs +++ b/Libraries/Core/Routers/HttpRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; namespace Core.Routers; diff --git a/Core/Routers/ImageRouter.cs b/Libraries/Core/Routers/ImageRouter.cs similarity index 97% rename from Core/Routers/ImageRouter.cs rename to Libraries/Core/Routers/ImageRouter.cs index e53d97f7..b9b1b088 100644 --- a/Core/Routers/ImageRouter.cs +++ b/Libraries/Core/Routers/ImageRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Services.Mod.Image; using Core.Utils; diff --git a/Core/Routers/ItemEventRouter.cs b/Libraries/Core/Routers/ItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEventRouter.cs rename to Libraries/Core/Routers/ItemEventRouter.cs index 61d12ffe..e840ed4a 100644 --- a/Core/Routers/ItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Helpers; using Core.Models.Eft.ItemEvent; diff --git a/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/CustomizationItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs index f40d0499..bf94fb84 100644 --- a/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/HealthItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/HealthItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs index 719f501b..8282713c 100644 --- a/Core/Routers/ItemEvents/HealthItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/HideoutItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs similarity index 99% rename from Core/Routers/ItemEvents/HideoutItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs index 83c8eeca..17a228c3 100644 --- a/Core/Routers/ItemEvents/HideoutItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs similarity index 97% rename from Core/Routers/ItemEvents/InsuranceItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs index a142ee0c..2c1a6be4 100644 --- a/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/InventoryItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs similarity index 99% rename from Core/Routers/ItemEvents/InventoryItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs index 1f2128a1..8dcf6251 100644 --- a/Core/Routers/ItemEvents/InventoryItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/NoteItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/NoteItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs index 3e6a468c..2d90c42e 100644 --- a/Core/Routers/ItemEvents/NoteItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/QuestItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/QuestItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs index d02e631b..d9281c85 100644 --- a/Core/Routers/ItemEvents/QuestItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/RagfairItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/RagfairItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs index 9b559496..3cfa262d 100644 --- a/Core/Routers/ItemEvents/RagfairItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/RepairItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs similarity index 97% rename from Core/Routers/ItemEvents/RepairItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs index ce7f903e..e46990b8 100644 --- a/Core/Routers/ItemEvents/RepairItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/TradeItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/TradeItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs index 29ec6447..511a9d18 100644 --- a/Core/Routers/ItemEvents/TradeItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/ItemEvents/WishlistItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs similarity index 98% rename from Core/Routers/ItemEvents/WishlistItemEventRouter.cs rename to Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs index c9d60ce3..52db5545 100644 --- a/Core/Routers/ItemEvents/WishlistItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs b/Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs similarity index 97% rename from Core/Routers/SaveLoad/HealthSaveLoadRouter.cs rename to Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs index 4ef2852d..c75aede4 100644 --- a/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs +++ b/Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Profile; diff --git a/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs b/Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs similarity index 94% rename from Core/Routers/SaveLoad/InraidSaveLoadRouter.cs rename to Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs index bae4b0bf..dcd46ab1 100644 --- a/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs +++ b/Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Profile; diff --git a/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs b/Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs similarity index 94% rename from Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs rename to Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs index 08f122de..ecf2c54d 100644 --- a/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs +++ b/Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Profile; diff --git a/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs b/Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs similarity index 94% rename from Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs rename to Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs index f8615124..ddc24c25 100644 --- a/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs +++ b/Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Profile; diff --git a/Core/Routers/Serializers/BundleSerializer.cs b/Libraries/Core/Routers/Serializers/BundleSerializer.cs similarity index 100% rename from Core/Routers/Serializers/BundleSerializer.cs rename to Libraries/Core/Routers/Serializers/BundleSerializer.cs diff --git a/Core/Routers/Serializers/ImageSerializer.cs b/Libraries/Core/Routers/Serializers/ImageSerializer.cs similarity index 94% rename from Core/Routers/Serializers/ImageSerializer.cs rename to Libraries/Core/Routers/Serializers/ImageSerializer.cs index ff644829..31ee1827 100644 --- a/Core/Routers/Serializers/ImageSerializer.cs +++ b/Libraries/Core/Routers/Serializers/ImageSerializer.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; namespace Core.Routers.Serializers; diff --git a/Core/Routers/Serializers/NotifySerializer.cs b/Libraries/Core/Routers/Serializers/NotifySerializer.cs similarity index 100% rename from Core/Routers/Serializers/NotifySerializer.cs rename to Libraries/Core/Routers/Serializers/NotifySerializer.cs diff --git a/Core/Routers/Static/AchievementStaticRouter.cs b/Libraries/Core/Routers/Static/AchievementStaticRouter.cs similarity index 97% rename from Core/Routers/Static/AchievementStaticRouter.cs rename to Libraries/Core/Routers/Static/AchievementStaticRouter.cs index b6f8fa91..f22a2f65 100644 --- a/Core/Routers/Static/AchievementStaticRouter.cs +++ b/Libraries/Core/Routers/Static/AchievementStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/BotStaticRouter.cs b/Libraries/Core/Routers/Static/BotStaticRouter.cs similarity index 96% rename from Core/Routers/Static/BotStaticRouter.cs rename to Libraries/Core/Routers/Static/BotStaticRouter.cs index 44b8a809..9225ac8d 100644 --- a/Core/Routers/Static/BotStaticRouter.cs +++ b/Libraries/Core/Routers/Static/BotStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Bot; diff --git a/Core/Routers/Static/BuildStaticRouter.cs b/Libraries/Core/Routers/Static/BuildStaticRouter.cs similarity index 98% rename from Core/Routers/Static/BuildStaticRouter.cs rename to Libraries/Core/Routers/Static/BuildStaticRouter.cs index 250c16a2..cf4efef0 100644 --- a/Core/Routers/Static/BuildStaticRouter.cs +++ b/Libraries/Core/Routers/Static/BuildStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Builds; diff --git a/Core/Routers/Static/BundleStaticRouter.cs b/Libraries/Core/Routers/Static/BundleStaticRouter.cs similarity index 96% rename from Core/Routers/Static/BundleStaticRouter.cs rename to Libraries/Core/Routers/Static/BundleStaticRouter.cs index 525ff3b8..e9e16496 100644 --- a/Core/Routers/Static/BundleStaticRouter.cs +++ b/Libraries/Core/Routers/Static/BundleStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/ClientLogStaticRouter.cs b/Libraries/Core/Routers/Static/ClientLogStaticRouter.cs similarity index 97% rename from Core/Routers/Static/ClientLogStaticRouter.cs rename to Libraries/Core/Routers/Static/ClientLogStaticRouter.cs index 9796772b..d6fcd473 100644 --- a/Core/Routers/Static/ClientLogStaticRouter.cs +++ b/Libraries/Core/Routers/Static/ClientLogStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Spt.Logging; diff --git a/Core/Routers/Static/CustomizationStaticRouter.cs b/Libraries/Core/Routers/Static/CustomizationStaticRouter.cs similarity index 98% rename from Core/Routers/Static/CustomizationStaticRouter.cs rename to Libraries/Core/Routers/Static/CustomizationStaticRouter.cs index a5af2bd9..3df9aac8 100644 --- a/Core/Routers/Static/CustomizationStaticRouter.cs +++ b/Libraries/Core/Routers/Static/CustomizationStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/DataStaticRouter.cs b/Libraries/Core/Routers/Static/DataStaticRouter.cs similarity index 99% rename from Core/Routers/Static/DataStaticRouter.cs rename to Libraries/Core/Routers/Static/DataStaticRouter.cs index c277d5be..3098f9b2 100644 --- a/Core/Routers/Static/DataStaticRouter.cs +++ b/Libraries/Core/Routers/Static/DataStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/DialogStaticRouter.cs b/Libraries/Core/Routers/Static/DialogStaticRouter.cs similarity index 99% rename from Core/Routers/Static/DialogStaticRouter.cs rename to Libraries/Core/Routers/Static/DialogStaticRouter.cs index b58493ef..5ea3032f 100644 --- a/Core/Routers/Static/DialogStaticRouter.cs +++ b/Libraries/Core/Routers/Static/DialogStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/GameStaticRouter.cs b/Libraries/Core/Routers/Static/GameStaticRouter.cs similarity index 99% rename from Core/Routers/Static/GameStaticRouter.cs rename to Libraries/Core/Routers/Static/GameStaticRouter.cs index e6015ada..458ad8aa 100644 --- a/Core/Routers/Static/GameStaticRouter.cs +++ b/Libraries/Core/Routers/Static/GameStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/HealthStaticRouter.cs b/Libraries/Core/Routers/Static/HealthStaticRouter.cs similarity index 96% rename from Core/Routers/Static/HealthStaticRouter.cs rename to Libraries/Core/Routers/Static/HealthStaticRouter.cs index a48eac3b..69247739 100644 --- a/Core/Routers/Static/HealthStaticRouter.cs +++ b/Libraries/Core/Routers/Static/HealthStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Health; diff --git a/Core/Routers/Static/InraidStaticRouter.cs b/Libraries/Core/Routers/Static/InraidStaticRouter.cs similarity index 98% rename from Core/Routers/Static/InraidStaticRouter.cs rename to Libraries/Core/Routers/Static/InraidStaticRouter.cs index cea04eef..cf80d131 100644 --- a/Core/Routers/Static/InraidStaticRouter.cs +++ b/Libraries/Core/Routers/Static/InraidStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/InsuranceStaticRouter.cs b/Libraries/Core/Routers/Static/InsuranceStaticRouter.cs similarity index 96% rename from Core/Routers/Static/InsuranceStaticRouter.cs rename to Libraries/Core/Routers/Static/InsuranceStaticRouter.cs index 0d97f0fa..e54cdda4 100644 --- a/Core/Routers/Static/InsuranceStaticRouter.cs +++ b/Libraries/Core/Routers/Static/InsuranceStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Insurance; diff --git a/Core/Routers/Static/ItemEventStaticRouter.cs b/Libraries/Core/Routers/Static/ItemEventStaticRouter.cs similarity index 96% rename from Core/Routers/Static/ItemEventStaticRouter.cs rename to Libraries/Core/Routers/Static/ItemEventStaticRouter.cs index 3c6488cc..e80b104b 100644 --- a/Core/Routers/Static/ItemEventStaticRouter.cs +++ b/Libraries/Core/Routers/Static/ItemEventStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.ItemEvent; diff --git a/Core/Routers/Static/LauncherStaticRouter.cs b/Libraries/Core/Routers/Static/LauncherStaticRouter.cs similarity index 99% rename from Core/Routers/Static/LauncherStaticRouter.cs rename to Libraries/Core/Routers/Static/LauncherStaticRouter.cs index 1aa5ae37..e8c746fc 100644 --- a/Core/Routers/Static/LauncherStaticRouter.cs +++ b/Libraries/Core/Routers/Static/LauncherStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/LauncherV2StaticRouter.cs b/Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs similarity index 98% rename from Core/Routers/Static/LauncherV2StaticRouter.cs rename to Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs index d85dc3cc..475eade1 100644 --- a/Core/Routers/Static/LauncherV2StaticRouter.cs +++ b/Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Launcher; diff --git a/Core/Routers/Static/LocationStaticRouter.cs b/Libraries/Core/Routers/Static/LocationStaticRouter.cs similarity index 97% rename from Core/Routers/Static/LocationStaticRouter.cs rename to Libraries/Core/Routers/Static/LocationStaticRouter.cs index 424f3b86..1f5ad5f4 100644 --- a/Core/Routers/Static/LocationStaticRouter.cs +++ b/Libraries/Core/Routers/Static/LocationStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/MatchStaticRouter.cs b/Libraries/Core/Routers/Static/MatchStaticRouter.cs similarity index 99% rename from Core/Routers/Static/MatchStaticRouter.cs rename to Libraries/Core/Routers/Static/MatchStaticRouter.cs index eed1b082..8485db63 100644 --- a/Core/Routers/Static/MatchStaticRouter.cs +++ b/Libraries/Core/Routers/Static/MatchStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/NotifierStaticRouter.cs b/Libraries/Core/Routers/Static/NotifierStaticRouter.cs similarity index 97% rename from Core/Routers/Static/NotifierStaticRouter.cs rename to Libraries/Core/Routers/Static/NotifierStaticRouter.cs index a560cc3c..845fb5a6 100644 --- a/Core/Routers/Static/NotifierStaticRouter.cs +++ b/Libraries/Core/Routers/Static/NotifierStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/PrestigeStaticRouter.cs b/Libraries/Core/Routers/Static/PrestigeStaticRouter.cs similarity index 97% rename from Core/Routers/Static/PrestigeStaticRouter.cs rename to Libraries/Core/Routers/Static/PrestigeStaticRouter.cs index 2fe7dc98..3e13f09c 100644 --- a/Core/Routers/Static/PrestigeStaticRouter.cs +++ b/Libraries/Core/Routers/Static/PrestigeStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/ProfileStaticRouter.cs b/Libraries/Core/Routers/Static/ProfileStaticRouter.cs similarity index 99% rename from Core/Routers/Static/ProfileStaticRouter.cs rename to Libraries/Core/Routers/Static/ProfileStaticRouter.cs index 14deb205..f71787ca 100644 --- a/Core/Routers/Static/ProfileStaticRouter.cs +++ b/Libraries/Core/Routers/Static/ProfileStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/QuestStaticRouter.cs b/Libraries/Core/Routers/Static/QuestStaticRouter.cs similarity index 97% rename from Core/Routers/Static/QuestStaticRouter.cs rename to Libraries/Core/Routers/Static/QuestStaticRouter.cs index fcc682e7..cc58f4a3 100644 --- a/Core/Routers/Static/QuestStaticRouter.cs +++ b/Libraries/Core/Routers/Static/QuestStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/RagfairStaticRouter.cs b/Libraries/Core/Routers/Static/RagfairStaticRouter.cs similarity index 98% rename from Core/Routers/Static/RagfairStaticRouter.cs rename to Libraries/Core/Routers/Static/RagfairStaticRouter.cs index 3dee68e9..528383e8 100644 --- a/Core/Routers/Static/RagfairStaticRouter.cs +++ b/Libraries/Core/Routers/Static/RagfairStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/TraderStaticRouter.cs b/Libraries/Core/Routers/Static/TraderStaticRouter.cs similarity index 97% rename from Core/Routers/Static/TraderStaticRouter.cs rename to Libraries/Core/Routers/Static/TraderStaticRouter.cs index b7ce7201..d1c7547b 100644 --- a/Core/Routers/Static/TraderStaticRouter.cs +++ b/Libraries/Core/Routers/Static/TraderStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Routers/Static/WeatherStaticRouter.cs b/Libraries/Core/Routers/Static/WeatherStaticRouter.cs similarity index 97% rename from Core/Routers/Static/WeatherStaticRouter.cs rename to Libraries/Core/Routers/Static/WeatherStaticRouter.cs index cca336b2..a7733b4d 100644 --- a/Core/Routers/Static/WeatherStaticRouter.cs +++ b/Libraries/Core/Routers/Static/WeatherStaticRouter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; diff --git a/Core/Servers/ConfigServer.cs b/Libraries/Core/Servers/ConfigServer.cs similarity index 98% rename from Core/Servers/ConfigServer.cs rename to Libraries/Core/Servers/ConfigServer.cs index 2007c9d7..1e8d7e11 100644 --- a/Core/Servers/ConfigServer.cs +++ b/Libraries/Core/Servers/ConfigServer.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Models.Utils; diff --git a/Core/Servers/DatabaseServer.cs b/Libraries/Core/Servers/DatabaseServer.cs similarity index 90% rename from Core/Servers/DatabaseServer.cs rename to Libraries/Core/Servers/DatabaseServer.cs index 0395fd3f..dec2f5c7 100644 --- a/Core/Servers/DatabaseServer.cs +++ b/Libraries/Core/Servers/DatabaseServer.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Server; namespace Core.Servers; @@ -17,4 +17,4 @@ public class DatabaseServer { tableData = tables; } -} \ No newline at end of file +} diff --git a/Core/Servers/Http/IHttpListener.cs b/Libraries/Core/Servers/Http/IHttpListener.cs similarity index 100% rename from Core/Servers/Http/IHttpListener.cs rename to Libraries/Core/Servers/Http/IHttpListener.cs diff --git a/Core/Servers/Http/RequestLogger.cs b/Libraries/Core/Servers/Http/RequestLogger.cs similarity index 100% rename from Core/Servers/Http/RequestLogger.cs rename to Libraries/Core/Servers/Http/RequestLogger.cs diff --git a/Core/Servers/Http/SptHttpListener.cs b/Libraries/Core/Servers/Http/SptHttpListener.cs similarity index 99% rename from Core/Servers/Http/SptHttpListener.cs rename to Libraries/Core/Servers/Http/SptHttpListener.cs index 1d710280..7d0237e6 100644 --- a/Core/Servers/Http/SptHttpListener.cs +++ b/Libraries/Core/Servers/Http/SptHttpListener.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using System.IO.Compression; using System.Text; -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Utils; using Core.Routers; diff --git a/Core/Servers/HttpServer.cs b/Libraries/Core/Servers/HttpServer.cs similarity index 99% rename from Core/Servers/HttpServer.cs rename to Libraries/Core/Servers/HttpServer.cs index 6950a4e3..9698beac 100644 --- a/Core/Servers/HttpServer.cs +++ b/Libraries/Core/Servers/HttpServer.cs @@ -2,7 +2,7 @@ using Core.Servers.Http; using Core.Services; using Microsoft.Extensions.Primitives; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Config; using Core.Models.Utils; diff --git a/Core/Servers/RagfairServer.cs b/Libraries/Core/Servers/RagfairServer.cs similarity index 99% rename from Core/Servers/RagfairServer.cs rename to Libraries/Core/Servers/RagfairServer.cs index 603728f0..5b60793b 100644 --- a/Core/Servers/RagfairServer.cs +++ b/Libraries/Core/Servers/RagfairServer.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Models.Eft.Ragfair; using Core.Models.Enums; diff --git a/Core/Servers/SaveServer.cs b/Libraries/Core/Servers/SaveServer.cs similarity index 99% rename from Core/Servers/SaveServer.cs rename to Libraries/Core/Servers/SaveServer.cs index 697409a3..269a779f 100644 --- a/Core/Servers/SaveServer.cs +++ b/Libraries/Core/Servers/SaveServer.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Profile; using Core.Models.Spt.Config; diff --git a/Core/Servers/WebSocketServer.cs b/Libraries/Core/Servers/WebSocketServer.cs similarity index 97% rename from Core/Servers/WebSocketServer.cs rename to Libraries/Core/Servers/WebSocketServer.cs index bc9f26ad..794ec638 100644 --- a/Core/Servers/WebSocketServer.cs +++ b/Libraries/Core/Servers/WebSocketServer.cs @@ -1,5 +1,5 @@ using System.Net.WebSockets; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; using Core.Servers.Ws; using Core.Utils; diff --git a/Core/Servers/Ws/IWebSocketConnectionHandler.cs b/Libraries/Core/Servers/Ws/IWebSocketConnectionHandler.cs similarity index 100% rename from Core/Servers/Ws/IWebSocketConnectionHandler.cs rename to Libraries/Core/Servers/Ws/IWebSocketConnectionHandler.cs diff --git a/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs b/Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs similarity index 93% rename from Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs rename to Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs index cf04c2b5..eaa78cd2 100644 --- a/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs +++ b/Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs @@ -1,6 +1,6 @@ using System.Net.WebSockets; using System.Text; -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Servers.Ws.Message; diff --git a/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs b/Libraries/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs similarity index 100% rename from Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs rename to Libraries/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs diff --git a/Core/Servers/Ws/SptWebSocketConnectionHandler.cs b/Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs similarity index 91% rename from Core/Servers/Ws/SptWebSocketConnectionHandler.cs rename to Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs index 70ef5fc6..560ff776 100644 --- a/Core/Servers/Ws/SptWebSocketConnectionHandler.cs +++ b/Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs @@ -1,6 +1,6 @@ using System.Net.WebSockets; using System.Text; -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Ws; using Core.Models.Spt.Config; @@ -63,12 +63,15 @@ public class SptWebSocketConnectionHandler( _logger.Debug(_localisationService.GetText("websocket-socket_lost_deleting_handle")); lock (_lockObject) { - var timer = _socketAliveTimers[sessionID]; - timer.Change(Timeout.Infinite, Timeout.Infinite); - _socketAliveTimers.Remove(sessionID); - _sockets.Remove(sessionID); - var receiveTask = _receiveTasks[sessionID]; - receiveTask.CancelAsync().Wait(); + if (_socketAliveTimers.TryGetValue(sessionID, out var timer)) + { + timer.Change(Timeout.Infinite, Timeout.Infinite); + _socketAliveTimers.Remove(sessionID); + } + if (_sockets.ContainsKey(sessionID)) + _sockets.Remove(sessionID); + if (_receiveTasks.TryGetValue(sessionID, out var receiveTask)) + receiveTask.CancelAsync().Wait(); } } ); diff --git a/Core/Services/AirdropService.cs b/Libraries/Core/Services/AirdropService.cs similarity index 98% rename from Core/Services/AirdropService.cs rename to Libraries/Core/Services/AirdropService.cs index bdba2fca..4a38f5f9 100644 --- a/Core/Services/AirdropService.cs +++ b/Libraries/Core/Services/AirdropService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Location; using Core.Models.Enums; diff --git a/Core/Services/BackupService.cs b/Libraries/Core/Services/BackupService.cs similarity index 99% rename from Core/Services/BackupService.cs rename to Libraries/Core/Services/BackupService.cs index 379db090..cab83ad1 100644 --- a/Core/Services/BackupService.cs +++ b/Libraries/Core/Services/BackupService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/BotEquipmentFilterService.cs b/Libraries/Core/Services/BotEquipmentFilterService.cs similarity index 99% rename from Core/Services/BotEquipmentFilterService.cs rename to Libraries/Core/Services/BotEquipmentFilterService.cs index a3a1e70e..2de2e85f 100644 --- a/Core/Services/BotEquipmentFilterService.cs +++ b/Libraries/Core/Services/BotEquipmentFilterService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; @@ -6,7 +6,7 @@ using Core.Models.Spt.Bots; using Core.Models.Spt.Config; using Core.Models.Utils; using Core.Servers; -using Core.Utils.Extensions; +using SptCommon.Extensions; namespace Core.Services; diff --git a/Core/Services/BotEquipmentModPoolService.cs b/Libraries/Core/Services/BotEquipmentModPoolService.cs similarity index 98% rename from Core/Services/BotEquipmentModPoolService.cs rename to Libraries/Core/Services/BotEquipmentModPoolService.cs index 52b22597..1b89b291 100644 --- a/Core/Services/BotEquipmentModPoolService.cs +++ b/Libraries/Core/Services/BotEquipmentModPoolService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Services; diff --git a/Core/Services/BotGenerationCacheService.cs b/Libraries/Core/Services/BotGenerationCacheService.cs similarity index 98% rename from Core/Services/BotGenerationCacheService.cs rename to Libraries/Core/Services/BotGenerationCacheService.cs index e7352309..7dac2e7f 100644 --- a/Core/Services/BotGenerationCacheService.cs +++ b/Libraries/Core/Services/BotGenerationCacheService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Utils; diff --git a/Core/Services/BotLootCacheService.cs b/Libraries/Core/Services/BotLootCacheService.cs similarity index 99% rename from Core/Services/BotLootCacheService.cs rename to Libraries/Core/Services/BotLootCacheService.cs index 34ca1658..6cf4b0dd 100644 --- a/Core/Services/BotLootCacheService.cs +++ b/Libraries/Core/Services/BotLootCacheService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Common; diff --git a/Core/Services/BotNameService.cs b/Libraries/Core/Services/BotNameService.cs similarity index 99% rename from Core/Services/BotNameService.cs rename to Libraries/Core/Services/BotNameService.cs index d4cfbf2c..602f670f 100644 --- a/Core/Services/BotNameService.cs +++ b/Libraries/Core/Services/BotNameService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; using Core.Helpers; diff --git a/Core/Services/BotWeaponModLimitService.cs b/Libraries/Core/Services/BotWeaponModLimitService.cs similarity index 99% rename from Core/Services/BotWeaponModLimitService.cs rename to Libraries/Core/Services/BotWeaponModLimitService.cs index 3e857117..a17ae6f5 100644 --- a/Core/Services/BotWeaponModLimitService.cs +++ b/Libraries/Core/Services/BotWeaponModLimitService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; diff --git a/Core/Services/Cache/BundleHashCacheService.cs b/Libraries/Core/Services/Cache/BundleHashCacheService.cs similarity index 100% rename from Core/Services/Cache/BundleHashCacheService.cs rename to Libraries/Core/Services/Cache/BundleHashCacheService.cs diff --git a/Core/Services/Cache/ModHashCacheService.cs b/Libraries/Core/Services/Cache/ModHashCacheService.cs similarity index 100% rename from Core/Services/Cache/ModHashCacheService.cs rename to Libraries/Core/Services/Cache/ModHashCacheService.cs diff --git a/Core/Services/CircleOfCultistService.cs b/Libraries/Core/Services/CircleOfCultistService.cs similarity index 99% rename from Core/Services/CircleOfCultistService.cs rename to Libraries/Core/Services/CircleOfCultistService.cs index 852285c4..17d08f34 100644 --- a/Core/Services/CircleOfCultistService.cs +++ b/Libraries/Core/Services/CircleOfCultistService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; diff --git a/Core/Services/CreateProfileService.cs b/Libraries/Core/Services/CreateProfileService.cs similarity index 99% rename from Core/Services/CreateProfileService.cs rename to Libraries/Core/Services/CreateProfileService.cs index 59039af2..44155d34 100644 --- a/Core/Services/CreateProfileService.cs +++ b/Libraries/Core/Services/CreateProfileService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Common; diff --git a/Core/Services/CustomLocationWaveService.cs b/Libraries/Core/Services/CustomLocationWaveService.cs similarity index 97% rename from Core/Services/CustomLocationWaveService.cs rename to Libraries/Core/Services/CustomLocationWaveService.cs index 0e0621c1..6843a098 100644 --- a/Core/Services/CustomLocationWaveService.cs +++ b/Libraries/Core/Services/CustomLocationWaveService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; namespace Core.Services; diff --git a/Core/Services/DatabaseService.cs b/Libraries/Core/Services/DatabaseService.cs similarity index 99% rename from Core/Services/DatabaseService.cs rename to Libraries/Core/Services/DatabaseService.cs index a46a5b99..aed8e018 100644 --- a/Core/Services/DatabaseService.cs +++ b/Libraries/Core/Services/DatabaseService.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; diff --git a/Core/Services/FenceService.cs b/Libraries/Core/Services/FenceService.cs similarity index 99% rename from Core/Services/FenceService.cs rename to Libraries/Core/Services/FenceService.cs index 7730ad11..1f8a67f6 100644 --- a/Core/Services/FenceService.cs +++ b/Libraries/Core/Services/FenceService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; diff --git a/Core/Services/GiftService.cs b/Libraries/Core/Services/GiftService.cs similarity index 99% rename from Core/Services/GiftService.cs rename to Libraries/Core/Services/GiftService.cs index c924ff09..4942ac19 100644 --- a/Core/Services/GiftService.cs +++ b/Libraries/Core/Services/GiftService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Enums; using Core.Models.Spt.Config; diff --git a/Core/Services/I18nService.cs b/Libraries/Core/Services/I18nService.cs similarity index 99% rename from Core/Services/I18nService.cs rename to Libraries/Core/Services/I18nService.cs index 88b2ee5e..a247c362 100644 --- a/Core/Services/I18nService.cs +++ b/Libraries/Core/Services/I18nService.cs @@ -1,5 +1,5 @@ using Core.Utils; -using Core.Utils.Extensions; +using SptCommon.Extensions; namespace Core.Services; diff --git a/Core/Services/InMemoryCacheService.cs b/Libraries/Core/Services/InMemoryCacheService.cs similarity index 96% rename from Core/Services/InMemoryCacheService.cs rename to Libraries/Core/Services/InMemoryCacheService.cs index cda31ac6..ef8dcb34 100644 --- a/Core/Services/InMemoryCacheService.cs +++ b/Libraries/Core/Services/InMemoryCacheService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/InsuranceService.cs b/Libraries/Core/Services/InsuranceService.cs similarity index 99% rename from Core/Services/InsuranceService.cs rename to Libraries/Core/Services/InsuranceService.cs index 374b50d7..57c759c3 100644 --- a/Core/Services/InsuranceService.cs +++ b/Libraries/Core/Services/InsuranceService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Services; diff --git a/Core/Services/ItemBaseClassService.cs b/Libraries/Core/Services/ItemBaseClassService.cs similarity index 99% rename from Core/Services/ItemBaseClassService.cs rename to Libraries/Core/Services/ItemBaseClassService.cs index 4cd15c90..a8b2e3f6 100644 --- a/Core/Services/ItemBaseClassService.cs +++ b/Libraries/Core/Services/ItemBaseClassService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Utils; diff --git a/Core/Services/ItemFilterService.cs b/Libraries/Core/Services/ItemFilterService.cs similarity index 99% rename from Core/Services/ItemFilterService.cs rename to Libraries/Core/Services/ItemFilterService.cs index 67a9914f..09506eff 100644 --- a/Core/Services/ItemFilterService.cs +++ b/Libraries/Core/Services/ItemFilterService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Config; using Core.Models.Utils; using Core.Servers; diff --git a/Core/Services/LegacyLocationLifecycleService.cs b/Libraries/Core/Services/LegacyLocationLifecycleService.cs similarity index 98% rename from Core/Services/LegacyLocationLifecycleService.cs rename to Libraries/Core/Services/LegacyLocationLifecycleService.cs index ac700e52..aacea37e 100644 --- a/Core/Services/LegacyLocationLifecycleService.cs +++ b/Libraries/Core/Services/LegacyLocationLifecycleService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Match; diff --git a/Core/Services/LocaleService.cs b/Libraries/Core/Services/LocaleService.cs similarity index 99% rename from Core/Services/LocaleService.cs rename to Libraries/Core/Services/LocaleService.cs index 9fee95bc..217026af 100644 --- a/Core/Services/LocaleService.cs +++ b/Libraries/Core/Services/LocaleService.cs @@ -1,5 +1,5 @@ using System.Globalization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Spt.Config; using Core.Models.Utils; using Core.Servers; diff --git a/Core/Services/LocalisationService.cs b/Libraries/Core/Services/LocalisationService.cs similarity index 98% rename from Core/Services/LocalisationService.cs rename to Libraries/Core/Services/LocalisationService.cs index b25a5103..ec5e22f7 100644 --- a/Core/Services/LocalisationService.cs +++ b/Libraries/Core/Services/LocalisationService.cs @@ -1,5 +1,5 @@ using Core.Utils; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; using Core.Servers; diff --git a/Core/Services/LocationLifecycleService.cs b/Libraries/Core/Services/LocationLifecycleService.cs similarity index 99% rename from Core/Services/LocationLifecycleService.cs rename to Libraries/Core/Services/LocationLifecycleService.cs index faf24bab..1f668886 100644 --- a/Core/Services/LocationLifecycleService.cs +++ b/Libraries/Core/Services/LocationLifecycleService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Match; diff --git a/Core/Services/MailSendService.cs b/Libraries/Core/Services/MailSendService.cs similarity index 99% rename from Core/Services/MailSendService.cs rename to Libraries/Core/Services/MailSendService.cs index 707af867..2a12e886 100644 --- a/Core/Services/MailSendService.cs +++ b/Libraries/Core/Services/MailSendService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; diff --git a/Core/Services/MapMarkerService.cs b/Libraries/Core/Services/MapMarkerService.cs similarity index 99% rename from Core/Services/MapMarkerService.cs rename to Libraries/Core/Services/MapMarkerService.cs index 87b95f25..0c3b5eec 100644 --- a/Core/Services/MapMarkerService.cs +++ b/Libraries/Core/Services/MapMarkerService.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Inventory; diff --git a/Core/Services/MatchBotDeatilsCacheService.cs b/Libraries/Core/Services/MatchBotDeatilsCacheService.cs similarity index 96% rename from Core/Services/MatchBotDeatilsCacheService.cs rename to Libraries/Core/Services/MatchBotDeatilsCacheService.cs index 076f6bf7..6d6e0c3e 100644 --- a/Core/Services/MatchBotDeatilsCacheService.cs +++ b/Libraries/Core/Services/MatchBotDeatilsCacheService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Services; diff --git a/Core/Services/MatchBotDetailsCacheService.cs b/Libraries/Core/Services/MatchBotDetailsCacheService.cs similarity index 97% rename from Core/Services/MatchBotDetailsCacheService.cs rename to Libraries/Core/Services/MatchBotDetailsCacheService.cs index 68e8961c..bc5efdd2 100644 --- a/Core/Services/MatchBotDetailsCacheService.cs +++ b/Libraries/Core/Services/MatchBotDetailsCacheService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Utils; diff --git a/Core/Services/MatchLocationService.cs b/Libraries/Core/Services/MatchLocationService.cs similarity index 86% rename from Core/Services/MatchLocationService.cs rename to Libraries/Core/Services/MatchLocationService.cs index a42861aa..dabbaad2 100644 --- a/Core/Services/MatchLocationService.cs +++ b/Libraries/Core/Services/MatchLocationService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/Mod/CustomItemService.cs b/Libraries/Core/Services/Mod/CustomItemService.cs similarity index 100% rename from Core/Services/Mod/CustomItemService.cs rename to Libraries/Core/Services/Mod/CustomItemService.cs diff --git a/Core/Services/Mod/DynamicRouter/DynamicRouterMod.cs b/Libraries/Core/Services/Mod/DynamicRouter/DynamicRouterMod.cs similarity index 100% rename from Core/Services/Mod/DynamicRouter/DynamicRouterMod.cs rename to Libraries/Core/Services/Mod/DynamicRouter/DynamicRouterMod.cs diff --git a/Core/Services/Mod/DynamicRouter/DynamicRouterModService.cs b/Libraries/Core/Services/Mod/DynamicRouter/DynamicRouterModService.cs similarity index 100% rename from Core/Services/Mod/DynamicRouter/DynamicRouterModService.cs rename to Libraries/Core/Services/Mod/DynamicRouter/DynamicRouterModService.cs diff --git a/Core/Services/Mod/HttpListener/HttpListenerMod.cs b/Libraries/Core/Services/Mod/HttpListener/HttpListenerMod.cs similarity index 100% rename from Core/Services/Mod/HttpListener/HttpListenerMod.cs rename to Libraries/Core/Services/Mod/HttpListener/HttpListenerMod.cs diff --git a/Core/Services/Mod/HttpListener/HttpListenerModService.cs b/Libraries/Core/Services/Mod/HttpListener/HttpListenerModService.cs similarity index 100% rename from Core/Services/Mod/HttpListener/HttpListenerModService.cs rename to Libraries/Core/Services/Mod/HttpListener/HttpListenerModService.cs diff --git a/Core/Services/Mod/Image/ImageRouterService.cs b/Libraries/Core/Services/Mod/Image/ImageRouterService.cs similarity index 93% rename from Core/Services/Mod/Image/ImageRouterService.cs rename to Libraries/Core/Services/Mod/Image/ImageRouterService.cs index e7c678c1..7adc4167 100644 --- a/Core/Services/Mod/Image/ImageRouterService.cs +++ b/Libraries/Core/Services/Mod/Image/ImageRouterService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services.Mod.Image; diff --git a/Core/Services/Mod/OnLoad/OnLoadMod.cs b/Libraries/Core/Services/Mod/OnLoad/OnLoadMod.cs similarity index 100% rename from Core/Services/Mod/OnLoad/OnLoadMod.cs rename to Libraries/Core/Services/Mod/OnLoad/OnLoadMod.cs diff --git a/Core/Services/Mod/OnLoad/OnLoadModService.cs b/Libraries/Core/Services/Mod/OnLoad/OnLoadModService.cs similarity index 100% rename from Core/Services/Mod/OnLoad/OnLoadModService.cs rename to Libraries/Core/Services/Mod/OnLoad/OnLoadModService.cs diff --git a/Core/Services/Mod/OnUpdate/OnUpdateMod.cs b/Libraries/Core/Services/Mod/OnUpdate/OnUpdateMod.cs similarity index 100% rename from Core/Services/Mod/OnUpdate/OnUpdateMod.cs rename to Libraries/Core/Services/Mod/OnUpdate/OnUpdateMod.cs diff --git a/Core/Services/Mod/OnUpdate/OnUpdateModService.cs b/Libraries/Core/Services/Mod/OnUpdate/OnUpdateModService.cs similarity index 100% rename from Core/Services/Mod/OnUpdate/OnUpdateModService.cs rename to Libraries/Core/Services/Mod/OnUpdate/OnUpdateModService.cs diff --git a/Core/Services/Mod/StaticRouter/StaticRouterMod.cs b/Libraries/Core/Services/Mod/StaticRouter/StaticRouterMod.cs similarity index 100% rename from Core/Services/Mod/StaticRouter/StaticRouterMod.cs rename to Libraries/Core/Services/Mod/StaticRouter/StaticRouterMod.cs diff --git a/Core/Services/Mod/StaticRouter/StaticRouterModService.cs b/Libraries/Core/Services/Mod/StaticRouter/StaticRouterModService.cs similarity index 100% rename from Core/Services/Mod/StaticRouter/StaticRouterModService.cs rename to Libraries/Core/Services/Mod/StaticRouter/StaticRouterModService.cs diff --git a/Core/Services/ModCompilerService.cs b/Libraries/Core/Services/ModCompilerService.cs similarity index 97% rename from Core/Services/ModCompilerService.cs rename to Libraries/Core/Services/ModCompilerService.cs index 2f05c262..c560da88 100644 --- a/Core/Services/ModCompilerService.cs +++ b/Libraries/Core/Services/ModCompilerService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/NotificationService.cs b/Libraries/Core/Services/NotificationService.cs similarity index 98% rename from Core/Services/NotificationService.cs rename to Libraries/Core/Services/NotificationService.cs index b436bbf2..27c25554 100644 --- a/Core/Services/NotificationService.cs +++ b/Libraries/Core/Services/NotificationService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ws; namespace Core.Services; diff --git a/Core/Services/OpenZoneService.cs b/Libraries/Core/Services/OpenZoneService.cs similarity index 95% rename from Core/Services/OpenZoneService.cs rename to Libraries/Core/Services/OpenZoneService.cs index 6a1873b2..f9a9d188 100644 --- a/Core/Services/OpenZoneService.cs +++ b/Libraries/Core/Services/OpenZoneService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/PaymentService.cs b/Libraries/Core/Services/PaymentService.cs similarity index 98% rename from Core/Services/PaymentService.cs rename to Libraries/Core/Services/PaymentService.cs index 3ce95d52..5be1e318 100644 --- a/Core/Services/PaymentService.cs +++ b/Libraries/Core/Services/PaymentService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Services/PlayerService.cs b/Libraries/Core/Services/PlayerService.cs similarity index 87% rename from Core/Services/PlayerService.cs rename to Libraries/Core/Services/PlayerService.cs index ff955650..ee742687 100644 --- a/Core/Services/PlayerService.cs +++ b/Libraries/Core/Services/PlayerService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; namespace Core.Services; diff --git a/Core/Services/PmcChatResponseService.cs b/Libraries/Core/Services/PmcChatResponseService.cs similarity index 99% rename from Core/Services/PmcChatResponseService.cs rename to Libraries/Core/Services/PmcChatResponseService.cs index cc439a10..33c53084 100644 --- a/Core/Services/PmcChatResponseService.cs +++ b/Libraries/Core/Services/PmcChatResponseService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; diff --git a/Core/Services/PostDbLoadService.cs b/Libraries/Core/Services/PostDbLoadService.cs similarity index 98% rename from Core/Services/PostDbLoadService.cs rename to Libraries/Core/Services/PostDbLoadService.cs index b7f168cc..3a08b209 100644 --- a/Core/Services/PostDbLoadService.cs +++ b/Libraries/Core/Services/PostDbLoadService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Services; diff --git a/Core/Services/ProfileActivityService.cs b/Libraries/Core/Services/ProfileActivityService.cs similarity index 98% rename from Core/Services/ProfileActivityService.cs rename to Libraries/Core/Services/ProfileActivityService.cs index 2fa4a3a7..f071067f 100644 --- a/Core/Services/ProfileActivityService.cs +++ b/Libraries/Core/Services/ProfileActivityService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Utils; namespace Core.Services; diff --git a/Core/Services/ProfileFixerService.cs b/Libraries/Core/Services/ProfileFixerService.cs similarity index 99% rename from Core/Services/ProfileFixerService.cs rename to Libraries/Core/Services/ProfileFixerService.cs index e6dd49bc..5951823a 100644 --- a/Core/Services/ProfileFixerService.cs +++ b/Libraries/Core/Services/ProfileFixerService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Services/RagfairCategoriesService.cs b/Libraries/Core/Services/RagfairCategoriesService.cs similarity index 96% rename from Core/Services/RagfairCategoriesService.cs rename to Libraries/Core/Services/RagfairCategoriesService.cs index 431755c7..6f08e0f9 100644 --- a/Core/Services/RagfairCategoriesService.cs +++ b/Libraries/Core/Services/RagfairCategoriesService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ragfair; namespace Core.Services; diff --git a/Core/Services/RagfairLinkedItemService.cs b/Libraries/Core/Services/RagfairLinkedItemService.cs similarity index 98% rename from Core/Services/RagfairLinkedItemService.cs rename to Libraries/Core/Services/RagfairLinkedItemService.cs index f83936d1..5a76487d 100644 --- a/Core/Services/RagfairLinkedItemService.cs +++ b/Libraries/Core/Services/RagfairLinkedItemService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Services; diff --git a/Core/Services/RagfairOfferService.cs b/Libraries/Core/Services/RagfairOfferService.cs similarity index 99% rename from Core/Services/RagfairOfferService.cs rename to Libraries/Core/Services/RagfairOfferService.cs index b1a9f8cf..39200382 100644 --- a/Core/Services/RagfairOfferService.cs +++ b/Libraries/Core/Services/RagfairOfferService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; diff --git a/Core/Services/RagfairPriceService.cs b/Libraries/Core/Services/RagfairPriceService.cs similarity index 99% rename from Core/Services/RagfairPriceService.cs rename to Libraries/Core/Services/RagfairPriceService.cs index 0c732d31..866146de 100644 --- a/Core/Services/RagfairPriceService.cs +++ b/Libraries/Core/Services/RagfairPriceService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Services/RagfairRequiredItemsService.cs b/Libraries/Core/Services/RagfairRequiredItemsService.cs similarity index 91% rename from Core/Services/RagfairRequiredItemsService.cs rename to Libraries/Core/Services/RagfairRequiredItemsService.cs index 485be6e9..694fec4b 100644 --- a/Core/Services/RagfairRequiredItemsService.cs +++ b/Libraries/Core/Services/RagfairRequiredItemsService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ragfair; namespace Core.Services; diff --git a/Core/Services/RagfairTaxService.cs b/Libraries/Core/Services/RagfairTaxService.cs similarity index 98% rename from Core/Services/RagfairTaxService.cs rename to Libraries/Core/Services/RagfairTaxService.cs index d6541aa8..16441c15 100644 --- a/Core/Services/RagfairTaxService.cs +++ b/Libraries/Core/Services/RagfairTaxService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; diff --git a/Core/Services/RaidTimeAdjustmentService.cs b/Libraries/Core/Services/RaidTimeAdjustmentService.cs similarity index 98% rename from Core/Services/RaidTimeAdjustmentService.cs rename to Libraries/Core/Services/RaidTimeAdjustmentService.cs index 9b087357..982d7723 100644 --- a/Core/Services/RaidTimeAdjustmentService.cs +++ b/Libraries/Core/Services/RaidTimeAdjustmentService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Game; using Core.Models.Spt.Config; diff --git a/Core/Services/RaidWeatherService.cs b/Libraries/Core/Services/RaidWeatherService.cs similarity index 99% rename from Core/Services/RaidWeatherService.cs rename to Libraries/Core/Services/RaidWeatherService.cs index a6af9717..73b4e0c4 100644 --- a/Core/Services/RaidWeatherService.cs +++ b/Libraries/Core/Services/RaidWeatherService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Weather; diff --git a/Core/Services/RepairService.cs b/Libraries/Core/Services/RepairService.cs similarity index 99% rename from Core/Services/RepairService.cs rename to Libraries/Core/Services/RepairService.cs index ad917160..152dfc81 100644 --- a/Core/Services/RepairService.cs +++ b/Libraries/Core/Services/RepairService.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; diff --git a/Core/Services/SeasonalEventService.cs b/Libraries/Core/Services/SeasonalEventService.cs similarity index 99% rename from Core/Services/SeasonalEventService.cs rename to Libraries/Core/Services/SeasonalEventService.cs index b3d5fe29..a80d641f 100644 --- a/Core/Services/SeasonalEventService.cs +++ b/Libraries/Core/Services/SeasonalEventService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; diff --git a/Core/Services/TraderAssortService.cs b/Libraries/Core/Services/TraderAssortService.cs similarity index 95% rename from Core/Services/TraderAssortService.cs rename to Libraries/Core/Services/TraderAssortService.cs index 276100b7..8792ce03 100644 --- a/Core/Services/TraderAssortService.cs +++ b/Libraries/Core/Services/TraderAssortService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Common.Tables; namespace Core.Services; diff --git a/Core/Services/TraderPurchasePersisterService.cs b/Libraries/Core/Services/TraderPurchasePersisterService.cs similarity index 99% rename from Core/Services/TraderPurchasePersisterService.cs rename to Libraries/Core/Services/TraderPurchasePersisterService.cs index 41826072..6b2339a1 100644 --- a/Core/Services/TraderPurchasePersisterService.cs +++ b/Libraries/Core/Services/TraderPurchasePersisterService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; using Core.Models.Eft.Profile; using Core.Models.Spt.Config; diff --git a/Core/Utils/App.cs b/Libraries/Core/Utils/App.cs similarity index 99% rename from Core/Utils/App.cs rename to Libraries/Core/Utils/App.cs index a2c76c80..f4cb8449 100644 --- a/Core/Utils/App.cs +++ b/Libraries/Core/Utils/App.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Spt.Config; using Core.Models.Utils; diff --git a/Core/Utils/Cloners/ICloner.cs b/Libraries/Core/Utils/Cloners/ICloner.cs similarity index 100% rename from Core/Utils/Cloners/ICloner.cs rename to Libraries/Core/Utils/Cloners/ICloner.cs diff --git a/Core/Utils/Cloners/JsonCloner.cs b/Libraries/Core/Utils/Cloners/JsonCloner.cs similarity index 91% rename from Core/Utils/Cloners/JsonCloner.cs rename to Libraries/Core/Utils/Cloners/JsonCloner.cs index 6844144b..b3b19205 100644 --- a/Core/Utils/Cloners/JsonCloner.cs +++ b/Libraries/Core/Utils/Cloners/JsonCloner.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils.Cloners; diff --git a/Core/Utils/Collections/ExhaustableArray.cs b/Libraries/Core/Utils/Collections/ExhaustableArray.cs similarity index 100% rename from Core/Utils/Collections/ExhaustableArray.cs rename to Libraries/Core/Utils/Collections/ExhaustableArray.cs diff --git a/Core/Utils/Collections/ProbabilityObjectArray.cs b/Libraries/Core/Utils/Collections/ProbabilityObjectArray.cs similarity index 100% rename from Core/Utils/Collections/ProbabilityObjectArray.cs rename to Libraries/Core/Utils/Collections/ProbabilityObjectArray.cs diff --git a/Core/Utils/CompareUtil.cs b/Libraries/Core/Utils/CompareUtil.cs similarity index 84% rename from Core/Utils/CompareUtil.cs rename to Libraries/Core/Utils/CompareUtil.cs index 67372cac..6c3cd5ad 100644 --- a/Core/Utils/CompareUtil.cs +++ b/Libraries/Core/Utils/CompareUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; diff --git a/Core/Utils/DatabaseImporter.cs b/Libraries/Core/Utils/DatabaseImporter.cs similarity index 99% rename from Core/Utils/DatabaseImporter.cs rename to Libraries/Core/Utils/DatabaseImporter.cs index 7fc950c8..c76662af 100644 --- a/Core/Utils/DatabaseImporter.cs +++ b/Libraries/Core/Utils/DatabaseImporter.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.DI; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; diff --git a/Core/Utils/EncodingUtil.cs b/Libraries/Core/Utils/EncodingUtil.cs similarity index 98% rename from Core/Utils/EncodingUtil.cs rename to Libraries/Core/Utils/EncodingUtil.cs index d1ce91cd..56927a9f 100644 --- a/Core/Utils/EncodingUtil.cs +++ b/Libraries/Core/Utils/EncodingUtil.cs @@ -1,5 +1,5 @@ using System.Text; -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; @@ -62,4 +62,4 @@ public enum EncodeType HEX, ASCII, UTF8 -} \ No newline at end of file +} diff --git a/Core/Utils/FileUtil.cs b/Libraries/Core/Utils/FileUtil.cs similarity index 98% rename from Core/Utils/FileUtil.cs rename to Libraries/Core/Utils/FileUtil.cs index e0a2d2a6..db5b7749 100644 --- a/Core/Utils/FileUtil.cs +++ b/Libraries/Core/Utils/FileUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; diff --git a/Core/Utils/HashUtil.cs b/Libraries/Core/Utils/HashUtil.cs similarity index 99% rename from Core/Utils/HashUtil.cs rename to Libraries/Core/Utils/HashUtil.cs index fce527de..771e089a 100644 --- a/Core/Utils/HashUtil.cs +++ b/Libraries/Core/Utils/HashUtil.cs @@ -1,7 +1,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Security.Cryptography; -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; diff --git a/Core/Utils/HttpFileUtil.cs b/Libraries/Core/Utils/HttpFileUtil.cs similarity index 96% rename from Core/Utils/HttpFileUtil.cs rename to Libraries/Core/Utils/HttpFileUtil.cs index 5e7539c3..21f761a3 100644 --- a/Core/Utils/HttpFileUtil.cs +++ b/Libraries/Core/Utils/HttpFileUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Helpers; namespace Core.Utils; diff --git a/Core/Utils/HttpResponseUtil.cs b/Libraries/Core/Utils/HttpResponseUtil.cs similarity index 99% rename from Core/Utils/HttpResponseUtil.cs rename to Libraries/Core/Utils/HttpResponseUtil.cs index 9c041da0..afcc474a 100644 --- a/Core/Utils/HttpResponseUtil.cs +++ b/Libraries/Core/Utils/HttpResponseUtil.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; using System.Text.RegularExpressions; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.HttpResponse; using Core.Models.Eft.ItemEvent; using Core.Models.Enums; diff --git a/Core/Utils/ImporterUtil.cs b/Libraries/Core/Utils/ImporterUtil.cs similarity index 99% rename from Core/Utils/ImporterUtil.cs rename to Libraries/Core/Utils/ImporterUtil.cs index 06ca11f5..b03ca0a6 100644 --- a/Core/Utils/ImporterUtil.cs +++ b/Libraries/Core/Utils/ImporterUtil.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; namespace Core.Utils; diff --git a/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs b/Libraries/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs rename to Libraries/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs diff --git a/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs b/Libraries/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs rename to Libraries/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs diff --git a/Core/Utils/Json/Converters/DictionaryOrListConverter.cs b/Libraries/Core/Utils/Json/Converters/DictionaryOrListConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/DictionaryOrListConverter.cs rename to Libraries/Core/Utils/Json/Converters/DictionaryOrListConverter.cs diff --git a/Core/Utils/Json/Converters/EftEnumConverter.cs b/Libraries/Core/Utils/Json/Converters/EftEnumConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/EftEnumConverter.cs rename to Libraries/Core/Utils/Json/Converters/EftEnumConverter.cs diff --git a/Core/Utils/Json/Converters/ListOrTConverter.cs b/Libraries/Core/Utils/Json/Converters/ListOrTConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/ListOrTConverter.cs rename to Libraries/Core/Utils/Json/Converters/ListOrTConverter.cs diff --git a/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs b/Libraries/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs rename to Libraries/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs diff --git a/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs b/Libraries/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs similarity index 100% rename from Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs rename to Libraries/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs diff --git a/Core/Utils/Json/DictionaryOrList.cs b/Libraries/Core/Utils/Json/DictionaryOrList.cs similarity index 100% rename from Core/Utils/Json/DictionaryOrList.cs rename to Libraries/Core/Utils/Json/DictionaryOrList.cs diff --git a/Core/Utils/Json/ListOrT.cs b/Libraries/Core/Utils/Json/ListOrT.cs similarity index 100% rename from Core/Utils/Json/ListOrT.cs rename to Libraries/Core/Utils/Json/ListOrT.cs diff --git a/Core/Utils/JsonUtil.cs b/Libraries/Core/Utils/JsonUtil.cs similarity index 98% rename from Core/Utils/JsonUtil.cs rename to Libraries/Core/Utils/JsonUtil.cs index bb79c4df..71229fd1 100644 --- a/Core/Utils/JsonUtil.cs +++ b/Libraries/Core/Utils/JsonUtil.cs @@ -1,7 +1,7 @@ using System.Text.Encodings.Web; using System.Text.Json; using System.Text.Json.Serialization; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.Ws; using Core.Models.Enums; using Core.Models.Spt.Dialog; diff --git a/Core/Utils/MathUtil.cs b/Libraries/Core/Utils/MathUtil.cs similarity index 99% rename from Core/Utils/MathUtil.cs rename to Libraries/Core/Utils/MathUtil.cs index 85ac2dcd..a49a8087 100644 --- a/Core/Utils/MathUtil.cs +++ b/Libraries/Core/Utils/MathUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; diff --git a/Core/Utils/ProgramStatics.cs b/Libraries/Core/Utils/ProgramStatics.cs similarity index 100% rename from Core/Utils/ProgramStatics.cs rename to Libraries/Core/Utils/ProgramStatics.cs diff --git a/Core/Utils/ProgressWriter.cs b/Libraries/Core/Utils/ProgressWriter.cs similarity index 100% rename from Core/Utils/ProgressWriter.cs rename to Libraries/Core/Utils/ProgressWriter.cs diff --git a/Core/Utils/RandomUtil.cs b/Libraries/Core/Utils/RandomUtil.cs similarity index 99% rename from Core/Utils/RandomUtil.cs rename to Libraries/Core/Utils/RandomUtil.cs index 276c7fbd..a5dc8fe9 100644 --- a/Core/Utils/RandomUtil.cs +++ b/Libraries/Core/Utils/RandomUtil.cs @@ -1,5 +1,5 @@ using System.Security.Cryptography; -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Utils; namespace Core.Utils; diff --git a/Core/Utils/TimeUtil.cs b/Libraries/Core/Utils/TimeUtil.cs similarity index 99% rename from Core/Utils/TimeUtil.cs rename to Libraries/Core/Utils/TimeUtil.cs index 4720e4cf..2fdba419 100644 --- a/Core/Utils/TimeUtil.cs +++ b/Libraries/Core/Utils/TimeUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils; diff --git a/Core/Utils/TimerUtil.cs b/Libraries/Core/Utils/TimerUtil.cs similarity index 95% rename from Core/Utils/TimerUtil.cs rename to Libraries/Core/Utils/TimerUtil.cs index e4c7640c..86c23f39 100644 --- a/Core/Utils/TimerUtil.cs +++ b/Libraries/Core/Utils/TimerUtil.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using Core.Annotations; +using SptCommon.Annotations; namespace Core.Utils { diff --git a/Core/Utils/Watermark.cs b/Libraries/Core/Utils/Watermark.cs similarity index 99% rename from Core/Utils/Watermark.cs rename to Libraries/Core/Utils/Watermark.cs index 20f78039..f8b6a9f9 100644 --- a/Core/Utils/Watermark.cs +++ b/Libraries/Core/Utils/Watermark.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Logging; using Core.Models.Spt.Config; using Core.Models.Utils; diff --git a/Libraries/SptDependencyInjection/Class1.cs b/Libraries/SptDependencyInjection/Class1.cs deleted file mode 100644 index 3fd0c410..00000000 --- a/Libraries/SptDependencyInjection/Class1.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SptDependencyInjection; - -public class Class1 -{ -} diff --git a/Server/DependencyInjectionRegistrator.cs b/Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs similarity index 92% rename from Server/DependencyInjectionRegistrator.cs rename to Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs index 8cce3e87..6b6dd7b4 100644 --- a/Server/DependencyInjectionRegistrator.cs +++ b/Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs @@ -1,8 +1,8 @@ using System.Reflection; -using Core.Annotations; -using Core.Utils; +using Microsoft.Extensions.DependencyInjection; +using SptCommon.Annotations; -namespace Server; +namespace SptDependencyInjection; public static class DependencyInjectionRegistrator { @@ -133,18 +133,20 @@ public static class DependencyInjectionRegistrator } } - public static void RegisterSptComponents(IServiceCollection builderServices) + public static void RegisterSptComponents( + Assembly serverLauncherAssembly, + Assembly coreAssembly, + IServiceCollection builderServices + ) { // We get all the services from this assembly first, since mods will override them later RegisterComponents( builderServices, - typeof(Program).Assembly.GetTypes() - .Where(type => Attribute.IsDefined(type, typeof(Injectable))) + serverLauncherAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))) ); RegisterComponents( builderServices, - typeof(App).Assembly.GetTypes() - .Where(type => Attribute.IsDefined(type, typeof(Injectable))) + coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))) ); } diff --git a/Libraries/SptDependencyInjection/SptDependencyInjection.csproj b/Libraries/SptDependencyInjection/SptDependencyInjection.csproj index 17b910f6..2fee4d0e 100644 --- a/Libraries/SptDependencyInjection/SptDependencyInjection.csproj +++ b/Libraries/SptDependencyInjection/SptDependencyInjection.csproj @@ -6,4 +6,12 @@ enable + + + + + + + + diff --git a/Server/Logger/WebApplicationLogger.cs b/Server/Logger/WebApplicationLogger.cs index aaf45f05..eb938ae3 100644 --- a/Server/Logger/WebApplicationLogger.cs +++ b/Server/Logger/WebApplicationLogger.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using SptCommon.Annotations; using Core.Models.Eft.ItemEvent; using Core.Models.Logging; using Core.Models.Utils; diff --git a/Server/Program.cs b/Server/Program.cs index 00612a5c..1d09bd34 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -7,6 +7,7 @@ using Serilog; using Serilog.Events; using Serilog.Exceptions; using Serilog.Extensions.Logging; +using SptDependencyInjection; using ILogger = Microsoft.Extensions.Logging.ILogger; namespace Server; @@ -26,7 +27,7 @@ public static class Program ProgramStatics.Initialize(); - DependencyInjectionRegistrator.RegisterSptComponents(builder.Services); + DependencyInjectionRegistrator.RegisterSptComponents(typeof(Program).Assembly, typeof(App).Assembly, builder.Services); DependencyInjectionRegistrator.RegisterModOverrideComponents(builder.Services, assemblies); ILogger logger = new SerilogLoggerProvider(registeredLogger).CreateLogger("Server"); try diff --git a/Server/Server.csproj b/Server/Server.csproj index 56863876..a16ef047 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -10,14 +10,14 @@ - + - - - - + + + + diff --git a/Core/Annotations/Injectable.cs b/SptCommon/Annotations/Injectable.cs similarity index 93% rename from Core/Annotations/Injectable.cs rename to SptCommon/Annotations/Injectable.cs index 8bb82dc5..37ec6981 100644 --- a/Core/Annotations/Injectable.cs +++ b/SptCommon/Annotations/Injectable.cs @@ -1,4 +1,4 @@ -namespace Core.Annotations; +namespace SptCommon.Annotations; [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)] public class Injectable(InjectionType injectionType = InjectionType.Scoped, Type? type = null, int typePriority = int.MaxValue) : Attribute diff --git a/Core/Utils/Extensions/MemberInfoExtensions.cs b/SptCommon/Extensions/MemberInfoExtensions.cs similarity index 92% rename from Core/Utils/Extensions/MemberInfoExtensions.cs rename to SptCommon/Extensions/MemberInfoExtensions.cs index 0d90d062..ebd39d31 100644 --- a/Core/Utils/Extensions/MemberInfoExtensions.cs +++ b/SptCommon/Extensions/MemberInfoExtensions.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Text.Json.Serialization; -namespace Core.Utils.Extensions; +namespace SptCommon.Extensions; public static class MemberInfoExtensions { diff --git a/Core/Utils/Extensions/ObjectExtensions.cs b/SptCommon/Extensions/ObjectExtensions.cs similarity index 97% rename from Core/Utils/Extensions/ObjectExtensions.cs rename to SptCommon/Extensions/ObjectExtensions.cs index 11b181d7..8881159c 100644 --- a/Core/Utils/Extensions/ObjectExtensions.cs +++ b/SptCommon/Extensions/ObjectExtensions.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace Core.Utils.Extensions +namespace SptCommon.Extensions { public static class ObjectExtensions { diff --git a/Core/Core.csproj b/SptCommon/SptCommon.csproj similarity index 69% rename from Core/Core.csproj rename to SptCommon/SptCommon.csproj index d38b2047..17b910f6 100644 --- a/Core/Core.csproj +++ b/SptCommon/SptCommon.csproj @@ -1,10 +1,9 @@ - + net9.0 enable enable - Library diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 78d944ba..e3610acd 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -16,7 +16,9 @@ - + + + diff --git a/server-csharp.sln b/server-csharp.sln index b4b75498..b3e8555d 100644 --- a/server-csharp.sln +++ b/server-csharp.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{1F5ED9C6-8B1F-4776-85AB-B387CBBC5557}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{AC8643DC-8779-4B4A-BBDA-2D4CC466F765}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Libraries\Core\Core.csproj", "{AC8643DC-8779-4B4A-BBDA-2D4CC466F765}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{6C0681F9-4013-4579-82DA-0A9297984FD3}" EndProject @@ -16,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SptDependencyInjection", "L EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ItemTplGenerator", "Tools\ItemTplGenerator\ItemTplGenerator.csproj", "{00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SptCommon", "SptCommon\SptCommon.csproj", "{DB049C81-DEC0-490D-AC06-7AF4DC8C0571}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -46,6 +48,10 @@ Global {00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU {00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU {00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF}.Release|Any CPU.Build.0 = Release|Any CPU + {DB049C81-DEC0-490D-AC06-7AF4DC8C0571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB049C81-DEC0-490D-AC06-7AF4DC8C0571}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB049C81-DEC0-490D-AC06-7AF4DC8C0571}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB049C81-DEC0-490D-AC06-7AF4DC8C0571}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -53,5 +59,7 @@ Global GlobalSection(NestedProjects) = preSolution {4B4AF50D-B2C6-47D1-B567-EA4560D8CBA1} = {F084DDFD-89F3-44F9-89C3-5CA11F4CDEEF} {00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF} = {587959C2-5AFA-4B77-B327-566610F9A289} + {AC8643DC-8779-4B4A-BBDA-2D4CC466F765} = {F084DDFD-89F3-44F9-89C3-5CA11F4CDEEF} + {DB049C81-DEC0-490D-AC06-7AF4DC8C0571} = {F084DDFD-89F3-44F9-89C3-5CA11F4CDEEF} EndGlobalSection EndGlobal