Fixed issue where ModBase could possibly determine the wrong mod assembly file during initialization

Author: solidDoWant

ModBase.cs

@@ -17,6 +17,7 @@ public abstract class ModBase
     {
         public List<Texture2D> ModTextures { get; protected set; }
         public List<GameObject> ModObjects { get; protected set; }
+        public Assembly ModAssembly { get; protected set; } // This is set by the mod loader and should generally not be set elsewhere except possibly by second stage mod loaders
 
         public virtual Version ModVersion => new Version(0, 0, 0, 0);
 
@@ -25,22 +26,28 @@ public abstract class ModBase
         private static FastZip ZipInstance { get; } = new FastZip();
 
         protected ModBase()
+        {
+            ExtractAssemblyResources();
+            LoadResourcesSafe();
+            UpdateCredits();
+        }
+
+        protected virtual void ExtractAssemblyResources()
         {
             //Extract embedded assets
             ZipConstants.DefaultCodePage = 0;   //This is a workaround to get files to extract properly
 
-            var currentAssembly = Assembly.GetCallingAssembly();
-            var manifest = currentAssembly.GetManifestResourceNames();
-
-            PreProcessEmbeddedResources(manifest);
+            var manifestResources = ModAssembly.GetManifestResourceNames();
+            PreProcessEmbeddedResources(manifestResources);
 
-            foreach (var file in manifest)
+            foreach (var file in manifestResources)
             {
-                if (!PreProcessEmbeddedResource(file)) continue;
+                if (!PreProcessEmbeddedResource(file)) 
+                    continue;
 
                 Debug.Log($"Processing embedded file \"{file}\"");
 
-                using (var resourceStream = currentAssembly.GetManifestResourceStream(file))
+                using (var resourceStream = ModAssembly.GetManifestResourceStream(file))
                 {
                     switch (Path.GetExtension(file))
                     {
@@ -73,7 +80,17 @@ protected ModBase()
                     }
                 }
             }
+        }
+
+        protected virtual void LoadResourcesSafe()
+        {
+            LoadStringsSafe();
+            LoadPngsSafe();
+            LoadObjsSafe();
+        }
 
+        protected virtual void LoadStringsSafe()
+        {
             try
             {
                 LoadAllStrings("strings");
@@ -83,7 +100,10 @@ protected ModBase()
                 Debug.Log("Failed to load strings files due to exception:");
                 Utils.LogException(e);
             }
+        }
 
+        protected virtual void LoadPngsSafe()
+        {
             try
             {
                 ModTextures = LoadAllPngs("png");
@@ -98,12 +118,15 @@ protected ModBase()
                 Debug.Log("Failed to load PNG files due to exception:");
                 Utils.LogException(e);
             }
+        }
 
+        protected virtual void LoadObjsSafe()
+        {
             try
             {
                 ModObjects = LoadAllObjs("obj");
 
-                if(ModObjects.Count > 0)
+                if (ModObjects.Count > 0)
                 {
                     Debug.Log($"Successfully loaded {ModObjects.Count} object(s)");
                 }
@@ -113,8 +136,11 @@ protected ModBase()
                 Debug.Log("Failed to load OBJ files due to exception:");
                 Utils.LogException(e);
             }
+        }
 
-            var credits = GetCredits().Trim();
+        protected virtual void UpdateCredits()
+        {
+            var credits = GetCredits()?.Trim();
             if (!string.IsNullOrEmpty(credits))
                 ConstructorPatch.Credits[this] = credits;
         }

Modloader.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 using Mono.Cecil;
 using Planetbase;
 using PlanetbaseFramework.Cecil;
@@ -120,12 +121,21 @@ public static T LoadMod<T>(Assembly modAssembly, string modTypeName) where T : M
             try
             {
                 var modType = modAssembly.GetType(modTypeName);
-                mod = Activator.CreateInstance(modType) as T;
+                var constructor = modType.GetConstructor(Type.EmptyTypes) ??
+                                  throw new Exception(
+                                      $"The type \"{modType.FullName}\" does not have a parameterless constructor");
+
+                mod = FormatterServices.GetUninitializedObject(modType) as T;
 
                 if (mod == null)
                     throw new Exception(
                         $"The type \"{modType.FullName}\" is not convertible to \"{typeof(T).FullName}\".");
 
+                // Populate the mod's fields and call constructor
+                // This is safe to assume as non-null as the property name is checked at compile time (if mod.ModAssembly does not exist, then compilation fails)
+                modType.GetProperty(nameof(mod.ModAssembly)).SetValue(mod, modAssembly, null);
+                constructor.Invoke(mod, null);
+
                 Debug.Log($"Instantiated mod \"{mod.ModName}\" from type \"{modTypeName}\"");
             }
             catch (Exception e)