Merge branch 'develop' into stable

4 files changed, 61 insertions, 44 deletions

diff --git a/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
new file mode 100644
index 00000000..4b4c4210
--- /dev/null
+++ b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using StardewValley;
+using StardewValley.Objects;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for a <see cref="IWorldEvents.ChestInventoryChanged"/> event.</summary>
+    public class ChestInventoryChangedEventArgs : EventArgs
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The chest whose inventory changed.</summary>
+        public Chest Chest { get; }
+
+        /// <summary>The location containing the chest.</summary>
+        public GameLocation Location { get; }
+
+        /// <summary>The added item stacks.</summary>
+        public IEnumerable<Item> Added { get; }
+
+        /// <summary>The removed item stacks.</summary>
+        public IEnumerable<Item> Removed { get; }
+
+        /// <summary>The item stacks whose size changed.</summary>
+        public IEnumerable<ItemStackSizeChange> QuantityChanged { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="chest">The chest whose inventory changed.</param>
+        /// <param name="location">The location containing the chest.</param>
+        /// <param name="added">The added item stacks.</param>
+        /// <param name="removed">The removed item stacks.</param>
+        /// <param name="quantityChanged">The item stacks whose size changed.</param>
+        internal ChestInventoryChangedEventArgs(Chest chest, GameLocation location, Item[] added, Item[] removed, ItemStackSizeChange[] quantityChanged)
+        {
+            this.Location = location;
+            this.Chest = chest;
+            this.Added = added;
+            this.Removed = removed;
+            this.QuantityChanged = quantityChanged;
+        }
+    }
+}
diff --git a/src/SMAPI/Events/IWorldEvents.cs b/src/SMAPI/Events/IWorldEvents.cs
index 0ceffcc1..9569a57b 100644
--- a/src/SMAPI/Events/IWorldEvents.cs
+++ b/src/SMAPI/Events/IWorldEvents.cs
@@ -23,6 +23,9 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised after objects are added or removed in a location.</summary>
         event EventHandler<ObjectListChangedEventArgs> ObjectListChanged;
 
+        /// <summary>Raised after items are added or removed from a chest.</summary>
+        event EventHandler<ChestInventoryChangedEventArgs> ChestInventoryChanged;
+
         /// <summary>Raised after terrain features (like floors and trees) are added or removed in a location.</summary>
         event EventHandler<TerrainFeatureListChangedEventArgs> TerrainFeatureListChanged;
     }
diff --git a/src/SMAPI/Events/InventoryChangedEventArgs.cs b/src/SMAPI/Events/InventoryChangedEventArgs.cs
index 874c2e48..40cd4128 100644
--- a/src/SMAPI/Events/InventoryChangedEventArgs.cs
+++ b/src/SMAPI/Events/InventoryChangedEventArgs.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Events
@@ -14,13 +13,13 @@ namespace StardewModdingAPI.Events
         /// <summary>The player whose inventory changed.</summary>
         public Farmer Player { get; }
 
-        /// <summary>The added items.</summary>
+        /// <summary>The added item stacks.</summary>
         public IEnumerable<Item> Added { get; }
 
-        /// <summary>The removed items.</summary>
+        /// <summary>The removed item stacks.</summary>
         public IEnumerable<Item> Removed { get; }
 
-        /// <summary>The items whose stack sizes changed, with the relative change.</summary>
+        /// <summary>The item stacks whose size changed.</summary>
         public IEnumerable<ItemStackSizeChange> QuantityChanged { get; }
 
         /// <summary>Whether the affected player is the local one.</summary>
@@ -32,28 +31,15 @@ namespace StardewModdingAPI.Events
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="player">The player whose inventory changed.</param>
-        /// <param name="changedItems">The inventory changes.</param>
-        internal InventoryChangedEventArgs(Farmer player, ItemStackChange[] changedItems)
+        /// <param name="added">The added item stacks.</param>
+        /// <param name="removed">The removed item stacks.</param>
+        /// <param name="quantityChanged">The item stacks whose size changed.</param>
+        internal InventoryChangedEventArgs(Farmer player, Item[] added, Item[] removed, ItemStackSizeChange[] quantityChanged)
         {
             this.Player = player;
-            this.Added = changedItems
-                .Where(n => n.ChangeType == ChangeType.Added)
-                .Select(p => p.Item)
-                .ToArray();
-
-            this.Removed = changedItems
-                .Where(n => n.ChangeType == ChangeType.Removed)
-                .Select(p => p.Item)
-                .ToArray();
-
-            this.QuantityChanged = changedItems
-                .Where(n => n.ChangeType == ChangeType.StackChange)
-                .Select(change => new ItemStackSizeChange(
-                    item: change.Item,
-                    oldSize: change.Item.Stack - change.StackChange,
-                    newSize: change.Item.Stack
-                ))
-                .ToArray();
+            this.Added = added;
+            this.Removed = removed;
+            this.QuantityChanged = quantityChanged;
         }
     }
 }
diff --git a/src/SMAPI/Events/ItemStackChange.cs b/src/SMAPI/Events/ItemStackChange.cs
deleted file mode 100644
index f9ae6df6..00000000
--- a/src/SMAPI/Events/ItemStackChange.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using StardewValley;
-
-namespace StardewModdingAPI.Events
-{
-    /// <summary>Represents an inventory slot that changed.</summary>
-    public class ItemStackChange
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The item in the slot.</summary>
-        public Item Item { get; set; }
-
-        /// <summary>The amount by which the item's stack size changed.</summary>
-        public int StackChange { get; set; }
-
-        /// <summary>How the inventory slot changed.</summary>
-        public ChangeType ChangeType { get; set; }
-    }
-}
\ No newline at end of file