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.0.2</Version>
+    <Version>4.0.3</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

docs/release-notes.md

@@ -1,6 +1,14 @@
 ← [README](README.md)
 
 # Release notes
+## 4.0.3
+Released 27 March 2024 for Stardew Valley 1.6.0 or later.
+
+* For players:
+  * Updated compatibility rewrites for Stardew Valley 1.6.3.
+  * Updated mod compatibility list.
+  * Tweaked `player_add` console command's error messages for clarity.
+
 ## 4.0.2
 Released 24 March 2024 for Stardew Valley 1.6.0 or later.
 

src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs

@@ -144,7 +144,7 @@ private bool TryReadArguments(ArgumentParser args, out string? id, out string? n
             SearchableItem[] matches = this.Items.GetAll().Where(p => p.NameContains(name)).ToArray();
             if (!matches.Any())
             {
-                monitor.Log($"There's no item with name '{name}'. You can use the 'list_items [name]' command to search for items.", LogLevel.Error);
+                monitor.Log($"There's no item whose name contains '{name}'. You can use 'list_items' command to list all items, or search like 'list_items {name}'.", LogLevel.Error);
                 return null;
             }
 
@@ -159,7 +159,7 @@ private bool TryReadArguments(ArgumentParser args, out string? id, out string? n
                 header: new[] { "type", "name", "command" },
                 getRow: item => new[] { item.Type.ToString(), item.DisplayName, $"player_add {item.QualifiedItemId}" }
             );
-            monitor.Log($"There's no item with name '{name}'. Do you mean one of these?\n\n{options}", LogLevel.Info);
+            monitor.Log($"Multiple items have a name containing '{name}'. Do you mean one of these?\n\n{options}", LogLevel.Info);
             return null;
         }
 

src/SMAPI.Mods.ConsoleCommands/manifest.json

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

src/SMAPI.Mods.SaveBackup/manifest.json

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

src/SMAPI.Web/wwwroot/SMAPI.metadata.json

@@ -341,6 +341,11 @@
             "~1.2.0 | Status": "AssumeBroken",
             "~1.2.0 | StatusReasonDetails": "Harmony patches fail at runtime"
         },
+        "More Grass": {
+            "ID": "EpicBellyFlop45.MoreGrass",
+            "~1.2.1 | Status": "AssumeBroken",
+            "~1.2.1 | StatusReasonDetails": "causes runtime crashes"
+        },
         "More Multiplayer Info": {
             "ID": "cheesysteak.moremultiplayerinfo",
             "~3.0.1 | Status": "AssumeBroken",
@@ -656,38 +661,27 @@
             "~1.3.4 | Status": "AssumeBroken",
             "~1.3.4 | StatusReasonDetails": "has no effect due to changes in Stardew Valley 1.5, causes crashes in other mods like Chests Anywhere"
         },
-
         "Custom Furniture": {
             "ID": "Platonymous.CustomFurniture",
             "~0.11.2 | Status": "AssumeBroken",
             "~0.11.2 | StatusReasonDetails": "causes errors and custom furniture no longer work in Stardew Valley 1.5"
         },
-
         "Custom Localization": {
             "ID": "ZaneYork.CustomLocalization",
             "FormerIDs": "SMAPI.CustomLocalization", // changed in 1.0.1
             "~1.1 | Status": "AssumeBroken",
             "~1.1 | StatusReasonDetails": "reflection error due to renamed _localizedAssets field"
         },
-
         "Geode Info Menu": {
             "ID": "cat.geodeinfomenu",
             "~1.5.2 | Status": "AssumeBroken",
             "~1.5.2 | StatusReasonDetails": "shows no info, freezes game if you try to search"
         },
-
         "Mod Settings Tab": {
             "ID": "GilarF.ModSettingsTab",
             "~0.2.1 | Status": "AssumeBroken",
             "~0.2.1 | StatusReasonDetails": "fails extending title menu"
         },
-
-        "More Grass": {
-            "ID": "EpicBellyFlop45.MoreGrass",
-            "~1.0.8 | Status": "AssumeBroken",
-            "~1.0.8 | StatusReasonDetails": "crashes on save load"
-        },
-
         "TreeTransplant": {
             "ID": "TreeTransplant",
             "~1.0.9 | Status": "AssumeBroken",

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.0.2";
+        internal static string RawApiVersion = "4.0.3";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>

src/SMAPI/Framework/ModLoading/Rewriters/StardewValley_1_6/NpcFacade.cs

@@ -21,6 +21,12 @@ public abstract class NpcFacade : NPC, IRewriteFacade
         /*********
         ** Accessors
         *********/
+        public bool eventActor
+        {
+            get => base.EventActor;
+            set => base.EventActor = value;
+        }
+
         public new int Gender
         {
             get => (int)base.Gender;