From 1767ad9be214c3a8afd46fd1fcc3316d865aedd2 Mon Sep 17 00:00:00 2001 From: CWX Date: Sat, 11 Jan 2025 21:01:32 +0000 Subject: [PATCH] injectors go brr --- .gitignore | 3 ++- Core/Controllers/HandBookController.cs | 2 +- Core/Generators/BotEquipmentModGenerator.cs | 6 ++++-- Core/Generators/BotGenerator.cs | 6 ++++-- Core/Generators/BotInventoryGenerator.cs | 6 ++++-- Core/Generators/BotLevelGenerator.cs | 6 ++++-- Core/Generators/BotLootGenerator.cs | 6 ++++-- Core/Generators/BotWeaponGenerator.cs | 6 ++++-- Core/Generators/FenceBaseAssortGenerator.cs | 6 ++++-- Core/Generators/LocationGenerator.cs | 6 ++++-- Core/Generators/LocationLootGenerator.cs | 4 +++- Core/Generators/LootGenerator.cs | 4 +++- Core/Generators/PMCLootGenerator.cs | 6 ++++-- Core/Generators/PlayerScavGenerator.cs | 6 ++++-- Core/Generators/RagfairAssortGenerator.cs | 6 ++++-- Core/Generators/RagfairOfferGenerator.cs | 6 ++++-- Core/Generators/RepeatableQuestGenerator.cs | 6 ++++-- Core/Generators/ScavCaseRewardGenerator.cs | 6 ++++-- .../Implementations/BarrelInvetoryMagGen.cs | 7 +++++-- .../Implementations/ExternalInventoryMagGen.cs | 6 ++++-- .../InternalMagazineInventoryMagGen.cs | 7 +++++-- .../Implementations/UbglExternalMagGen.cs | 7 +++++-- Core/Generators/WeaponGen/InventoryMagGen.cs | 6 ++++-- Core/Generators/WeatherGenerator.cs | 6 ++++-- Core/Helpers/AssortHelper.cs | 4 +++- Core/Helpers/BotDifficultyHelper.cs | 4 +++- Core/Helpers/BotGeneratorHelper.cs | 4 +++- Core/Helpers/BotHelper.cs | 4 +++- Core/Helpers/BotWeaponGeneratorHelper.cs | 4 +++- Core/Helpers/ContainerHelper.cs | 2 ++ Core/Helpers/Dialogue/AbstractDialogChatBot.cs | 4 +++- .../Dialogue/Commando/SptCommandoCommands.cs | 4 +++- .../SptCommands/GiveCommand/GiveSptCommand.cs | 4 +++- .../SptCommands/GiveCommand/SavedCommand.cs | 5 ++++- .../ProfileCommand/ProfileSptCommand.cs | 4 +++- .../TraderCommand/TraderSptCommand.cs | 4 +++- Core/Helpers/Dialogue/CommandoDialogChatBot.cs | 4 +++- Core/Helpers/Dialogue/SptDialogueChatBot.cs | 4 +++- Core/Helpers/DialogueHelper.cs | 4 +++- Core/Helpers/DurabilityLimitsHelper.cs | 4 +++- Core/Helpers/GameEventHelper.cs | 5 ++++- Core/Helpers/HandbookHelper.cs | 4 +++- Core/Helpers/HealthHelper.cs | 4 +++- Core/Helpers/HideoutHelper.cs | 4 +++- Core/Helpers/InRaidHelper.cs | 4 +++- Core/Helpers/InventoryHelper.cs | 2 ++ Core/Helpers/NotificationSendHelper.cs | 4 +++- Core/Helpers/NotifierHelper.cs | 4 +++- Core/Helpers/PaymentHelper.cs | 5 ++++- Core/Helpers/PresetHelper.cs | 4 +++- Core/Helpers/ProbabilityHelper.cs | 5 ++++- Core/Helpers/QuestConditionHelper.cs | 4 +++- Core/Helpers/QuestHelper.cs | 4 +++- Core/Helpers/RagfairHelper.cs | 4 +++- Core/Helpers/RagfairOfferHelper.cs | 4 +++- Core/Helpers/RagfairSellHelper.cs | 4 +++- Core/Helpers/RagfairServerHelper.cs | 4 +++- Core/Helpers/RagfairSortHelper.cs | 4 +++- Core/Helpers/RepairHelper.cs | 4 +++- Core/Helpers/RepeatableQuestHelper.cs | 4 +++- Core/Helpers/SecureContainerHelper.cs | 4 +++- Core/Helpers/TradeHelper.cs | 4 +++- Core/Helpers/TraderAssortHelper.cs | 4 +++- Core/Helpers/TraderHelper.cs | 4 +++- Core/Helpers/UtilityHelper.cs | 5 ++++- Core/Helpers/WeatherHelper.cs | 5 ++++- Core/Helpers/WeightedRandomHelper.cs | 5 ++++- Core/Routers/Static/ProfileStaticRouter.cs | 17 +++++++---------- Core/Servers/SaveServer.cs | 2 +- Core/Utils/FileUtil.cs | 3 ++- .../user/profiles/6781aa7c00037bbc69469ef8.json | 0 71 files changed, 236 insertions(+), 97 deletions(-) delete mode 100644 Server/user/profiles/6781aa7c00037bbc69469ef8.json diff --git a/.gitignore b/.gitignore index 3b3780b5..aa98f0e4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ## files generated by popular Visual Studio add-ons. ## ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +.Server/user/ # User-specific files *.rsuser @@ -421,4 +422,4 @@ fabric.properties .idea/httpRequests # Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser \ No newline at end of file +.idea/caches/build_file_checksums.ser diff --git a/Core/Controllers/HandBookController.cs b/Core/Controllers/HandBookController.cs index f3cc9a1d..15081c8c 100644 --- a/Core/Controllers/HandBookController.cs +++ b/Core/Controllers/HandBookController.cs @@ -8,6 +8,6 @@ public class HandBookController { public void Load() { - throw new NotImplementedException(); + // throw new NotImplementedException(); } } diff --git a/Core/Generators/BotEquipmentModGenerator.cs b/Core/Generators/BotEquipmentModGenerator.cs index a0889ec7..8fcc9094 100644 --- a/Core/Generators/BotEquipmentModGenerator.cs +++ b/Core/Generators/BotEquipmentModGenerator.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Enums; using Core.Models.Spt.Bots; @@ -6,6 +7,7 @@ using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class BotEquipmentModGenerator { private BotConfig _botConfig; @@ -388,4 +390,4 @@ public class BotEquipmentModGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/BotGenerator.cs b/Core/Generators/BotGenerator.cs index 22517f32..80a13de2 100644 --- a/Core/Generators/BotGenerator.cs +++ b/Core/Generators/BotGenerator.cs @@ -1,4 +1,5 @@ -using Core.Models.Common; +using Core.Annotations; +using Core.Models.Common; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; @@ -7,6 +8,7 @@ using BodyPart = Core.Models.Eft.Common.Tables.BodyPart; namespace Core.Generators; +[Injectable] public class BotGenerator { private BotConfig _botConfig; @@ -272,4 +274,4 @@ public class BotGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/BotInventoryGenerator.cs b/Core/Generators/BotInventoryGenerator.cs index f3ad9300..00f387c3 100644 --- a/Core/Generators/BotInventoryGenerator.cs +++ b/Core/Generators/BotInventoryGenerator.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Match; using Core.Models.Spt.Bots; using Core.Models.Spt.Config; @@ -6,6 +7,7 @@ using Equipment = Core.Models.Eft.Common.Tables.Equipment; namespace Core.Generators; +[Injectable] public class BotInventoryGenerator { private BotConfig _botConfig; @@ -143,4 +145,4 @@ public class BotInventoryGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/BotLevelGenerator.cs b/Core/Generators/BotLevelGenerator.cs index e6bdad71..810e2ec5 100644 --- a/Core/Generators/BotLevelGenerator.cs +++ b/Core/Generators/BotLevelGenerator.cs @@ -1,10 +1,12 @@ -using Core.Models.Common; +using Core.Annotations; +using Core.Models.Common; using Core.Models.Eft.Bot; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; namespace Core.Generators; +[Injectable] public class BotLevelGenerator { public BotLevelGenerator() @@ -39,4 +41,4 @@ public class BotLevelGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/BotLootGenerator.cs b/Core/Generators/BotLootGenerator.cs index c520ea23..63b01612 100644 --- a/Core/Generators/BotLootGenerator.cs +++ b/Core/Generators/BotLootGenerator.cs @@ -1,10 +1,12 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Enums; using Core.Models.Spt.Bots; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class BotLootGenerator { private BotConfig _botConfig; @@ -200,4 +202,4 @@ public class BotLootGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/BotWeaponGenerator.cs b/Core/Generators/BotWeaponGenerator.cs index f3cabb86..3f9f1c03 100644 --- a/Core/Generators/BotWeaponGenerator.cs +++ b/Core/Generators/BotWeaponGenerator.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class BotWeaponGenerator { private const string _modMagazineSlotId = "mod_magazine"; @@ -240,4 +242,4 @@ public class BotWeaponGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/FenceBaseAssortGenerator.cs b/Core/Generators/FenceBaseAssortGenerator.cs index 8258f115..427e55ee 100644 --- a/Core/Generators/FenceBaseAssortGenerator.cs +++ b/Core/Generators/FenceBaseAssortGenerator.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class FenceBaseAssortGenerator { private TraderConfig _traderConfig; @@ -58,4 +60,4 @@ public class FenceBaseAssortGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/LocationGenerator.cs b/Core/Generators/LocationGenerator.cs index 370c3a58..2f9361c0 100644 --- a/Core/Generators/LocationGenerator.cs +++ b/Core/Generators/LocationGenerator.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; namespace Core.Generators; +[Injectable] public class LocationGenerator { public StaticContainerProps GenerateContainerLoot(StaticContainerProps containerIn, List staticForced, @@ -15,4 +17,4 @@ public class LocationGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/LocationLootGenerator.cs b/Core/Generators/LocationLootGenerator.cs index ff2b33bb..16eed7a6 100644 --- a/Core/Generators/LocationLootGenerator.cs +++ b/Core/Generators/LocationLootGenerator.cs @@ -1,10 +1,12 @@ using System.Text.Json.Serialization; +using Core.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class LocationLootGenerator { private LocationConfig _locationConfig; @@ -181,4 +183,4 @@ public class ContainerItem [JsonPropertyName("height")] public int Height { get; set; } -} \ No newline at end of file +} diff --git a/Core/Generators/LootGenerator.cs b/Core/Generators/LootGenerator.cs index 1fa7acbb..77a8c167 100644 --- a/Core/Generators/LootGenerator.cs +++ b/Core/Generators/LootGenerator.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Annotations; using Core.Models.Common; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; @@ -7,6 +8,7 @@ using Core.Models.Spt.Services; namespace Core.Generators; +[Injectable] public class LootGenerator { public LootGenerator() @@ -174,4 +176,4 @@ public class ItemLimit [JsonPropertyName("max")] public double Max { get; set; } -} \ No newline at end of file +} diff --git a/Core/Generators/PMCLootGenerator.cs b/Core/Generators/PMCLootGenerator.cs index f93a1e82..5443d142 100644 --- a/Core/Generators/PMCLootGenerator.cs +++ b/Core/Generators/PMCLootGenerator.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Generators; +[Injectable] public class PMCLootGenerator { public PMCLootGenerator() @@ -59,4 +61,4 @@ public class PMCLootGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/PlayerScavGenerator.cs b/Core/Generators/PlayerScavGenerator.cs index 2129b794..830fd024 100644 --- a/Core/Generators/PlayerScavGenerator.cs +++ b/Core/Generators/PlayerScavGenerator.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class PlayerScavGenerator { private PlayerScavConfig _playerScavConfig; @@ -101,4 +103,4 @@ public class PlayerScavGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/RagfairAssortGenerator.cs b/Core/Generators/RagfairAssortGenerator.cs index 87aab60c..7796f8b1 100644 --- a/Core/Generators/RagfairAssortGenerator.cs +++ b/Core/Generators/RagfairAssortGenerator.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; namespace Core.Generators; +[Injectable] public class RagfairAssortGenerator { public RagfairAssortGenerator() @@ -57,4 +59,4 @@ public class RagfairAssortGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/RagfairOfferGenerator.cs b/Core/Generators/RagfairOfferGenerator.cs index f26f838b..8db0df07 100644 --- a/Core/Generators/RagfairOfferGenerator.cs +++ b/Core/Generators/RagfairOfferGenerator.cs @@ -1,10 +1,12 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; using Core.Models.Spt.Config; using Core.Models.Spt.Ragfair; namespace Core.Generators; +[Injectable] public class RagfairOfferGenerator { public RagfairOfferGenerator() @@ -282,4 +284,4 @@ public class RagfairOfferGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/RepeatableQuestGenerator.cs b/Core/Generators/RepeatableQuestGenerator.cs index 97b16658..48c5dcb4 100644 --- a/Core/Generators/RepeatableQuestGenerator.cs +++ b/Core/Generators/RepeatableQuestGenerator.cs @@ -1,10 +1,12 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; using Core.Models.Spt.Repeatable; namespace Core.Generators; +[Injectable] public class RepeatableQuestGenerator { public RepeatableQuestGenerator() @@ -205,4 +207,4 @@ public class RepeatableQuestGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/ScavCaseRewardGenerator.cs b/Core/Generators/ScavCaseRewardGenerator.cs index e0c9c1fa..cbfe2b9c 100644 --- a/Core/Generators/ScavCaseRewardGenerator.cs +++ b/Core/Generators/ScavCaseRewardGenerator.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; using Core.Models.Spt.Hideout; namespace Core.Generators; +[Injectable] public class ScavCaseRewardGenerator { public ScavCaseRewardGenerator() @@ -122,4 +124,4 @@ public class ScavCaseRewardGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs index b1a80d19..46408db2 100644 --- a/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs +++ b/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs @@ -1,5 +1,8 @@ -namespace Core.Generators.WeaponGen.Implementations; +using Core.Annotations; +namespace Core.Generators.WeaponGen.Implementations; + +[Injectable] public class BarrelInvetoryMagGen : InventoryMagGen { public BarrelInvetoryMagGen() @@ -20,4 +23,4 @@ public class BarrelInvetoryMagGen : InventoryMagGen { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs index d9a454c0..208d7e56 100644 --- a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs +++ b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Generators.WeaponGen.Implementations; +[Injectable] public class ExternalInventoryMagGen : InventoryMagGen { public ExternalInventoryMagGen() @@ -27,4 +29,4 @@ public class ExternalInventoryMagGen : InventoryMagGen { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs index 46e2f744..5ddafdc8 100644 --- a/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs +++ b/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs @@ -1,5 +1,8 @@ -namespace Core.Generators.WeaponGen.Implementations; +using Core.Annotations; +namespace Core.Generators.WeaponGen.Implementations; + +[Injectable] public class InternalMagazineInventoryMagGen : InventoryMagGen { public InternalMagazineInventoryMagGen() @@ -20,4 +23,4 @@ public class InternalMagazineInventoryMagGen : InventoryMagGen { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs index a8bffd89..b31df330 100644 --- a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs +++ b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs @@ -1,5 +1,8 @@ -namespace Core.Generators.WeaponGen.Implementations; +using Core.Annotations; +namespace Core.Generators.WeaponGen.Implementations; + +[Injectable] public class UbglExternalMagGen : InventoryMagGen { public UbglExternalMagGen() @@ -20,4 +23,4 @@ public class UbglExternalMagGen : InventoryMagGen { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Generators/WeaponGen/InventoryMagGen.cs b/Core/Generators/WeaponGen/InventoryMagGen.cs index b3620b62..9d11d056 100644 --- a/Core/Generators/WeaponGen/InventoryMagGen.cs +++ b/Core/Generators/WeaponGen/InventoryMagGen.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Generators.WeaponGen; +[Injectable] public class InventoryMagGen { private GenerationData _magCounts; @@ -38,4 +40,4 @@ public class InventoryMagGen { return _pmcInventory; } -} \ No newline at end of file +} diff --git a/Core/Generators/WeatherGenerator.cs b/Core/Generators/WeatherGenerator.cs index f3abe30b..dc1d7114 100644 --- a/Core/Generators/WeatherGenerator.cs +++ b/Core/Generators/WeatherGenerator.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Weather; +using Core.Annotations; +using Core.Models.Eft.Weather; using Core.Models.Enums; using Core.Models.Spt.Config; namespace Core.Generators; +[Injectable] public class WeatherGenerator { public WeatherGenerator() @@ -107,4 +109,4 @@ public class WeatherGenerator { throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/Core/Helpers/AssortHelper.cs b/Core/Helpers/AssortHelper.cs index 67dba009..56162a87 100644 --- a/Core/Helpers/AssortHelper.cs +++ b/Core/Helpers/AssortHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class AssortHelper { /** diff --git a/Core/Helpers/BotDifficultyHelper.cs b/Core/Helpers/BotDifficultyHelper.cs index 9c172c8e..81b4bb06 100644 --- a/Core/Helpers/BotDifficultyHelper.cs +++ b/Core/Helpers/BotDifficultyHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Bots; namespace Core.Helpers; +[Injectable] public class BotDifficultyHelper { /// diff --git a/Core/Helpers/BotGeneratorHelper.cs b/Core/Helpers/BotGeneratorHelper.cs index ad38f2f3..3b0ca7ab 100644 --- a/Core/Helpers/BotGeneratorHelper.cs +++ b/Core/Helpers/BotGeneratorHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; namespace Core.Helpers; +[Injectable] public class BotGeneratorHelper { /// diff --git a/Core/Helpers/BotHelper.cs b/Core/Helpers/BotHelper.cs index 94567116..e4f689ec 100644 --- a/Core/Helpers/BotHelper.cs +++ b/Core/Helpers/BotHelper.cs @@ -1,9 +1,11 @@ -using Core.Models.Common; +using Core.Annotations; +using Core.Models.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; namespace Core.Helpers; +[Injectable] public class BotHelper { /// diff --git a/Core/Helpers/BotWeaponGeneratorHelper.cs b/Core/Helpers/BotWeaponGeneratorHelper.cs index 9c2f1a73..2ef93210 100644 --- a/Core/Helpers/BotWeaponGeneratorHelper.cs +++ b/Core/Helpers/BotWeaponGeneratorHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class BotWeaponGeneratorHelper { /// diff --git a/Core/Helpers/ContainerHelper.cs b/Core/Helpers/ContainerHelper.cs index c2ca1d36..08b0dc55 100644 --- a/Core/Helpers/ContainerHelper.cs +++ b/Core/Helpers/ContainerHelper.cs @@ -1,7 +1,9 @@ using System.Text.Json.Serialization; +using Core.Annotations; namespace Core.Helpers; +[Injectable] public class ContainerHelper { /// diff --git a/Core/Helpers/Dialogue/AbstractDialogChatBot.cs b/Core/Helpers/Dialogue/AbstractDialogChatBot.cs index 7d76336c..f5425e11 100644 --- a/Core/Helpers/Dialogue/AbstractDialogChatBot.cs +++ b/Core/Helpers/Dialogue/AbstractDialogChatBot.cs @@ -1,9 +1,11 @@ -using Core.Helpers.Dialog.Commando; +using Core.Annotations; +using Core.Helpers.Dialog.Commando; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; namespace Core.Helpers.Dialogue; +[Injectable] public class AbstractDialogChatBot : IDialogueChatBot { public UserDialogInfo GetChatBot() diff --git a/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs index d08cde1c..4ecc1809 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs +++ b/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs @@ -1,9 +1,11 @@ -using Core.Helpers.Dialog.Commando.SptCommands; +using Core.Annotations; +using Core.Helpers.Dialog.Commando.SptCommands; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; namespace Core.Helpers.Dialog.Commando; +[Injectable] public class SptCommandoCommands : IChatCommand { public void RegisterSptCommandoCommand(ISptCommand command) diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index bec8a9a9..ec21924a 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; namespace Core.Helpers.Dialog.Commando.SptCommands.GiveCommand; +[Injectable] public class GiveSptCommand { public string GetCommand() diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs b/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs index f6abea47..ff659bc1 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs +++ b/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers.Dialog.Commando.SptCommands.GiveCommand; +using Core.Annotations; +namespace Core.Helpers.Dialog.Commando.SptCommands.GiveCommand; + +[Injectable] public class SavedCommand { diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs b/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs index a8773eae..adc82827 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs +++ b/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Dialog; +using Core.Annotations; +using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; using Core.Models.Spt.Dialog; namespace Core.Helpers.Dialog.Commando.SptCommands.ProfileCommand; +[Injectable] public class ProfileSptCommand : ISptCommand { public string GetCommand() diff --git a/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs b/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs index 50942d1a..cbb4e6ee 100644 --- a/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs +++ b/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Dialog; +using Core.Annotations; +using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; namespace Core.Helpers.Dialog.Commando.SptCommands.TraderCommand; +[Injectable] public class TraderSptCommand : ISptCommand { public string GetCommand() diff --git a/Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Core/Helpers/Dialogue/CommandoDialogChatBot.cs index 5a58341d..4635d536 100644 --- a/Core/Helpers/Dialogue/CommandoDialogChatBot.cs +++ b/Core/Helpers/Dialogue/CommandoDialogChatBot.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Profile; +using Core.Annotations; +using Core.Models.Eft.Profile; namespace Core.Helpers.Dialogue; +[Injectable] public class CommandoDialogChatBot : AbstractDialogChatBot { public UserDialogInfo GetChatBot() diff --git a/Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Core/Helpers/Dialogue/SptDialogueChatBot.cs index 4e1867f4..a9e1a100 100644 --- a/Core/Helpers/Dialogue/SptDialogueChatBot.cs +++ b/Core/Helpers/Dialogue/SptDialogueChatBot.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Dialog; +using Core.Annotations; +using Core.Models.Eft.Dialog; using Core.Models.Eft.Profile; namespace Core.Helpers.Dialogue; +[Injectable] public class SptDialogueChatBot : IDialogueChatBot { public UserDialogInfo GetChatBot() diff --git a/Core/Helpers/DialogueHelper.cs b/Core/Helpers/DialogueHelper.cs index 741dc843..5d4c2f05 100644 --- a/Core/Helpers/DialogueHelper.cs +++ b/Core/Helpers/DialogueHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; namespace Core.Helpers; +[Injectable] public class DialogueHelper { /// diff --git a/Core/Helpers/DurabilityLimitsHelper.cs b/Core/Helpers/DurabilityLimitsHelper.cs index 784f0259..60e2a824 100644 --- a/Core/Helpers/DurabilityLimitsHelper.cs +++ b/Core/Helpers/DurabilityLimitsHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class DurabilityLimitsHelper { /// diff --git a/Core/Helpers/GameEventHelper.cs b/Core/Helpers/GameEventHelper.cs index 40790d30..dc897d3a 100644 --- a/Core/Helpers/GameEventHelper.cs +++ b/Core/Helpers/GameEventHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class GameEventHelper { diff --git a/Core/Helpers/HandbookHelper.cs b/Core/Helpers/HandbookHelper.cs index 999823c1..dfc6188b 100644 --- a/Core/Helpers/HandbookHelper.cs +++ b/Core/Helpers/HandbookHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class HandbookHelper { /// diff --git a/Core/Helpers/HealthHelper.cs b/Core/Helpers/HealthHelper.cs index 3e0f15e9..863a8d08 100644 --- a/Core/Helpers/HealthHelper.cs +++ b/Core/Helpers/HealthHelper.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Health; using Core.Models.Eft.Profile; @@ -7,6 +8,7 @@ using Health = Core.Models.Eft.Profile.Health; namespace Core.Helpers; +[Injectable] public class HealthHelper { /// diff --git a/Core/Helpers/HideoutHelper.cs b/Core/Helpers/HideoutHelper.cs index 79685ac3..fe4f82a8 100644 --- a/Core/Helpers/HideoutHelper.cs +++ b/Core/Helpers/HideoutHelper.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; using Core.Models.Eft.ItemEvent; @@ -6,6 +7,7 @@ using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class HideoutHelper { /// diff --git a/Core/Helpers/InRaidHelper.cs b/Core/Helpers/InRaidHelper.cs index 98e5ec54..4adaa8f3 100644 --- a/Core/Helpers/InRaidHelper.cs +++ b/Core/Helpers/InRaidHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class InRaidHelper { /// diff --git a/Core/Helpers/InventoryHelper.cs b/Core/Helpers/InventoryHelper.cs index a45d341d..f728f2cb 100644 --- a/Core/Helpers/InventoryHelper.cs +++ b/Core/Helpers/InventoryHelper.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Inventory; @@ -8,6 +9,7 @@ using Core.Models.Spt.Inventory; namespace Core.Helpers; +[Injectable] public class InventoryHelper { /// diff --git a/Core/Helpers/NotificationSendHelper.cs b/Core/Helpers/NotificationSendHelper.cs index fd09ddcd..0d92b8d1 100644 --- a/Core/Helpers/NotificationSendHelper.cs +++ b/Core/Helpers/NotificationSendHelper.cs @@ -1,9 +1,11 @@ -using Core.Models.Eft.Profile; +using Core.Annotations; +using Core.Models.Eft.Profile; using Core.Models.Eft.Ws; using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class NotificationSendHelper { /// diff --git a/Core/Helpers/NotifierHelper.cs b/Core/Helpers/NotifierHelper.cs index 972450a9..71647bf5 100644 --- a/Core/Helpers/NotifierHelper.cs +++ b/Core/Helpers/NotifierHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Profile; +using Core.Annotations; +using Core.Models.Eft.Profile; using Core.Models.Eft.Ws; namespace Core.Helpers; +[Injectable] public class NotifierHelper { public WsNotificationEvent GetDefaultNotification() diff --git a/Core/Helpers/PaymentHelper.cs b/Core/Helpers/PaymentHelper.cs index 01f393fa..1b94c0d1 100644 --- a/Core/Helpers/PaymentHelper.cs +++ b/Core/Helpers/PaymentHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class PaymentHelper { /// diff --git a/Core/Helpers/PresetHelper.cs b/Core/Helpers/PresetHelper.cs index 4c23cb8d..a6ac3e16 100644 --- a/Core/Helpers/PresetHelper.cs +++ b/Core/Helpers/PresetHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class PresetHelper { public void HydratePresetStore(Dictionary> input) diff --git a/Core/Helpers/ProbabilityHelper.cs b/Core/Helpers/ProbabilityHelper.cs index cecfa5ee..8c356340 100644 --- a/Core/Helpers/ProbabilityHelper.cs +++ b/Core/Helpers/ProbabilityHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class ProbabilityHelper { /// diff --git a/Core/Helpers/QuestConditionHelper.cs b/Core/Helpers/QuestConditionHelper.cs index b25aace8..d31764b6 100644 --- a/Core/Helpers/QuestConditionHelper.cs +++ b/Core/Helpers/QuestConditionHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class QuestConditionHelper { public List GetQuestConditions( diff --git a/Core/Helpers/QuestHelper.cs b/Core/Helpers/QuestHelper.cs index 2d9c27a7..62fc08cd 100644 --- a/Core/Helpers/QuestHelper.cs +++ b/Core/Helpers/QuestHelper.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; using Core.Models.Eft.ItemEvent; @@ -7,6 +8,7 @@ using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class QuestHelper { /// diff --git a/Core/Helpers/RagfairHelper.cs b/Core/Helpers/RagfairHelper.cs index 1f63b3eb..2a66b9f9 100644 --- a/Core/Helpers/RagfairHelper.cs +++ b/Core/Helpers/RagfairHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Ragfair; namespace Core.Helpers; +[Injectable] public class RagfairHelper { /// diff --git a/Core/Helpers/RagfairOfferHelper.cs b/Core/Helpers/RagfairOfferHelper.cs index fffb2899..5b56ceea 100644 --- a/Core/Helpers/RagfairOfferHelper.cs +++ b/Core/Helpers/RagfairOfferHelper.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; using Core.Models.Eft.Profile; @@ -7,6 +8,7 @@ using Core.Models.Spt.Config; namespace Core.Helpers; +[Injectable] public class RagfairOfferHelper { /// diff --git a/Core/Helpers/RagfairSellHelper.cs b/Core/Helpers/RagfairSellHelper.cs index 4fc8e138..b7327dd2 100644 --- a/Core/Helpers/RagfairSellHelper.cs +++ b/Core/Helpers/RagfairSellHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Ragfair; +using Core.Annotations; +using Core.Models.Eft.Ragfair; namespace Core.Helpers; +[Injectable] public class RagfairSellHelper { /// diff --git a/Core/Helpers/RagfairServerHelper.cs b/Core/Helpers/RagfairServerHelper.cs index 5c8c79b5..8898fbb0 100644 --- a/Core/Helpers/RagfairServerHelper.cs +++ b/Core/Helpers/RagfairServerHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class RagfairServerHelper { /// diff --git a/Core/Helpers/RagfairSortHelper.cs b/Core/Helpers/RagfairSortHelper.cs index b98ae726..303eabeb 100644 --- a/Core/Helpers/RagfairSortHelper.cs +++ b/Core/Helpers/RagfairSortHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Ragfair; +using Core.Annotations; +using Core.Models.Eft.Ragfair; using Core.Models.Enums; namespace Core.Helpers; +[Injectable] public class RagfairSortHelper { /** diff --git a/Core/Helpers/RepairHelper.cs b/Core/Helpers/RepairHelper.cs index 75dba591..937d4e18 100644 --- a/Core/Helpers/RepairHelper.cs +++ b/Core/Helpers/RepairHelper.cs @@ -1,8 +1,10 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; using Props = Core.Models.Eft.Common.Props; namespace Core.Helpers; +[Injectable] public class RepairHelper { /// diff --git a/Core/Helpers/RepeatableQuestHelper.cs b/Core/Helpers/RepeatableQuestHelper.cs index a9ca0439..52ac348b 100644 --- a/Core/Helpers/RepeatableQuestHelper.cs +++ b/Core/Helpers/RepeatableQuestHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Spt.Config; +using Core.Annotations; +using Core.Models.Spt.Config; namespace Core.Helpers; +[Injectable] public class RepeatableQuestHelper { /// diff --git a/Core/Helpers/SecureContainerHelper.cs b/Core/Helpers/SecureContainerHelper.cs index 9d8914fb..18a78125 100644 --- a/Core/Helpers/SecureContainerHelper.cs +++ b/Core/Helpers/SecureContainerHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class SecureContainerHelper { /// diff --git a/Core/Helpers/TradeHelper.cs b/Core/Helpers/TradeHelper.cs index ed199769..b5673de4 100644 --- a/Core/Helpers/TradeHelper.cs +++ b/Core/Helpers/TradeHelper.cs @@ -1,10 +1,12 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.ItemEvent; using Core.Models.Eft.Trade; namespace Core.Helpers; +[Injectable] public class TradeHelper { public TradeHelper() diff --git a/Core/Helpers/TraderAssortHelper.cs b/Core/Helpers/TraderAssortHelper.cs index ad5626f1..3777c4f0 100644 --- a/Core/Helpers/TraderAssortHelper.cs +++ b/Core/Helpers/TraderAssortHelper.cs @@ -1,7 +1,9 @@ -using Core.Models.Eft.Common.Tables; +using Core.Annotations; +using Core.Models.Eft.Common.Tables; namespace Core.Helpers; +[Injectable] public class TraderAssortHelper { public TraderAssortHelper() diff --git a/Core/Helpers/TraderHelper.cs b/Core/Helpers/TraderHelper.cs index d4d0c694..76d4cbfd 100644 --- a/Core/Helpers/TraderHelper.cs +++ b/Core/Helpers/TraderHelper.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.Annotations; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Profile; using Core.Models.Enums; @@ -6,6 +7,7 @@ using Core.Models.Spt.Config; namespace Core.Helpers; +[Injectable] public class TraderHelper { private TraderConfig _traderConfig; diff --git a/Core/Helpers/UtilityHelper.cs b/Core/Helpers/UtilityHelper.cs index ae7c0c4c..8674f6b0 100644 --- a/Core/Helpers/UtilityHelper.cs +++ b/Core/Helpers/UtilityHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class UtilityHelper { public List ArrayIntersect(List a, List b) diff --git a/Core/Helpers/WeatherHelper.cs b/Core/Helpers/WeatherHelper.cs index ef67a945..e93a6b37 100644 --- a/Core/Helpers/WeatherHelper.cs +++ b/Core/Helpers/WeatherHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class WeatherHelper { public WeatherHelper() diff --git a/Core/Helpers/WeightedRandomHelper.cs b/Core/Helpers/WeightedRandomHelper.cs index 01f9b145..cc7eedf0 100644 --- a/Core/Helpers/WeightedRandomHelper.cs +++ b/Core/Helpers/WeightedRandomHelper.cs @@ -1,5 +1,8 @@ -namespace Core.Helpers; +using Core.Annotations; +namespace Core.Helpers; + +[Injectable] public class WeightedRandomHelper { public WeightedRandomHelper() diff --git a/Core/Routers/Static/ProfileStaticRouter.cs b/Core/Routers/Static/ProfileStaticRouter.cs index a5cd62f8..14deb205 100644 --- a/Core/Routers/Static/ProfileStaticRouter.cs +++ b/Core/Routers/Static/ProfileStaticRouter.cs @@ -1,3 +1,4 @@ +using Core.Annotations; using Core.Callbacks; using Core.DI; using Core.Models.Eft.Common; @@ -7,6 +8,7 @@ using Core.Utils; namespace Core.Routers.Static; +[Injectable(InjectableTypeOverride = typeof(StaticRouter))] public class ProfileStaticRouter : StaticRouter { public ProfileStaticRouter(ProfileCallbacks profileCallbacks, JsonUtil jsonUtil) : base( @@ -28,8 +30,7 @@ public class ProfileStaticRouter : StaticRouter info, sessionID, output - ) => profileCallbacks.GetProfileData(url, info as EmptyRequestData, sessionID), - typeof(EmptyRequestData)), + ) => profileCallbacks.GetProfileData(url, info as EmptyRequestData, sessionID)), new RouteAction( "/client/game/profile/savage/regenerate", ( @@ -37,8 +38,7 @@ public class ProfileStaticRouter : StaticRouter info, sessionID, output - ) => profileCallbacks.RegenerateScav(url, info as EmptyRequestData, sessionID), - typeof(EmptyRequestData)), + ) => profileCallbacks.RegenerateScav(url, info as EmptyRequestData, sessionID)), new RouteAction( "/client/game/profile/voice/change", (url, info, sessionID, output) => @@ -69,8 +69,7 @@ public class ProfileStaticRouter : StaticRouter info, sessionID, output - ) => profileCallbacks.GetReservedNickname(url, info as EmptyRequestData, sessionID), - typeof(EmptyRequestData)), + ) => profileCallbacks.GetReservedNickname(url, info as EmptyRequestData, sessionID)), new RouteAction( "/client/profile/status", ( @@ -78,8 +77,7 @@ public class ProfileStaticRouter : StaticRouter info, sessionID, output - ) => profileCallbacks.GetProfileStatus(url, info as EmptyRequestData, sessionID), - typeof(EmptyRequestData)), + ) => profileCallbacks.GetProfileStatus(url, info as EmptyRequestData, sessionID)), new RouteAction( "/client/profile/view", ( @@ -115,8 +113,7 @@ public class ProfileStaticRouter : StaticRouter new RouteAction( "/launcher/profiles", (url, info, sessionID, output) => - profileCallbacks.GetAllMiniProfiles(url, info as EmptyRequestData, sessionID), - typeof(EmptyRequestData)), + profileCallbacks.GetAllMiniProfiles(url, info as EmptyRequestData, sessionID)), ]) { } diff --git a/Core/Servers/SaveServer.cs b/Core/Servers/SaveServer.cs index bec7c83a..fa7db3c2 100644 --- a/Core/Servers/SaveServer.cs +++ b/Core/Servers/SaveServer.cs @@ -113,7 +113,7 @@ public class SaveServer */ public SptProfile GetProfile(string sessionId) { - if (!string.IsNullOrEmpty(sessionId)) + if (string.IsNullOrEmpty(sessionId)) { throw new Exception("session id provided was empty, did you restart the server while the game was running?"); } diff --git a/Core/Utils/FileUtil.cs b/Core/Utils/FileUtil.cs index 1e29003d..a8242d4d 100644 --- a/Core/Utils/FileUtil.cs +++ b/Core/Utils/FileUtil.cs @@ -60,7 +60,8 @@ public class FileUtil private void CreateFile(string filePath) { - File.Create(filePath); + var stream = File.Create(filePath); + stream.Close(); } public void DeleteFile(string filePath) diff --git a/Server/user/profiles/6781aa7c00037bbc69469ef8.json b/Server/user/profiles/6781aa7c00037bbc69469ef8.json deleted file mode 100644 index e69de29b..00000000