From cca7bf197079975bf310ca90c03b78d0f77fdf02 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 1 Jun 2018 01:15:26 -0400
Subject: rename new events for clarity (#310)

---
 src/SMAPI/Events/IWorldEvents.cs                   |  6 ++--
 .../Events/WorldBuildingListChangedEventArgs.cs    | 39 +++++++++++++++++++++
 src/SMAPI/Events/WorldBuildingsChangedEventArgs.cs | 39 ---------------------
 .../Events/WorldLocationListChangedEventArgs.cs    | 33 ++++++++++++++++++
 src/SMAPI/Events/WorldLocationsChangedEventArgs.cs | 33 ------------------
 .../Events/WorldObjectListChangedEventArgs.cs      | 40 ++++++++++++++++++++++
 src/SMAPI/Events/WorldObjectsChangedEventArgs.cs   | 40 ----------------------
 7 files changed, 115 insertions(+), 115 deletions(-)
 create mode 100644 src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs
 delete mode 100644 src/SMAPI/Events/WorldBuildingsChangedEventArgs.cs
 create mode 100644 src/SMAPI/Events/WorldLocationListChangedEventArgs.cs
 delete mode 100644 src/SMAPI/Events/WorldLocationsChangedEventArgs.cs
 create mode 100644 src/SMAPI/Events/WorldObjectListChangedEventArgs.cs
 delete mode 100644 src/SMAPI/Events/WorldObjectsChangedEventArgs.cs

(limited to 'src/SMAPI/Events')

diff --git a/src/SMAPI/Events/IWorldEvents.cs b/src/SMAPI/Events/IWorldEvents.cs
index 5c713250..a9a5fe6b 100644
--- a/src/SMAPI/Events/IWorldEvents.cs
+++ b/src/SMAPI/Events/IWorldEvents.cs
@@ -9,12 +9,12 @@ namespace StardewModdingAPI.Events
         ** Events
         *********/
         /// <summary>Raised after a game location is added or removed.</summary>
-        event EventHandler<WorldLocationsChangedEventArgs> LocationsChanged;
+        event EventHandler<WorldLocationListChangedEventArgs> LocationListChanged;
 
         /// <summary>Raised after buildings are added or removed in a location.</summary>
-        event EventHandler<WorldBuildingsChangedEventArgs> BuildingsChanged;
+        event EventHandler<WorldBuildingListChangedEventArgs> BuildingListChanged;
 
         /// <summary>Raised after objects are added or removed in a location.</summary>
-        event EventHandler<WorldObjectsChangedEventArgs> ObjectsChanged;
+        event EventHandler<WorldObjectListChangedEventArgs> ObjectListChanged;
     }
 }
