Merge branch 'develop' into stable

Author: Pathoschild

build/common.targets

@@ -7,7 +7,7 @@ repo. It imports the other MSBuild files as needed.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--set general build properties -->
-    <Version>4.2.0</Version>
+    <Version>4.2.1</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

docs/release-notes.md

@@ -1,6 +1,16 @@
 ← [README](README.md)
 
 # Release notes
+## Upcoming release
+Released 25 March 2025 for Stardew Valley 1.6.14 or later.
+
+* For players:
+  * Fixed crash when some mods' custom tiles are on-screen.
+
+* For mod authors:
+  * Reverted the fix for the game's `Data/ChairTiles` logic not handling unique string IDs like `Maps/Author.ModName` correctly.  
+    _The fix caused crashes loading map tiles in some cases. This will be fixed in the next game update instead._
+
 ## 4.2.0
 Released 24 March 2025 for Stardew Valley 1.6.14 or later. See [release highlights](https://www.patreon.com/posts/125017679).
 
@@ -13,7 +23,8 @@ Released 24 March 2025 for Stardew Valley 1.6.14 or later. See [release highligh
 * For mod authors:
   * Mod events are now raised on the shipping menu (except when it's actually saving).
   * Added translation API methods to query translation keys (`ContainsKey` and `GetKeys`).
-  * Fixed the game's `Data/ChairTiles` logic not handling unique string IDs like `Maps/Author.ModName` correctly.
+  * ~~Fixed the game's `Data/ChairTiles` logic not handling unique string IDs like `Maps/Author.ModName` correctly.~~  
+    _Reverted in 4.2.1._
   * Fixed exception thrown if `modRegistry.GetApi<T>` can't proxy the API to the given interface. It now logs an error and returns null as intended.
 
 * For external tools:

src/SMAPI.Mods.ConsoleCommands/manifest.json

@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "4.2.0",
+    "Version": "4.2.1",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueId": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "4.2.0"
+    "MinimumApiVersion": "4.2.1"
 }

src/SMAPI.Mods.SaveBackup/manifest.json

@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "4.2.0",
+    "Version": "4.2.1",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueId": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "4.2.0"
+    "MinimumApiVersion": "4.2.1"
 }

src/SMAPI.Web/wwwroot/schemas/content-patcher.json

@@ -14,9 +14,9 @@
             "title": "Format version",
             "description": "The format version. You should always use the latest version to enable the latest features, avoid obsolete behavior, and reduce load times.",
             "type": "string",
-            "pattern": "^2\\.5\\.[0-9]+$",
+            "pattern": "^2\\.6\\.[0-9]+$",
             "@errorMessages": {
-                "pattern": "Incorrect value '@value'. You should always use the latest format version (currently 2.5.0) to enable the latest features, avoid obsolete behavior, and reduce load times."
+                "pattern": "Incorrect value '@value'. You should always use the latest format version (currently 2.6.0) to enable the latest features, avoid obsolete behavior, and reduce load times."
             }
         },
         "ConfigSchema": {
@@ -355,7 +355,19 @@
                             "type": "string",
                             "pattern": " *-?\\d+ -?\\d+ [A-Za-z0-9_\\.]+ -?\\d+ -?\\d+ *$",
                             "@errorMessages": {
-                                "pattern": "Each warp must match the exact format recognized by the game's Warp map property (i.e. 'fromX fromY targetMap targetX targetY', like '10 10 Town 0 30'."
+                                "pattern": "Each warp must match the exact format recognized by the game's Warp map property (i.e. 'fromX fromY targetMap targetX targetY', like '10 10 Town 0 30')."
+                            }
+                        }
+                    },
+                    "AddNpcWarps": {
+                        "title": "Add NPC-only warps",
+                        "description": "The NPC-only warp values to add to the location, in the format recognized by the game's NPCWarp map property.",
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "pattern": " *-?\\d+ -?\\d+ [A-Za-z0-9_\\.]+ -?\\d+ -?\\d+ *$",
+                            "@errorMessages": {
+                                "pattern": "Each warp must match the exact format recognized by the game's NPCWarp map property (i.e. 'fromX fromY targetMap targetX targetY', like '10 10 Town 0 30')."
                             }
                         }
                     },
