Merge branch 'develop' into stable

15 files changed, 327 insertions, 86 deletions

diff --git a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
index 3db3856f..665c019b 100644
--- a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
@@ -414,7 +414,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
 
                         int loadedIndex = this.TryFindTilesheet(loadedMap, vanillaSheet.Id);
                         string reason = loadedIndex != -1
-                            ? $"mod reordered the original tilesheets, which {(isFarmMap ? "would cause a crash" : "often causes crashes")}.\nTechnical details for mod author: Expected order: {string.Join(", ", vanillaTilesheetRefs.Select(p => p.Id))}. See https://stardewcommunitywiki.com/Modding:Maps#Tilesheet_order for help."
+                            ? $"mod reordered the original tilesheets, which {(isFarmMap ? "would cause a crash" : "often causes crashes")}.\nTechnical details for mod author: Expected order: {string.Join(", ", vanillaTilesheetRefs.Select(p => p.Id))}. See https://stardewvalleywiki.com/Modding:Maps#Tilesheet_order for help."
                             : $"mod has no tilesheet with ID '{vanillaSheet.Id}'. Map replacements must keep the original tilesheets to avoid errors or crashes.";
 
                         SCore.DeprecationManager.PlaceholderWarn("3.8.2", DeprecationLevel.PendingRemoval);
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 753ec188..1456d3c1 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -127,7 +127,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                             if (asset is Map map)
                             {
                                 map.assetPath = assetName;
-                                this.FixTilesheetPaths(map, relativeMapPath: assetName);
+                                this.FixTilesheetPaths(map, relativeMapPath: assetName, fixEagerPathPrefixes: true);
                             }
                         }
                         break;
@@ -168,7 +168,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                             FormatManager formatManager = FormatManager.Instance;
                             Map map = formatManager.LoadMap(file.FullName);
                             map.assetPath = assetName;
-                            this.FixTilesheetPaths(map, relativeMapPath: assetName);
+                            this.FixTilesheetPaths(map, relativeMapPath: assetName, fixEagerPathPrefixes: false);
                             asset = (T)(object)map;
                         }
                         break;
@@ -260,8 +260,9 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <summary>Fix custom map tilesheet paths so they can be found by the content manager.</summary>
         /// <param name="map">The map whose tilesheets to fix.</param>
         /// <param name="relativeMapPath">The relative map path within the mod folder.</param>
+        /// <param name="fixEagerPathPrefixes">Whether to undo the game's eager tilesheet path prefixing for maps loaded from an <c>.xnb</c> file, which incorrectly prefixes tilesheet paths with the map's local asset key folder.</param>
         /// <exception cref="ContentLoadException">A map tilesheet couldn't be resolved.</exception>
-        private void FixTilesheetPaths(Map map, string relativeMapPath)
+        private void FixTilesheetPaths(Map map, string relativeMapPath, bool fixEagerPathPrefixes)
         {
             // get map info
             relativeMapPath = this.AssertAndNormalizeAssetName(relativeMapPath); // Mono's Path.GetDirectoryName doesn't handle Windows dir separators
@@ -270,12 +271,16 @@ namespace StardewModdingAPI.Framework.ContentManagers
             // fix tilesheets
             foreach (TileSheet tilesheet in map.TileSheets)
             {
+                // get image source
                 tilesheet.ImageSource = this.NormalizePathSeparators(tilesheet.ImageSource);
-
                 string imageSource = tilesheet.ImageSource;
-                string errorPrefix = $"{this.ModName} loaded map '{relativeMapPath}' with invalid tilesheet path '{imageSource}'.";
+
+                // reverse incorrect eager tilesheet path prefixing
+                if (fixEagerPathPrefixes && relativeMapFolder.Length > 0 && imageSource.StartsWith(relativeMapFolder))
+                    imageSource = imageSource.Substring(relativeMapFolder.Length + 1);
 
                 // validate tilesheet path
+                string errorPrefix = $"{this.ModName} loaded map '{relativeMapPath}' with invalid tilesheet path '{imageSource}'.";
                 if (Path.IsPathRooted(imageSource) || PathUtilities.GetSegments(imageSource).Contains(".."))
                     throw new SContentLoadException($"{errorPrefix} Tilesheet paths must be a relative path without directory climbing (../).");
 
diff --git a/src/SMAPI/Framework/Events/EventManager.cs b/src/SMAPI/Framework/Events/EventManager.cs
index 665dbfe3..f4abfffe 100644
--- a/src/SMAPI/Framework/Events/EventManager.cs
+++ b/src/SMAPI/Framework/Events/EventManager.cs
@@ -93,6 +93,9 @@ namespace StardewModdingAPI.Framework.Events
         /****
         ** Input
         ****/
+        /// <summary>Raised after the player presses or releases any buttons on the keyboard, controller, or mouse.</summary>
+        public readonly ManagedEvent<ButtonsChangedEventArgs> ButtonsChanged;
+
         /// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
         public readonly ManagedEvent<ButtonPressedEventArgs> ButtonPressed;
 
@@ -212,6 +215,7 @@ namespace StardewModdingAPI.Framework.Events
             this.TimeChanged = ManageEventOf<TimeChangedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.TimeChanged));
             this.ReturnedToTitle = ManageEventOf<ReturnedToTitleEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.ReturnedToTitle));
 
