diff --git a/Core/Callbacks/AchievementCallbacks.cs b/Core/Callbacks/AchievementCallbacks.cs index e809f24c..096cec94 100644 --- a/Core/Callbacks/AchievementCallbacks.cs +++ b/Core/Callbacks/AchievementCallbacks.cs @@ -1,4 +1,5 @@ -using Core.Controllers; +using Core.Annotations; +using Core.Controllers; using Core.Models.Eft.Common; using Core.Models.Eft.HttpResponse; using Core.Models.Eft.Profile; @@ -6,6 +7,7 @@ using Core.Utils; namespace Core.Callbacks; +[Injectable(InjectableTypeOverride = typeof(AchievementCallbacks))] public class AchievementCallbacks { protected AchievementController _achievementController; diff --git a/Core/Callbacks/DialogueCallbacks.cs b/Core/Callbacks/DialogueCallbacks.cs index c9a189de..b6180142 100644 --- a/Core/Callbacks/DialogueCallbacks.cs +++ b/Core/Callbacks/DialogueCallbacks.cs @@ -9,6 +9,7 @@ using Core.Utils; namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.DialogCallbacks)] +[Injectable(InjectableTypeOverride = typeof(DialogueCallbacks))] public class DialogueCallbacks : OnUpdate { protected HashUtil _hashUtil; diff --git a/Core/Callbacks/InsuranceCallbacks.cs b/Core/Callbacks/InsuranceCallbacks.cs index 40a5426f..c1bb90e5 100644 --- a/Core/Callbacks/InsuranceCallbacks.cs +++ b/Core/Callbacks/InsuranceCallbacks.cs @@ -14,6 +14,7 @@ using Core.Utils; namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.InsuranceCallbacks)] +[Injectable(InjectableTypeOverride = typeof(InsuranceCallbacks))] public class InsuranceCallbacks : OnUpdate { protected InsuranceController _insuranceController; diff --git a/Core/Callbacks/RagfairCallbacks.cs b/Core/Callbacks/RagfairCallbacks.cs index abca089d..e42c0f7d 100644 --- a/Core/Callbacks/RagfairCallbacks.cs +++ b/Core/Callbacks/RagfairCallbacks.cs @@ -14,6 +14,7 @@ namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.RagfairCallbacks)] [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.RagfairCallbacks)] +[Injectable(InjectableTypeOverride = typeof(RagfairCallbacks))] public class RagfairCallbacks : OnLoad, OnUpdate { protected HttpResponseUtil _httpResponseUtil; diff --git a/Core/Controllers/WeatherController.cs b/Core/Controllers/WeatherController.cs index c80d6f1d..8cc014d3 100644 --- a/Core/Controllers/WeatherController.cs +++ b/Core/Controllers/WeatherController.cs @@ -7,6 +7,7 @@ using Core.Models.Spt.Config; using Core.Models.Spt.Weather; using Core.Servers; using Core.Services; +using ILogger = Core.Models.Utils.ILogger; namespace Core.Controllers; diff --git a/Core/Generators/WeatherGenerator.cs b/Core/Generators/WeatherGenerator.cs index 8631667a..bd254ace 100644 --- a/Core/Generators/WeatherGenerator.cs +++ b/Core/Generators/WeatherGenerator.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using Core.Annotations; using Core.Helpers; using Core.Models.Eft.Weather; using Core.Models.Enums; diff --git a/Core/Helpers/WeightedRandomHelper.cs b/Core/Helpers/WeightedRandomHelper.cs index 4bbf62b1..87127248 100644 --- a/Core/Helpers/WeightedRandomHelper.cs +++ b/Core/Helpers/WeightedRandomHelper.cs @@ -1,5 +1,6 @@ -using Core.Annotations; +using Core.Annotations; using Core.Models.Spt.Helper; +using ILogger = Core.Models.Utils.ILogger; namespace Core.Helpers; @@ -42,17 +43,17 @@ public class WeightedRandomHelper { if (items.Count == 0) { - _logger.LogError("Items must not be empty"); + _logger.Error("Items must not be empty"); } if (weights.Count == 0) { - _logger.LogError("Item weights must not be empty"); + _logger.Error("Item weights must not be empty"); } if (items.Count != weights.Count) { - _logger.LogError("Items and weight inputs must be of the same length"); + _logger.Error("Items and weight inputs must be of the same length"); } // Preparing the cumulative weights list. diff --git a/Core/Models/Spt/Config/WeatherConfig.cs b/Core/Models/Spt/Config/WeatherConfig.cs index aa553dd7..f64fe8ab 100644 --- a/Core/Models/Spt/Config/WeatherConfig.cs +++ b/Core/Models/Spt/Config/WeatherConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using Core.Models.Common; using Core.Models.Enums; using Core.Utils.Json.Converters; diff --git a/Core/Services/RaidWeatherService.cs b/Core/Services/RaidWeatherService.cs index 992bd6ae..6ad3e87f 100644 --- a/Core/Services/RaidWeatherService.cs +++ b/Core/Services/RaidWeatherService.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using Core.Annotations; using Core.Generators; using Core.Helpers; using Core.Models.Eft.Weather; @@ -6,6 +6,7 @@ using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Servers; using Core.Utils; +using ILogger = Core.Models.Utils.ILogger; namespace Core.Services; diff --git a/Core/Utils/TimeUtil.cs b/Core/Utils/TimeUtil.cs index 16440e2b..af167958 100644 --- a/Core/Utils/TimeUtil.cs +++ b/Core/Utils/TimeUtil.cs @@ -1,4 +1,4 @@ -using Core.Annotations; +using Core.Annotations; namespace Core.Utils;