Fixed Dependency Graph Assembly Resolving

LavaGang · Sep 12, 2024 · 679d468 · 679d468
1 parent 2177062
commit 679d468
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/MelonLoader/InternalUtils/DependencyGraph.cs b/MelonLoader/InternalUtils/DependencyGraph.cs
@@ -100,6 +100,7 @@ private DependencyGraph(IList<T> melons)
                             dependencyVertex.dependents.Add(melonVertex);
                     }
                     else if (!TryLoad(dependency)
+                        && !TryResolve(dependency)
                         && !optionalDependencies.Contains(dependency.Name)
                         && !missingDependencies.Contains(dependency))
                         missingDependencies.Add(dependency);
@@ -116,6 +117,7 @@ private DependencyGraph(IList<T> melons)
                             dependencyVertex.dependents.Add(melonVertex);
                     }
                     else if (!TryLoad(dependency)
+                        && !TryResolve(dependency)
                         && !missingDependencies.Contains(dependency))
                         missingDependencies.Add(dependency);
                 }
@@ -140,6 +142,24 @@ private DependencyGraph(IList<T> melons)
 
         // Returns true if 'assembly' was already loaded or could be loaded, false if the required assembly was missing.
         private static bool TryLoad(AssemblyName assembly)
+        {
+            try
+            {
+                Assembly asm = Assembly.Load(assembly);
+                if (asm == null)
+                    return false;
+                return true;
+            }
+            catch (FileNotFoundException) { return false; }
+            catch (Exception ex)
+            {
+                MelonLogger.Error("Loading Melon Dependency Failed: " + ex);
+                return false;
+            }
+        }
+
+		// Returns true if 'assembly' was already resolved or could be resolved, false if the required assembly was missing.
+        private static bool TryResolve(AssemblyName assembly)
         {
             try
             {
@@ -155,7 +175,7 @@ private static bool TryLoad(AssemblyName assembly)
             catch (FileNotFoundException) { return false; }
             catch (Exception ex)
             {
-                MelonLogger.Error("Loading Melon Dependency Failed: " + ex);
+                MelonLogger.Error("Resolving Melon Dependency Failed: " + ex);
                 return false;
             }
         }