From 63574c22aa5b287ddff18adbc8902f8d791cd231 Mon Sep 17 00:00:00 2001
From: Sam Byass <r3byass@ags.bucks.sch.uk>
Date: Mon, 2 Mar 2020 20:39:13 +0000
Subject: [PATCH] Add harmony dep, make stages dispatch updates, better warning
 message

---
 About/About.xml                               | 11 ++++
 Source/BetterLoading.csproj                   |  3 +-
 Source/BetterLoadingApi.cs                    | 19 ++++++-
 Source/BetterLoadingMain.cs                   | 40 ++++++++++-----
 Source/Compat/HugsLib/StageHugsLibInit.cs     | 28 ++++++----
 Source/Folder.DotSettings.user                |  2 +
 Source/LoadingScreen.cs                       | 51 +++++++++++++++++--
 Source/Stage/InitialLoad/0StageInitMods.cs    |  5 ++
 Source/Stage/InitialLoad/1StageReadXML.cs     |  4 ++
 Source/Stage/InitialLoad/2StageUnifyXML.cs    |  6 ++-
 .../Stage/InitialLoad/3StageApplyPatches.cs   | 11 ++++
 .../Stage/InitialLoad/4StageRegisterDefs.cs   |  9 ++++
 .../Stage/InitialLoad/5StageConstructDefs.cs  |  5 ++
 .../InitialLoad/6StageResolveDefDatabases.cs  | 11 +++-
 .../7StageRunPostLoadPreFinalizeCallbacks.cs  | 29 +++++++----
 .../InitialLoad/8StageRunStaticCctors.cs      | 40 +++++++++------
 .../9StageRunPostFinalizeCallbacks.cs         | 21 ++++++--
 Source/ToExecuteWhenFinishedHandler.cs        |  5 +-
 18 files changed, 237 insertions(+), 63 deletions(-)
 create mode 100644 Source/Folder.DotSettings.user

diff --git a/About/About.xml b/About/About.xml
index 09587a1..74f411d 100755
--- a/About/About.xml
+++ b/About/About.xml
@@ -12,6 +12,17 @@
     	<li>Ludeon.RimWorld</li>
     	<li>UnlimitedHugs.HugsLib</li>
     </loadBefore>
+    <loadAfter>
+        <li>brrainz.harmony</li>
+    </loadAfter>
+    <modDependencies>
+        <li>
+            <packageId>brrainz.harmony</packageId>
+            <displayName>Harmony</displayName>
+            <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+            <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
+        </li>
+    </modDependencies>
     <description>An enhanced loading screen.</description>
 
 </ModMetaData>
\ No newline at end of file
diff --git a/Source/BetterLoading.csproj b/Source/BetterLoading.csproj
index 7a58250..0a998b2 100755
--- a/Source/BetterLoading.csproj
+++ b/Source/BetterLoading.csproj
@@ -46,6 +46,7 @@
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath Condition="Exists('../../../RimWorldLinux_Data/')">../../../RimWorldLinux_Data/Managed/UnityEngine.dll</HintPath>
       <HintPath Condition="Exists('..\..\..\RimWorldWin64_Data\')">..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath Condition="Exists('../../../RimWorldLinux_Data/')">../../../RimWorldLinux_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
@@ -89,7 +90,7 @@
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lib.Harmony" Version="2.0.0.7" />
+    <PackageReference Include="Lib.Harmony" Version="2.0.0.8" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Source/BetterLoadingApi.cs b/Source/BetterLoadingApi.cs
index be4a62f..e2a00c4 100755
--- a/Source/BetterLoadingApi.cs
+++ b/Source/BetterLoadingApi.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using BetterLoading.Stage;
 using Verse;
@@ -7,9 +8,16 @@ namespace BetterLoading
 {
     public static class BetterLoadingApi
     {
-        public static void AddInitialLoadStage(LoadingStage stage)
+        /// <summary>
+        /// Invoked when a loading stage changes (updates its progress), and is called SYNCHRONOUSLY, ON THE UI THREAD.
+        /// If you care about your users, at all, don't do long-running code here.
+        /// </summary>
+        public static event Action<LoadingStage> OnStageChangeSync = stage => { };
+        
+        public static void AddInitialLoadStage<T>(T stage) where T: LoadingStage
         {
             LoadingScreen.BootLoadList.Add(stage);
+            LoadingScreen.RegisterStageInstance(stage);
         }
 
         public static List<LoadingStage> GetInitialLoadStages()
@@ -27,5 +35,12 @@ public static void InsertInitialLoadStage(LoadingStage stage, int where)
             
             LoadingScreen.BootLoadList.Insert(where, stage);
         }
+
+        public static void DispatchChange(LoadingStage? stage)
+        {
+            if (stage == null) return;
+            
+            OnStageChangeSync(stage);
+        }
     }
 }
