Loose fix for embedded dependences

javisar · Jan 26, 2019 · bc4700b · bc4700b
1 parent 9886411
commit bc4700b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/Managed/ModLoader.dll b/Managed/ModLoader.dll
diff --git a/Source/ModLoader/ModLoader.cs b/Source/ModLoader/ModLoader.cs
@@ -82,31 +82,38 @@ private static List<Assembly> CheckForDependences(List<Assembly> modAssemblies)
 
                 try
                 {
-                    ModLogger.WriteLine("Loading: " + modAssembly.FullName);
-
+                    ModLogger.WriteLine("\tChecking " + modAssembly.FullName);
+                    
                     bool correct = true;
                     foreach (AssemblyName referenced in modAssembly.GetReferencedAssemblies())
                     {
-                        ModLogger.WriteLine("\t" + referenced.FullName);
+                        ModLogger.WriteLine("\t\t" + referenced.FullName);
                         try
                         {
                             Assembly dependence = Assembly.ReflectionOnlyLoad(referenced.FullName);
                             if (dependence == null)
                             {
                                 correct = false;
                                 ModLogger.Error.WriteLine("\tCannot find dependence: " + referenced.FullName);
+
                                 continue;
+
                             }
-
                         }
                         catch (Exception ex)
                         {
-                            correct = false;
-                            ModLogger.Error.WriteLine("\tCannot find dependence: " + referenced.FullName);
-                            ModLogger.Error.WriteLine(ex);
-                            continue;
+                            ModLogger.WriteLine("\t\t\tChecking embedded dependences:");
+                            correct = CheckForEmbeddedDependence(referenced.Name, modAssembly);
+                            if (!correct)
+                            {
+                                ModLogger.Error.WriteLine("\tCannot find dependence: " + referenced.FullName);
+                                ModLogger.Error.WriteLine(ex);
+                                continue;
+                            }
+
                         }
                     }
+
                     if (correct)
                     {                        
                         loadableMods.Add(modAssembly);
@@ -127,6 +134,19 @@ private static List<Assembly> CheckForDependences(List<Assembly> modAssemblies)
             return loadableMods;
         }
 
+        private static bool CheckForEmbeddedDependence(string name, Assembly modAssembly)
+        {
+            // Load embedded resources to check inner dependences
+            string[] resources = modAssembly.GetManifestResourceNames();
+            foreach (string resource in resources)
+            {
+                ModLogger.WriteLine("\t\t\t" + resource);
+                if (resource.Contains(name))
+                    return true;               
+            }
+            return false;
+        }
+
         private static List<Assembly> ApplyHarmonyPatches([NotNull] List<Assembly> modAssemblies)
         {
             ModLogger.WriteLine("Applying Harmony patches");