From c74702b027aeab927b4e038e440cbbb24d859cfd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 20 Jul 2021 22:18:57 -0400
Subject: fix error loading .xnb files from the local mod folder since SMAPI
 3.0

---
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/ContentManagers')

diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 4f6aa775..bc5a8b74 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -77,6 +77,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <inheritdoc />
         public override T Load<T>(string assetName, LanguageCode language, bool useCache)
         {
+            // normalize key
+            bool isXnbFile = Path.GetExtension(assetName).ToLower() == ".xnb";
             assetName = this.AssertAndNormalizeAssetName(assetName);
 
             // disable caching
@@ -108,7 +110,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             try
             {
                 // get file
-                FileInfo file = this.GetModFile(assetName);
+                FileInfo file = this.GetModFile(isXnbFile ? $"{assetName}.xnb" : assetName); // .xnb extension is stripped from asset names passed to the content manager
                 if (!file.Exists)
                     throw GetContentError("the specified path doesn't exist.");
 
-- 
cgit