Merge pull request #37 from CWXDEV/main

injectables go brr

.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
+.idea/caches/build_file_checksums.ser

Core/Controllers/HandBookController.cs

@@ -8,6 +8,6 @@ public class HandBookController
 {
     public void Load()
     {
-        throw new NotImplementedException();
+        // throw new NotImplementedException();
     }
 }

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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<StaticForcedProps> staticForced,
@@ -15,4 +17,4 @@ public class LocationGenerator
     {
         throw new NotImplementedException();
     }
-}
+}

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; }
-}
+}

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; }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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();
     }
-}
+}

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;
     }
-}
+}

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();
     }
-}
+}

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
 {
     /**

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

Core/Helpers/ContainerHelper.cs

@@ -1,7 +1,9 @@
 using System.Text.Json.Serialization;
+using Core.Annotations;
 
 namespace Core.Helpers;
 
+[Injectable]
 public class ContainerHelper
 {
     /// <summary>

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()

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)

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()

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
 {
     

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()

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()

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()

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()

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
 {
     /// <summary>

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
 {
     /// <summary>

Core/Helpers/GameEventHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class GameEventHelper
 {
     

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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()

Core/Helpers/PaymentHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class PaymentHelper
 {
     /// <summary>

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<string, List<string>> input)

Core/Helpers/ProbabilityHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class ProbabilityHelper
 {
     /// <summary>

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<QuestCondition> GetQuestConditions(

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /**

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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()

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()

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;

Core/Helpers/UtilityHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class UtilityHelper
 {
     public List<T> ArrayIntersect<T>(List<T> a, List<T> b)

Core/Helpers/WeatherHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class WeatherHelper
 {
     public WeatherHelper()

Core/Helpers/WeightedRandomHelper.cs

@@ -1,5 +1,8 @@
-namespace Core.Helpers;
+using Core.Annotations;
 
+namespace Core.Helpers;
+
+[Injectable]
 public class WeightedRandomHelper
 {
     public WeightedRandomHelper()

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)),
         ])
     {
     }

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?");
         }

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)