\ No newline at end of file
diff --git a/Source/BetterLoadingMain.cs b/Source/BetterLoadingMain.cs
index ddfc9c2..14f03d5 100755
--- a/Source/BetterLoadingMain.cs
+++ b/Source/BetterLoadingMain.cs
@@ -106,7 +106,8 @@ BetterLoading did not display because not all of your modded .dll files (assembl
 Don't report this to the BetterLoading dev. If you want to report it to anyone, report it to the developers of the mods below, but it's probably your fault.
 
 The assemblies that failed to load are:
-" + string.Join("\n", DllPathsThatFailedToLoad.Select(kvp => $"{kvp.Key.Name} - {kvp.Value.Select(e => e.dllName + ".dll").ToCommaList()}").ToArray());
+" + string.Join("\n", DllPathsThatFailedToLoad.Select(kvp => $"{kvp.Key.Name} - {kvp.Value.Select(e => e.dllName + ".dll").ToCommaList()}").ToArray())
+  + "\nIf you would like to see what info BetterLoading has been able to work out in terms of dependencies";
 
             foreach (var kvp in DllPathsThatFailedToLoad)
             {
@@ -135,20 +136,35 @@ BetterLoading did not display because not all of your modded .dll files (assembl
                             .ToList();
 
                         //Try find mods containing the DLLs we're dependent on but can't get
-                        var unsatisfiedDeps = missingAssemblies 
+                        var dependentMods = missingAssemblies
+                            .Where(asm => !asm.Contains("Harmony")) //Ignore harmony as that'll likely break
                             .Select(e => ModLister.AllInstalledMods.FirstOrDefault(m => ModContainsAssembly(m, e)))
+                            .Where(mod => mod != null)
                             .ToList();
 
-                        Log.Message($"\t{dllLoadError.dllName} appears to have a dependency on these mods: {unsatisfiedDeps.Select(m => m.Name).ToStringSafeEnumerable()}");
+                        if (dependentMods.Count > 0)
+                        {
+                            Log.Message($"\t{dllLoadError.dllName} appears to have a dependency on these mod(s): {dependentMods.Select(m => m.Name).ToStringSafeEnumerable()}");
+
+                            var notLoaded = dependentMods.Where(requiredMod => LoadedModManager.RunningMods.All(runningMod => runningMod.Name != requiredMod.Name)).ToList();
+                            if (notLoaded.Count > 0)
+                                notLoaded.ForEach(m => Log.Warning($"\t{modThatFailedLoad.Name} depends on {m.Name} which is not enabled, so it didn't load properly."));
 
-                        var notLoaded = unsatisfiedDeps.Where(requiredMod => LoadedModManager.RunningMods.All(runningMod => runningMod.Name != requiredMod.Name)).ToList();
-                        if(notLoaded.Count > 0)
-                            notLoaded.ForEach(m => Log.Warning($"\t{modThatFailedLoad.Name} depends on {m.Name} which is not enabled, so it didn't load properly."));
+                            var modsLoadedAfterTarget = LoadedModManager.RunningMods.Skip(LoadedModManager.RunningModsListForReading.FindIndex(i => i.Name == modThatFailedLoad.Name)).Take(int.MaxValue).ToList();
+                            var depsLoadedAfterDependent = modsLoadedAfterTarget.Where(loadedAfter => dependentMods.Any(dep => dep.Name == loadedAfter.Name)).ToList();
+                            if (depsLoadedAfterDependent.Count > 0)
+                                depsLoadedAfterDependent.ForEach(m => Log.Warning($"\t{modThatFailedLoad.Name} is loaded before {m.Name} but depends on it, so must be loaded after. It didn't load properly because of this."));
+                        }
 
-                        var modsLoadedAfterTarget = LoadedModManager.RunningMods.Skip(LoadedModManager.RunningModsListForReading.FindIndex(i => i.Name == modThatFailedLoad.Name)).Take(int.MaxValue).ToList();
-                        var depsLoadedAfterDependent = modsLoadedAfterTarget.Where(loadedAfter => unsatisfiedDeps.Any(dep => dep.Name == loadedAfter.Name)).ToList();
-                        if(depsLoadedAfterDependent.Count > 0)
-                            depsLoadedAfterDependent.ForEach(m => Log.Warning($"\t{modThatFailedLoad.Name} is loaded before {m.Name} but depends on it, so must be loaded after. It didn't load properly because of this."));
+                        if (dependentMods.Count != missingAssemblies.Count)
+                        {
+                            var notInAnyMods = missingAssemblies
+                                .Where(asm => ModLister.AllInstalledMods.All(m => !ModContainsAssembly(m, asm)))
+                                .Select(asm => $"{asm}.dll")
+                                .ToList();
+                            
+                            Log.Message($"\t{dllLoadError.dllName} (also) depends on these DLL(s) which couldn't be found in any installed mods: {notInAnyMods.ToStringSafeEnumerable()}");
+                        }
                     }
                 }
             }
@@ -170,10 +186,10 @@ private static bool ModContainsAssembly(ModMetaData mod, string assemblyName)
             {
                 //Add default ones - common folder, version folder, + root
                 var pathWithVer = Path.Combine(mod.RootDir.FullName, VersionControl.CurrentVersionStringWithoutBuild);
-                if(Directory.Exists(pathWithVer))
+                if (Directory.Exists(pathWithVer))
                     searchPaths.Add(pathWithVer);
                 var commonPath = Path.Combine(mod.RootDir.FullName, ModContentPack.CommonFolderName);
-                if(Directory.Exists(commonPath))
+                if (Directory.Exists(commonPath))
                     searchPaths.Add(commonPath);
                 searchPaths.Add(mod.RootDir.FullName);
             }
diff --git a/Source/Compat/HugsLib/StageHugsLibInit.cs b/Source/Compat/HugsLib/StageHugsLibInit.cs
index 4e2a7ec..b4a638c 100755
--- a/Source/Compat/HugsLib/StageHugsLibInit.cs
+++ b/Source/Compat/HugsLib/StageHugsLibInit.cs
@@ -14,16 +14,18 @@ public class StageHugsLibInit : LoadingStage
         private static bool _hasEnumeratedChildren;
         private static bool _done;
 
