diff --git a/Libraries/SPTarkov.Common/Annotations/Injectable.cs b/Libraries/SPTarkov.DI/Annotations/Injectable.cs similarity index 65% rename from Libraries/SPTarkov.Common/Annotations/Injectable.cs rename to Libraries/SPTarkov.DI/Annotations/Injectable.cs index 11bddf86..44c62578 100644 --- a/Libraries/SPTarkov.Common/Annotations/Injectable.cs +++ b/Libraries/SPTarkov.DI/Annotations/Injectable.cs @@ -1,6 +1,6 @@ -namespace SPTarkov.Common.Annotations; +namespace SPTarkov.DI.Annotations; -[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)] +[AttributeUsage(AttributeTargets.Class, Inherited = false)] public class Injectable(InjectionType injectionType = InjectionType.Scoped, Type? type = null, int typePriority = int.MaxValue) : Attribute { public InjectionType InjectionType @@ -9,12 +9,6 @@ public class Injectable(InjectionType injectionType = InjectionType.Scoped, Type set; } = injectionType; - public Type? InjectableTypeOverride - { - get; - set; - } = type; - public int TypePriority { get; diff --git a/Libraries/SPTarkov.DI/DependencyInjectionHandler.cs b/Libraries/SPTarkov.DI/DependencyInjectionHandler.cs new file mode 100644 index 00000000..005a968d --- /dev/null +++ b/Libraries/SPTarkov.DI/DependencyInjectionHandler.cs @@ -0,0 +1,220 @@ +using System.Reflection; +using SPTarkov.DI.Annotations; + +namespace SPTarkov.DI; + +public class DependencyInjectionHandler +{ + private static List? _allLoadedTypes; + private static List? _allConstructors; + + private readonly Dictionary _injectedTypeNames = new(); + private readonly IServiceCollection _serviceCollection; + + private readonly Dictionary _injectedValues = new(); + private readonly object _injectedValuesLock = new(); + + private bool _oneTimeUseFlag; + + + public DependencyInjectionHandler(IServiceCollection serviceCollection) + { + _serviceCollection = serviceCollection; + } + + public void AddInjectableTypesFromAssembly(Assembly assembly) + { + AddInjectableTypesFromTypeList(assembly.GetTypes()); + } + + public void AddInjectableTypesFromAssemblies(IEnumerable assemblies) + { + foreach (var assembly in assemblies) + { + AddInjectableTypesFromAssembly(assembly); + } + } + + public void AddInjectableTypesFromTypeAssembly(Type type) + { + AddInjectableTypesFromAssembly(type.Assembly); + } + + public void AddInjectableTypesFromTypeList(IEnumerable types) + { + var typesToInject = types.Where(type => + Attribute.IsDefined(type, typeof(Injectable)) && + !_injectedTypeNames.ContainsKey($"{type.Namespace}.{type.Name}")); + if (typesToInject.Any()) + { + foreach (var type in typesToInject) + { + _injectedTypeNames.Add($"{type.Namespace}.{type.Name}", type); + } + } + } + + public void InjectAll() + { + if (_oneTimeUseFlag) + { + throw new Exception("Invalid usage of DependencyInjectionHandler, this is a one time use service!"); + } + _oneTimeUseFlag = true; + var sortedInjectableTypes = _injectedTypeNames.Values + .Select(t => + new TypeRefContainer(((Injectable[]) Attribute.GetCustomAttributes(t, typeof(Injectable)))[0], t, t)) + .OrderBy(tRef => tRef.InjectableAttribute.TypePriority); + + foreach (var typeRefToInject in sortedInjectableTypes) + { + var nodes = new Queue(); + nodes.Enqueue(typeRefToInject); + foreach (var implementedInterface in typeRefToInject.Type.GetInterfaces() + .Where(t => !t.Namespace.StartsWith("System"))) + { + nodes.Enqueue(new TypeRefContainer(typeRefToInject.InjectableAttribute, typeRefToInject.Type, + implementedInterface)); + } + + while (nodes.Any()) + { + var node = nodes.Dequeue(); + if (node.Type.BaseType != null && node.Type.BaseType != typeof(object)) + { + nodes.Enqueue(new TypeRefContainer(node.InjectableAttribute, typeRefToInject.Type, + node.Type.BaseType)); + } + + if (node.Type.IsGenericType) + { + RegisterGenericComponents(node); + } + else + { + RegisterComponent(node.InjectableAttribute.InjectionType, + node.Type, + node.ParentType); + } + } + } + } + + private void RegisterGenericComponents(TypeRefContainer typeRef) + { + try + { + _allLoadedTypes ??= AppDomain.CurrentDomain.GetAssemblies().SelectMany(t => t.GetTypes()).ToList(); + } + catch (ReflectionTypeLoadException ex) + { + Console.WriteLine($"COULD NOT LOAD TYPE: {ex}"); + } + + _allConstructors ??= _allLoadedTypes.SelectMany(t => t.GetConstructors()).ToList(); + + var typeName = $"{typeRef.Type.Namespace}.{typeRef.Type.Name}"; + try + { + var matchedConstructors = _allConstructors.Where(c => c.GetParameters() + .Any(p => p.ParameterType.IsGenericType && + p.ParameterType.GetGenericTypeDefinition().FullName == typeName + ) + ); + + var constructorInfos = matchedConstructors.ToList(); + if (constructorInfos.Count == 0) + { + return; + } + + foreach (var matchedConstructor in constructorInfos) + { + var constructorParams = matchedConstructor.GetParameters(); + foreach (var parameterInfo in constructorParams.Where(x => IsMatchingGenericType(x, typeName))) + { + var parameters = parameterInfo.ParameterType.GetGenericArguments(); + var typedGeneric = typeRef.ParentType.MakeGenericType(parameters); + RegisterComponent( + typeRef.InjectableAttribute.InjectionType, + parameterInfo.ParameterType, + typedGeneric + ); + } + } + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + } + + private static bool IsMatchingGenericType(ParameterInfo paramInfo, string typeName) + { + return paramInfo.ParameterType.IsGenericType && + paramInfo.ParameterType.GetGenericTypeDefinition().FullName == typeName; + } + + private void RegisterComponent( + InjectionType injectionType, + Type registrableInterface, + Type implementationType + ) + { + switch (injectionType) + { + case InjectionType.Singleton: + HandleSingletonRegistration(registrableInterface, implementationType); + break; + case InjectionType.Transient: + _serviceCollection.AddTransient(registrableInterface, implementationType); + break; + case InjectionType.Scoped: + _serviceCollection.AddScoped(registrableInterface, implementationType); + break; + default: + throw new ArgumentOutOfRangeException(nameof(injectionType), "unknown injection type"); + } + } + + private void HandleSingletonRegistration(Type registrableInterface, Type implementationType) + { + var serviceKey = $"{implementationType.Namespace}.{implementationType.Name}"; + if (registrableInterface != implementationType) + { + _serviceCollection.AddSingleton(registrableInterface, (serviceProvider) => + { + object service; + lock (_injectedValuesLock) + { + if (!_injectedValues.TryGetValue(serviceKey, out service)) + { + service = serviceProvider.GetService(implementationType); + _injectedValues.Add(serviceKey, service); + } + } + + return service; + }); + } + else + { + _serviceCollection.AddSingleton(registrableInterface, implementationType); + } + } + + private class TypeRefContainer + { + public Injectable InjectableAttribute { get; } + public Type Type { get; } + public Type ParentType { get; } + + public TypeRefContainer(Injectable injectable, Type parentType, Type type) + { + InjectableAttribute = injectable; + Type = type; + ParentType = parentType; + } + } +} diff --git a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs deleted file mode 100644 index d424f6ba..00000000 --- a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System.Reflection; -using SPTarkov.Common.Annotations; - -namespace SPTarkov.DI; - -public static class DependencyInjectionRegistrator -{ - private static List? _allLoadedTypes; - private static List? _allConstructors; - - public static void RegisterModOverrideComponents(IServiceCollection builderServices, List assemblies) - { - // We get all the services from this assembly first, since mods will override them later - RegisterComponents( - builderServices, - assemblies.SelectMany(a => a.GetTypes()) - .Where(type => Attribute.IsDefined(type, typeof(Injectable))) - ); - } - - public static void RegisterComponents(IServiceCollection builderServices, IEnumerable types) - { - var groupedTypes = types.SelectMany(t => - { - var attributes = (Injectable[]) Attribute.GetCustomAttributes(t, typeof(Injectable)); - var registerableType = t; - var registerableComponents = new List(); - foreach (var attribute in attributes) - { - // if we have a type override this takes priority - if (attribute.InjectableTypeOverride != null) - { - registerableType = attribute.InjectableTypeOverride; - } - // if this class only has 1 interface we register it on that interface - else if (registerableType.GetInterfaces().Length == 1) - { - registerableType = registerableType.GetInterfaces()[0]; - } - - registerableComponents.Add(new RegistrableType(registerableType, t, attribute)); - } - - return registerableComponents; - } - ) - .GroupBy(t => $"{t.RegistrableInterface.Namespace}.{t.RegistrableInterface.Name}"); - // We get all injectable services to register them on our services - foreach (var groupedInjectables in groupedTypes) - { - foreach (var valueTuple in groupedInjectables.OrderBy(t => t.InjectableAttribute.TypePriority)) - { - if (valueTuple.TypeToRegister.IsGenericType) - { - RegisterGenericComponents(builderServices, valueTuple); - } - else - { - RegisterComponent( - builderServices, - valueTuple.InjectableAttribute.InjectionType, - valueTuple.RegistrableInterface, - valueTuple.TypeToRegister - ); - } - } - } - } - - private static void RegisterGenericComponents(IServiceCollection builderServices, RegistrableType valueTuple) - { - try - { - _allLoadedTypes ??= AppDomain.CurrentDomain.GetAssemblies().SelectMany(t => t.GetTypes()).ToList(); - } - catch (ReflectionTypeLoadException ex) - { - Console.WriteLine($"COULD NOT LOAD TYPE: {ex}"); - } - - _allConstructors ??= _allLoadedTypes.SelectMany(t => t.GetConstructors()).ToList(); - - var typeName = $"{valueTuple.RegistrableInterface.Namespace}.{valueTuple.RegistrableInterface.Name}"; - try - { - var matchedConstructors = _allConstructors.Where(c => c.GetParameters() - .Any(p => p.ParameterType.IsGenericType && - p.ParameterType.GetGenericTypeDefinition().FullName == typeName - ) - ); - - var constructorInfos = matchedConstructors.ToList(); - if (constructorInfos.Count == 0) - { - return; - } - - foreach (var matchedConstructor in constructorInfos) - { - var constructorParams = matchedConstructor.GetParameters(); - foreach (var parameterInfo in constructorParams.Where(x => IsMatchingGenericType(x, typeName))) - { - var parameters = parameterInfo.ParameterType.GetGenericArguments(); - var typedGeneric = valueTuple.TypeToRegister.MakeGenericType(parameters); - RegisterComponent( - builderServices, - valueTuple.InjectableAttribute.InjectionType, - parameterInfo.ParameterType, - typedGeneric - ); - } - } - } - catch (Exception e) - { - Console.WriteLine(e); - throw; - } - } - - private static bool IsMatchingGenericType(ParameterInfo paramInfo, string typeName) - { - return paramInfo.ParameterType.IsGenericType && - paramInfo.ParameterType.GetGenericTypeDefinition().FullName == typeName; - } - - private static void RegisterComponent( - IServiceCollection builderServices, - InjectionType injectionType, - Type registrableInterface, - Type implementationType - ) - { - switch (injectionType) - { - case InjectionType.Singleton: - builderServices.AddSingleton(registrableInterface, implementationType); - break; - case InjectionType.Transient: - builderServices.AddTransient(registrableInterface, implementationType); - break; - case InjectionType.Scoped: - builderServices.AddScoped(registrableInterface, implementationType); - break; - default: - throw new ArgumentOutOfRangeException(nameof(injectionType), "unknown injection type"); - } - } - - 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, - serverLauncherAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))) - .Concat(coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable)))) - ); - } - - private sealed class RegistrableType(Type registrableInterface, Type typeToRegister, Injectable injectableAttribute) - { - public Type RegistrableInterface - { - get; - } = registrableInterface; - - public Type TypeToRegister - { - get; - } = typeToRegister; - - public Injectable InjectableAttribute - { - get; - } = injectableAttribute; - } -} diff --git a/Libraries/SPTarkov.DI/SingletonStateHolder.cs b/Libraries/SPTarkov.DI/SingletonStateHolder.cs new file mode 100644 index 00000000..77f10fab --- /dev/null +++ b/Libraries/SPTarkov.DI/SingletonStateHolder.cs @@ -0,0 +1,14 @@ +namespace SPTarkov.DI; + +public class SingletonStateHolder +{ + public T State + { + get; + } + + public SingletonStateHolder(T state) + { + State = state; + } +} diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs index d2a5c0c9..d7519545 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(AchievementCallbacks))] +[Injectable] public class AchievementCallbacks( AchievementController _achievementController, HttpResponseUtil _httpResponseUtil diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs index c1b9f320..792e9841 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Bot; @@ -8,7 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(BotCallbacks))] +[Injectable] public class BotCallbacks( BotController _botController, HttpResponseUtil _httpResponseUtil, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs index 4afbd207..9de18c9f 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Builds; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs index 2bc76b8a..0f781bdc 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Loaders; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(BundleCallbacks))] +[Injectable] public class BundleCallbacks( HttpResponseUtil _httpResponseUtil, BundleLoader _bundleLoader) diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs index 6f64fd6a..2b5bfb8d 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs index 9f259e10..84480f8e 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Customization; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs index 1e4d8b81..14b992a7 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Services; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(DataCallbacks))] +[Injectable] public class DataCallbacks( HttpResponseUtil _httpResponseUtil, DatabaseService _databaseService, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs index 5d0f3c44..22d70721 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,8 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.DialogueCallbacks)] -[Injectable(InjectableTypeOverride = typeof(DialogueCallbacks))] +[Injectable(TypePriority = OnUpdateOrder.DialogueCallbacks)] public class DialogueCallbacks( HashUtil _hashUtil, TimeUtil _timeUtil, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs index d10ad6fe..ec7527ea 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,8 +9,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.GameCallbacks)] -[Injectable(InjectableTypeOverride = typeof(GameCallbacks))] +[Injectable(TypePriority = OnLoadOrder.GameCallbacks)] public class GameCallbacks( HttpResponseUtil _httpResponseUtil, Watermark _watermark, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs index c0f4face..4770445e 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.HandbookCallbacks)] +[Injectable(TypePriority = OnLoadOrder.HandbookCallbacks)] public class HandbookCallbacks(HandBookController _handBookController) : IOnLoad { public Task OnLoad() diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs index 69f69843..940391ae 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs index 570ec990..f20499db 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,8 +9,7 @@ using SPTarkov.Server.Core.Servers; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.HideoutCallbacks)] -[Injectable(InjectableTypeOverride = typeof(HideoutCallbacks))] +[Injectable(TypePriority = OnUpdateOrder.HideoutCallbacks)] public class HideoutCallbacks( HideoutController _hideoutController, ConfigServer _configServer diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs index 1aabb187..ec0d5361 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Servers; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectionType.Singleton, InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.HttpCallbacks)] +[Injectable(InjectionType.Singleton, TypePriority = OnLoadOrder.HttpCallbacks)] public class HttpCallbacks(HttpServer _httpServer, ApplicationContext _applicationContext) : IOnLoad { public Task OnLoad() diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs index aacc7409..95bc395a 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.InRaid; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs index 84db677d..a73d8fd3 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -11,8 +11,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.InsuranceCallbacks)] -[Injectable(InjectableTypeOverride = typeof(InsuranceCallbacks))] +[Injectable(TypePriority = OnUpdateOrder.InsuranceCallbacks)] public class InsuranceCallbacks( InsuranceController _insuranceController, InsuranceService _insuranceService, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs index 5ceef18f..a373bea3 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Inventory; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs index ce25c4f4..89b42818 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.ItemEvent; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Routers; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs index f0273042..adbcc739 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs index a1343b1a..13deee54 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Spt.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs index 18d953cd..e8eee7a8 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Location; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs index 1066b30b..443913be 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Match; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs index 58f93495..cf9c71b7 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs index 53f5e53b..a23c2ea4 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(NotifierCallbacks))] +[Injectable] public class NotifierCallbacks( HttpResponseUtil _httpResponseUtil, NotifierController _notifierController, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs index 1768a34f..5cccd9aa 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PresetCallbacks)] +[Injectable(TypePriority = OnLoadOrder.PresetCallbacks)] public class PresetCallbacks(PresetController _presetController) : IOnLoad { public Task OnLoad() diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs index cbc9ac9e..117ca081 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Prestige; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs index e0a831ed..e26d369f 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs index ca0d7fcd..e4827db4 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs index 6135a72e..d6113459 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -11,9 +11,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.RagfairCallbacks)] -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.RagfairCallbacks)] -[Injectable(InjectableTypeOverride = typeof(RagfairCallbacks))] +[Injectable(TypePriority = OnLoadOrder.RagfairCallbacks)] public class RagfairCallbacks( HttpResponseUtil _httpResponseUtil, RagfairServer _ragfairServer, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs index 387e6480..6bad8f9d 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs index 5d077929..351d89ec 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Servers; @@ -6,8 +6,7 @@ using SPTarkov.Server.Core.Services; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.SaveCallbacks)] -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.SaveCallbacks)] +[Injectable(TypePriority = OnLoadOrder.SaveCallbacks)] public class SaveCallbacks( SaveServer _saveServer, ConfigServer _configServer, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs index cff28c25..c8e7ba3e 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs index 7e1b9ee8..2f07014f 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,9 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Callbacks; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.TraderCallbacks)] -[Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.TraderCallbacks)] -[Injectable(InjectableTypeOverride = typeof(TraderCallbacks))] +[Injectable(TypePriority = OnLoadOrder.TraderCallbacks)] public class TraderCallbacks( HttpResponseUtil _httpResponseUtil, TraderController _traderController, diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs index b57d5fee..08cb56dc 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs index 3caf10bb..e229b1c8 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs b/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs index 989418e7..1b21019e 100644 --- a/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs +++ b/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Context; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs b/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs index a61d2221..e912f080 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs b/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs index 2411948a..80564295 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; using SPTarkov.Server.Core.Constants; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs b/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs index 8fc8a939..2cfe31eb 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Builds; using SPTarkov.Server.Core.Models.Eft.PresetBuild; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs b/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs index f041c221..f9fd4b5c 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; using SPTarkov.Server.Core.Models.Spt.Logging; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs b/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs index 167dcce5..a2352868 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs b/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs index c076c3bb..a2e288a2 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Helpers.Dialogue; using SPTarkov.Server.Core.Models.Eft.Dialog; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs b/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs index cfb96658..841ad645 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs index 56599ce2..431b1309 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Controllers; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs index 5d3eb52e..608cf88e 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs index 8c79e011..e502e1b1 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs index df416968..b529759a 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.InRaid; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs index f920afd6..9570cc3a 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs index f5eea438..c54e01ae 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs index 3ae5b431..6a9492c7 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs index e697d746..14cf8b94 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs index c69c6b22..382a9a9d 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Location; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs b/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs index 48bafe33..d507a69e 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Match; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs b/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs index 298b868b..5d0ab989 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; using SPTarkov.Server.Core.Models.Eft.Notes; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs b/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs index a2b0d04d..cc58b632 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Notifier; using SPTarkov.Server.Core.Models.Eft.Ws; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs b/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs index ee675383..1fd14ced 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Spt.Presets; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs index c8963704..2690ae3f 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Prestige; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs index 187a270c..28e1e5bb 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs b/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs index aff6dc00..b0e35598 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs index 3640ce7b..25ad55dc 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs index 5a523ffa..ed20bdbf 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; using SPTarkov.Server.Core.Models.Eft.Repair; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs index a0630526..9f52100a 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs b/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs index ca02bde3..e1a3c239 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs index a9ce5b55..76956c0c 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs index fb6b1600..e8c5e912 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Weather; diff --git a/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs b/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs index 641cd96d..67a5e256 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.ItemEvent; using SPTarkov.Server.Core.Models.Eft.Wishlist; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs index ea539bb5..63784d99 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs @@ -1,6 +1,6 @@ using System.Collections.Frozen; using System.Globalization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs index bc9c7de0..37aee9ae 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Server.Core.Constants; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs index d5d9f2c7..40f6881a 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs @@ -1,5 +1,5 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs index 3d395dfe..c101f47e 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Bot; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs index 1f385510..0a1b3711 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs index caab5eec..bef7cc41 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators.WeaponGen; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs index 1cf7b7fb..46988f81 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs index 8c81e167..89de09dd 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs index 9276e8f4..dd0dbfed 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs index fe4112a4..83d2eaf5 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs index 11cd35fd..86544689 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs index c64c9e0b..655cdf7f 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs index 889a7621..e4ea6702 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs index 3d4b2825..03110b84 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Ragfair; diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs index 22d46a40..0f06aff1 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs index 11013e07..7374d809 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs index d6de7493..9c44779a 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs index b82df52b..3a48e2d8 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs index f8f14ca4..71f921c8 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs index 7f771fc4..876d4568 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs index f4833717..332e0216 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs index 7502adcf..95b7d88a 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Generators.WeaponGen; diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs index 8e329170..255f4789 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Weather; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs index f7b59d21..b9acf0e8 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs index 9ffb7e29..c78ebce3 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Bots; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs index 8b25bbad..654844c2 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs @@ -1,7 +1,8 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; using SPTarkov.Server.Core.Constants; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; +using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Match; using SPTarkov.Server.Core.Models.Enums; @@ -15,8 +16,18 @@ using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; namespace SPTarkov.Server.Core.Helpers; -[Injectable] -public class BotGeneratorHelper +[Injectable(InjectionType.Singleton)] +public class BotGeneratorHelper( + ISptLogger _logger, + RandomUtil _randomUtil, + DurabilityLimitsHelper _durabilityLimitsHelper, + ItemHelper _itemHelper, + InventoryHelper _inventoryHelper, + ContainerHelper _containerHelper, + ApplicationContext _applicationContext, + LocalisationService _localisationService, + ConfigServer _configServer + ) : IOnLoad { // Equipment slot ids that do not conflict with other slots private static readonly FrozenSet _slotsWithNoCompatIssues = [ @@ -27,38 +38,20 @@ public class BotGeneratorHelper EquipmentSlots.ArmBand.ToString() ]; - private readonly BotConfig _botConfig; - private readonly ISptLogger _logger; - private readonly RandomUtil _randomUtil; - private readonly DurabilityLimitsHelper _durabilityLimitsHelper; - private readonly ItemHelper _itemHelper; - private readonly InventoryHelper _inventoryHelper; - private readonly ContainerHelper _containerHelper; - private readonly ApplicationContext _applicationContext; - private readonly LocalisationService _localisationService; - private readonly string[] _pmcTypes; + private BotConfig _botConfig; + private string[] _pmcTypes; - public BotGeneratorHelper(ISptLogger logger, - RandomUtil randomUtil, - DurabilityLimitsHelper durabilityLimitsHelper, - ItemHelper itemHelper, - InventoryHelper inventoryHelper, - ContainerHelper containerHelper, - ApplicationContext applicationContext, - LocalisationService localisationService, - ConfigServer configServer) + public Task OnLoad() { - _logger = logger; - _randomUtil = randomUtil; - _durabilityLimitsHelper = durabilityLimitsHelper; - _itemHelper = itemHelper; - _inventoryHelper = inventoryHelper; - _containerHelper = containerHelper; - _applicationContext = applicationContext; - _localisationService = localisationService; - _botConfig = configServer.GetConfig(); - var pmcConfig = configServer.GetConfig(); + _botConfig = _configServer.GetConfig(); + var pmcConfig = _configServer.GetConfig(); _pmcTypes = [pmcConfig.UsecType.ToLower(), pmcConfig.BearType.ToLower()]; + return Task.CompletedTask; + } + + public string GetRoute() + { + return "spt-botGeneratorHelper"; } /// diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs index 7d3eced0..558fa704 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Frozen; -using SPTarkov.Common.Annotations; using SPTarkov.Server.Core.Constants; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs index 41de2667..35c7df6d 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs @@ -1,5 +1,5 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs index 52669dbe..8daf99ed 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs @@ -1,7 +1,7 @@ using System.Net; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs index 57a718a1..3ba8a377 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs index 1fa49714..7b0e96f9 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index 9fcf3407..d718334e 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -1,6 +1,6 @@ using System.Collections.Frozen; using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Dialog; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs index 72a09d80..823d3491 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs index 738fafd3..4cc80e5d 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Dialog; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs index 35438194..cea4718f 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Dialog; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs index c007a640..a1080938 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs index 4c75081d..0717bae6 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs index 4f18b512..ff205109 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs index 05979dd5..c8a6de87 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs index 6b4fd428..f1873a62 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs index 8967aece..1a9bb5f3 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs index 41ee72b2..183fcce6 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs index fd687ba0..57387463 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs index 540c2ba5..52c68e93 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs index 003d45e5..050c87c2 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs @@ -1,5 +1,5 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs index 6a4a5cab..d8c0a950 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs index babfbf4a..8b30e567 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs index 85362359..08d29888 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs index bb3469a1..d0316544 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs index 20ff21c5..111b4d86 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando; using SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands; using SPTarkov.Server.Core.Models.Eft.Dialog; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs index fae2a26e..cd72e2ed 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs index bcb84c44..8262a4ae 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs index fc145d3d..dd8fe9ef 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs index 037fdfed..b9d877c1 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs index 495d931d..aa91c8e3 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs index 71648bdb..8eda4775 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Hideout; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs index 48cfd4eb..ffba5631 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs index 6e6e9789..5258db4e 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; -using SPTarkov.Common.Extensions; +using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs index 2a66ae07..12029b92 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs @@ -1,8 +1,8 @@ using System.Collections.Frozen; using System.Text.Json; using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Inventory; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs index b360b985..4df2aca6 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs @@ -1,6 +1,6 @@ using System.Collections.Frozen; using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs index cd0db5d5..7a2f3ac4 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs @@ -1,5 +1,5 @@ using System.Reflection; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs index da8124ad..921089bd 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Eft.Ws; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs index 6e06f9e4..d2829b15 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Eft.Ws; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs index 4ae1e86a..e94e9508 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs index 7011629d..887f2979 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Presets; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs index b8b0aa82..21eb109b 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs @@ -1,6 +1,6 @@ using System.Text.Json; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs index b3d0a539..dd7e9a02 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs index c3f41e6c..93deacbd 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs @@ -1,5 +1,5 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs index d90e56fa..6b9b2e5d 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs index 63503b11..be843f81 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs @@ -1,6 +1,6 @@ using System.Globalization; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs index f4935965..a4435f34 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs index 9f89cf87..567f2e5d 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Ragfair; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs index 90787b78..d436e67c 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs @@ -1,6 +1,6 @@ using System.Collections.Frozen; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs index 081c7383..59e1da89 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Ragfair; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs index 040c3f5e..0224c6f8 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs index 57d292f4..94b0875f 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Ragfair; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs index 2a0c73bb..f03002ba 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs index 3c3741b7..a2e7fbbf 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs index 3402f48e..b4681db1 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs @@ -1,5 +1,5 @@ using System.Globalization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Hideout; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs index f5cd0417..ab6b39d7 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs index 7c365fe0..d522baf7 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Inventory; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs index 3fb1267e..3dd5d8ee 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs index 8b7152e8..5d52dfaa 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs index 7936ee4e..b5793fff 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs index 6fbd5ebc..629feff9 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs index c95f68f7..4cca6266 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Helper; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs index 9eb63616..e68aece8 100644 --- a/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs +++ b/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Services; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs index fcc8f0b4..017d450a 100644 --- a/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs +++ b/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.External; using SPTarkov.Server.Core.Models.Utils; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Loaders; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PostDBModLoader)] +[Injectable(TypePriority = OnLoadOrder.PostDBModLoader)] public class PostDBModLoader( ISptLogger _logger, IEnumerable _postDbLoadMods diff --git a/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs index 4161e19a..35684c93 100644 --- a/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs +++ b/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.External; using SPTarkov.Server.Core.Models.Utils; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Loaders; -[Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PostSptModLoader)] +[Injectable(TypePriority = OnLoadOrder.PostSptModLoader)] public class PostSptModLoader( ISptLogger _logger, IEnumerable _postSptLoadMods diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs index ee4f3385..e806aa8a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class BotDynamicRouter : DynamicRouter { public BotDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs index 371c3d68..559a739b 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class BundleDynamicRouter : DynamicRouter { public BundleDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs index b2c6211c..0a5aed6a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class CustomizationDynamicRouter : DynamicRouter { public CustomizationDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs index da418496..913b2706 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class DataDynamicRouter : DynamicRouter { public DataDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs index bff02f89..97d7bb9b 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class HttpDynamicRouter : DynamicRouter { public HttpDynamicRouter(ImageRouter imageRouter, JsonUtil jsonUtil) : base( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs index 677d83e0..11e56861 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.InRaid; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class InraidDynamicRouter : DynamicRouter { public InraidDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs index f443235a..1e65dfb0 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class LocationDynamicRouter : DynamicRouter { public LocationDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs index 22134abf..748cf41b 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class NotifierDynamicRouter : DynamicRouter { public NotifierDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs index 75ecd50e..ef58822b 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Dynamic; -[Injectable(InjectableTypeOverride = typeof(DynamicRouter))] +[Injectable] public class TraderDynamicRouter : DynamicRouter { public TraderDynamicRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs b/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs index 80c76fb0..7aeddc84 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs index a1e78173..b72ee99c 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; namespace SPTarkov.Server.Core.Routers; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs index 7cf28c13..6863b725 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Services.Image; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs index bcac3883..9ed1f48b 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.ItemEvent; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs index 445a2935..3c3820c2 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -10,7 +10,7 @@ using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class CustomizationItemEventRouter : ItemEventRouterDefinition { protected CustomizationCallbacks _customizationCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs index 869676f5..3bf8c14f 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class HealthItemEventRouter : ItemEventRouterDefinition { protected HealthCallbacks _healthCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs index 32f077e8..04b89a72 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class HideoutItemEventRouter : ItemEventRouterDefinition { protected HideoutCallbacks _hideoutCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs index 074c1a5b..0d7def37 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class InsuranceItemEventRouter : ItemEventRouterDefinition { protected InsuranceCallbacks _insuranceCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs index 992b8d42..17a0962c 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -11,7 +11,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class InventoryItemEventRouter : ItemEventRouterDefinition { protected HideoutCallbacks _hideoutCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs index 911cd773..bb31604e 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class NoteItemEventRouter : ItemEventRouterDefinition { protected NoteCallbacks _noteCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs index 4f652e6a..a126c4d2 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class QuestItemEventRouter : ItemEventRouterDefinition { protected QuestCallbacks _questCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs index b75f22ff..cf282b55 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class RagfairItemEventRouter : ItemEventRouterDefinition { protected RagfairCallbacks _ragfairCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs index aff0917a..6b79cc91 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class RepairItemEventRouter : ItemEventRouterDefinition { protected RepairCallbacks _repairCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs index ee75ad29..d46ec83d 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class TradeItemEventRouter : ItemEventRouterDefinition { protected TradeCallbacks _tradeCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs index fd584f52..c59a9d70 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -9,7 +9,7 @@ using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Routers.ItemEvents; -[Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))] +[Injectable] public class WishlistItemEventRouter : ItemEventRouterDefinition { protected WishlistCallbacks _wishlistCallbacks; diff --git a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs index 6c4e6900..a8cacfae 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Routers.SaveLoad; -[Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))] +[Injectable] public class HealthSaveLoadRouter : SaveLoadRouter { protected override List GetHandledRoutes() diff --git a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs index e1ad15d5..7ae807fa 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Routers.SaveLoad; -[Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))] +[Injectable] public class InraidSaveLoadRouter : SaveLoadRouter { protected override List GetHandledRoutes() diff --git a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs index 0f84b2b8..dd5f52d7 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs @@ -1,10 +1,10 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Routers.SaveLoad; -[Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))] +[Injectable] public class InsuranceSaveLoadRouter : SaveLoadRouter { protected override List GetHandledRoutes() diff --git a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs index 9fb9c261..7315be0f 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Routers.SaveLoad; -[Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))] +[Injectable] public class ProfileSaveLoadRouter : SaveLoadRouter { protected override List GetHandledRoutes() diff --git a/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs index e4dcc7ca..2d020d41 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Loaders; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs index f6819d88..8dfcd085 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; namespace SPTarkov.Server.Core.Routers.Serializers; diff --git a/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs index 96a2c73a..870bec25 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs index 2a435e96..b93a8a6d 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class AchievementStaticRouter : StaticRouter { public AchievementStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs index a2fc4073..ad8e0967 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Bot; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class BotStaticRouter : StaticRouter { public BotStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs index c04fde8c..9eb57037 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Builds; @@ -8,7 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class BuildStaticRouter : StaticRouter { public BuildStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs index fed43264..e56c195d 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class BundleStaticRouter : StaticRouter { public BundleStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs index 39f85870..dd4b9ecd 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Spt.Logging; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class ClientLogStaticRouter : StaticRouter { public ClientLogStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs index 0f8e635a..8f015925 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class CustomizationStaticRouter : StaticRouter { public CustomizationStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs index a6714e18..fdee825a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class DataStaticRouter : StaticRouter { public DataStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs index f461c0bc..fcfe66fa 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,7 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class DialogStaticRouter : StaticRouter { public DialogStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs index 296f377d..65bc00dd 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,7 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class GameStaticRouter : StaticRouter { public GameStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs index 543005ef..58c21035 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Health; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class HealthStaticRouter : StaticRouter { public HealthStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs index ddff2c91..4b8746dd 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class InraidStaticRouter : StaticRouter { public InraidStaticRouter(InraidCallbacks inraidCallbacks, JsonUtil jsonUtil) : base( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs index 2109540b..9ebf4eb1 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Insurance; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class InsuranceStaticRouter : StaticRouter { public InsuranceStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs index c8393f8d..e2afa67e 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.ItemEvent; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class ItemEventStaticRouter : StaticRouter { public ItemEventStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs index 064ad519..7f8d8848 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class LauncherStaticRouter : StaticRouter { public LauncherStaticRouter(LauncherCallbacks launcherCallbacks, JsonUtil jsonUtil) : base( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs index 987990d5..6c550cd0 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Launcher; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class LauncherV2StaticRouter : StaticRouter { public LauncherV2StaticRouter(LauncherV2Callbacks launcherV2Callbacks, JsonUtil jsonUtil) : base( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs index 13e448e5..adfdec90 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class LocationStaticRouter : StaticRouter { public LocationStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs index f36fcb9b..eba592bd 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,7 +8,7 @@ using static SPTarkov.Server.Core.Services.MatchLocationService; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class MatchStaticRouter : StaticRouter { public MatchStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs index 22a42ad1..717ce6bc 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class NotifierStaticRouter : StaticRouter { public NotifierStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs index 945937da..87deba0a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class PrestigeStaticRouter : StaticRouter { public PrestigeStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs index 82dff1d8..1aa7c2ca 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -8,7 +8,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class ProfileStaticRouter : StaticRouter { public ProfileStaticRouter(ProfileCallbacks profileCallbacks, JsonUtil jsonUtil) : base( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs index ee282cb3..e25ad4d7 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class QuestStaticRouter : StaticRouter { public QuestStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs index c3d49e3b..72b1810a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -7,7 +7,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class RagfairStaticRouter : StaticRouter { public RagfairStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs index eb790275..7198d046 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class TraderStaticRouter : StaticRouter { public TraderStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs index 03e2860f..b454bc97 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; @@ -6,7 +6,7 @@ using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Routers.Static; -[Injectable(InjectableTypeOverride = typeof(StaticRouter))] +[Injectable] public class WeatherStaticRouter : StaticRouter { public WeatherStaticRouter( diff --git a/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs b/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs index 106513ed..1686c8a9 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs b/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs index 84b1ca43..0f2260b8 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Server; namespace SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs b/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs index 1fcfa90e..268d0712 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using System.IO.Compression; using System.Text; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs index aeb60794..1faaa838 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs @@ -2,8 +2,8 @@ using System.Security.Authentication; using Microsoft.AspNetCore.Server.Kestrel.Https; using Microsoft.Extensions.Primitives; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs b/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs index 672db1d6..4dca0d05 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Models.Eft.Ragfair; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs index de833a5b..82720d33 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; using System.Diagnostics; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs b/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs index abda551d..70bfd44d 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs @@ -1,5 +1,5 @@ using System.Net.WebSockets; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers.Ws; using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; diff --git a/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs index f35145c7..cd182821 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs @@ -1,6 +1,6 @@ using System.Net.WebSockets; using System.Text; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Servers.Ws.Message; diff --git a/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs index 7cc7ec4f..9ba230d9 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Net.WebSockets; using System.Text; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Ws; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs b/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs index 8d71c2c6..77b710a5 100644 --- a/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/BackupService.cs b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs index 8c3b43f5..dd380fdb 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BackupService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Spt.Mod; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs index 9ac3b698..086524c2 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs index 9e6cb9ec..d6b4ef10 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs index 66875b34..16a57781 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs index 549b28ac..23731f3e 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs b/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs index c7c76025..fe4682a9 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Bots; diff --git a/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs b/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs index c088a86d..1eaf775c 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs index a2f21b60..ac355d13 100644 --- a/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs index 68c62cc0..61b78871 100644 --- a/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; diff --git a/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs index 0393b15c..de66683b 100644 --- a/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; diff --git a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs index eecc8979..3b3a9370 100644 --- a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs index bab01c8d..875b00b0 100644 --- a/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs b/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs index fda3e9d8..5a41c348 100644 --- a/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs index 27596461..cdc06e1b 100644 --- a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Bots; diff --git a/Libraries/SPTarkov.Server.Core/Services/FenceService.cs b/Libraries/SPTarkov.Server.Core/Services/FenceService.cs index bb336ca6..ad419a4b 100644 --- a/Libraries/SPTarkov.Server.Core/Services/FenceService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/FenceService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/GiftService.cs b/Libraries/SPTarkov.Server.Core/Services/GiftService.cs index 9b968bf5..9a4dac79 100644 --- a/Libraries/SPTarkov.Server.Core/Services/GiftService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/GiftService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs b/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs index f703f0b7..61d55992 100644 --- a/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Services.Image; diff --git a/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs index e7dd4246..93c704a9 100644 --- a/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Utils.Cloners; namespace SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs b/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs index 4e685129..aaef1219 100644 --- a/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs b/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs index 64177a3a..ce9472cb 100644 --- a/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Utils; using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; diff --git a/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs b/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs index f45b5c62..bb9e2340 100644 --- a/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs b/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs index b081ef8d..ea63cd37 100644 --- a/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs @@ -1,5 +1,5 @@ using System.Globalization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs b/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs index ae87ca7a..a0741974 100644 --- a/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs index 1cb3ffbf..476d0b86 100644 --- a/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; diff --git a/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs b/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs index 1ff7dc98..83c2e50f 100644 --- a/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; diff --git a/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs b/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs index 10b27137..a8f6178d 100644 --- a/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Inventory; diff --git a/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs index 08c151b3..73806767 100644 --- a/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; using SPTarkov.Server.Core.Constants; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Bots; diff --git a/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs b/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs index 491d34a0..6de418fb 100644 --- a/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs b/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs index 81d36ce4..9e8ecf31 100644 --- a/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; -using SPTarkov.Common.Extensions; +using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/Mod/ProfileDataService.cs b/Libraries/SPTarkov.Server.Core/Services/Mod/ProfileDataService.cs index 07f09ddc..2b8e21b1 100644 --- a/Libraries/SPTarkov.Server.Core/Services/Mod/ProfileDataService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/Mod/ProfileDataService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs b/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs index 873adf20..d2970764 100644 --- a/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Ws; namespace SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs b/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs index 93052b82..61511357 100644 --- a/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers; diff --git a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs index 93cce508..1c6f0656 100644 --- a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs b/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs index 48b25f3e..5e5b0373 100644 --- a/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; namespace SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs b/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs index 05eb269f..42027712 100644 --- a/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs index 16dae0a5..b0f1683e 100644 --- a/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs b/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs index a0102077..b1b097cf 100644 --- a/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Utils; namespace SPTarkov.Server.Core.Services; diff --git a/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs b/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs index f87edcb8..e0be9c67 100644 --- a/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs @@ -1,5 +1,5 @@ using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs index d23b0a41..ea1ab5c7 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Ragfair; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs index d4aa6dea..77941fc7 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs index a865b4ad..b62db5f8 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Ragfair; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs index 8634f9b0..b8862d3a 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs index 2a19400b..ce7968f2 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Ragfair; diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs index dd7dfaec..44ab8a61 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs b/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs index c68122d7..b45e80ff 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Context; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs b/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs index 9991609b..81923195 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Generators; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Weather; diff --git a/Libraries/SPTarkov.Server.Core/Services/RepairService.cs b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs index 985c069c..2dbd4815 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RepairService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; diff --git a/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs index d6854904..7d4e3111 100644 --- a/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs b/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs index 2e4c12e2..2c724158 100644 --- a/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Utils/App.cs b/Libraries/SPTarkov.Server.Core/Utils/App.cs index 5e39f81e..98195eac 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/App.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/App.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs b/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs index ac292753..a4333595 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils.Cloners; diff --git a/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs b/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs index 3c20419b..553a544d 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Config; @@ -12,7 +12,7 @@ using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; namespace SPTarkov.Server.Core.Utils; -[Injectable(InjectionType.Singleton, InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.Database)] +[Injectable(InjectionType.Singleton, TypePriority = OnLoadOrder.Database)] public class DatabaseImporter : IOnLoad { private const string _sptDataPath = "./Assets/"; diff --git a/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs index 4d5d31fe..92073d34 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs @@ -1,5 +1,5 @@ using System.Text; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs index 07643d67..dcf337b1 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs index f94a5734..eabfb8b7 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs @@ -2,7 +2,7 @@ using System.IO.Hashing; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs index 5442c515..a4128d9f 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs index a5b27754..28bf430f 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; using System.Text.RegularExpressions; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Eft.HttpResponse; using SPTarkov.Server.Core.Models.Eft.ItemEvent; using SPTarkov.Server.Core.Models.Enums; diff --git a/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs index 7f868504..0ea9de40 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Linq.Expressions; using System.Reflection; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils.Json; diff --git a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs index ccd1fba7..b9c3a435 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs @@ -1,7 +1,7 @@ using System.Text.Encodings.Web; using System.Text.Json; using System.Text.Json.Serialization; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Ws; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/ConsoleLogHandler.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/ConsoleLogHandler.cs index 1ee8b122..20589ad6 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/ConsoleLogHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/ConsoleLogHandler.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; namespace SPTarkov.Server.Core.Utils.Logger.Handlers; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/FileLogHandler.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/FileLogHandler.cs index be6e980b..dfdeb920 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/FileLogHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/Handlers/FileLogHandler.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; using System.Text; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils.Logger.Handlers; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs index 524d0147..1b0fb92a 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs @@ -1,11 +1,11 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; using SPTarkov.Server.Core.Models.Utils; using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; namespace SPTarkov.Server.Core.Utils.Logger; -[Injectable(InjectableTypeOverride = typeof(ISptLogger<>), TypePriority = int.MinValue)] +[Injectable(TypePriority = int.MinValue)] public class SptLogger : ISptLogger, IDisposable { private string _category; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLoggerQueueManager.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLoggerQueueManager.cs index c0b8732c..73c20c6e 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLoggerQueueManager.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLoggerQueueManager.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils.Logger; diff --git a/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs index 3d91a113..cbbdb031 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs index 8f683905..11f41eff 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Ragfair; diff --git a/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs index b4282db1..cd0021be 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Utils.Cloners; diff --git a/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs index ef113f63..85625535 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs index 51f14bf2..a8697dd6 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; namespace SPTarkov.Server.Core.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs index b4def0de..eb83035f 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; using SPTarkov.Server.Core.Models.Spt.Config; using SPTarkov.Server.Core.Models.Utils; diff --git a/SPTarkov.Server/Logger/SptLoggerProvider.cs b/SPTarkov.Server/Logger/SptLoggerProvider.cs index 7cd29988..3864764d 100644 --- a/SPTarkov.Server/Logger/SptLoggerProvider.cs +++ b/SPTarkov.Server/Logger/SptLoggerProvider.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Utils; using SPTarkov.Server.Core.Utils.Logger; diff --git a/SPTarkov.Server/Program.cs b/SPTarkov.Server/Program.cs index 1155478e..aec5638a 100644 --- a/SPTarkov.Server/Program.cs +++ b/SPTarkov.Server/Program.cs @@ -32,14 +32,16 @@ public static class Program // for harmony, we use the original list, as some mods may only be bepinex patches only HarmonyBootstrapper.LoadAllPatches(mods.SelectMany(asm => asm.Assemblies).ToList()); + var diHandler = new DependencyInjectionHandler(builder.Services); // register SPT components - DependencyInjectionRegistrator.RegisterSptComponents(typeof(Program).Assembly, typeof(App).Assembly, builder.Services); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(Program)); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(App)); if (ProgramStatics.MODS()) { - // register mod components from the filtered list - DependencyInjectionRegistrator.RegisterModOverrideComponents(builder.Services, sortedLoadedMods.SelectMany(a => a.Assemblies).ToList()); + diHandler.AddInjectableTypesFromAssemblies(sortedLoadedMods.SelectMany(a => a.Assemblies)); } + diHandler.InjectAll(); var serviceProvider = builder.Services.BuildServiceProvider(); var logger = serviceProvider.GetService().CreateLogger("Server"); @@ -115,7 +117,10 @@ public static class Program // So we create a disposable web application that we will throw away after getting the mods to load var builder = CreateNewHostBuilder(); // register SPT components - DependencyInjectionRegistrator.RegisterSptComponents(typeof(Program).Assembly, typeof(App).Assembly, builder.Services); + var diHandler = new DependencyInjectionHandler(builder.Services); + diHandler.AddInjectableTypesFromAssembly(typeof(Program).Assembly); + diHandler.AddInjectableTypesFromAssembly(typeof(App).Assembly); + diHandler.InjectAll(); // register the mod validator components var provider = builder.Services .AddScoped(typeof(ISptLogger), typeof(SptLogger)) diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs index dfcc126e..3dd6df59 100644 --- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs +++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Helpers; using SPTarkov.Server.Core.Models.Eft.Common.Tables; diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs index d33e2da0..11942db5 100644 --- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs +++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs @@ -11,11 +11,10 @@ public class HideoutCraftQuestIdGeneratorLauncher try { var serviceCollection = new ServiceCollection(); - DependencyInjectionRegistrator.RegisterSptComponents( - typeof(HideoutCraftQuestIdGeneratorLauncher).Assembly, - typeof(App).Assembly, - serviceCollection - ); + var diHandler = new DependencyInjectionHandler(serviceCollection); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(HideoutCraftQuestIdGeneratorLauncher)); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(App)); + diHandler.InjectAll(); var serviceProvider = serviceCollection.BuildServiceProvider(); serviceProvider.GetService().Run().Wait(); } diff --git a/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs b/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs index b027dddd..ed39d804 100644 --- a/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs +++ b/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; using SPTarkov.Server.Core.Models.Spt.Logging; using SPTarkov.Server.Core.Models.Utils; diff --git a/Tools/ItemTplGenerator/ItemTplGenerator.cs b/Tools/ItemTplGenerator/ItemTplGenerator.cs index 2917e13d..77fc750c 100644 --- a/Tools/ItemTplGenerator/ItemTplGenerator.cs +++ b/Tools/ItemTplGenerator/ItemTplGenerator.cs @@ -1,5 +1,5 @@ -using SPTarkov.Common.Annotations; using SPTarkov.Common.Extensions; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Callbacks; using SPTarkov.Server.Core.DI; using SPTarkov.Server.Core.Helpers; diff --git a/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs b/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs index 74f5b967..ebcf10ec 100644 --- a/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs +++ b/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs @@ -11,11 +11,10 @@ public class ItemTplGeneratorLauncher try { var serviceCollection = new ServiceCollection(); - DependencyInjectionRegistrator.RegisterSptComponents( - typeof(ItemTplGeneratorLauncher).Assembly, - typeof(App).Assembly, - serviceCollection - ); + var diHandler = new DependencyInjectionHandler(serviceCollection); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(ItemTplGeneratorLauncher)); + diHandler.AddInjectableTypesFromTypeAssembly(typeof(App)); + diHandler.InjectAll(); var serviceProvider = serviceCollection.BuildServiceProvider(); serviceProvider.GetService().Run().Wait(); } diff --git a/Tools/ItemTplGenerator/SptBasicLogger.cs b/Tools/ItemTplGenerator/SptBasicLogger.cs index 5e032590..4a35048d 100644 --- a/Tools/ItemTplGenerator/SptBasicLogger.cs +++ b/Tools/ItemTplGenerator/SptBasicLogger.cs @@ -1,4 +1,4 @@ -using SPTarkov.Common.Annotations; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Logging; using SPTarkov.Server.Core.Models.Spt.Logging; using SPTarkov.Server.Core.Models.Utils;