Merge pull request #10 from puppy-girl/main

Remove invalid mods from loaded mods
NotNite · Nov 1, 2024 · 5ed074a · 5ed074a
2 parents 397234f + c4c441c
commit 5ed074a
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/GDWeave/Loader/ModLoader.cs b/GDWeave/Loader/ModLoader.cs
@@ -51,6 +51,16 @@ private void Register() {
                                    : null
                 };
 
+                if (loadedMod.AssemblyPath != null && !File.Exists(loadedMod.AssemblyPath)) {
+                    this.logger.Warning("Assembly at {AssemblyPath} does not exist", loadedMod.AssemblyPath);
+                    continue;
+                }
+
+                if (loadedMod.PackPath != null && !File.Exists(loadedMod.PackPath)) {
+                    this.logger.Warning("Pack file at {PackPath} does not exist", loadedMod.PackPath);
+                    continue;
+                }
+
                 this.LoadedMods.Add(loadedMod);
             } catch (Exception e) {
                 this.logger.Warning(e, "Failed to load mod at {ModDir}", modDir);
@@ -97,6 +107,8 @@ private void Sort() {
     }
 
     private void LoadAssemblies() {
+        var invalidMods = new List<LoadedMod>();
+
         foreach (var loadedMod in this.LoadedMods) {
             if (loadedMod.AssemblyPath is not { } assemblyPath) continue;
 
@@ -107,8 +119,13 @@ private void LoadAssemblies() {
                 loadedMod.AssemblyMod = assemblyMod;
             } catch (Exception e) {
                 this.logger.Warning(e, "Failed to load assembly for mod {ModId}", loadedMod.Manifest.Id);
+                invalidMods.Add(loadedMod);
             }
         }
+
+        foreach (var invalidMod in invalidMods) {
+            this.LoadedMods.Remove(invalidMod);
+        }
     }
 
     private IMod? LoadAssembly(string id, string assemblyPath) {