-        private static List<object> _children;
+        private static List<object>? _children;
         private static int _numChildrenInitialized;
         private static int _numChildrenCheckedForUpdate;
         private static int _numChildrenDefLoaded;
 
-        private static object _currentChildMod;
-        private static Harmony hInstance;
+        private static object? _currentChildMod;
+        private static Harmony? hInstance;
 
         private static PropertyInfo _modIdentifierProperty;
 
+        private static StageHugsLibInit? inst;
+
         public StageHugsLibInit(Harmony instance) : base(instance)
         {
         }
@@ -33,11 +35,6 @@ public override string GetStageName()
             return "Initializing HugsLib";
         }
 
-        public override void BecomeActive()
-        {
-            Log.Message($"At becomeActive, toexecutewhenfinished has {LongEventHandlerMirror.ToExecuteWhenFinished.Count} items and eventqueue has {LongEventHandlerMirror.EventQueue.Count} items ");
-        }
-
         public override string? GetCurrentStepName()
         {
             if (!_hasEnumeratedChildren)
@@ -77,6 +74,11 @@ public override int GetMaximumProgress()
             return 1 + childCount + childCount + childCount;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageHugsLibInit>();
+        }
+
         public override void DoPatching(Harmony instance)
         {
             hInstance = instance;
@@ -88,7 +90,7 @@ public override void DoPatching(Harmony instance)
 
             _modIdentifierProperty = hlAssembly.GetTypes().First(t => t.Name == "ModBase").GetProperty("ModIdentifier");
 
-            Log.Message($"[BetterLoading:HugsLib Compat] Resolved required hugslib types as follows: Controller: {controllerType?.FullName} / Update Manager: {updateFeatureManagerType?.FullName} / Mod Identifier: {_modIdentifierProperty?.Name}");
+            Log.Message($"[BetterLoading:HugsLib Compat] Resolved required hugslib types as follows: Controller: {controllerType?.FullName} / Update Manager: {updateFeatureManagerType?.FullName} / Mod Identifier (Property): {_modIdentifierProperty?.Name}");
 
             hInstance.Patch(AccessTools.Method(controllerType, "LoadReloadInitialize"), postfix: new HarmonyMethod(typeof(StageHugsLibInit), nameof(PostLRI)));
             hInstance.Patch(AccessTools.Method(controllerType, "EnumerateChildMods"), postfix: new HarmonyMethod(typeof(StageHugsLibInit), nameof(PostEnumerateChildren)));
@@ -98,7 +100,7 @@ public override void DoPatching(Harmony instance)
                 new HarmonyMethod(typeof(StageHugsLibInit), nameof(PostUpdateCheck))
             );
 
-            Log.Message("[BetterLoading:HugsLib] Successfully blind-patched hugslib.");
+            Log.Message("[BetterLoading:HugsLib Compat] Successfully blind-patched hugslib.");
         }
 
         public static void PostLRI()
