From 074f730329659d0db4be3a99fa8e5c09383ca3e6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 27 Sep 2018 00:36:31 -0400
Subject: [PATCH] add separate error when player puts an XNB mod in Mods

---
 docs/release-notes.md                           |  1 +
 .../Framework/ModScanning/ModScanner.cs         | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3fea347e..12886019 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@
   * Moved most SMAPI files into a `smapi-internal` subfolder.
   * Moved save backups into a `save-backups` subfolder (instead of `Mods/SaveBackup/backups`). Note that previous backups will be deleted when you update.
   * Update checks now work even when the mod has no update keys in most cases.
+  * Improved error when you put an XNB mod in `Mods`.
   * Fixed error when mods add an invalid location with no name.
   * Fixed compatibility issues for some Linux players. SMAPI will now always use xterm if it's available.
   * Fixed some game install paths not detected on Windows.
diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index 7512d5cb..2c23a3ce 100644
--- a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -24,6 +24,15 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             "Thumbs.db"
         };
 
+        /// <summary>The extensions for files which an XNB mod may contain. If a mod contains *only* these file extensions, it should be considered an XNB mod.</summary>
+        private readonly HashSet<string> PotentialXnbModExtensions = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase)
+        {
+            ".md",
+            ".png",
+            ".txt",
+            ".xnb"
+        };
+
 
         /*********
         ** Public methods
@@ -50,11 +59,15 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         {
             // find manifest.json
             FileInfo manifestFile = this.FindManifest(searchFolder);
+
+            // set appropriate invalid-mod error
             if (manifestFile == null)
             {
-                bool isEmpty = !searchFolder.GetFileSystemInfos().Where(this.IsRelevant).Any();
-                if (isEmpty)
+                FileInfo[] files = searchFolder.GetFiles("*", SearchOption.AllDirectories).Where(this.IsRelevant).ToArray();
+                if (!files.Any())
                     return new ModFolder(root, searchFolder, null, "it's an empty folder.");
+                if (files.All(file => this.PotentialXnbModExtensions.Contains(file.Extension)))
+                    return new ModFolder(root, searchFolder, null, "it's an older XNB mod which replaces game files (not run through SMAPI).");
                 return new ModFolder(root, searchFolder, null, "it contains files, but none of them are manifest.json.");
             }