fix local file path asset name parsing locale codes in rare cases (#766)

Mod file paths can't be localized through the content pipeline. Normally the locale would be ignored anyway due to the file extension, but it'd be incorrectly parsed if the file name ended with a locale and no file extension (like "assets/example.fr-FR").

3 files changed, 11 insertions, 11 deletions

diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
index b0064532..ae914c46 100644
--- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
@@ -107,7 +107,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <inheritdoc />
         public T Load<T>(string key, ContentSource source = ContentSource.ModFolder)
         {
-            IAssetName assetName = this.ContentCore.ParseAssetName(key);
+            IAssetName assetName = this.ContentCore.ParseAssetName(key, allowLocales: source == ContentSource.GameContent);
 
             try
             {
@@ -157,21 +157,21 @@ namespace StardewModdingAPI.Framework.ModHelpers
         public bool InvalidateCache(string key)
         {
             string actualKey = this.GetActualAssetKey(key, ContentSource.GameContent);
-            this.Monitor.Log($"Requested cache invalidation for '{actualKey}'.", LogLevel.Trace);
+            this.Monitor.Log($"Requested cache invalidation for '{actualKey}'.");
             return this.ContentCore.InvalidateCache(asset => asset.Name.IsEquivalentTo(actualKey)).Any();
         }
 
         /// <inheritdoc />
         public bool InvalidateCache<T>()
         {
-            this.Monitor.Log($"Requested cache invalidation for all assets of type {typeof(T)}. This is an expensive operation and should be avoided if possible.", LogLevel.Trace);
-            return this.ContentCore.InvalidateCache((contentManager, key, type) => typeof(T).IsAssignableFrom(type)).Any();
+            this.Monitor.Log($"Requested cache invalidation for all assets of type {typeof(T)}. This is an expensive operation and should be avoided if possible.");
+            return this.ContentCore.InvalidateCache((_, _, type) => typeof(T).IsAssignableFrom(type)).Any();
         }
 
         /// <inheritdoc />
         public bool InvalidateCache(Func<IAssetInfo, bool> predicate)
         {
-            this.Monitor.Log("Requested cache invalidation for all assets matching a predicate.", LogLevel.Trace);
+            this.Monitor.Log("Requested cache invalidation for all assets matching a predicate.");
             return this.ContentCore.InvalidateCache(predicate).Any();
         }
 
@@ -183,7 +183,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
             assetName ??= $"temp/{Guid.NewGuid():N}";
 
-            return new AssetDataForObject(this.CurrentLocale, this.ContentCore.ParseAssetName(assetName), data, this.NormalizeAssetName);
+            return new AssetDataForObject(this.CurrentLocale, this.ContentCore.ParseAssetName(assetName, allowLocales: true/* no way to know if it's a game or mod asset here*/), data, this.NormalizeAssetName);
         }
 
 
diff --git a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
index 42a4de20..0eb385d4 100644
--- a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
@@ -58,13 +58,13 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <inheritdoc />
         public IAssetName ParseAssetName(string rawName)
         {
-            return this.ContentCore.ParseAssetName(rawName);
+            return this.ContentCore.ParseAssetName(rawName, allowLocales: true);
         }
 
         /// <inheritdoc />
         public T Load<T>(string key)
         {
-            IAssetName assetName = this.ContentCore.ParseAssetName(key);
+            IAssetName assetName = this.ContentCore.ParseAssetName(key, allowLocales: true);
             return this.Load<T>(assetName);
         }
 
@@ -117,7 +117,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
             assetName ??= $"temp/{Guid.NewGuid():N}";
 
-            return new AssetDataForObject(this.CurrentLocale, this.ContentCore.ParseAssetName(assetName), data, key => this.ParseAssetName(key).Name);
+            return new AssetDataForObject(this.CurrentLocale, this.ContentCore.ParseAssetName(assetName, allowLocales: true), data, key => this.ParseAssetName(key).Name);
         }
 
         /// <summary>Get the underlying game content manager.</summary>
diff --git a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
index 45899dd7..2379583c 100644
--- a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
@@ -43,7 +43,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <inheritdoc />
         public T Load<T>(string relativePath)
         {
-            IAssetName assetName = this.ContentCore.ParseAssetName(relativePath);
+            IAssetName assetName = this.ContentCore.ParseAssetName(relativePath, allowLocales: false);
 
             try
             {
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
             relativePath ??= $"temp/{Guid.NewGuid():N}";
 
-            return new AssetDataForObject(this.ContentCore.GetLocale(), this.ContentCore.ParseAssetName(relativePath), data, key => this.ContentCore.ParseAssetName(key).Name);
+            return new AssetDataForObject(this.ContentCore.GetLocale(), this.ContentCore.ParseAssetName(relativePath, allowLocales: false), data, key => this.ContentCore.ParseAssetName(key, allowLocales: false).Name);
         }
     }
 }