@@ -128,21 +130,25 @@ public static void PreChildInit(object __instance)
             if (__instance.GetType().GetProperty("ModIdentifier") == null) return;
 
             _currentChildMod = __instance;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostChildInit()
         {
             _numChildrenInitialized++;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PreUpdateCheck(string modId)
         {
             _currentChildMod = _children?.Find(m => (string) _modIdentifierProperty.GetValue(m, null) == modId);
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostUpdateCheck()
         {
             _numChildrenCheckedForUpdate++;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PreDefsLoaded(object __instance)
@@ -150,11 +156,13 @@ public static void PreDefsLoaded(object __instance)
             if (__instance.GetType().GetProperty("ModIdentifier") == null) return;
 
             _currentChildMod = __instance;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostDefsLoaded()
         {
             _numChildrenDefLoaded++;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Folder.DotSettings.user b/Source/Folder.DotSettings.user
new file mode 100644
index 0000000..fbc8036
--- /dev/null
+++ b/Source/Folder.DotSettings.user
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CProgram_0020Files_0020_0028x86_0029_005CSteam_005Csteamapps_005Ccommon_005CRimWorld_005CRimWorldWin64_005FData_005CManaged_005CUnityEngine_002EAssetBundleModule_002Edll/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Source/LoadingScreen.cs b/Source/LoadingScreen.cs
index 9316538..2e0711f 100755
--- a/Source/LoadingScreen.cs
+++ b/Source/LoadingScreen.cs
@@ -31,6 +31,8 @@ public sealed class LoadingScreen : MonoBehaviour
             new StageRunStaticCctors(BetterLoadingMain.hInstance),
             new StageRunPostFinalizeCallbacks(BetterLoadingMain.hInstance)
         };
+        
+        private static Dictionary<Type, LoadingStage> _loadingStagesByType = new Dictionary<Type, LoadingStage>();
 
         private Texture2D background;
         private Texture2D errorBarColor;
@@ -56,6 +58,8 @@ public sealed class LoadingScreen : MonoBehaviour
         public LoadingScreen()
         {
             Instance = this;
+            BootLoadList.ForEach(s => _loadingStagesByType[s.GetType()] = s);
+            
             _currentStage.BecomeActive();
             StageTimingData.ExecutedStages.Add(new StageTimingData
             {
@@ -63,6 +67,31 @@ public LoadingScreen()
                 stage = _currentStage
             });
         }
+        
+        internal static void RegisterStageInstance<T>(T stage) where T: LoadingStage
+        {
+            try
+            {
+                GetStageInstance<T>(); //Verify not in dict already
+            }
+            catch (ArgumentException)
+            {
+                _loadingStagesByType.Add(typeof(T), stage);
+                return;
+            }
+            
+            throw new ArgumentException($"RegisterStageInstance called for an already registered stage type {typeof(T)} (mapped to {GetStageInstance<T>()}).");
+        }
+
+        internal static T GetStageInstance<T>() where T: LoadingStage
+        {
+            if (!_loadingStagesByType.TryGetValue(typeof(T), out var ret))
+            {
+                throw new ArgumentException($"GetStageInstance called for an unregistered stage type {typeof(T)}.");
+            }
+
+            return (T) ret;
+        }
 
         private void Awake()
         {
@@ -114,12 +143,28 @@ public void OnGUI()
 
                     //Move to next stage
                     Log.Message("BetterLoading: Finished stage " + _currentStage.GetStageName() + " at " + DateTime.Now.ToLongTimeString());
-                    _currentStage.BecomeInactive();
+                    try
+                    {
+                        _currentStage.BecomeInactive();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error($"[BetterLoading] The stage {_currentStage} errored during BecomeInactive: {e}");
+                    }
+
                     StageTimingData.ExecutedStages.Last().end = DateTime.Now;
 
                     _currentStage = currentList[idx + 1];
-                    _currentStage.BecomeActive();
-                    Log.Message("BetterLoading: Starting stage " + _currentStage.GetStageName());
+                    try
+                    {
+                        Log.Message("BetterLoading: Starting stage " + _currentStage.GetStageName());
+                        _currentStage.BecomeActive();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error($"[BetterLoading] The stage {_currentStage} errored during BecomeActive: {e}");
+                    }
+
                     StageTimingData.ExecutedStages.Add(new StageTimingData
                     {
                         start = DateTime.Now,
diff --git a/Source/Stage/InitialLoad/0StageInitMods.cs b/Source/Stage/InitialLoad/0StageInitMods.cs
index f58dfd4..8786031 100755
--- a/Source/Stage/InitialLoad/0StageInitMods.cs
+++ b/Source/Stage/InitialLoad/0StageInitMods.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using BetterLoading.Compat;
 using BetterLoading.Compat.HugsLib;
 using HarmonyLib;
@@ -16,6 +17,8 @@ public class StageInitMods : LoadingStage
         private static ModContentPack _currentMod = BetterLoadingMain.ourContentPack;
         private static bool _completed;
 
+        private static StageInitMods? inst;
+
         public StageInitMods(Harmony instance) : base(instance)
         {
         }
@@ -38,6 +41,7 @@ public override int GetCurrentProgress()
         public override void BecomeActive()
         {
             _numMods = typeof(Mod).InstantiableDescendantsAndSelf().Select(m => m.FullName).Distinct().Count();
+            inst = LoadingScreen.GetStageInstance<StageInitMods>();
         }
 
         public override void BecomeInactive()
@@ -74,6 +78,7 @@ public static void OnActivatorCreateInstance(Type type, params object[] args)
 
             _currentModIdx++;
             _currentMod = pack;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/1StageReadXML.cs b/Source/Stage/InitialLoad/1StageReadXML.cs
index c1efd97..cf884e9 100755
--- a/Source/Stage/InitialLoad/1StageReadXML.cs
+++ b/Source/Stage/InitialLoad/1StageReadXML.cs
@@ -10,6 +10,8 @@ public class StageReadXML : LoadingStage
         private static int _currentPackIdx = 1;
         private int _numPacks = -1;
 
+        private static StageReadXML? inst;
+
         public StageReadXML(Harmony instance) : base(instance)
         {
             
@@ -43,12 +45,14 @@ public override void DoPatching(Harmony instance)
         public override void BecomeActive()
         {
             _numPacks = LoadedModManager.RunningMods.Count();
+            inst = LoadingScreen.GetStageInstance<StageReadXML>();
         }
 
         public static void OnLoadDefsComplete(ModContentPack __instance)
         {
             _currentPack = __instance;
             _currentPackIdx++;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/2StageUnifyXML.cs b/Source/Stage/InitialLoad/2StageUnifyXML.cs
index c8b5ec3..cfdbf02 100755
--- a/Source/Stage/InitialLoad/2StageUnifyXML.cs
+++ b/Source/Stage/InitialLoad/2StageUnifyXML.cs
@@ -10,8 +10,10 @@ public class StageUnifyXML : LoadingStage
         private static List<LoadableXmlAsset>? _assets;
         private static LoadableXmlAsset? _currentAsset;
         private static int _numAssets = int.MaxValue;
-        private static int _currentAssetNo = 0;
+        private static int _currentAssetNo;
         private static bool _valid;
+
+        private static StageUnifyXML? inst;
         
         public StageUnifyXML(Harmony instance) : base(instance)
         {
@@ -61,6 +63,7 @@ public static void PreUnifyXML(List<LoadableXmlAsset> xmls)
         public override void BecomeActive()
         {
             _valid = true;
+            inst = LoadingScreen.GetStageInstance<StageUnifyXML>();
         }
 
         public override void BecomeInactive()
@@ -80,6 +83,7 @@ public static void PostGetDocumentElement(object __instance)
 
             _currentAsset = next;
             _currentAssetNo = idx + 1;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/3StageApplyPatches.cs b/Source/Stage/InitialLoad/3StageApplyPatches.cs
index 57b283b..464f333 100755
--- a/Source/Stage/InitialLoad/3StageApplyPatches.cs
+++ b/Source/Stage/InitialLoad/3StageApplyPatches.cs
@@ -15,6 +15,8 @@ public class StageApplyPatches : LoadingStage
         private static int _numPatches = -1;
         private static int _currentPatch;
 
+        private static StageApplyPatches inst;
+
         public StageApplyPatches(Harmony instance) : base(instance)
         {
             _modList = LoadedModManager.RunningMods.ToList();
@@ -26,6 +28,11 @@ public override void BecomeInactive()
             _currentModNum = -1;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageApplyPatches>();
+        }
+
         public override string GetStageName()
         {
             return "Applying Patches";
@@ -75,6 +82,7 @@ public static void PreLoadPatches(ModContentPack __instance)
             _currentModNum = _modList.IndexOf(_currentMod) + 1;
             _numPatches = -1;
             _currentPatch = 0;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostLoadPatches(List<PatchOperation> ___patches)
@@ -82,6 +90,7 @@ public static void PostLoadPatches(List<PatchOperation> ___patches)
             _numPatches = ___patches.Count;
             _currentPatch = 0;
             _loadingPatches = false;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostApplyPatch()
@@ -89,6 +98,8 @@ public static void PostApplyPatch()
             _currentPatch++;
             if (_currentPatch > _numPatches)
                 _numPatches++;
+            
+            // BetterLoadingApi.DispatchChange(inst); //This is probably overkill
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/4StageRegisterDefs.cs b/Source/Stage/InitialLoad/4StageRegisterDefs.cs
index 6a0d856..25bb6cd 100755
--- a/Source/Stage/InitialLoad/4StageRegisterDefs.cs
+++ b/Source/Stage/InitialLoad/4StageRegisterDefs.cs
@@ -9,6 +9,8 @@ public class StageRegisterDefs : LoadingStage
     {
         private static int _numDefsToRegister = 1;
         private static int _currentDefNum;
+
+        private static StageRegisterDefs inst;
         
         public StageRegisterDefs(Harmony instance) : base(instance)
         {
@@ -30,6 +32,11 @@ public override void BecomeInactive()
             _currentDefNum = 0;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageRegisterDefs>();
+        }
+
         public override string? GetCurrentStepName()
         {
             return null;
@@ -55,6 +62,7 @@ public static void PreParseProcXml(XmlDocument xmlDoc)
         {
             _numDefsToRegister = xmlDoc.DocumentElement?.ChildNodes.GetEnumerator().ToIEnumerable<XmlNode>().Count(e => e.NodeType == XmlNodeType.Element) ?? 0;
             _currentDefNum = 0;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PreRegisterDef()
@@ -62,6 +70,7 @@ public static void PreRegisterDef()
             if (_currentDefNum >= _numDefsToRegister) return;
             
             _currentDefNum++;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/5StageConstructDefs.cs b/Source/Stage/InitialLoad/5StageConstructDefs.cs
index 98b1462..bb634c1 100755
--- a/Source/Stage/InitialLoad/5StageConstructDefs.cs
+++ b/Source/Stage/InitialLoad/5StageConstructDefs.cs
@@ -11,6 +11,8 @@ public class StageConstructDefs : LoadingStage
         private static int _currentDefNum;
         private static bool _shouldCount;
         private static LoadableXmlAsset _asset;
+
+        private static StageConstructDefs inst;
         
         public StageConstructDefs(Harmony instance) : base(instance)
         {
@@ -29,6 +31,7 @@ public override bool IsCompleted()
         public override void BecomeActive()
         {
             _shouldCount = true;
+            inst = LoadingScreen.GetStageInstance<StageConstructDefs>();
         }
 
         public override void BecomeInactive()
@@ -63,6 +66,7 @@ public static void PreParseProcXml(XmlDocument xmlDoc)
         {
             _numDefsToResolve = xmlDoc.DocumentElement?.ChildNodes.Count ?? 1;
             _currentDefNum = 0;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PreDefFromNode(LoadableXmlAsset loadingAsset)
@@ -71,6 +75,7 @@ public static void PreDefFromNode(LoadableXmlAsset loadingAsset)
 
             _currentDefNum++;
             _asset = loadingAsset;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/6StageResolveDefDatabases.cs b/Source/Stage/InitialLoad/6StageResolveDefDatabases.cs
index 2d0122f..ea3ab66 100755
--- a/Source/Stage/InitialLoad/6StageResolveDefDatabases.cs
+++ b/Source/Stage/InitialLoad/6StageResolveDefDatabases.cs
@@ -9,10 +9,11 @@ namespace BetterLoading.Stage.InitialLoad
 {
     public class StageResolveDefDatabases : LoadingStage
     {
-        private static Type _currentDatabase;
+        private static Type? _currentDatabase;
         private static int _numDatabases = 1;
         private static int _currentDatabaseNum;
 
+        private static StageResolveDefDatabases inst;
 
         public StageResolveDefDatabases(Harmony instance) : base(instance)
         {
@@ -43,6 +44,11 @@ public override bool IsCompleted()
             return _currentDatabaseNum == _numDatabases;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageResolveDefDatabases>();
+        }
+
         public override void DoPatching(Harmony instance)
         {
             instance.Patch(
@@ -63,6 +69,7 @@ public static void PreMOGT(Type genericParam, string methodName)
                 _numDatabases = typeof(Def).AllSubclasses().Count() - 2; //ThingCategoryDef and RecipeDef aren't done
 
             _currentDatabase = genericParam;
+            BetterLoadingApi.DispatchChange(inst);
         }
 
         public static void PostMOGT(Type genericParam, string methodName)
@@ -76,6 +83,7 @@ public static void PostMOGT(Type genericParam, string methodName)
             if (_currentDatabaseNum == _numDatabases - 3)
             {
                 _currentDatabase = typeof(ThingDef);
+                BetterLoadingApi.DispatchChange(inst);
             }
         }
 
@@ -83,6 +91,7 @@ public static void PreGenImplied()
         {
             //Finished thingdef database at this point
             _currentDatabaseNum++;
+            BetterLoadingApi.DispatchChange(inst);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs b/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs
index adca78f..d98989a 100755
--- a/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs
+++ b/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs
@@ -14,13 +14,15 @@ public class StageRunPostLoadPreFinalizeCallbacks : LoadingStage
         private static int _numTasksToRun = 2;
         private static int _numTasksRun;
 
-        private static Action _currentAction;
+        private static Action? _currentAction;
 
         private static bool _hasBeenCalled;
 
         private static bool _finishedExecuting;
         private static bool _done;
 
+        private static StageRunPostLoadPreFinalizeCallbacks inst;
+
 
         public StageRunPostLoadPreFinalizeCallbacks(Harmony instance) : base(instance)
         {
@@ -54,6 +56,11 @@ public override int GetMaximumProgress()
             return _numTasksToRun;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageRunPostLoadPreFinalizeCallbacks>();
+        }
+
         public override void DoPatching(Harmony instance)
         {
             instance.Patch(AccessTools.Method(typeof(LongEventHandler), "ExecuteToExecuteWhenFinished"), new HarmonyMethod(typeof(StageRunPostLoadPreFinalizeCallbacks), nameof(PreExecToExecWhenFinished)));
@@ -76,17 +83,17 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
 
             var last = ___toExecuteWhenFinished.Skip(2900).Take(int.MaxValue).Select(i => i.Method.DeclaringType).ToList();
             
-            Debug.Log($"BL Debug: last few task defining types: {last.ToStringSafeEnumerable()}");
+            // Debug.Log($"BL Debug: last few task defining types: {last.ToStringSafeEnumerable()}");
             
-            Debug.Log($"BL Debug: Looking for actions defined in type beginning with {targetTypeName}");
+            // Debug.Log($"BL Debug: Looking for actions defined in type beginning with {targetTypeName}");
 
             var declaredInPDL = ___toExecuteWhenFinished.Where(task => task.Method.DeclaringType?.FullName?.StartsWith(targetTypeName) == true).ToList();
             
-            Debug.Log($"BL Debug: types declared in PDL: {declaredInPDL.Select(a => a.Method).ToStringSafeEnumerable()}");
+            // Debug.Log($"BL Debug: types declared in PDL: {declaredInPDL.Select(a => a.Method).ToStringSafeEnumerable()}");
 
             var indexOfStaticCtor = ___toExecuteWhenFinished.IndexOf(declaredInPDL.Find(task => task.Method.Name.Contains("b__4_2"))); //The anon class that calls static ctors.
             
-            Debug.Log($"BL Debug: Identified target index as {indexOfStaticCtor} which maps to the action-method {___toExecuteWhenFinished[indexOfStaticCtor].Method.FullDescription()}");
+            // Debug.Log($"BL Debug: Identified target index as {indexOfStaticCtor} which maps to the action-method {___toExecuteWhenFinished[indexOfStaticCtor].Method.FullDescription()}");
 
             //Ones to execute now are the ones before the ctors
             var toExecute = ___toExecuteWhenFinished.Take(indexOfStaticCtor).ToList();
@@ -99,7 +106,7 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
             //To execute after are the ones after the ctors - if there are any.
             var remainder = ___toExecuteWhenFinished.Skip(indexOfStaticCtor + 1).Take(int.MaxValue).ToList();
             
-            Debug.Log($"BL Debug: This leaves {toExecute.Count} tasks to execute now, that one to execute in the middle, and then {remainder.Count} to execute after static ctors");
+            // Debug.Log($"BL Debug: This leaves {toExecute.Count} tasks to execute now, that one to execute in the middle, and then {remainder.Count} to execute after static ctors");
 
             LongEventHandlerMirror.ToExecuteWhenFinished = remainder;
 
@@ -110,14 +117,18 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
                     toExecute,
                     false,
                     currentAction => _currentAction = currentAction,
-                    () => _numTasksRun++,
+                    () =>
+                    {
+                        _numTasksRun++;
+                        BetterLoadingApi.DispatchChange(inst);
+                    },
                     () => _finishedExecuting = true
                 )
             );
 
             LongEventHandler.QueueLongEvent(() =>
             {
-                Log.Message("[BetterLoading] Blocking loading screen from being dismissed until post-load actions are complete.");
+                // Log.Message("[BetterLoading] Blocking loading screen from being dismissed until post-load actions are complete.");
                 Thread.Sleep(1000);
 
                 while (!_finishedExecuting)
@@ -125,7 +136,7 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
                     Thread.Sleep(2000); //Wait
                 }
                 
-                Log.Message($"Obtained synclock, assuming post-load actions are complete and starting static constructors");
+                Log.Message($"[BetterLoading] Obtained synclock, assuming post-load actions are complete and starting static constructors");
 
                 runStaticCtors();
 
diff --git a/Source/Stage/InitialLoad/8StageRunStaticCctors.cs b/Source/Stage/InitialLoad/8StageRunStaticCctors.cs
index 6652494..940a462 100755
--- a/Source/Stage/InitialLoad/8StageRunStaticCctors.cs
+++ b/Source/Stage/InitialLoad/8StageRunStaticCctors.cs
@@ -13,13 +13,15 @@ namespace BetterLoading.Stage.InitialLoad
     public class StageRunStaticCctors : LoadingStage
     {
         private static Type? _modType;
-        private static List<Type> _toRun;
+        private static List<Type>? _toRun;
         private static int _numRun;
 
-        private static List<Action> _queue;
+        private static List<Action>? _queue;
 
         private static bool _finishedProcessing;
-        private static Exception _encounteredException;
+        private static Exception? _encounteredException;
+
+        private static StageRunStaticCctors? inst;
 
         public StageRunStaticCctors(Harmony instance) : base(instance)
         {
@@ -65,11 +67,16 @@ public override bool HasError()
             return _encounteredException != null;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageRunStaticCctors>();
+        }
+
         public static IEnumerator StaticConstructAll()
         {
             Log.Message("[BetterLoading] Starting Antifreeze(tm) StaticConstructorCaller. Synchronizing retransmission chronicity...");
             Application.runInBackground = true;
-            Log.Message("[BetterLoading] Contact Engaged. Here goes nothing...");
+            // Log.Message("[BetterLoading] Contact Engaged. Here goes nothing...");
             foreach (var type in _toRun)
             {
                 try
@@ -79,6 +86,7 @@ public static IEnumerator StaticConstructAll()
                     RuntimeHelpers.RunClassConstructor(type.TypeHandle);
 
                     _numRun++;
+                    BetterLoadingApi.DispatchChange(inst);
                 }
                 catch (Exception e)
                 {
@@ -96,7 +104,7 @@ public static IEnumerator StaticConstructAll()
                 Log.Message("[BetterLoading] Finished calling static constructors at " + DateTime.Now.ToLongTimeString() + ". AND I didn't make the game freeze. Take that, Tynan.");
                 var existing = LongEventHandlerMirror.ToExecuteWhenFinished;
 
-                Log.Message($"[BetterLoading] Restoring original job queue of {_queue.Count} item/s and merging with any just added (looking at you, Fluffy) ({existing.Count} entries have been added).");
+                // Log.Message($"[BetterLoading] Restoring original job queue of {_queue.Count} item/s and merging with any just added (looking at you, Fluffy) ({existing.Count} entries have been added).");
                 if (existing.Count > 0 && _queue.Count == 0)
                 {
                     //This is probably usually the case
@@ -117,13 +125,13 @@ public static IEnumerator StaticConstructAll()
 
                 _queue = null;
 
-                Log.Message($"[BetterLoading] Job queue restored. Running GC...");
+                // Log.Message($"[BetterLoading] Job queue restored. Running GC...");
 
                 StaticConstructorOnStartupUtility.coreStaticAssetsLoaded = true;
 
                 GC.Collect(int.MaxValue, GCCollectionMode.Forced); //Copied from PlayDataLoader
 
-                Log.Message($"[BetterLoading] GC Has completed. Relinquishing lock.");
+                // Log.Message($"[BetterLoading] GC Has completed. Relinquishing lock.");
             }
             catch (Exception e)
             {
@@ -133,32 +141,32 @@ public static IEnumerator StaticConstructAll()
             {
                 StageRunPostFinalizeCallbacks.ShouldInterceptNext = true;
                 _finishedProcessing = true;
-                Log.Message("[BetterLoading] Lock released.");
+                // Log.Message("[BetterLoading] Lock released.");
             }
         }
 
         public static bool PreCallAll()
         {
-            Log.Message("Static constructors? Oh, sit down, vanilla, I'll do it myself. Starting now, at " + DateTime.Now.ToLongTimeString(), true);
+            // Log.Message("Static constructors? Oh, sit down, vanilla, I'll do it myself. Starting now, at " + DateTime.Now.ToLongTimeString(), true);
             _toRun = GenTypes.AllTypesWithAttribute<StaticConstructorOnStartup>().ToList();
 
             BetterLoadingMain.LoadingScreen.StartCoroutine(StaticConstructAll());
 
-            Log.Message("[BetterLoading] Overriding LongEventHandler's toExecuteWhenFinished", true);
+            // Log.Message("[BetterLoading] Overriding LongEventHandler's toExecuteWhenFinished", true);
             
             var result = LongEventHandlerMirror.ToExecuteWhenFinished;
 
-            Log.Message($"[BetterLoading]    Got list of pending actions: {result}. Removing up to and including the static constructor call...", true);
+            // Log.Message($"[BetterLoading]    Got list of pending actions: {result}. Removing up to and including the static constructor call...", true);
 
             var staticCallIdx = result.FindIndex(i => i.Method.DeclaringType?.Name == "PlayDataLoader" && i.Method.Name.Contains("m__2"));
 
-            Log.Message($"[BetterLoading]        (Which is at index {staticCallIdx} of {result.Count})", true);
+            // Log.Message($"[BetterLoading]        (Which is at index {staticCallIdx} of {result.Count})", true);
 
             result = result.Skip(staticCallIdx + 1).Take(int.MaxValue).ToList(); //Remove the static constructor call
 
             _queue = result;
 
-            Log.Message($"[BetterLoading]     Updating field in LEH to a new list of size {result.Count}...", true);
+            // Log.Message($"[BetterLoading]     Updating field in LEH to a new list of size {result.Count}...", true);
             LongEventHandlerMirror.ToExecuteWhenFinished = new List<Action>();
 
             LongEventHandler.QueueLongEvent(WaitForStaticCtors, null, true, null);
@@ -169,13 +177,13 @@ public static bool PreCallAll()
         private static void WaitForStaticCtors()
         {
             //Called async so can just block
-            Log.Message("[BetterLoading] Blocking LEH until static ctors finish", true);
+            // Log.Message("[BetterLoading] Blocking LEH until static ctors finish", true);
             Thread.Sleep(1000);
-            Log.Message("[BetterLoading] Awaiting release of lock...");
+            // Log.Message("[BetterLoading] Awaiting release of lock...");
             
             while(!_finishedProcessing){Thread.Sleep(2000);} //wait for sync lock to be available
             
-            Log.Message("[BetterLoading] Lock released, assuming we're finished calling static ctors", true);
+            // Log.Message("[BetterLoading] Lock released, assuming we're finished calling static ctors", true);
             Thread.Sleep(0);
             
         }
diff --git a/Source/Stage/InitialLoad/9StageRunPostFinalizeCallbacks.cs b/Source/Stage/InitialLoad/9StageRunPostFinalizeCallbacks.cs
index 565cc55..b5833dc 100755
--- a/Source/Stage/InitialLoad/9StageRunPostFinalizeCallbacks.cs
+++ b/Source/Stage/InitialLoad/9StageRunPostFinalizeCallbacks.cs
@@ -13,12 +13,14 @@ public class StageRunPostFinalizeCallbacks : LoadingStage
         private static int _numTasksToRun = 2;
         private static int _numTasksRun;
 
-        private static Action _currentAction;
+        private static Action? _currentAction;
 
         private static bool _hasBeenCalled;
 
         private static bool _finishedExecuting;
 
+        private static StageRunPostFinalizeCallbacks? inst;
+
         public StageRunPostFinalizeCallbacks(Harmony instance) : base(instance)
         {
         }
@@ -51,6 +53,11 @@ public override int GetMaximumProgress()
             return _numTasksToRun;
         }
 
+        public override void BecomeActive()
+        {
+            inst = LoadingScreen.GetStageInstance<StageRunPostFinalizeCallbacks>();
+        }
+
         public override void DoPatching(Harmony instance)
         {
             instance.Patch(AccessTools.Method(typeof(LongEventHandler), "ExecuteToExecuteWhenFinished"), new HarmonyMethod(typeof(StageRunPostFinalizeCallbacks), nameof(PreExecToExecWhenFinished)));
@@ -82,10 +89,14 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
                     ___toExecuteWhenFinished,
                     false,
                     currentAction => _currentAction = currentAction,
-                    () => _numTasksRun++,
                     () =>
                     {
-                        Log.Message("[BetterLoading] Finished post-finalize callbacks, releasing lock.");
+                        _numTasksRun++;
+                        BetterLoadingApi.DispatchChange(inst);
+                    },
+                    () =>
+                    {
+                        // Log.Message("[BetterLoading] Finished post-finalize callbacks, releasing lock.");
                         _finishedExecuting = true;
                     })
             );
@@ -94,13 +105,13 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
             {
                 Thread.Sleep(500);
 
-                Log.Message("[BetterLoading] Blocking loading screen from being dismissed until post-finalize actions are complete.");
+                // Log.Message("[BetterLoading] Blocking loading screen from being dismissed until post-finalize actions are complete.");
                 while (!_finishedExecuting)
                 {
                     Thread.Sleep(500); //Wait
                 }
 
-                Log.Message("Obtained lock, assuming we're done with post-finalize.");
+                Log.Message("[BetterLoading] Obtained lock, assuming we're done with post-finalize.");
 
                 Thread.Sleep(0);
 
diff --git a/Source/ToExecuteWhenFinishedHandler.cs b/Source/ToExecuteWhenFinishedHandler.cs
index ee7c995..76a9f7f 100755
--- a/Source/ToExecuteWhenFinishedHandler.cs
+++ b/Source/ToExecuteWhenFinishedHandler.cs
@@ -7,7 +7,7 @@ namespace BetterLoading
 {
     public class ToExecuteWhenFinishedHandler
     {
-        private const float TARGET_FPS_DURING_LOAD = 30;
+        private const float TARGET_FPS_DURING_LOAD = 15;
         private const float MAX_FRAME_DURATION = 1f / TARGET_FPS_DURING_LOAD * 10_000f;
         private static long lastEnd;
 
@@ -53,7 +53,7 @@ public static IEnumerator ExecuteToExecuteWhenFinishedTheGoodVersion(List<Action
                         index++;
                         if(index >= toExecuteWhenFinished.Count)
                             break;
-                    } while (DateTime.Now.Ticks - lastEnd < MAX_FRAME_DURATION); //Target 60fps
+                    } while (DateTime.Now.Ticks - lastEnd < MAX_FRAME_DURATION); //Target 30fps
 
                     yield return null;
                     lastEnd = DateTime.Now.Ticks;
@@ -73,7 +73,6 @@ public static IEnumerator ExecuteToExecuteWhenFinishedTheGoodVersion(List<Action
                 }
                 finally
                 {
-                    Log.Message("[BetterLoading] TEWFH: Firing complete callback.");
                     completeCallback();
                 }
             }