StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #901 from atravita-mods/develop 

Avoid resolving empty folders
This commit is contained in:
Jesse Plamondon-Willard 2023-04-02 15:39:46 -04:00
parent 45903dbf3e c12e9d788e
commit d13046edb6
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SMAPI/Framework/ModLoading/ModResolver.cs
View File

@ -180,7 +180,10 @@ namespace StardewModdingAPI.Framework.ModLoading
return mods return mods
.OrderBy(mod => .OrderBy(mod =>
{ {
string id = mod.Manifest.UniqueID; string? id = mod.Manifest?.UniqueID;
if (id is null)
return 0;
if (modIdsToLoadEarly.TryGetValue(id, out string? actualId)) if (modIdsToLoadEarly.TryGetValue(id, out string? actualId))
return -int.MaxValue + Array.IndexOf(earlyArray, actualId); return -int.MaxValue + Array.IndexOf(earlyArray, actualId);

2
src/SMAPI/Framework/SCore.cs
View File

@ -433,7 +433,7 @@ namespace StardewModdingAPI.Framework
// apply load order customizations // apply load order customizations
if (this.Settings.ModsToLoadEarly.Any() || this.Settings.ModsToLoadLate.Any()) if (this.Settings.ModsToLoadEarly.Any() || this.Settings.ModsToLoadLate.Any())
{ {
HashSet<string> installedIds = new HashSet<string>(mods.Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase); HashSet<string> installedIds = new HashSet<string>(mods.Where(p => p.FailReason is null).Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase);
string[] missingEarlyMods = this.Settings.ModsToLoadEarly.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray(); string[] missingEarlyMods = this.Settings.ModsToLoadEarly.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();
string[] missingLateMods = this.Settings.ModsToLoadLate.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray(); string[] missingLateMods = this.Settings.ModsToLoadLate.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();