+            this.ButtonsChanged = ManageEventOf<ButtonsChangedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonsChanged));
             this.ButtonPressed = ManageEventOf<ButtonPressedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonPressed));
             this.ButtonReleased = ManageEventOf<ButtonReleasedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonReleased));
             this.CursorMoved = ManageEventOf<CursorMovedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.CursorMoved), isPerformanceCritical: true);
diff --git a/src/SMAPI/Framework/Events/ModInputEvents.cs b/src/SMAPI/Framework/Events/ModInputEvents.cs
index ab26ab3e..6f423e5d 100644
--- a/src/SMAPI/Framework/Events/ModInputEvents.cs
+++ b/src/SMAPI/Framework/Events/ModInputEvents.cs
@@ -9,6 +9,13 @@ namespace StardewModdingAPI.Framework.Events
         /*********
         ** Accessors
         *********/
+        /// <summary>Raised after the player presses or releases any buttons on the keyboard, controller, or mouse.</summary>
+        public event EventHandler<ButtonsChangedEventArgs> ButtonsChanged
+        {
+            add => this.EventManager.ButtonsChanged.Add(value, this.Mod);
+            remove => this.EventManager.ButtonsChanged.Remove(value);
+        }
+
         /// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
         public event EventHandler<ButtonPressedEventArgs> ButtonPressed
         {
diff --git a/src/SMAPI/Framework/Logging/LogManager.cs b/src/SMAPI/Framework/Logging/LogManager.cs
index e504218b..ff00cff7 100644
--- a/src/SMAPI/Framework/Logging/LogManager.cs
+++ b/src/SMAPI/Framework/Logging/LogManager.cs
@@ -208,7 +208,7 @@ namespace StardewModdingAPI.Framework.Logging
             // show update alert
             if (File.Exists(Constants.UpdateMarker))
             {
-                string[] rawUpdateFound = File.ReadAllText(Constants.UpdateMarker).Split(new [] { '|' }, 2);
+                string[] rawUpdateFound = File.ReadAllText(Constants.UpdateMarker).Split(new[] { '|' }, 2);
                 if (SemanticVersion.TryParse(rawUpdateFound[0], out ISemanticVersion updateFound))
                 {
                     if (Constants.ApiVersion.IsPrerelease() && updateFound.IsNewerThan(Constants.ApiVersion))
@@ -286,12 +286,15 @@ namespace StardewModdingAPI.Framework.Logging
         /// <summary>Log details for settings that don't match the default.</summary>
         /// <param name="isDeveloperMode">Whether to enable full console output for developers.</param>
         /// <param name="checkForUpdates">Whether to check for newer versions of SMAPI and mods on startup.</param>
-        public void LogSettingsHeader(bool isDeveloperMode, bool checkForUpdates)
+        /// <param name="rewriteMods">Whether to rewrite mods for compatibility.</param>
+        public void LogSettingsHeader(bool isDeveloperMode, bool checkForUpdates, bool rewriteMods)
         {
             if (isDeveloperMode)
-                this.Monitor.Log($"You have SMAPI for developers, so the console will be much more verbose. You can disable developer mode by installing the non-developer version of SMAPI, or by editing {Constants.ApiConfigPath}.", LogLevel.Info);
+                this.Monitor.Log("You have SMAPI for developers, so the console will be much more verbose. You can disable developer mode by installing the non-developer version of SMAPI.", LogLevel.Info);
             if (!checkForUpdates)
-                this.Monitor.Log($"You configured SMAPI to not check for updates. Running an old version of SMAPI is not recommended. You can enable update checks by reinstalling SMAPI or editing {Constants.ApiConfigPath}.", LogLevel.Warn);
+                this.Monitor.Log("You configured SMAPI to not check for updates. Running an old version of SMAPI is not recommended. You can enable update checks by reinstalling SMAPI.", LogLevel.Warn);
+            if (!rewriteMods)
+                this.Monitor.Log("You configured SMAPI to not rewrite broken mods. Many older mods may fail to load. You can undo this by reinstalling SMAPI.", LogLevel.Warn);
             if (!this.Monitor.WriteToConsole)
                 this.Monitor.Log("Writing to the terminal is disabled because the --no-terminal argument was received. This usually means launching the terminal failed.", LogLevel.Warn);
             this.Monitor.VerboseLog("Verbose logging enabled.");
diff --git a/src/SMAPI/Framework/ModHelpers/InputHelper.cs b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
index e1317544..88caf4c3 100644
--- a/src/SMAPI/Framework/ModHelpers/InputHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using StardewModdingAPI.Framework.Input;
+using StardewModdingAPI.Utilities;
 
 namespace StardewModdingAPI.Framework.ModHelpers
 {
@@ -50,6 +51,19 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
+        public void SuppressActiveKeybinds(KeybindList keybindList)
+        {
+            foreach (Keybind keybind in keybindList.Keybinds)
+            {
+                if (!keybind.GetState().IsDown())
+                    continue;
+
+                foreach (SButton button in keybind.Buttons)
+                    this.Suppress(button);
+            }
+        }
+
+        /// <inheritdoc />
         public SButtonState GetState(SButton button)
         {
             return this.CurrentInputState().GetState(button);
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 9fb5384e..4fae0f44 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -37,6 +37,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>The objects to dispose as part of this instance.</summary>
         private readonly HashSet<IDisposable> Disposables = new HashSet<IDisposable>();
 
+        /// <summary>Whether to rewrite mods for compatibility.</summary>
+        private readonly bool RewriteMods;
+
 
         /*********
         ** Public methods
@@ -45,10 +48,12 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="targetPlatform">The current game platform.</param>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         /// <param name="paranoidMode">Whether to detect paranoid mode issues.</param>
-        public AssemblyLoader(Platform targetPlatform, IMonitor monitor, bool paranoidMode)
+        /// <param name="rewriteMods">Whether to rewrite mods for compatibility.</param>
+        public AssemblyLoader(Platform targetPlatform, IMonitor monitor, bool paranoidMode, bool rewriteMods)
         {
             this.Monitor = monitor;
             this.ParanoidMode = paranoidMode;
+            this.RewriteMods = rewriteMods;
             this.AssemblyMap = this.TrackForDisposal(Constants.GetAssemblyMap(targetPlatform));
 
             // init resolver
@@ -308,7 +313,7 @@ namespace StardewModdingAPI.Framework.ModLoading
             }
 
             // find or rewrite code
-            IInstructionHandler[] handlers = new InstructionMetadata().GetHandlers(this.ParanoidMode, platformChanged).ToArray();
+            IInstructionHandler[] handlers = new InstructionMetadata().GetHandlers(this.ParanoidMode, platformChanged, this.RewriteMods).ToArray();
             RecursiveRewriter rewriter = new RecursiveRewriter(
                 module: module,
                 rewriteType: (type, replaceWith) =>
diff --git a/src/SMAPI/Framework/Models/SConfig.cs b/src/SMAPI/Framework/Models/SConfig.cs
index 3a3f6960..dea08717 100644
--- a/src/SMAPI/Framework/Models/SConfig.cs
+++ b/src/SMAPI/Framework/Models/SConfig.cs
@@ -20,13 +20,15 @@ namespace StardewModdingAPI.Framework.Models
             [nameof(GitHubProjectName)] = "Pathoschild/SMAPI",
             [nameof(WebApiBaseUrl)] = "https://smapi.io/api/",
             [nameof(VerboseLogging)] = false,
-            [nameof(LogNetworkTraffic)] = false
+            [nameof(LogNetworkTraffic)] = false,
+            [nameof(RewriteMods)] = true
         };
 
         /// <summary>The default values for <see cref="SuppressUpdateChecks"/>, to log changes if different.</summary>
         private static readonly HashSet<string> DefaultSuppressUpdateChecks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "SMAPI.ConsoleCommands",
+            "SMAPI.ErrorHandler",
             "SMAPI.SaveBackup"
         };
 
@@ -55,6 +57,9 @@ namespace StardewModdingAPI.Framework.Models
         /// <summary>Whether SMAPI should log more information about the game context.</summary>
         public bool VerboseLogging { get; set; }
 
+        /// <summary>Whether SMAPI should rewrite mods for compatibility.</summary>
+        public bool RewriteMods { get; set; } = (bool)SConfig.DefaultValues[nameof(SConfig.RewriteMods)];
+
         /// <summary>Whether SMAPI should log network traffic. Best combined with <see cref="VerboseLogging"/>, which includes network metadata.</summary>
         public bool LogNetworkTraffic { get; set; }
 
@@ -68,7 +73,7 @@ namespace StardewModdingAPI.Framework.Models
         /********
         ** Public methods
         ********/
-        /// <summary>Get the settings which have been customised by the player.</summary>
+        /// <summary>Get the settings which have been customized by the player.</summary>
         public IDictionary<string, object> GetCustomSettings()
         {
             IDictionary<string, object> custom = new Dictionary<string, object>();
diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
index 5eda71f6..3923700f 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
@@ -25,9 +25,15 @@ namespace StardewModdingAPI.Framework.Networking
         public bool IsHost { get; }
 
         /// <inheritdoc />
+        public bool IsSplitScreen => this.ScreenID != null;
+
+        /// <inheritdoc />
         public bool HasSmapi => this.ApiVersion != null;
 
         /// <inheritdoc />
+        public int? ScreenID { get; }
+
+        /// <inheritdoc />
         public GamePlatform? Platform { get; }
 
         /// <inheritdoc />
@@ -45,12 +51,14 @@ namespace StardewModdingAPI.Framework.Networking
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="playerID">The player's unique ID.</param>
+        /// <param name="screenID">The player's screen ID, if applicable.</param>
         /// <param name="model">The metadata to copy.</param>
         /// <param name="sendMessage">A method which sends a message to the peer.</param>
         /// <param name="isHost">Whether this is a connection to the host player.</param>
-        public MultiplayerPeer(long playerID, RemoteContextModel model, Action<OutgoingMessage> sendMessage, bool isHost)
+        public MultiplayerPeer(long playerID, int? screenID, RemoteContextModel model, Action<OutgoingMessage> sendMessage, bool isHost)
         {
             this.PlayerID = playerID;
+            this.ScreenID = screenID;
             this.IsHost = isHost;
             if (model != null)
             {
diff --git a/src/SMAPI/Framework/SChatBox.cs b/src/SMAPI/Framework/SChatBox.cs
new file mode 100644
index 00000000..e000d1cd
--- /dev/null
+++ b/src/SMAPI/Framework/SChatBox.cs
@@ -0,0 +1,49 @@
+using StardewValley;
+using StardewValley.Menus;
+
+namespace StardewModdingAPI.Framework
+{
+    /// <summary>SMAPI's implementation of the chatbox which intercepts errors for logging.</summary>
+    internal class SChatBox : ChatBox
+    {
+        /*********
+        ** Fields
+        *********/
+        /// <summary>Encapsulates monitoring and logging.</summary>
+        private readonly IMonitor Monitor;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        public SChatBox(IMonitor monitor)
+        {
+            this.Monitor = monitor;
+        }
+
+        /// <inheritdoc />
+        protected override void runCommand(string command)
+        {
+            this.Monitor.Log($"> chat command: {command}");
+            base.runCommand(command);
+        }
+
+        /// <inheritdoc />
+        public override void receiveChatMessage(long sourceFarmer, int chatKind, LocalizedContentManager.LanguageCode language, string message)
+        {
+            if (chatKind == ChatBox.errorMessage)
+            {
+                // log error
+                this.Monitor.Log(message, LogLevel.Error);
+
+                // add event details if applicable
+                if (Game1.CurrentEvent != null && message.StartsWith("Event script error:"))
+                    this.Monitor.Log($"In event #{Game1.CurrentEvent.id} for location {Game1.currentLocation?.NameOrUniqueName}", LogLevel.Error);
+            }
+
+            base.receiveChatMessage(sourceFarmer, chatKind, language, message);
+        }
+    }
+}
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index f9a36593..cd094ff4 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -124,9 +124,6 @@ namespace StardewModdingAPI.Framework
         /// <summary>The maximum number of consecutive attempts SMAPI should make to recover from an update error.</summary>
         private readonly Countdown UpdateCrashTimer = new Countdown(60); // 60 ticks = roughly one second
 
-        /// <summary>Whether custom content was removed from the save data to avoid a crash.</summary>
-        private bool IsSaveContentRemoved;
-
         /// <summary>Asset interceptors added or removed since the last tick.</summary>
         private readonly List<AssetInterceptorChange> ReloadAssetInterceptorsQueue = new List<AssetInterceptorChange>();
 
@@ -135,7 +132,7 @@ namespace StardewModdingAPI.Framework
         private readonly ConcurrentQueue<string> RawCommandQueue = new ConcurrentQueue<string>();
 
         /// <summary>A list of commands to execute on each screen.</summary>
-        private readonly PerScreen<List<Tuple<Command, string, string[]>>> ScreenCommandQueue = new(() => new());
+        private readonly PerScreen<List<Tuple<Command, string, string[]>>> ScreenCommandQueue = new PerScreen<List<Tuple<Command, string, string[]>>>(() => new List<Tuple<Command, string, string[]>>());
 
 
         /*********
@@ -145,6 +142,10 @@ namespace StardewModdingAPI.Framework
         /// <remarks>This is initialized after the game starts. This is accessed directly because it's not part of the normal class model.</remarks>
         internal static DeprecationManager DeprecationManager { get; private set; }
 
+        /// <summary>The singleton instance.</summary>
+        /// <remarks>This is only intended for use by external code like the Error Handler mod.</remarks>
+        internal static SCore Instance { get; private set; }
+
         /// <summary>The number of update ticks which have already executed. This is similar to <see cref="Game1.ticks"/>, but incremented more consistently for every tick.</summary>
         internal static uint TicksElapsed { get; private set; }
 
@@ -157,6 +158,8 @@ namespace StardewModdingAPI.Framework
         /// <param name="writeToConsole">Whether to output log messages to the console.</param>
         public SCore(string modsPath, bool writeToConsole)
         {
+            SCore.Instance = this;
+
             // init paths
             this.VerifyPath(modsPath);
             this.VerifyPath(Constants.LogDir);
@@ -205,6 +208,7 @@ namespace StardewModdingAPI.Framework
             {
                 JsonConverter[] converters = {
                     new ColorConverter(),
+                    new KeybindConverter(),
                     new PointConverter(),
                     new Vector2Converter(),
                     new RectangleConverter()
@@ -245,12 +249,7 @@ namespace StardewModdingAPI.Framework
 
                 // apply game patches
                 new GamePatcher(this.Monitor).Apply(
-                    new EventErrorPatch(this.LogManager.MonitorForGame),
-                    new DialogueErrorPatch(this.LogManager.MonitorForGame, this.Reflection),
-                    new ObjectErrorPatch(),
-                    new LoadContextPatch(this.Reflection, this.OnLoadStageChanged),
-                    new LoadErrorPatch(this.Monitor, this.OnSaveContentRemoved),
-                    new ScheduleErrorPatch(this.LogManager.MonitorForGame)
+                    new LoadContextPatch(this.Reflection, this.OnLoadStageChanged)
                 );
 
                 // add exit handler
@@ -278,7 +277,7 @@ namespace StardewModdingAPI.Framework
 
             // log basic info
             this.LogManager.HandleMarkerFiles();
-            this.LogManager.LogSettingsHeader(this.Settings.DeveloperMode, this.Settings.CheckForUpdates);
+            this.LogManager.LogSettingsHeader(this.Settings.DeveloperMode, this.Settings.CheckForUpdates, this.Settings.RewriteMods);
 
             // set window titles
             this.SetWindowTitles(
@@ -517,15 +516,6 @@ namespace StardewModdingAPI.Framework
                     this.ScreenCommandQueue.GetValueForScreen(screenId).Add(Tuple.Create(command, name, args));
                 }
 
-                /*********
-                ** Show in-game warnings (for main player only)
-                *********/
-                // save content removed
-                if (this.IsSaveContentRemoved && Context.IsWorldReady)
-                {
-                    this.IsSaveContentRemoved = false;
-                    Game1.addHUDMessage(new HUDMessage(this.Translator.Get("warn.invalid-content-removed"), HUDMessage.error_type));
-                }
 
                 /*********
                 ** Run game update
@@ -827,24 +817,29 @@ namespace StardewModdingAPI.Framework
                             }
 
                             // raise input button events
-                            foreach (var pair in inputState.ButtonStates)
+                            if (inputState.ButtonStates.Count > 0)
                             {
-                                SButton button = pair.Key;
-                                SButtonState status = pair.Value;
+                                events.ButtonsChanged.Raise(new ButtonsChangedEventArgs(cursor, inputState));
 
-                                if (status == SButtonState.Pressed)
+                                foreach (var pair in inputState.ButtonStates)
                                 {
-                                    if (this.Monitor.IsVerbose)
-                                        this.Monitor.Log($"Events: button {button} pressed.");
+                                    SButton button = pair.Key;
+                                    SButtonState status = pair.Value;
 
-                                    events.ButtonPressed.Raise(new ButtonPressedEventArgs(button, cursor, inputState));
-                                }
-                                else if (status == SButtonState.Released)
-                                {
-                                    if (this.Monitor.IsVerbose)
-                                        this.Monitor.Log($"Events: button {button} released.");
+                                    if (status == SButtonState.Pressed)
+                                    {
+                                        if (this.Monitor.IsVerbose)
+                                            this.Monitor.Log($"Events: button {button} pressed.");
 
-                                    events.ButtonReleased.Raise(new ButtonReleasedEventArgs(button, cursor, inputState));
+                                        events.ButtonPressed.Raise(new ButtonPressedEventArgs(button, cursor, inputState));
+                                    }
+                                    else if (status == SButtonState.Released)
+                                    {
+                                        if (this.Monitor.IsVerbose)
+                                            this.Monitor.Log($"Events: button {button} released.");
+
+                                        events.ButtonReleased.Raise(new ButtonReleasedEventArgs(button, cursor, inputState));
+                                    }
                                 }
                             }
                         }
@@ -1065,6 +1060,13 @@ namespace StardewModdingAPI.Framework
                 this.OnReturnedToTitle();
             }
 
+            // override chatbox
+            if (newStage == LoadStage.Loaded)
+            {
+                Game1.onScreenMenus.Remove(Game1.chatBox);
+                Game1.onScreenMenus.Add(Game1.chatBox = new SChatBox(this.LogManager.MonitorForGame));
+            }
+
             // raise events
             this.EventManager.LoadStageChanged.Raise(new LoadStageChangedEventArgs(oldStage, newStage));
             if (newStage == LoadStage.None)
@@ -1105,12 +1107,6 @@ namespace StardewModdingAPI.Framework
             Game1.CustomData[migrationKey] = Constants.ApiVersion.ToString();
         }
 
-        /// <summary>Raised after custom content is removed from the save data to avoid a crash.</summary>
-        internal void OnSaveContentRemoved()
-        {
-            this.IsSaveContentRemoved = true;
-        }
-
         /// <summary>A callback invoked before <see cref="Game1.newDayAfterFade"/> runs.</summary>
         protected void OnNewDayAfterFade()
         {
@@ -1406,7 +1402,7 @@ namespace StardewModdingAPI.Framework
 
             // load mods
             IList<IModMetadata> skippedMods = new List<IModMetadata>();
-            using (AssemblyLoader modAssemblyLoader = new AssemblyLoader(Constants.Platform, this.Monitor, this.Settings.ParanoidWarnings))
+            using (AssemblyLoader modAssemblyLoader = new AssemblyLoader(Constants.Platform, this.Monitor, this.Settings.ParanoidWarnings, this.Settings.RewriteMods))
             {
                 // init
                 HashSet<string> suppressUpdateChecks = new HashSet<string>(this.Settings.SuppressUpdateChecks, StringComparer.OrdinalIgnoreCase);
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 42a712ee..af7fa387 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -11,6 +11,7 @@ using StardewModdingAPI.Framework.Input;
 using StardewModdingAPI.Framework.Reflection;
 using StardewModdingAPI.Framework.StateTracking.Snapshots;
 using StardewModdingAPI.Framework.Utilities;
+using StardewModdingAPI.Utilities;
 using StardewValley;
 using StardewValley.BellsAndWhistles;
 using StardewValley.Locations;
@@ -81,6 +82,9 @@ namespace StardewModdingAPI.Framework
         /// <summary>Whether the game is creating the save file and SMAPI has already raised <see cref="IGameLoopEvents.SaveCreating"/>.</summary>
         public bool IsBetweenCreateEvents { get; set; }
 
+        /// <summary>The cached <see cref="Farmer.UniqueMultiplayerID"/> value for this instance's player.</summary>
+        public long? PlayerId { get; private set; }
+
         /// <summary>Construct a content manager to read game content files.</summary>
         /// <remarks>This must be static because the game accesses it before the <see cref="SGame"/> constructor is called.</remarks>
         [NonInstancedStatic]
@@ -121,6 +125,18 @@ namespace StardewModdingAPI.Framework
             this.OnUpdating = onUpdating;
         }
 
+        /// <summary>Get the current input state for a button.</summary>
+        /// <param name="button">The button to check.</param>
+        /// <remarks>This is intended for use by <see cref="Keybind"/> and shouldn't be used directly in most cases.</remarks>
+        internal static SButtonState GetInputState(SButton button)
+        {
+            SInputState input = Game1.input as SInputState;
+            if (input == null)
+                throw new InvalidOperationException("SMAPI's input state is not in a ready state yet.");
+
+            return input.GetState(button);
+        }
+
 
         /*********
         ** Protected methods
@@ -167,6 +183,7 @@ namespace StardewModdingAPI.Framework
             try
             {
                 this.OnUpdating(this, gameTime, () => base.Update(gameTime));
+                this.PlayerId = Game1.player?.UniqueMultiplayerID;
             }
             finally
             {
diff --git a/src/SMAPI/Framework/SGameRunner.cs b/src/SMAPI/Framework/SGameRunner.cs
index ae06f513..45e7369c 100644
--- a/src/SMAPI/Framework/SGameRunner.cs
+++ b/src/SMAPI/Framework/SGameRunner.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Framework.Events;
@@ -49,6 +50,13 @@ namespace StardewModdingAPI.Framework
         /*********
         ** Public methods
         *********/
+        /// <summary>The singleton instance.</summary>
+        public static SGameRunner Instance => (SGameRunner)GameRunner.instance;
+
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging for SMAPI.</param>
         /// <param name="reflection">Simplifies access to private game code.</param>
@@ -99,15 +107,24 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <inheritdoc />
-        public override void RemoveGameInstance(Game1 instance)
+        public override void RemoveGameInstance(Game1 gameInstance)
         {
-            base.RemoveGameInstance(instance);
+            base.RemoveGameInstance(gameInstance);
 
             if (this.gameInstances.Count <= 1)
                 EarlyConstants.LogScreenId = null;
             this.UpdateForSplitScreenChanges();
         }
 
+        /// <summary>Get the screen ID for a given player ID, if the player is local.</summary>
+        /// <param name="playerId">The player ID to check.</param>
+        public int? GetScreenId(long playerId)
+        {
+            return this.gameInstances
+                .FirstOrDefault(p => ((SGame)p).PlayerId == playerId)
+                ?.instanceId;
+        }
+
 
         /*********
         ** Protected methods
@@ -136,6 +153,7 @@ namespace StardewModdingAPI.Framework
             this.OnGameUpdating(gameTime, () => base.Update(gameTime));
         }
 
+        /// <summary>Update metadata when a split screen is added or removed.</summary>
         private void UpdateForSplitScreenChanges()
         {
             HashSet<int> oldScreenIds = new HashSet<int>(Context.ActiveScreenIds);
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index 2f89fce9..5956b63f 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -56,10 +56,10 @@ namespace StardewModdingAPI.Framework
         private readonly bool LogNetworkTraffic;
 
         /// <summary>The backing field for <see cref="Peers"/>.</summary>
-        private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new(() => new Dictionary<long, MultiplayerPeer>());
+        private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new PerScreen<IDictionary<long, MultiplayerPeer>>(() => new Dictionary<long, MultiplayerPeer>());
 
         /// <summary>The backing field for <see cref="HostPeer"/>.</summary>
-        private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new();
+        private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new PerScreen<MultiplayerPeer>();
 
 
         /*********
@@ -196,7 +196,13 @@ namespace StardewModdingAPI.Framework
                         this.Monitor.Log($"Received context for farmhand {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
 
                         // store peer
-                        MultiplayerPeer newPeer = new MultiplayerPeer(message.FarmerID, model, sendMessage, isHost: false);
+                        MultiplayerPeer newPeer = new MultiplayerPeer(
+                            playerID: message.FarmerID,
+                            screenID: this.GetScreenId(message.FarmerID),
+                            model: model,
+                            sendMessage: sendMessage,
+                            isHost: false
+                        );
                         if (this.Peers.ContainsKey(message.FarmerID))
                         {
                             this.Monitor.Log($"Received mod context from farmhand {message.FarmerID}, but the game didn't see them disconnect. This may indicate issues with the network connection.", LogLevel.Info);
@@ -238,7 +244,13 @@ namespace StardewModdingAPI.Framework
                     if (!this.Peers.ContainsKey(message.FarmerID))
                     {
                         this.Monitor.Log($"Received connection for vanilla player {message.FarmerID}.", LogLevel.Trace);
-                        MultiplayerPeer peer = new MultiplayerPeer(message.FarmerID, null, sendMessage, isHost: false);
+                        MultiplayerPeer peer = new MultiplayerPeer(
+                            playerID: message.FarmerID,
+                            screenID: this.GetScreenId(message.FarmerID),
+                            model: null,
+                            sendMessage: sendMessage,
+                            isHost: false
+                        );
                         this.AddPeer(peer, canBeHost: false);
                     }
 
@@ -280,7 +292,13 @@ namespace StardewModdingAPI.Framework
                         this.Monitor.Log($"Received context for {(model?.IsHost == true ? "host" : "farmhand")} {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
 
                         // store peer
-                        MultiplayerPeer peer = new MultiplayerPeer(message.FarmerID, model, sendMessage, isHost: model?.IsHost ?? this.HostPeer == null);
+                        MultiplayerPeer peer = new MultiplayerPeer(
+                            playerID: message.FarmerID,
+                            screenID: this.GetScreenId(message.FarmerID),
+                            model: model,
+                            sendMessage: sendMessage,
+                            isHost: model?.IsHost ?? this.HostPeer == null
+                        );
                         if (peer.IsHost && this.HostPeer != null)
                         {
                             this.Monitor.Log($"Rejected mod context from host player {peer.PlayerID}: already received host data from {(peer.PlayerID == this.HostPeer.PlayerID ? "that player" : $"player {peer.PlayerID}")}.", LogLevel.Error);
@@ -297,7 +315,14 @@ namespace StardewModdingAPI.Framework
                         if (!this.Peers.ContainsKey(message.FarmerID) && this.HostPeer == null)
                         {
                             this.Monitor.Log($"Received connection for vanilla host {message.FarmerID}.", LogLevel.Trace);
-                            this.AddPeer(new MultiplayerPeer(message.FarmerID, null, sendMessage, isHost: true), canBeHost: false);
+                            var peer = new MultiplayerPeer(
+                                playerID: message.FarmerID,
+                                screenID: this.GetScreenId(message.FarmerID),
+                                model: null,
+                                sendMessage: sendMessage,
+                                isHost: true
+                            );
+                            this.AddPeer(peer, canBeHost: false);
                         }
                         resume();
                         break;
@@ -309,7 +334,13 @@ namespace StardewModdingAPI.Framework
                         // store peer
                         if (!this.Peers.TryGetValue(message.FarmerID, out MultiplayerPeer peer))
                         {
-                            peer = new MultiplayerPeer(message.FarmerID, null, sendMessage, isHost: this.HostPeer == null);
+                            peer = new MultiplayerPeer(
+                                playerID: message.FarmerID,
+                                screenID: this.GetScreenId(message.FarmerID),
+                                model: null,
+                                sendMessage: sendMessage,
+                                isHost: this.HostPeer == null
+                            );
                             this.Monitor.Log($"Received connection for vanilla {(peer.IsHost ? "host" : "farmhand")} {message.FarmerID}.", LogLevel.Trace);
                             this.AddPeer(peer, canBeHost: true);
                         }
@@ -361,34 +392,24 @@ namespace StardewModdingAPI.Framework
             if (string.IsNullOrWhiteSpace(fromModID))
                 throw new ArgumentNullException(nameof(fromModID));
 
-            // get target players
-            long curPlayerId = Game1.player.UniqueMultiplayerID;
-            bool sendToSelf = false;
-            List<MultiplayerPeer> sendToPeers = new List<MultiplayerPeer>();
-            if (toPlayerIDs == null)
-            {
-                sendToSelf = true;
-                sendToPeers.AddRange(this.Peers.Values);
-            }
-            else
+            // get valid peers
+            var sendToPeers = this.Peers.Values.Where(p => p.HasSmapi).ToList();
+            bool sendToSelf = true;
+
+            // filter by player ID
+            if (toPlayerIDs != null)
             {
-                foreach (long id in toPlayerIDs.Distinct())
-                {
-                    if (id == curPlayerId)
-                        sendToSelf = true;
-                    else if (this.Peers.TryGetValue(id, out MultiplayerPeer peer) && peer.HasSmapi)
-                        sendToPeers.Add(peer);
-                }
+                var ids = new HashSet<long>(toPlayerIDs);
+                sendToPeers.RemoveAll(peer => !ids.Contains(peer.PlayerID));
+                sendToSelf = ids.Contains(Game1.player.UniqueMultiplayerID);
             }
 
             // filter by mod ID
             if (toModIDs != null)
             {
-                HashSet<string> sendToMods = new HashSet<string>(toModIDs, StringComparer.OrdinalIgnoreCase);
-                if (sendToSelf && toModIDs.All(id => this.ModRegistry.Get(id) == null))
-                    sendToSelf = false;
-
-                sendToPeers.RemoveAll(peer => peer.Mods.All(mod => !sendToMods.Contains(mod.ID)));
+                var ids = new HashSet<string>(toModIDs, StringComparer.OrdinalIgnoreCase);
+                sendToPeers.RemoveAll(peer => peer.Mods.All(mod => !ids.Contains(mod.ID)));
+                sendToSelf = sendToSelf && toModIDs.Any(id => this.ModRegistry.Get(id) != null);
             }
 
             // validate recipients
@@ -505,6 +526,13 @@ namespace StardewModdingAPI.Framework
             }
         }
 
+        /// <summary>Get the screen ID for a given player ID, if the player is local.</summary>
+        /// <param name="playerId">The player ID to check.</param>
+        private int? GetScreenId(long playerId)
+        {
+            return SGameRunner.Instance.GetScreenId(playerId);
+        }
+
         /// <summary>Get all connected player IDs, including the current player.</summary>
         private IEnumerable<long> GetKnownPlayerIDs()
         {
diff --git a/src/SMAPI/Framework/Serialization/KeybindConverter.cs b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
new file mode 100644
index 00000000..93a274a8
--- /dev/null
+++ b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
@@ -0,0 +1,82 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using StardewModdingAPI.Toolkit.Serialization;
+using StardewModdingAPI.Utilities;
+
+namespace StardewModdingAPI.Framework.Serialization
+{
+    /// <summary>Handles deserialization of <see cref="Keybind"/> and <see cref="KeybindList"/> models.</summary>
+    internal class KeybindConverter : JsonConverter
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <inheritdoc />
+        public override bool CanRead { get; } = true;
+
+        /// <inheritdoc />
+        public override bool CanWrite { get; } = true;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Get whether this instance can convert the specified object type.</summary>
+        /// <param name="objectType">The object type.</param>
+        public override bool CanConvert(Type objectType)
+        {
+            return
+                typeof(Keybind).IsAssignableFrom(objectType)
+                || typeof(KeybindList).IsAssignableFrom(objectType);
+        }
+
+        /// <summary>Reads the JSON representation of the object.</summary>
+        /// <param name="reader">The JSON reader.</param>
+        /// <param name="objectType">The object type.</param>
+        /// <param name="existingValue">The object being read.</param>
+        /// <param name="serializer">The calling serializer.</param>
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            string path = reader.Path;
+
+            switch (reader.TokenType)
+            {
+                case JsonToken.Null:
+                    return objectType == typeof(Keybind)
+                        ? (object)new Keybind()
+                        : new KeybindList();
+
+                case JsonToken.String:
+                    {
+                        string str = JToken.Load(reader).Value<string>();
+
+                        if (objectType == typeof(Keybind))
+                        {
+                            return Keybind.TryParse(str, out Keybind parsed, out string[] errors)
+                                ? parsed
+                                : throw new SParseException($"Can't parse {nameof(Keybind)} from invalid value '{str}' (path: {path}).\n{string.Join("\n", errors)}");
+                        }
+                        else
+                        {
+                            return KeybindList.TryParse(str, out KeybindList parsed, out string[] errors)
+                                ? parsed
+                                : throw new SParseException($"Can't parse {nameof(KeybindList)} from invalid value '{str}' (path: {path}).\n{string.Join("\n", errors)}");
+                        }
+                    }
+
+                default:
+                    throw new SParseException($"Can't parse {objectType} from unexpected {reader.TokenType} node (path: {reader.Path}).");
+            }
+        }
+
+        /// <summary>Writes the JSON representation of the object.</summary>
+        /// <param name="writer">The JSON writer.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="serializer">The calling serializer.</param>
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            writer.WriteValue(value?.ToString());
+        }
+    }
+}