From 6d46d0563243496a0a930d93f94944aa911f399f Mon Sep 17 00:00:00 2001 From: Chipseq Date: Sat, 8 Feb 2025 14:41:03 +0100 Subject: [PATCH] fixed null error when a mod had no dependencies --- Dropship/Data/mods.json | 7 +++---- Dropship/DataManager.cs | 17 ++++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dropship/Data/mods.json b/Dropship/Data/mods.json index 89e106c..1d209b8 100644 --- a/Dropship/Data/mods.json +++ b/Dropship/Data/mods.json @@ -12,7 +12,9 @@ "Name" : "Mira API", "Author" : "All-Of-Us-Mods", "Releases" : "https://api.github.com/repos/All-Of-Us-Mods/MiraAPI/releases", - "Dependencies" : {}, + "Dependencies" : { + "Reactor" : "2.3.1" + }, "Versioning" : {} }, @@ -29,14 +31,12 @@ "Name" : "Submerged", "Author" : "SubmergedAmongUs", "Releases" : "https://api.github.com/repos/SubmergedAmongUs/Submerged/releases", - "Dependencies" : {}, "Versioning" : {} }, "BetterPolus" : { "Name" : "Better Polus", "Author" : "Brybry16", "Releases" : "https://api.github.com/repos/Brybry16/BetterPolus/releases", - "Dependencies" : {}, "Versioning" : {} }, @@ -53,7 +53,6 @@ "Name" : "AUnlocker", "Author" : "astra1dev", "Releases" : "https://api.github.com/repos/astra1dev/AUnlocker/releases", - "Dependencies" : {}, "Versioning" : {} }, diff --git a/Dropship/DataManager.cs b/Dropship/DataManager.cs index 22f1494..9ca3177 100644 --- a/Dropship/DataManager.cs +++ b/Dropship/DataManager.cs @@ -242,19 +242,22 @@ public static async Task DownloadMod(string modName, string version, bool contentStream.Close(); // Check for dependencies - if (mod.Dependencies.Count > 0 && !dependency) + if (mod.Dependencies != null && !dependency) { Console.WriteLine("\nChecking for dependencies..."); - - foreach (var d in mod.Dependencies) + if (mod.Dependencies.Count > 0) { - if (!IsModDownloaded(d.Value, d.Key)) + + foreach (var d in mod.Dependencies) { - await DownloadMod(d.Key, d.Value, true); + if (!IsModDownloaded(d.Value, d.Key)) + { + await DownloadMod(d.Key, d.Value, true); + } } - } - Console.WriteLine("\nAll dependencies installed"); + Console.WriteLine("\nAll dependencies installed"); + } } if (!dependency)