Merge branch 'develop' into stable

65 files changed, 891 insertions, 150 deletions

diff --git a/src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
index e73b9396..9bc691fc 100644
--- a/src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs
+++ b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
@@ -7,7 +7,7 @@ using StardewValley.Buildings;
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments for a <see cref="IWorldEvents.BuildingListChanged"/> event.</summary>
-    public class WorldBuildingListChangedEventArgs : EventArgs
+    public class BuildingListChangedEventArgs : EventArgs
     {
         /*********
         ** Accessors
@@ -29,7 +29,7 @@ namespace StardewModdingAPI.Events
         /// <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)
+        public BuildingListChangedEventArgs(GameLocation location, IEnumerable<Building> added, IEnumerable<Building> removed)
         {
             this.Location = location;
             this.Added = added.ToArray();
diff --git a/src/SMAPI/Events/InputButtonPressedEventArgs.cs b/src/SMAPI/Events/ButtonPressedEventArgs.cs
index 8c6844dd..9e6c187f 100644
--- a/src/SMAPI/Events/InputButtonPressedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonPressedEventArgs.cs
@@ -4,7 +4,7 @@ using StardewModdingAPI.Framework.Input;
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments when a button is pressed.</summary>
-    public class InputButtonPressedEventArgs : EventArgs
+    public class ButtonPressedEventArgs : EventArgs
     {
         /*********
         ** Properties
@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Events
         /// <param name="button">The button on the controller, keyboard, or mouse.</param>
         /// <param name="cursor">The cursor position.</param>
         /// <param name="inputState">The game's current input state.</param>
-        internal InputButtonPressedEventArgs(SButton button, ICursorPosition cursor, SInputState inputState)
+        internal ButtonPressedEventArgs(SButton button, ICursorPosition cursor, SInputState inputState)
         {
             this.Button = button;
             this.Cursor = cursor;
diff --git a/src/SMAPI/Events/InputButtonReleasedEventArgs.cs b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
index 4b0bc326..2a289bc7 100644
--- a/src/SMAPI/Events/InputButtonReleasedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
@@ -4,7 +4,7 @@ using StardewModdingAPI.Framework.Input;
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments when a button is released.</summary>
-    public class InputButtonReleasedEventArgs : EventArgs
+    public class ButtonReleasedEventArgs : EventArgs
     {
         /*********
         ** Properties
@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Events
         /// <param name="button">The button on the controller, keyboard, or mouse.</param>
         /// <param name="cursor">The cursor position.</param>
         /// <param name="inputState">The game's current input state.</param>
-        internal InputButtonReleasedEventArgs(SButton button, ICursorPosition cursor, SInputState inputState)
+        internal ButtonReleasedEventArgs(SButton button, ICursorPosition cursor, SInputState inputState)
         {
             this.Button = button;
             this.Cursor = cursor;
diff --git a/src/SMAPI/Events/ContentEvents.cs b/src/SMAPI/Events/ContentEvents.cs
index 63645258..3ee0560b 100644
--- a/src/SMAPI/Events/ContentEvents.cs
+++ b/src/SMAPI/Events/ContentEvents.cs
@@ -19,8 +19,8 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised after the content language changes.</summary>
         public static event EventHandler<EventArgsValueChanged<string>> AfterLocaleChanged
         {
-            add => ContentEvents.EventManager.Content_LocaleChanged.Add(value);
-            remove => ContentEvents.EventManager.Content_LocaleChanged.Remove(value);
+            add => ContentEvents.EventManager.Legacy_LocaleChanged.Add(value);
+            remove => ContentEvents.EventManager.Legacy_LocaleChanged.Remove(value);
         }
 
 
diff --git a/src/SMAPI/Events/ControlEvents.cs b/src/SMAPI/Events/ControlEvents.cs
index a3994d1d..56a4fa3f 100644
--- a/src/SMAPI/Events/ControlEvents.cs
+++ b/src/SMAPI/Events/ControlEvents.cs
@@ -20,57 +20,57 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised when the <see cref="KeyboardState"/> changes. That happens when the player presses or releases a key.</summary>
         public static event EventHandler<EventArgsKeyboardStateChanged> KeyboardChanged
         {
-            add => ControlEvents.EventManager.Legacy_Control_KeyboardChanged.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_KeyboardChanged.Remove(value);
+            add => ControlEvents.EventManager.Legacy_KeyboardChanged.Add(value);
+            remove => ControlEvents.EventManager.Legacy_KeyboardChanged.Remove(value);
         }
 
         /// <summary>Raised after the player presses a keyboard key.</summary>
         public static event EventHandler<EventArgsKeyPressed> KeyPressed
         {
-            add => ControlEvents.EventManager.Legacy_Control_KeyPressed.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_KeyPressed.Remove(value);
+            add => ControlEvents.EventManager.Legacy_KeyPressed.Add(value);
+            remove => ControlEvents.EventManager.Legacy_KeyPressed.Remove(value);
         }
 
         /// <summary>Raised after the player releases a keyboard key.</summary>
         public static event EventHandler<EventArgsKeyPressed> KeyReleased
         {
-            add => ControlEvents.EventManager.Legacy_Control_KeyReleased.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_KeyReleased.Remove(value);
+            add => ControlEvents.EventManager.Legacy_KeyReleased.Add(value);
+            remove => ControlEvents.EventManager.Legacy_KeyReleased.Remove(value);
         }
 
         /// <summary>Raised when the <see cref="MouseState"/> changes. That happens when the player moves the mouse, scrolls the mouse wheel, or presses/releases a button.</summary>
         public static event EventHandler<EventArgsMouseStateChanged> MouseChanged
         {
-            add => ControlEvents.EventManager.Legacy_Control_MouseChanged.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_MouseChanged.Remove(value);
+            add => ControlEvents.EventManager.Legacy_MouseChanged.Add(value);
+            remove => ControlEvents.EventManager.Legacy_MouseChanged.Remove(value);
         }
 
         /// <summary>The player pressed a controller button. This event isn't raised for trigger buttons.</summary>
         public static event EventHandler<EventArgsControllerButtonPressed> ControllerButtonPressed
         {
-            add => ControlEvents.EventManager.Legacy_Control_ControllerButtonPressed.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_ControllerButtonPressed.Remove(value);
+            add => ControlEvents.EventManager.Legacy_ControllerButtonPressed.Add(value);
+            remove => ControlEvents.EventManager.Legacy_ControllerButtonPressed.Remove(value);
         }
 
         /// <summary>The player released a controller button. This event isn't raised for trigger buttons.</summary>
         public static event EventHandler<EventArgsControllerButtonReleased> ControllerButtonReleased
         {
-            add => ControlEvents.EventManager.Legacy_Control_ControllerButtonReleased.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_ControllerButtonReleased.Remove(value);
+            add => ControlEvents.EventManager.Legacy_ControllerButtonReleased.Add(value);
+            remove => ControlEvents.EventManager.Legacy_ControllerButtonReleased.Remove(value);
         }
 
         /// <summary>The player pressed a controller trigger button.</summary>
         public static event EventHandler<EventArgsControllerTriggerPressed> ControllerTriggerPressed
         {
-            add => ControlEvents.EventManager.Legacy_Control_ControllerTriggerPressed.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_ControllerTriggerPressed.Remove(value);
+            add => ControlEvents.EventManager.Legacy_ControllerTriggerPressed.Add(value);
+            remove => ControlEvents.EventManager.Legacy_ControllerTriggerPressed.Remove(value);
         }
 
         /// <summary>The player released a controller trigger button.</summary>
         public static event EventHandler<EventArgsControllerTriggerReleased> ControllerTriggerReleased
         {
-            add => ControlEvents.EventManager.Legacy_Control_ControllerTriggerReleased.Add(value);
-            remove => ControlEvents.EventManager.Legacy_Control_ControllerTriggerReleased.Remove(value);
+            add => ControlEvents.EventManager.Legacy_ControllerTriggerReleased.Add(value);
+            remove => ControlEvents.EventManager.Legacy_ControllerTriggerReleased.Remove(value);
         }
 
 
diff --git a/src/SMAPI/Events/InputCursorMovedEventArgs.cs b/src/SMAPI/Events/CursorMovedEventArgs.cs
index 53aac5b3..453743b9 100644
--- a/src/SMAPI/Events/InputCursorMovedEventArgs.cs
+++ b/src/SMAPI/Events/CursorMovedEventArgs.cs
@@ -3,7 +3,7 @@ using System;
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments when the in-game cursor is moved.</summary>
-    public class InputCursorMovedEventArgs : EventArgs
+    public class CursorMovedEventArgs : EventArgs
     {
         /*********
         ** Accessors
@@ -21,7 +21,7 @@ namespace StardewModdingAPI.Events
         /// <summary>Construct an instance.</summary>
         /// <param name="oldPosition">The previous cursor position.</param>
         /// <param name="newPosition">The new cursor position.</param>
-        public InputCursorMovedEventArgs(ICursorPosition oldPosition, ICursorPosition newPosition)
+        public CursorMovedEventArgs(ICursorPosition oldPosition, ICursorPosition newPosition)
         {
             this.OldPosition = oldPosition;
             this.NewPosition = newPosition;
diff --git a/src/SMAPI/Events/GameLoopLaunchedEventArgs.cs b/src/SMAPI/Events/DayEndingEventArgs.cs
index 6a42e4f9..5cb433bc 100644
--- a/src/SMAPI/Events/GameLoopLaunchedEventArgs.cs
+++ b/src/SMAPI/Events/DayEndingEventArgs.cs
@@ -2,6 +2,6 @@ using System;
 
 namespace StardewModdingAPI.Events
 {
-    /// <summary>Event arguments for an <see cref="IGameLoopEvents.Launched"/> event.</summary>
-    public class GameLoopLaunchedEventArgs : EventArgs { }
+    /// <summary>Event arguments for an <see cref="IGameLoopEvents.DayEnding"/> event.</summary>
+    public class DayEndingEventArgs : EventArgs { }
 }
diff --git a/src/SMAPI/Events/DayStartedEventArgs.cs b/src/SMAPI/Events/DayStartedEventArgs.cs
new file mode 100644
index 00000000..45823628
--- /dev/null
+++ b/src/SMAPI/Events/DayStartedEventArgs.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for an <see cref="IGameLoopEvents.DayStarted"/> event.</summary>
+    public class DayStartedEventArgs : EventArgs { }
+}
diff --git a/src/SMAPI/Events/WorldDebrisListChangedEventArgs.cs b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
index aad9c24d..1337bd3b 100644
--- a/src/SMAPI/Events/WorldDebrisListChangedEventArgs.cs
+++ b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
@@ -6,7 +6,7 @@ using StardewValley;
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments for a <see cref="IWorldEvents.DebrisListChanged"/> event.</summary>
-    public class WorldDebrisListChangedEventArgs : EventArgs
+    public class DebrisListChangedEventArgs : EventArgs
     {
         /*********
         ** Accessors
@@ -28,7 +28,7 @@ namespace StardewModdingAPI.Events
         /// <param name="location">The location which changed.</param>
         /// <param name="added">The debris added to the location.</param>
         /// <param name="removed">The debris removed from the location.</param>
-        public WorldDebrisListChangedEventArgs(GameLocation location, IEnumerable<Debris> added, IEnumerable<Debris> removed)
+        public DebrisListChangedEventArgs(GameLocation location, IEnumerable<Debris> added, IEnumerable<Debris> removed)
         {
             this.Location = location;
             this.Added = added.ToArray();
diff --git a/src/SMAPI/Events/EventArgsInventoryChanged.cs b/src/SMAPI/Events/EventArgsInventoryChanged.cs
index 1fdca834..3a2354b6 100644
--- a/src/SMAPI/Events/EventArgsInventoryChanged.cs
+++ b/src/SMAPI/Events/EventArgsInventoryChanged.cs
@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Events
         /// <summary>Construct an instance.</summary>
         /// <param name="inventory">The player's inventory.</param>
         /// <param name="changedItems">The inventory changes.</param>
-        public EventArgsInventoryChanged(IList<Item> inventory, List<ItemStackChange> changedItems)
+        public EventArgsInventoryChanged(IList<Item> inventory, ItemStackChange[] changedItems)
         {
             this.Inventory = inventory;
             this.Added = changedItems.Where(n => n.ChangeType == ChangeType.Added).ToList();
diff --git a/src/SMAPI/Events/EventArgsLevelUp.cs b/src/SMAPI/Events/EventArgsLevelUp.cs
index fe6696d4..e9a697e7 100644
--- a/src/SMAPI/Events/EventArgsLevelUp.cs
+++ b/src/SMAPI/Events/EventArgsLevelUp.cs
@@ -1,4 +1,5 @@
 using System;
+using StardewModdingAPI.Enums;
 
 namespace StardewModdingAPI.Events
 {
@@ -18,22 +19,22 @@ namespace StardewModdingAPI.Events
         public enum LevelType
         {
             /// <summary>The combat skill.</summary>
-            Combat,
+            Combat = SkillType.Combat,
 
             /// <summary>The farming skill.</summary>
-            Farming,
+            Farming = SkillType.Farming,
 
             /// <summary>The fishing skill.</summary>
-            Fishing,
+            Fishing = SkillType.Fishing,
 
             /// <summary>The foraging skill.</summary>
-            Foraging,
+            Foraging = SkillType.Foraging,
 
             /// <summary>The mining skill.</summary>
-            Mining,
+            Mining = SkillType.Mining,
 
             /// <summary>The luck skill.</summary>
-            Luck
+            Luck = SkillType.Luck
         }
 
 
diff --git a/src/SMAPI/Events/GameEvents.cs b/src/SMAPI/Events/GameEvents.cs
index 92879280..952b3570 100644
--- a/src/SMAPI/Events/GameEvents.cs
+++ b/src/SMAPI/Events/GameEvents.cs
@@ -19,57 +19,57 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised when the game updates its state (≈60 times per second).</summary>
         public static event EventHandler UpdateTick
         {
-            add => GameEvents.EventManager.Game_UpdateTick.Add(value);
-            remove => GameEvents.EventManager.Game_UpdateTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_UpdateTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_UpdateTick.Remove(value);
         }
 
         /// <summary>Raised every other tick (≈30 times per second).</summary>
         public static event EventHandler SecondUpdateTick
         {
-            add => GameEvents.EventManager.Game_SecondUpdateTick.Add(value);
-            remove => GameEvents.EventManager.Game_SecondUpdateTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_SecondUpdateTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_SecondUpdateTick.Remove(value);
         }
 
         /// <summary>Raised every fourth tick (≈15 times per second).</summary>
         public static event EventHandler FourthUpdateTick
         {
-            add => GameEvents.EventManager.Game_FourthUpdateTick.Add(value);
-            remove => GameEvents.EventManager.Game_FourthUpdateTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_FourthUpdateTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_FourthUpdateTick.Remove(value);
         }
 
         /// <summary>Raised every eighth tick (≈8 times per second).</summary>
         public static event EventHandler EighthUpdateTick
         {
-            add => GameEvents.EventManager.Game_EighthUpdateTick.Add(value);
-            remove => GameEvents.EventManager.Game_EighthUpdateTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_EighthUpdateTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_EighthUpdateTick.Remove(value);
         }
 
         /// <summary>Raised every 15th tick (≈4 times per second).</summary>
         public static event EventHandler QuarterSecondTick
         {
-            add => GameEvents.EventManager.Game_QuarterSecondTick.Add(value);
-            remove => GameEvents.EventManager.Game_QuarterSecondTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_QuarterSecondTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_QuarterSecondTick.Remove(value);
         }
 
         /// <summary>Raised every 30th tick (≈twice per second).</summary>
         public static event EventHandler HalfSecondTick
         {
-            add => GameEvents.EventManager.Game_HalfSecondTick.Add(value);
-            remove => GameEvents.EventManager.Game_HalfSecondTick.Remove(value);
+            add => GameEvents.EventManager.Legacy_HalfSecondTick.Add(value);
+            remove => GameEvents.EventManager.Legacy_HalfSecondTick.Remove(value);
         }
 
         /// <summary>Raised every 60th tick (≈once per second).</summary>
         public static ev