From 9c1617c9ee51a0f6b93242fe8fc789336957460c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 11 Apr 2018 21:15:16 -0400
Subject: drop support for Stardew Valley 1.2 (#453)

---
 src/SMAPI/Events/EventArgsLocationObjectsChanged.cs | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/SMAPI/Events/EventArgsLocationObjectsChanged.cs')

diff --git a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
index 180e9d78..de6bd365 100644
--- a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
+++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
@@ -1,11 +1,7 @@
 using System;
-using Microsoft.Xna.Framework;
-#if STARDEW_VALLEY_1_3
 using System.Collections.Generic;
+using Microsoft.Xna.Framework;
 using Netcode;
-#else
-using StardewValley;
-#endif
 using Object = StardewValley.Object;
 
 namespace StardewModdingAPI.Events
@@ -17,11 +13,7 @@ namespace StardewModdingAPI.Events
         ** Accessors
         *********/
         /// <summary>The current list of objects in the current location.</summary>
-#if STARDEW_VALLEY_1_3
         public IDictionary<Vector2, NetRef<Object>> NewObjects { get; }
-#else
-        public SerializableDictionary<Vector2, Object> NewObjects { get; }
-#endif
 
 
         /*********
@@ -29,13 +21,7 @@ namespace StardewModdingAPI.Events
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="newObjects">The current list of objects in the current location.</param>
-        public EventArgsLocationObjectsChanged(
-#if STARDEW_VALLEY_1_3
-            IDictionary<Vector2, NetRef<Object>> newObjects
-#else
-            SerializableDictionary<Vector2, Object> newObjects
-#endif
-    )
+        public EventArgsLocationObjectsChanged(IDictionary<Vector2, NetRef<Object>> newObjects)
         {
             this.NewObjects = newObjects;
         }
-- 
cgit 


From 8051862c7bd2fe498657eef4bb102b5ca33390a6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 4 May 2018 20:44:20 -0400
Subject: add LocationEvents.ObjectsChanged event

---
 .../Events/EventArgsLocationObjectsChanged.cs      | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI/Events/EventArgsLocationObjectsChanged.cs')

diff --git a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
index de6bd365..a6138ddb 100644
--- a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
+++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
@@ -1,28 +1,46 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Xna.Framework;
 using Netcode;
-using Object = StardewValley.Object;
+using StardewValley;
+using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Events
 {
-    /// <summary>Event arguments for a <see cref="LocationEvents.LocationObjectsChanged"/> event.</summary>
+    /// <summary>Event arguments for a <see cref="LocationEvents.LocationObjectsChanged"/> or <see cref="LocationEvents.ObjectsChanged"/> event.</summary>
     public class EventArgsLocationObjectsChanged : EventArgs
     {
         /*********
         ** Accessors
         *********/
+        /// <summary>The location which changed.</summary>
+        public GameLocation Location { get; }
+
+        /// <summary>The objects added to the list.</summary>
+        public IEnumerable<KeyValuePair<Vector2, SObject>> Added { get; }
+
+        /// <summary>The objects removed from the list.</summary>
+        public IEnumerable<KeyValuePair<Vector2, SObject>> Removed { get; }
+
         /// <summary>The current list of objects in the current location.</summary>
-        public IDictionary<Vector2, NetRef<Object>> NewObjects { get; }
+        [Obsolete("Use " + nameof(EventArgsLocationObjectsChanged.Added))]
+        public IDictionary<Vector2, NetRef<SObject>> NewObjects { get; }
 
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
+        /// <param name="location">The location which changed.</param>
+        /// <param name="added">The objects added to the list.</param>
+        /// <param name="removed">The objects removed from the list.</param>
         /// <param name="newObjects">The current list of objects in the current location.</param>
-        public EventArgsLocationObjectsChanged(IDictionary<Vector2, NetRef<Object>> newObjects)
+        public EventArgsLocationObjectsChanged(GameLocation location, IEnumerable<KeyValuePair<Vector2, SObject>> added, IEnumerable<KeyValuePair<Vector2, SObject>> removed, IDictionary<Vector2, NetRef<SObject>> newObjects)
         {
+            this.Location = location;
+            this.Added = added.ToArray();
+            this.Removed = removed.ToArray();
             this.NewObjects = newObjects;
         }
     }
-- 
cgit 


From b8fd3aedfe884741bdda8c68398427f875585456 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 5 May 2018 01:31:06 -0400
Subject: rewrite location events for multiplayer

---
 src/SMAPI/Events/EventArgsLocationObjectsChanged.cs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/SMAPI/Events/EventArgsLocationObjectsChanged.cs')

diff --git a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
index a6138ddb..410ef6e6 100644
--- a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
+++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
@@ -8,7 +8,7 @@ using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Events
 {
-    /// <summary>Event arguments for a <see cref="LocationEvents.LocationObjectsChanged"/> or <see cref="LocationEvents.ObjectsChanged"/> event.</summary>
+    /// <summary>Event arguments for a <see cref="LocationEvents.ObjectsChanged"/> event.</summary>
     public class EventArgsLocationObjectsChanged : EventArgs
     {
         /*********
@@ -17,31 +17,25 @@ namespace StardewModdingAPI.Events
         /// <summary>The location which changed.</summary>
         public GameLocation Location { get; }
 
-        /// <summary>The objects added to the list.</summary>
+        /// <summary>The objects added to the location.</summary>
         public IEnumerable<KeyValuePair<Vector2, SObject>> Added { get; }
 
-        /// <summary>The objects removed from the list.</summary>
+        /// <summary>The objects removed from the location.</summary>
         public IEnumerable<KeyValuePair<Vector2, SObject>> Removed { get; }
 
-        /// <summary>The current list of objects in the current location.</summary>
-        [Obsolete("Use " + nameof(EventArgsLocationObjectsChanged.Added))]
-        public IDictionary<Vector2, NetRef<SObject>> NewObjects { get; }
-
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="location">The location which changed.</param>
-        /// <param name="added">The objects added to the list.</param>
-        /// <param name="removed">The objects removed from the list.</param>
-        /// <param name="newObjects">The current list of objects in the current location.</param>
-        public EventArgsLocationObjectsChanged(GameLocation location, IEnumerable<KeyValuePair<Vector2, SObject>> added, IEnumerable<KeyValuePair<Vector2, SObject>> removed, IDictionary<Vector2, NetRef<SObject>> newObjects)
+        /// <param name="added">The objects added to the location.</param>
+        /// <param name="removed">The objects removed from the location.</param>
+        public EventArgsLocationObjectsChanged(GameLocation location, IEnumerable<KeyValuePair<Vector2, SObject>> added, IEnumerable<KeyValuePair<Vector2, SObject>> removed)
         {
             this.Location = location;
             this.Added = added.ToArray();
             this.Removed = removed.ToArray();
-            this.NewObjects = newObjects;
         }
     }
 }
-- 
cgit 


From 558fb8a865b638cf5536856e7dcab44823feeaf3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 31 May 2018 22:47:56 -0400
Subject: move location events into new event system (#310)

---
 src/SMAPI/Events/EventArgsLocationObjectsChanged.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/SMAPI/Events/EventArgsLocationObjectsChanged.cs')

diff --git a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
index 410ef6e6..3bb387d5 100644
--- a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
+++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
-using Netcode;
 using StardewValley;
 using SObject = StardewValley.Object;
 
-- 
cgit