diff --git a/src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs b/src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs
new file mode 100644
index 00000000..e73b9396
--- /dev/null
+++ b/src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using StardewValley;
+using StardewValley.Buildings;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for a <see cref="IWorldEvents.BuildingListChanged"/> event.</summary>
+    public class WorldBuildingListChangedEventArgs : EventArgs
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The location which changed.</summary>
+        public GameLocation Location { get; }
+
+        /// <summary>The buildings added to the location.</summary>
+        public IEnumerable<Building> Added { get; }
+
+        /// <summary>The buildings removed from the location.</summary>
+        public IEnumerable<Building> Removed { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="location">The location which changed.</param>
+        /// <param name="added">The buildings added to the location.</param>
+        /// <param name="removed">The buildings removed from the location.</param>
+        public WorldBuildingListChangedEventArgs(GameLocation location, IEnumerable<Building> added, IEnumerable<Building> removed)
+        {
+            this.Location = location;
+            this.Added = added.ToArray();
+            this.Removed = removed.ToArray();
+        }
+    }
+}
diff --git a/src/SMAPI/Events/WorldBuildingsChangedEventArgs.cs b/src/SMAPI/Events/WorldBuildingsChangedEventArgs.cs
deleted file mode 100644
index 1f68fd02..00000000
--- a/src/SMAPI/Events/WorldBuildingsChangedEventArgs.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using StardewValley;
-using StardewValley.Buildings;
-
-namespace StardewModdingAPI.Events
-{
-    /// <summary>Event arguments for a <see cref="IWorldEvents.BuildingsChanged"/> event.</summary>
-    public class WorldBuildingsChangedEventArgs : EventArgs
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The location which changed.</summary>
-        public GameLocation Location { get; }
-
-        /// <summary>The buildings added to the location.</summary>
-        public IEnumerable<Building> Added { get; }
-
-        /// <summary>The buildings removed from the location.</summary>
-        public IEnumerable<Building> Removed { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="location">The location which changed.</param>
-        /// <param name="added">The buildings added to the location.</param>
-        /// <param name="removed">The buildings removed from the location.</param>
-        public WorldBuildingsChangedEventArgs(GameLocation location, IEnumerable<Building> added, IEnumerable<Building> removed)
-        {
-            this.Location = location;
-            this.Added = added.ToArray();
-            this.Removed = removed.ToArray();
-        }
-    }
-}
diff --git a/src/SMAPI/Events/WorldLocationListChangedEventArgs.cs b/src/SMAPI/Events/WorldLocationListChangedEventArgs.cs
new file mode 100644
index 00000000..8bc26a43
--- /dev/null
+++ b/src/SMAPI/Events/WorldLocationListChangedEventArgs.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using StardewValley;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for a <see cref="IWorldEvents.LocationListChanged"/> event.</summary>
+    public class WorldLocationListChangedEventArgs : EventArgs
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The added locations.</summary>
+        public IEnumerable<GameLocation> Added { get; }
+
+        /// <summary>The removed locations.</summary>
+        public IEnumerable<GameLocation> Removed { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="added">The added locations.</param>
+        /// <param name="removed">The removed locations.</param>
+        public WorldLocationListChangedEventArgs(IEnumerable<GameLocation> added, IEnumerable<GameLocation> removed)
+        {
+            this.Added = added.ToArray();
+            this.Removed = removed.ToArray();
+        }
+    }
+}
diff --git a/src/SMAPI/Events/WorldLocationsChangedEventArgs.cs b/src/SMAPI/Events/WorldLocationsChangedEventArgs.cs
deleted file mode 100644
index 5cf77959..00000000
--- a/src/SMAPI/Events/WorldLocationsChangedEventArgs.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using StardewValley;
-
-namespace StardewModdingAPI.Events
-{
-    /// <summary>Event arguments for a <see cref="IWorldEvents.LocationsChanged"/> event.</summary>
-    public class WorldLocationsChangedEventArgs : EventArgs
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The added locations.</summary>
-        public IEnumerable<GameLocation> Added { get; }
-
-        /// <summary>The removed locations.</summary>
-        public IEnumerable<GameLocation> Removed { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="added">The added locations.</param>
-        /// <param name="removed">The removed locations.</param>
-        public WorldLocationsChangedEventArgs(IEnumerable<GameLocation> added, IEnumerable<GameLocation> removed)
-        {
-            this.Added = added.ToArray();
-            this.Removed = removed.ToArray();
-        }
-    }
-}
diff --git a/src/SMAPI/Events/WorldObjectListChangedEventArgs.cs b/src/SMAPI/Events/WorldObjectListChangedEventArgs.cs
new file mode 100644
index 00000000..5623a49b
--- /dev/null
+++ b/src/SMAPI/Events/WorldObjectListChangedEventArgs.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using StardewValley;
+using Object = StardewValley.Object;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for a <see cref="IWorldEvents.ObjectListChanged"/> event.</summary>
+    public class WorldObjectListChangedEventArgs : EventArgs
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The location which changed.</summary>
+        public GameLocation Location { get; }
+
+        /// <summary>The objects added to the location.</summary>
+        public IEnumerable<KeyValuePair<Vector2, Object>> Added { get; }
+
+        /// <summary>The objects removed from the location.</summary>
+        public IEnumerable<KeyValuePair<Vector2, Object>> Removed { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="location">The location which changed.</param>
+        /// <param name="added">The objects added to the location.</param>
+        /// <param name="removed">The objects removed from the location.</param>
+        public WorldObjectListChangedEventArgs(GameLocation location, IEnumerable<KeyValuePair<Vector2, Object>> added, IEnumerable<KeyValuePair<Vector2, Object>> removed)
+        {
+            this.Location = location;
+            this.Added = added.ToArray();
+            this.Removed = removed.ToArray();
+        }
+    }
+}
diff --git a/src/SMAPI/Events/WorldObjectsChangedEventArgs.cs b/src/SMAPI/Events/WorldObjectsChangedEventArgs.cs
deleted file mode 100644
index fb20acd4..00000000
--- a/src/SMAPI/Events/WorldObjectsChangedEventArgs.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using StardewValley;
-using Object = StardewValley.Object;
-
-namespace StardewModdingAPI.Events
-{
-    /// <summary>Event arguments for a <see cref="IWorldEvents.ObjectsChanged"/> event.</summary>
-    public class WorldObjectsChangedEventArgs : EventArgs
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The location which changed.</summary>
-        public GameLocation Location { get; }
-
-        /// <summary>The objects added to the location.</summary>
-        public IEnumerable<KeyValuePair<Vector2, Object>> Added { get; }
-
-        /// <summary>The objects removed from the location.</summary>
-        public IEnumerable<KeyValuePair<Vector2, Object>> Removed { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="location">The location which changed.</param>
-        /// <param name="added">The objects added to the location.</param>
-        /// <param name="removed">The objects removed from the location.</param>
-        public WorldObjectsChangedEventArgs(GameLocation location, IEnumerable<KeyValuePair<Vector2, Object>> added, IEnumerable<KeyValuePair<Vector2, Object>> removed)
-        {
-            this.Location = location;
-            this.Added = added.ToArray();
-            this.Removed = removed.ToArray();
-        }
-    }
-}
-- 
cgit