Merge branch 'develop' into stable

4 files changed, 29 insertions, 28 deletions

diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index 6c9cc4f5..0d0469d7 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -17,25 +17,25 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public GameLocation Location { get; }
 
         /// <summary>Tracks added or removed buildings.</summary>
-        public SnapshotListDiff<Building> Buildings { get; } = new SnapshotListDiff<Building>();
+        public SnapshotListDiff<Building> Buildings { get; } = new();
 
         /// <summary>Tracks added or removed debris.</summary>
-        public SnapshotListDiff<Debris> Debris { get; } = new SnapshotListDiff<Debris>();
+        public SnapshotListDiff<Debris> Debris { get; } = new();
 
         /// <summary>Tracks added or removed large terrain features.</summary>
-        public SnapshotListDiff<LargeTerrainFeature> LargeTerrainFeatures { get; } = new SnapshotListDiff<LargeTerrainFeature>();
+        public SnapshotListDiff<LargeTerrainFeature> LargeTerrainFeatures { get; } = new();
 
         /// <summary>Tracks added or removed NPCs.</summary>
-        public SnapshotListDiff<NPC> Npcs { get; } = new SnapshotListDiff<NPC>();
+        public SnapshotListDiff<NPC> Npcs { get; } = new();
 
         /// <summary>Tracks added or removed objects.</summary>
-        public SnapshotListDiff<KeyValuePair<Vector2, Object>> Objects { get; } = new SnapshotListDiff<KeyValuePair<Vector2, Object>>();
+        public SnapshotListDiff<KeyValuePair<Vector2, Object>> Objects { get; } = new();
 
         /// <summary>Tracks added or removed terrain features.</summary>
-        public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>>();
+        public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new();
 
         /// <summary>Tracks added or removed furniture.</summary>
-        public SnapshotListDiff<Furniture> Furniture { get; } = new SnapshotListDiff<Furniture>();
+        public SnapshotListDiff<Furniture> Furniture { get; } = new();
 
         /// <summary>Tracks changed chest inventories.</summary>
         public IDictionary<Chest, SnapshotItemListDiff> ChestItems { get; } = new Dictionary<Chest, SnapshotItemListDiff>();
@@ -68,7 +68,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             this.ChestItems.Clear();
             foreach (ChestTracker tracker in watcher.ChestWatchers.Values)
             {
-                if (tracker.TryGetInventoryChanges(out SnapshotItemListDiff changes))
+                if (tracker.TryGetInventoryChanges(out SnapshotItemListDiff? changes))
                     this.ChestItems[tracker.Chest] = changes;
             }
         }
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index 0908b02a..6a24ec30 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Fields
         *********/
         /// <summary>An empty item list diff.</summary>
-        private readonly SnapshotItemListDiff EmptyItemListDiff = new SnapshotItemListDiff(new Item[0], new Item[0], new ItemStackSizeChange[0]);
+        private readonly SnapshotItemListDiff EmptyItemListDiff = new(Array.Empty<Item>(), Array.Empty<Item>(), Array.Empty<ItemStackSizeChange>());
 
 
         /*********
@@ -24,14 +24,14 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public Farmer Player { get; }
 
         /// <summary>The player's current location.</summary>
-        public SnapshotDiff<GameLocation> Location { get; } = new SnapshotDiff<GameLocation>();
+        public SnapshotDiff<GameLocation> Location { get; } = new();
 
         /// <summary>Tracks changes to the player's skill levels.</summary>
         public IDictionary<SkillType, SnapshotDiff<int>> Skills { get; } =
             Enum
                 .GetValues(typeof(SkillType))
                 .Cast<SkillType>()
-                .ToDictionary(skill => skill, skill => new SnapshotDiff<int>());
+                .ToDictionary(skill => skill, _ => new SnapshotDiff<int>());
 
         /// <summary>Get a list of inventory changes.</summary>
         public SnapshotItemListDiff Inventory { get; private set; }
@@ -45,17 +45,18 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public PlayerSnapshot(Farmer player)
         {
             this.Player = player;
+            this.Inventory = this.EmptyItemListDiff;
         }
 
         /// <summary>Update the tracked values.</summary>
         /// <param name="watcher">The player watcher to snapshot.</param>
         public void Update(PlayerTracker watcher)
         {
-            this.Location.Update(watcher.LocationWatcher);
-            foreach (var pair in this.Skills)
-                pair.Value.Update(watcher.SkillWatchers[pair.Key]);
+            this.Location.Update(watcher.LocationWatcher!);
+            foreach ((SkillType skill, var value) in this.Skills)
+                value.Update(watcher.SkillWatchers[skill]);
 
-            this.Inventory = watcher.TryGetInventoryChanges(out SnapshotItemListDiff itemChanges)
+            this.Inventory = watcher.TryGetInventoryChanges(out SnapshotItemListDiff? itemChanges)
                 ? itemChanges
                 : this.EmptyItemListDiff;
         }
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
index cf51e040..27a891de 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
@@ -11,31 +11,31 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Accessors
         *********/
         /// <summary>Tracks changes to the window size.</summary>
