diff --git a/Core/Callbacks/ModCallbacks.cs b/Core/Callbacks/ModCallbacks.cs index 1de767f5..bc30dcd2 100644 --- a/Core/Callbacks/ModCallbacks.cs +++ b/Core/Callbacks/ModCallbacks.cs @@ -43,7 +43,7 @@ public class ModCallbacks : OnLoad // if (ProgramStatics.MODS) { // await this.postSptModLoader.load(); // } TODO: needs to be implemented - throw new NotImplementedException(); + return; } public string GetRoute() diff --git a/Core/Callbacks/SaveCallbacks.cs b/Core/Callbacks/SaveCallbacks.cs index 17b41ce6..103ac844 100644 --- a/Core/Callbacks/SaveCallbacks.cs +++ b/Core/Callbacks/SaveCallbacks.cs @@ -26,12 +26,10 @@ public class SaveCallbacks : OnLoad, OnUpdate _backupService = backupService; } - public Task OnLoad() + public async Task OnLoad() { _backupService.InitAsync(); _saveServer.Load(); - - return Task.CompletedTask; } public async Task OnUpdate(long SecondsSinceLastRun) diff --git a/Core/Controllers/GameController.cs b/Core/Controllers/GameController.cs index d3bf02b8..59d81ebc 100644 --- a/Core/Controllers/GameController.cs +++ b/Core/Controllers/GameController.cs @@ -187,6 +187,6 @@ public class GameController public void Load() { - throw new NotImplementedException(); + return; // TODO: actually implement } } diff --git a/Core/Controllers/PresetController.cs b/Core/Controllers/PresetController.cs index 72d1d89e..dfe9e26b 100644 --- a/Core/Controllers/PresetController.cs +++ b/Core/Controllers/PresetController.cs @@ -10,6 +10,6 @@ public class PresetController /// public void Initialize() { - throw new NotImplementedException(); + return; // TODO: actually implement } } diff --git a/Core/Controllers/TraderController.cs b/Core/Controllers/TraderController.cs index d6e1bdad..46290be5 100644 --- a/Core/Controllers/TraderController.cs +++ b/Core/Controllers/TraderController.cs @@ -14,7 +14,7 @@ public class TraderController /// public void Load() { - throw new NotImplementedException(); + return; // TODO: actually implement } /// diff --git a/Core/DI/OnLoadOrder.cs b/Core/DI/OnLoadOrder.cs index 9e9b75d7..82ba878c 100644 --- a/Core/DI/OnLoadOrder.cs +++ b/Core/DI/OnLoadOrder.cs @@ -5,12 +5,12 @@ public static class OnLoadOrder public const int Database = 0; public const int PostDBModLoader = 1; public const int HandbookCallbacks = 2; - public const int HttpCallbacks = 3; - public const int PresetCallbacks = 4; - public const int SaveCallbacks = 5; - public const int TraderCallbacks = 6; - public const int RagfairPriceService = 7; - public const int RagfairCallbacks = 8; - public const int ModCallbacks = 9; - public const int GameCallbacks = 10; + public const int PresetCallbacks = 3; + public const int SaveCallbacks = 4; + public const int TraderCallbacks = 5; + public const int RagfairPriceService = 6; + public const int RagfairCallbacks = 7; + public const int ModCallbacks = 8; + public const int GameCallbacks = 9; + public const int HttpCallbacks = 10; } diff --git a/Core/Utils/App.cs b/Core/Utils/App.cs index 6824f5ec..9635b0ad 100644 --- a/Core/Utils/App.cs +++ b/Core/Utils/App.cs @@ -79,9 +79,23 @@ public class App _logger.Debug("Commit: ${ProgramStatics.COMMIT}"); } */ - foreach (var onLoad in _onLoad) await onLoad.OnLoad(); + foreach (var onLoad in _onLoad) + { + Console.WriteLine($"Start Onload: {onLoad.GetRoute()}"); + await onLoad.OnLoad(); + Console.WriteLine($"finish Onload: {onLoad.GetRoute()}"); + } - var timer = new Timer(_ => { update(_onUpdate); }, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(5000)); + var timer = new Timer(_ => + { + Console.WriteLine($"Start OnUpdate"); + update(_onUpdate); + Console.WriteLine($"Finish OnUpdate"); + + }, + null, + TimeSpan.Zero, + TimeSpan.FromMilliseconds(5000)); } protected async Task update(IEnumerable onUpdateComponents) @@ -124,4 +138,4 @@ public class App _logger.Error(_localisationService.GetText("scheduled_event_failed_to_run", updateable.GetRoute())); _logger.Error(err.ToString()); } -} \ No newline at end of file +}