@@ -560,6 +572,7 @@
                                     "When",
 
                                     "AddWarps",
+                                    "AddNPCWarps",
                                     "FromArea",
                                     "MapProperties",
                                     "MapTiles",

src/SMAPI/Constants.cs

@@ -49,7 +49,7 @@ internal static class EarlyConstants
     internal static int? LogScreenId { get; set; }
 
     /// <summary>SMAPI's current raw semantic version.</summary>
-    internal static string RawApiVersion = "4.2.0";
+    internal static string RawApiVersion = "4.2.1";
 }
 
 /// <summary>Contains SMAPI's constants and assumptions.</summary>

src/SMAPI/Framework/ContentManagers/ModContentManager.cs

@@ -419,21 +419,15 @@ private void FixTilesheetPaths(Map map, string relativeMapPath, bool fixEagerPat
             // load best match
             try
             {
-                if (!this.TryGetTilesheetAssetName(relativeMapFolder, imageSource, out IAssetName? assetName, out bool isInternalAssetKey, out string? error))
+                if (!this.TryGetTilesheetAssetName(relativeMapFolder, imageSource, out IAssetName? assetName, out string? error))
                     throw new SContentLoadException(ContentLoadErrorType.InvalidData, $"{errorPrefix} {error}");
 
                 if (assetName is not null)
                 {
-                    // Some game code is hardcoded to expect a file extension, which results in issues like the
-                    // `Data/ChairTiles` key for `Author.ModName_Tilesheet` being `Author`.
-                    string newImageSource = !isInternalAssetKey && Path.GetExtension(assetName.Name).ToLowerInvariant() is not (".xnb" or ".png")
-                        ? assetName.Name + ".xnb"
-                        : assetName.Name;
-
-                    // set path
-                    if (this.Monitor.IsVerbose && PathUtilities.NormalizeAssetName(tilesheet.ImageSource) != PathUtilities.NormalizePath(newImageSource))
+                    if (!assetName.IsEquivalentTo(tilesheet.ImageSource))
                         this.Monitor.VerboseLog($"   Mapped tilesheet '{tilesheet.ImageSource}' to '{assetName}'.");
-                    tilesheet.ImageSource = newImageSource;
+
+                    tilesheet.ImageSource = assetName.Name;
                 }
             }
             catch (Exception ex)
@@ -450,19 +444,17 @@ private void FixTilesheetPaths(Map map, string relativeMapPath, bool fixEagerPat
     /// <param name="modRelativeMapFolder">The folder path containing the map, relative to the mod folder.</param>
     /// <param name="relativePath">The tilesheet path to load.</param>
     /// <param name="assetName">The found asset name.</param>
-    /// <param name="isInternalAssetKey">Whether the <paramref name="assetName"/> is an internal asset key which points to a file in the mod folder, rather than an asset name in the game's normal content pipeline.</param>
     /// <param name="error">A message indicating why the file couldn't be loaded.</param>
     /// <returns>Returns whether the asset name was found.</returns>
     /// <remarks>See remarks on <see cref="FixTilesheetPaths"/>.</remarks>
-    private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relativePath, out IAssetName? assetName, out bool isInternalAssetKey, out string? error)
+    private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relativePath, out IAssetName? assetName, out string? error)
     {
         error = null;
 
         // nothing to do
         if (string.IsNullOrWhiteSpace(relativePath))
         {
             assetName = null;
-            isInternalAssetKey = false;
             return true;
         }
 
@@ -481,7 +473,6 @@ private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relati
             if (this.GetModFile<Texture2D>(localKey).Exists)
             {
                 assetName = this.GetInternalAssetKey(localKey);
-                isInternalAssetKey = true;
                 return true;
             }
         }
@@ -492,7 +483,6 @@ private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relati
         {
             this.GameContentManager.LoadLocalized<Texture2D>(contentKey, this.GameContentManager.Language, useCache: true); // no need to bypass cache here, since we're not storing the asset
             assetName = contentKey;
-            isInternalAssetKey = false;
             return true;
         }
         catch
@@ -510,7 +500,6 @@ private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relati
 
         // not found
         assetName = null;
-        isInternalAssetKey = false;
         error = "The tilesheet couldn't be found relative to either the map file or the game's content folder.";
         return false;
     }