Merge branch 'develop' into stable

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

docs/release-notes.md

@@ -1,6 +1,15 @@
 ← [README](README.md)
 
 # Release notes
+# 4.0.1
+Released 20 March 2024 for Stardew Valley 1.6.0 or later.
+
+* For players:
+  * Fixed error in some cases when rewritten mod code removes items from an inventory.
+
+* For the web UI:
+  * Added CurseForge download link to main page for cases where Nexus is unavailable.
+
 ## 4.0.0
 Released 19 March 2024 for Stardew Valley 1.6.0 or later. See [release highlights](https://www.patreon.com/posts/100388693).
 

src/SMAPI.Mods.ConsoleCommands/manifest.json

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

src/SMAPI.Mods.SaveBackup/manifest.json

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

src/SMAPI.Web/Views/Index/Index.cshtml

@@ -27,7 +27,8 @@
         <a href="@Model!.StableVersion.DownloadUrl" class="main-cta download">Download SMAPI @Model.StableVersion.Version</a><br />
         <div class="dropdown-content">
             <a href="https://www.nexusmods.com/stardewvalley/mods/2400"><img src="Content/images/nexus-icon.png" /> Download from Nexus</a>
-            <a href="@Model.StableVersion.DownloadUrl"><img src="Content/images/direct-download-icon.png" /> Direct download</a>
+            <a href="https://www.curseforge.com/stardewvalley/utility/smapi"><img src="Content/images/curseforge-icon.png" /> Download from CurseForge</a>
+            <a href="@Model.StableVersion.DownloadUrl"><img src="Content/images/github-logo.png" /> Download from GitHub</a>
         </div>
     </div>
     <div><a href="https://stardewvalleywiki.com/Modding:Player_Guide" class="secondary-cta">Player guide</a></div>

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

src/SMAPI/Framework/ModLoading/Rewriters/StardewValley_1_6/Internal/InventoryToNetObjectList.cs

@@ -85,8 +85,14 @@ public override void RemoveAt(int index)
         /// <param name="after">The new value.</param>
         private void OnInventorySlotChanged(Inventory inventory, int index, Item before, Item after)
         {
-            // don't use `this` to avoid re-editing the inventory
-            base[index] = after;
+            try
+            {
+                base[index] = after;
+            }
+            catch
+            {
+                this.RebuildList(); // if the item list is out of sync, rebuild it
+            }
         }
 
         /// <summary>Handle the underlying inventory getting replaced with a new list.</summary>