Fix various compat issues + hugslib bugs

SamboyCoding · Feb 27, 2020 · 0e27689 · 0e27689
1 parent b7ee372
commit 0e27689
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,7 @@
 <ModMetaData>
     <name>BetterLoading</name>
     <author>Samboy063</author>
-    <packageId>me.samboycoding.betterloading</packageId>
+    <packageId>me.samboycoding.betterloading.dev</packageId>
     <url></url>
     <supportedVersions>
         <li>1.0</li>

diff --git a/Source/BetterLoading.csproj b/Source/BetterLoading.csproj
@@ -18,7 +18,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>..\1.1\Assemblies\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

diff --git a/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs b/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using HarmonyLib;
+using UnityEngine;
 using Verse;
 
 namespace BetterLoading.Stage.InitialLoad
@@ -50,7 +51,7 @@ public override int GetCurrentProgress()
 
         public override int GetMaximumProgress()
         {
-            return _numTasksToRun - 1;
+            return _numTasksToRun;
         }
 
         public override void DoPatching(Harmony instance)
@@ -71,9 +72,21 @@ public static bool PreExecToExecWhenFinished(ref List<Action> ___toExecuteWhenFi
 
             _hasBeenCalled = true;
 
-            var targetTypeName = typeof(PlayDataLoader).FullName;
+            var targetTypeName = typeof(PlayDataLoader).FullName ?? throw new Exception("WTF where has playdataloader gone.");
 
-            var indexOfStaticCtor = ___toExecuteWhenFinished.FindIndex(task => task.Method.DeclaringType?.FullName == targetTypeName && task.Method.Name.Contains("m__2"));
+            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: 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()}");
+
+            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()}");
 
             //Ones to execute now are the ones before the ctors
             var toExecute = ___toExecuteWhenFinished.Take(indexOfStaticCtor).ToList();
@@ -85,6 +98,8 @@ 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");
 
             LongEventHandlerMirror.ToExecuteWhenFinished = remainder;