Always run KSPCF first in MMPostLoad

KSPModdingLibs · Jul 28, 2024 · b2d6d5a · b2d6d5a
1 parent 441f2d7
commit b2d6d5a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/KSPCommunityFixes/KSPCommunityFixes.cs b/KSPCommunityFixes/KSPCommunityFixes.cs
@@ -63,7 +63,7 @@ void Start()
                 Destroy(Instance);
                 Instance = null;
             }
-            
+
             if (Instance.IsNullOrDestroyed())
             {
                 Instance = this;
@@ -77,9 +77,17 @@ void Start()
 #endif
             LocalizationUtils.GenerateLocTemplateIfRequested();
             LocalizationUtils.ParseLocalization();
+
+            // Insert KSPCF as the first entry in the explicit callback list.
+            // This guarantees that KSPCF will run before all other post load callbacks.
+            // Note that this is cumbersome to access via publicizer because it references
+            // assemblies via file name, and ModuleManager's dll is versioned.
+            AccessTools
+                .StaticFieldRefAccess<List<ModuleManager.ModuleManagerPostPatchCallback>>(typeof(ModuleManager.PostPatchLoader), "postPatchCallbacks")
+                .Insert(0, MMPostLoadCallback);
         }
 
-        public void ModuleManagerPostLoad()
+        public void MMPostLoadCallback()
         {
             if (Instance.IsNullOrDestroyed() || !Instance.RefEquals(this))
                 return;
@@ -106,7 +114,7 @@ public void ModuleManagerPostLoad()
                 if (!type.IsAbstract && type.IsSubclassOf(basePatchType))
                 {
                     patchesTypes.Add(type);
-                    
+
                 }
             }
 

diff --git a/KSPCommunityFixes/KSPCommunityFixes.csproj b/KSPCommunityFixes/KSPCommunityFixes.csproj
@@ -84,6 +84,10 @@
       <Name>Harmony</Name>
       <Private>False</Private>
     </Reference>
+    <Reference Include="$(ReferencePath)\GameData\ModuleManager.*.dll">
+      <Name>ModuleManager</Name>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <!--Krafs.Publicizer items-->
   <ItemGroup>
@@ -407,4 +411,4 @@
     <Error Condition="!Exists('..\packages\Krafs.Publicizer.2.2.1\build\Krafs.Publicizer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Krafs.Publicizer.2.2.1\build\Krafs.Publicizer.targets'))" />
   </Target>
   <Import Project="..\packages\Krafs.Publicizer.2.2.1\build\Krafs.Publicizer.targets" Condition="Exists('..\packages\Krafs.Publicizer.2.2.1\build\Krafs.Publicizer.targets')" />
-</Project>
+</Project>
diff --git a/KSPCommunityFixes/Properties/AssemblyInfo.cs b/KSPCommunityFixes/Properties/AssemblyInfo.cs
@@ -34,3 +34,4 @@
 
 [assembly: KSPAssembly("KSPCommunityFixes", 1, 35, 2)]
 [assembly: KSPAssemblyDependency("MultipleModulePartAPI", 1, 0, 0)]
+[assembly: KSPAssemblyDependency("ModuleManager", 1, 0)]