From 915e6d22f199354ef69a20e47f13731379b46306 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 24 Aug 2020 22:23:02 -0400
Subject: minor tweaks

---
 src/SMAPI/Framework/WatcherCore.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI/Framework/WatcherCore.cs')

diff --git a/src/SMAPI/Framework/WatcherCore.cs b/src/SMAPI/Framework/WatcherCore.cs
index c89efa44..2a5d1ee6 100644
--- a/src/SMAPI/Framework/WatcherCore.cs
+++ b/src/SMAPI/Framework/WatcherCore.cs
@@ -56,7 +56,8 @@ namespace StardewModdingAPI.Framework
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="inputState">Manages input visible to the game.</param>
-        public WatcherCore(SInputState inputState)
+        /// <param name="gameLocations">The observable list of game locations.</param>
+        public WatcherCore(SInputState inputState, ObservableCollection<GameLocation> gameLocations)
         {
             // init watchers
             this.CursorWatcher = WatcherFactory.ForEquatable(() => inputState.CursorPosition);
@@ -65,7 +66,7 @@ namespace StardewModdingAPI.Framework
             this.WindowSizeWatcher = WatcherFactory.ForEquatable(() => new Point(Game1.viewport.Width, Game1.viewport.Height));
             this.TimeWatcher = WatcherFactory.ForEquatable(() => Game1.timeOfDay);
             this.ActiveMenuWatcher = WatcherFactory.ForReference(() => Game1.activeClickableMenu);
-            this.LocationsWatcher = new WorldLocationsTracker((ObservableCollection<GameLocation>)Game1.locations, MineShaft.activeMines);
+            this.LocationsWatcher = new WorldLocationsTracker(gameLocations, MineShaft.activeMines);
             this.LocaleWatcher = WatcherFactory.ForGenericEquality(() => LocalizedContentManager.CurrentLanguageCode);
             this.Watchers.AddRange(new IWatcher[]
             {
-- 
cgit 


From f57feb7319725513fadde8b14d55f4e8e4b82c24 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 4 Sep 2020 20:56:27 -0400
Subject: extend game's input logic instead of replacing it

---
 src/SMAPI/Framework/WatcherCore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/WatcherCore.cs')

diff --git a/src/SMAPI/Framework/WatcherCore.cs b/src/SMAPI/Framework/WatcherCore.cs
index 2a5d1ee6..393f6a37 100644
--- a/src/SMAPI/Framework/WatcherCore.cs
+++ b/src/SMAPI/Framework/WatcherCore.cs
@@ -61,7 +61,7 @@ namespace StardewModdingAPI.Framework
         {
             // init watchers
             this.CursorWatcher = WatcherFactory.ForEquatable(() => inputState.CursorPosition);
-            this.MouseWheelScrollWatcher = WatcherFactory.ForEquatable(() => inputState.LastMouse.ScrollWheelValue);
+            this.MouseWheelScrollWatcher = WatcherFactory.ForEquatable(() => inputState.MouseState.ScrollWheelValue);
             this.SaveIdWatcher = WatcherFactory.ForEquatable(() => Game1.hasLoadedGame ? Game1.uniqueIDForThisGame : 0);
             this.WindowSizeWatcher = WatcherFactory.ForEquatable(() => new Point(Game1.viewport.Width, Game1.viewport.Height));
             this.TimeWatcher = WatcherFactory.ForEquatable(() => Game1.timeOfDay);
-- 
cgit