From 037d7e357b169936fa858f6c8b9c1388ca75840b Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 9 Oct 2022 17:39:11 -0400
Subject: set texture name earlier to support mods like SpriteMaster

---
 src/SMAPI/Framework/ContentManagers/BaseContentManager.cs | 2 +-
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index 54f8e2a2..1e9f4ffe 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -336,7 +336,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         {
             // track asset key
             if (value is Texture2D texture)
-                texture.Name = assetName.Name;
+                texture.SetName(assetName);
 
             // save to cache
             // Note: even if the asset was loaded and cached right before this method was called,
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 72dcf6e1..30dd4215 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -232,7 +232,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     return (T)raw;
                 else
                 {
-                    Texture2D texture = new(Game1.graphics.GraphicsDevice, raw.Width, raw.Height);
+                    Texture2D texture = new Texture2D(Game1.graphics.GraphicsDevice, raw.Width, raw.Height).SetName(assetName);
                     texture.SetData(raw.Data);
                     return (T)(object)texture;
                 }
@@ -240,7 +240,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             else
             {
                 using FileStream stream = File.OpenRead(file.FullName);
-                Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream);
+                Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream).SetName(assetName);
                 this.PremultiplyTransparency(texture);
                 return (T)(object)texture;
             }
-- 
cgit