-        public SnapshotDiff<Point> WindowSize { get; } = new SnapshotDiff<Point>();
+        public SnapshotDiff<Point> WindowSize { get; } = new();
 
         /// <summary>Tracks changes to the current player.</summary>
-        public PlayerSnapshot CurrentPlayer { get; private set; }
+        public PlayerSnapshot? CurrentPlayer { get; private set; }
 
         /// <summary>Tracks changes to the time of day (in 24-hour military format).</summary>
-        public SnapshotDiff<int> Time { get; } = new SnapshotDiff<int>();
+        public SnapshotDiff<int> Time { get; } = new();
 
         /// <summary>Tracks changes to the save ID.</summary>
-        public SnapshotDiff<ulong> SaveID { get; } = new SnapshotDiff<ulong>();
+        public SnapshotDiff<ulong> SaveID { get; } = new();
 
         /// <summary>Tracks changes to the game's locations.</summary>
-        public WorldLocationsSnapshot Locations { get; } = new WorldLocationsSnapshot();
+        public WorldLocationsSnapshot Locations { get; } = new();
 
         /// <summary>Tracks changes to <see cref="Game1.activeClickableMenu"/>.</summary>
-        public SnapshotDiff<IClickableMenu> ActiveMenu { get; } = new SnapshotDiff<IClickableMenu>();
+        public SnapshotDiff<IClickableMenu> ActiveMenu { get; } = new();
 
         /// <summary>Tracks changes to the cursor position.</summary>
-        public SnapshotDiff<ICursorPosition> Cursor { get; } = new SnapshotDiff<ICursorPosition>();
+        public SnapshotDiff<ICursorPosition> Cursor { get; } = new();
 
         /// <summary>Tracks changes to the mouse wheel scroll.</summary>
-        public SnapshotDiff<int> MouseWheelScroll { get; } = new SnapshotDiff<int>();
+        public SnapshotDiff<int> MouseWheelScroll { get; } = new();
 
         /// <summary>Tracks changes to the content locale.</summary>
-        public SnapshotDiff<LocalizedContentManager.LanguageCode> Locale { get; } = new SnapshotDiff<LocalizedContentManager.LanguageCode>();
+        public SnapshotDiff<LocalizedContentManager.LanguageCode> Locale { get; } = new();
 
 
         /*********
@@ -54,7 +54,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             // update snapshots
             this.WindowSize.Update(watchers.WindowSizeWatcher);
             this.Locale.Update(watchers.LocaleWatcher);
-            this.CurrentPlayer?.Update(watchers.CurrentPlayerTracker);
+            this.CurrentPlayer?.Update(watchers.CurrentPlayerTracker!);
             this.Time.Update(watchers.TimeWatcher);
             this.SaveID.Update(watchers.SaveIdWatcher);
             this.Locations.Update(watchers.LocationsWatcher);
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
index 73ed2d8f..59f94942 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
@@ -12,14 +12,14 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Fields
         *********/
         /// <summary>A map of tracked locations.</summary>
-        private readonly Dictionary<GameLocation, LocationSnapshot> LocationsDict = new Dictionary<GameLocation, LocationSnapshot>(new ObjectReferenceComparer<GameLocation>());
+        private readonly Dictionary<GameLocation, LocationSnapshot> LocationsDict = new(new ObjectReferenceComparer<GameLocation>());
 
 
         /*********
         ** Accessors
         *********/
         /// <summary>Tracks changes to the location list.</summary>
-        public SnapshotListDiff<GameLocation> LocationList { get; } = new SnapshotListDiff<GameLocation>();
+        public SnapshotListDiff<GameLocation> LocationList { get; } = new();
 
         /// <summary>The tracked locations.</summary>
         public IEnumerable<LocationSnapshot> Locations => this.LocationsDict.Values;
@@ -42,7 +42,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             // update locations
             foreach (LocationTracker locationWatcher in watcher.Locations)
             {
-                if (!this.LocationsDict.TryGetValue(locationWatcher.Location, out LocationSnapshot snapshot))
+                if (!this.LocationsDict.TryGetValue(locationWatcher.Location, out LocationSnapshot? snapshot))
                     this.LocationsDict[locationWatcher.Location] = snapshot = new LocationSnapshot(locationWatcher.Location);
 
                 snapshot.Update(locationWatcher);