Merge pull request #212 from sp-tarkov/di-fix

Fixed component naming and dependency injection prioritization

Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs

@@ -44,7 +44,7 @@ public static class DependencyInjectionRegistrator
                     return registerableComponents;
                 }
             )
-            .GroupBy(t => t.RegistrableInterface.FullName);
+            .GroupBy(t => $"{t.RegistrableInterface.Namespace}.{t.RegistrableInterface.Name}");
         // We get all injectable services to register them on our services
         foreach (var groupedInjectables in groupedTypes)
         {
@@ -157,10 +157,7 @@ public static class DependencyInjectionRegistrator
         RegisterComponents(
             builderServices,
             serverLauncherAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable)))
-        );
-        RegisterComponents(
-            builderServices,
-            coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable)))
+                .Concat(coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))))
         );
     }
 

Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs

@@ -5,7 +5,7 @@ using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 namespace SPTarkov.Server.Core.Utils.Logger;
 
-[Injectable(InjectableTypeOverride = typeof(ISptLogger<>))]
+[Injectable(InjectableTypeOverride = typeof(ISptLogger<>), TypePriority = int.MinValue)]
 public class SptLogger<T> : ISptLogger<T>, IDisposable
 {
     private string _category;