diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs index 9bad178..3d894c8 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs @@ -68,8 +68,6 @@ protected override IEnumerable GetFeaturePatches() /// protected override bool OnEngineInit() { - LoadProgressReporter.AddFixedPhases(4); - return base.OnEngineInit(); } @@ -96,7 +94,7 @@ private static async Task InitializeFrooxEnginePostfixAsync(Task __result) { await __result; - LoadProgressReporter.AdvanceFixedPhase("Loading RML Libraries..."); + LoadProgressReporter.SetSubphase("Loading RML Libraries..."); try { @@ -117,22 +115,20 @@ private static async Task InitializeFrooxEnginePostfixAsync(Task __result) { Logger.Warn(() => ex.Format($"Failed to load library from rml_libs: {file}")); } - - LoadProgressReporter.ExitSubphase(); } - LoadProgressReporter.AdvanceFixedPhase("Collecting RML Mods..."); + LoadProgressReporter.SetSubphase("Collecting RML Mods..."); var rmlMods = await LoadModsAsync().ToArrayAsync(); - LoadProgressReporter.AdvanceFixedPhase("Running RML Mods..."); + LoadProgressReporter.SetSubphase("Running RML Mods..."); await Task.Run(() => Mod.Loader.RunMods(rmlMods)); - LoadProgressReporter.AdvanceFixedPhase("Done with RML"); + LoadProgressReporter.SetSubphase("Done with RML"); } catch (Exception ex) { Logger.Error(() => ex.Format("Exception in execution hook!")); - LoadProgressReporter.AdvanceFixedPhase("Error running RML Mods!"); + LoadProgressReporter.SetSubphase("Error running RML Mods!"); } } @@ -174,8 +170,6 @@ private static async IAsyncEnumerable LoadModsAsync() Logger.Warn(() => ex.Format($"Failed to load mod from rml_mods: {fileName}")); } - LoadProgressReporter.ExitSubphase(); - if (success) yield return rmlMod!; } diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj b/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj index 4947fe5..64f0ad2 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj @@ -11,7 +11,7 @@ MonkeyLoader.GamePacks.ResoniteModLoader ResoniteModLoader Banane9, Nytra - 4.0.0.0 + 4.0.0.1 This MonkeyLoader Game Pack for Resonite enables loading ResoniteModLoader mods as MonkeyLoader mods. README.md LGPL-3.0-or-later diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs index c5b2d90..979bd44 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs @@ -1,3 +1,4 @@ +using FrooxEngine; using MonkeyLoader; using MonkeyLoader.Configuration; using MonkeyLoader.Logging; @@ -144,10 +145,6 @@ public override bool Run() Logger.Error(ex.LogFormat($"Error while intitializing RML Mod {Name}:")); return false; } - finally - { - LoadProgressReporter.ExitSubphase(); - } } ///