Merge branch 'develop' into stable

2 files changed, 19 insertions, 4 deletions

diff --git a/src/SMAPI/Framework/ModLoading/ModFailReason.cs b/src/SMAPI/Framework/ModLoading/ModFailReason.cs
index cd4623e7..cfb76a33 100644
--- a/src/SMAPI/Framework/ModLoading/ModFailReason.cs
+++ b/src/SMAPI/Framework/ModLoading/ModFailReason.cs
@@ -9,6 +9,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Multiple copies of the mod are installed.</summary>
         Duplicate,
 
+        /// <summary>The folder is empty or contains only ignored files.</summary>
+        EmptyFolder,
+
         /// <summary>The mod has incompatible code instructions, needs a newer SMAPI version, or is marked 'assume broken' in the SMAPI metadata list.</summary>
         Incompatible,
 
@@ -22,6 +25,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         MissingDependencies,
 
         /// <summary>The mod is marked obsolete in the SMAPI metadata list.</summary>
-        Obsolete
+        Obsolete,
+
+        /// <summary>The folder is an XNB mod, which can't be loaded through SMAPI.</summary>
+        XnbMod
     }
 }
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index c5648c74..fe56f4d2 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -48,7 +48,16 @@ namespace StardewModdingAPI.Framework.ModLoading
                 if (shouldIgnore)
                     metadata.SetStatus(status, ModFailReason.DisabledByDotConvention, "disabled by dot convention");
                 else if (status == ModMetadataStatus.Failed)
-                    metadata.SetStatus(status, ModFailReason.InvalidManifest, folder.ManifestParseErrorText);
+                {
+                    ModFailReason reason = folder.ManifestParseError switch
+                    {
+                        ModParseError.EmptyFolder or ModParseError.EmptyVortexFolder => ModFailReason.EmptyFolder,
+                        ModParseError.XnbMod => ModFailReason.XnbMod,
+                        _ => ModFailReason.InvalidManifest
+                    };
+
+                    metadata.SetStatus(status, reason, folder.ManifestParseErrorText);
+                }
 
                 yield return metadata;
             }
@@ -218,12 +227,12 @@ namespace StardewModdingAPI.Framework.ModLoading
             {
                 var duplicatesByID = mods
                     .GroupBy(mod => mod.Manifest?.UniqueID?.Trim(), mod => mod, StringComparer.OrdinalIgnoreCase)
-                    .Where(p => p.Count() > 1);
+                    .Where(p => !string.IsNullOrEmpty(p.Key) && p.Count() > 1);
                 foreach (var group in duplicatesByID)
                 {
                     foreach (IModMetadata mod in group)
                     {
-                        if (mod.Status == ModMetadataStatus.Failed && mod.FailReason != ModFailReason.InvalidManifest)
+                        if (mod.Status == ModMetadataStatus.Failed && mod.FailReason is not (ModFailReason.InvalidManifest or ModFailReason.LoadFailed or ModFailReason.MissingDependencies))
                             continue;
 
                         string folderList = string.Join(", ", group.Select(p => p.GetRelativePathWithRoot()).OrderBy(p => p));