fix private assets from content packs not having tracking info

2 files changed, 19 insertions, 12 deletions

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 690c6442..6f06d3d2 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -11,6 +11,7 @@
 * For modders:
   * Added asset propagation for grass textures.
   * `helper.Read/WriteSaveData` can now be used while a save is being loaded (e.g. within a `Specialized.LoadStageChanged` event).
+  * Fixed private textures loaded from content packs not having their `Name` field set.
 
 * For the web UI:
   * If a JSON validator upload can't be saved to Pastebin (e.g. due to rate limits), it's now uploaded to Amazon S3 instead. Files uploaded to S3 expire after one month.
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 90b86179..fdf76b24 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -105,6 +105,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
 
             // get local asset
             SContentLoadException GetContentError(string reasonPhrase) => new SContentLoadException($"Failed loading asset '{assetName}' from {this.Name}: {reasonPhrase}");
+            T asset;
             try
             {
                 // get file
@@ -118,22 +119,22 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     // XNB file
                     case ".xnb":
                         {
-                            T data = this.RawLoad<T>(assetName, useCache: false);
-                            if (data is Map map)
+                            asset = this.RawLoad<T>(assetName, useCache: false);
+                            if (asset is Map map)
                             {
                                 this.NormalizeTilesheetPaths(map);
                                 this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
                             }
-                            return data;
                         }
+                        break;
 
                     // unpacked data
                     case ".json":
                         {
-                            if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out T data))
+                            if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out asset))
                                 throw GetContentError("the JSON file is invalid."); // should never happen since we check for file existence above
-                            return data;
                         }
+                        break;
 
                     // unpacked image
                     case ".png":
@@ -143,13 +144,13 @@ namespace StardewModdingAPI.Framework.ContentManagers
                                 throw GetContentError($"can't read file with extension '{file.Extension}' as type '{typeof(T)}'; must be type '{typeof(Texture2D)}'.");
 
                             // fetch & cache
-                            using (FileStream stream = File.OpenRead(file.FullName))
-                            {
-                                Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream);
-                                texture = this.PremultiplyTransparency(texture);
-                                return (T)(object)texture;
-                            }
+                            using FileStream stream = File.OpenRead(file.FullName);
+
+                            Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream);
+                            texture = this.PremultiplyTransparency(texture);
+                            asset = (T)(object)texture;
                         }
+                        break;
 
                     // unpacked map
                     case ".tbin":
@@ -163,8 +164,9 @@ namespace StardewModdingAPI.Framework.ContentManagers
                             Map map = formatManager.LoadMap(file.FullName);
                             this.NormalizeTilesheetPaths(map);
                             this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
-                            return (T)(object)map;
+                            asset = (T)(object)map;
                         }
+                        break;
 
                     default:
                         throw GetContentError($"unknown file extension '{file.Extension}'; must be one of '.json', '.png', '.tbin', or '.xnb'.");
@@ -176,6 +178,10 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     throw GetContentError("couldn't find libgdiplus, which is needed to load mod images. Make sure Mono is installed and you're running the game through the normal launcher.");
                 throw new SContentLoadException($"The content manager failed loading content asset '{assetName}' from {this.Name}.", ex);
             }
+
+            // track & return asset
+            this.TrackAsset(assetName, asset, language, useCache);
+            return asset;
         }
 
         /// <summary>Create a new content manager for temporary use.</summary>