12 files changed, 225 insertions, 93 deletions
diff --git a/src/StardewModdingAPI/Events/ChangeType.cs b/src/StardewModdingAPI/Events/ChangeType.cs
new file mode 100644
index 00000000..4b207f08
--- /dev/null
+++ b/src/StardewModdingAPI/Events/ChangeType.cs
@@ -0,0 +1,15 @@
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Indicates how an inventory item changed.</summary>
+    public enum ChangeType
+    {
+        /// <summary>The entire stack was removed.</summary>
+        Removed,
+
+        /// <summary>The entire stack was added.</summary>
+        Added,
+
+        /// <summary>The stack size changed.</summary>
+        StackChange
+    }
+}
+\ No newline at end of file
diff --git a/src/StardewModdingAPI/Events/ContentEvents.cs b/src/StardewModdingAPI/Events/ContentEvents.cs
new file mode 100644
index 00000000..9418673a
--- /dev/null
+++ b/src/StardewModdingAPI/Events/ContentEvents.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using StardewModdingAPI.Framework;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Events raised when the game loads content.</summary>
+    [Obsolete("This is an undocumented experimental API and may change without warning.")]
+    public static class ContentEvents
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>Tracks the installed mods.</summary>
+        private static ModRegistry ModRegistry;
+
+        /// <summary>Encapsulates monitoring and logging.</summary>
+        private static IMonitor Monitor;
+
+        /// <summary>The mods using the experimental API for which a warning has been raised.</summary>
+        private static readonly HashSet<string> WarnedMods = new HashSet<string>();
+
+
+        /*********
+        ** Events
+        *********/
+        /// <summary>Raised after the content language changes.</summary>
+        public static event EventHandler<EventArgsValueChanged<string>> AfterLocaleChanged;
+
+        /// <summary>Raised when an XNB file is being read into the cache. Mods can change the data here before it's cached.</summary>
+        internal static event EventHandler<IContentEventHelper> AfterAssetLoaded;
+
+
+        /*********
+        ** Internal methods
+        *********/
+        /// <summary>Injects types required for backwards compatibility.</summary>
+        /// <param name="modRegistry">Tracks the installed mods.</param>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        internal static void Shim(ModRegistry modRegistry, IMonitor monitor)
+        {
+            ContentEvents.ModRegistry = modRegistry;
+            ContentEvents.Monitor = monitor;
+        }
+
+        /// <summary>Raise an <see cref="AfterLocaleChanged"/> event.</summary>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        /// <param name="oldLocale">The previous locale.</param>
+        /// <param name="newLocale">The current locale.</param>
+        internal static void InvokeAfterLocaleChanged(IMonitor monitor, string oldLocale, string newLocale)
+        {
+            monitor.SafelyRaiseGenericEvent($"{nameof(ContentEvents)}.{nameof(ContentEvents.AfterLocaleChanged)}", ContentEvents.AfterLocaleChanged?.GetInvocationList(), null, new EventArgsValueChanged<string>(oldLocale, newLocale));
+        }
+
+        /// <summary>Raise an <see cref="AfterAssetLoaded"/> event.</summary>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        /// <param name="contentHelper">Encapsulates access and changes to content being read from a data file.</param>
+        internal static void InvokeAfterAssetLoaded(IMonitor monitor, IContentEventHelper contentHelper)
+        {
+            if (ContentEvents.AfterAssetLoaded != null)
+            {
+                Delegate[] handlers = ContentEvents.AfterAssetLoaded.GetInvocationList();
+                ContentEvents.RaiseDeprecationWarning(handlers);
+                monitor.SafelyRaiseGenericEvent($"{nameof(ContentEvents)}.{nameof(ContentEvents.AfterAssetLoaded)}", handlers, null, contentHelper);
+            }
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Raise a 'experimental API' warning for each mod using the content API.</summary>
+        /// <param name="handlers">The event handlers.</param>
+        private static void RaiseDeprecationWarning(Delegate[] handlers)
+        {
+            foreach (Delegate handler in handlers)
+            {
+                string modName = ContentEvents.ModRegistry.GetModFrom(handler) ?? "An unknown mod";
+                if (!ContentEvents.WarnedMods.Contains(modName))
+                {
+                    ContentEvents.WarnedMods.Add(modName);
+                    ContentEvents.Monitor.Log($"{modName} used the undocumented and experimental content API, which may change or be removed without warning.", LogLevel.Warn);
+                }
+            }
+        }
+    }
+}
diff --git a/src/StardewModdingAPI/Events/EventArgsCommand.cs b/src/StardewModdingAPI/Events/EventArgsCommand.cs
index ddf644fb..bae13694 100644
--- a/src/StardewModdingAPI/Events/EventArgsCommand.cs
+++ b/src/StardewModdingAPI/Events/EventArgsCommand.cs
@@ -3,6 +3,7 @@
 namespace StardewModdingAPI.Events
 {
     /// <summary>Event arguments for a <see cref="StardewModdingAPI.Command.CommandFired"/> event.</summary>
+    [Obsolete("Use " + nameof(IModHelper) + "." + nameof(IModHelper.ConsoleCommands))]
     public class EventArgsCommand : EventArgs
     {
         /*********
diff --git a/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs b/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs
index 273f9d25..699d90be 100644
--- a/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs
+++ b/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs
@@ -1,5 +1,5 @@
 using System;
-using StardewValley;
+using SFarmer = StardewValley.Farmer;
 
 namespace StardewModdingAPI.Events
 {
@@ -10,10 +10,10 @@ namespace StardewModdingAPI.Events
         ** Accessors
         *********/
         /// <summary>The previous player character.</summary>
-        public Farmer NewFarmer { get; }
+        public SFarmer NewFarmer { get; }
 
         /// <summary>The new player character.</summary>
-        public Farmer PriorFarmer { get; }
+        public SFarmer PriorFarmer { get; }
 
 
         /*********
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Events
         /// <summary>Construct an instance.</summary>
         /// <param name="priorFarmer">The previous player character.</param>
         /// <param name="newFarmer">The new player character.</param>
-        public EventArgsFarmerChanged(Farmer priorFarmer, Farmer newFarmer)
+        public EventArgsFarmerChanged(SFarmer priorFarmer, SFarmer newFarmer)
         {
             this.PriorFarmer = priorFarmer;
             this.NewFarmer = newFarmer;
diff --git a/src/StardewModdingAPI/Events/EventArgsIntChanged.cs b/src/StardewModdingAPI/Events/EventArgsIntChanged.cs
index 31079730..0c742d12 100644
--- a/src/StardewModdingAPI/Events/EventArgsIntChanged.cs
+++ b/src/StardewModdingAPI/Events/EventArgsIntChanged.cs
@@ -9,11 +9,10 @@ namespace StardewModdingAPI.Events
         ** Accessors
         *********/
         /// <summary>The previous value.</summary>
-        public int NewInt { get; }
-
-        /// <summary>The current value.</summary>
         public int PriorInt { get; }
 
+        /// <summary>The current value.</summary>
+        public int NewInt { get; }
 
         /*********
         ** Public methods
diff --git a/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs b/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs
index 40c77419..11cbcedf 100644
--- a/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs
+++ b/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using StardewModdingAPI.Inheritance;
 using StardewValley;
 
 namespace StardewModdingAPI.Events
diff --git a/src/StardewModdingAPI/Events/EventArgsValueChanged.cs b/src/StardewModdingAPI/Events/EventArgsValueChanged.cs
new file mode 100644
index 00000000..1d25af49
--- /dev/null
+++ b/src/StardewModdingAPI/Events/EventArgsValueChanged.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace StardewModdingAPI.Events
+{
+    /// <summary>Event arguments for a field that changed value.</summary>
+    /// <typeparam name="T">The value type.</typeparam>
+    public class EventArgsValueChanged<T> : EventArgs
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The previous value.</summary>
+        public T PriorValue { get; }
+
+        /// <summary>The current value.</summary>
+        public T NewValue { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="priorValue">The previous value.</param>
+        /// <param name="newValue">The current value.</param>
+        public EventArgsValueChanged(T priorValue, T newValue)
+        {
+            this.PriorValue = priorValue;
+            this.NewValue = newValue;
+        }
+    }
+}
+\ No newline at end of file
diff --git a/src/StardewModdingAPI/Events/GraphicsEvents.cs b/src/StardewModdingAPI/Events/GraphicsEvents.cs
index 5f4feeac..25b976f1 100644
--- a/src/StardewModdingAPI/Events/GraphicsEvents.cs
+++ b/src/StardewModdingAPI/Events/GraphicsEvents.cs
@@ -15,24 +15,13 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised after the game window is resized.</summary>
         public static event EventHandler Resize;
 
-        /// <summary>Raised when drawing debug information to the screen (when <see cref="StardewModdingAPI.Inheritance.SGame.Debug"/> is true). This is called after the sprite batch is begun. If you just want to add debug info, use <see cref="StardewModdingAPI.Inheritance.SGame.DebugMessageQueue" /> in your update loop.</summary>
-        public static event EventHandler DrawDebug;
-
-        /// <summary>Obsolete.</summary>
-        [Obsolete("Use the other Pre/Post render events instead.")]
-        public static event EventHandler DrawTick;
-
-        /// <summary>Obsolete.</summary>
-        [Obsolete("Use the other Pre/Post render events instead. All of them will automatically be drawn into the render target if needed.")]
-        public static event EventHandler DrawInRenderTargetTick;
-
         /****
         ** Main render events
         ****/
-        /// <summary>Raised before drawing everything to the screen during a draw loop.</summary>
+        /// <summary>Raised before drawing the world to the screen.</summary>
         public static event EventHandler OnPreRenderEvent;
 
-        /// <summary>Raised after drawing everything to the screen during a draw loop.</summary>
+        /// <summary>Raised after drawing the world to the screen.</summary>
         public static event EventHandler OnPostRenderEvent;
 
         /****
@@ -41,30 +30,18 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised before drawing the HUD (item toolbar, clock, etc) to the screen. The HUD is available at this point, but not necessarily visible. (For example, the event is raised even if a menu is open.)</summary>
         public static event EventHandler OnPreRenderHudEvent;
 
-        /// <summary>Equivalent to <see cref="OnPreRenderHudEvent"/>, but invoked even if the HUD isn't available.</summary>
-        public static event EventHandler OnPreRenderHudEventNoCheck;
-
         /// <summary>Raised after drawing the HUD (item toolbar, clock, etc) to the screen. The HUD is available at this point, but not necessarily visible. (For example, the event is raised even if a menu is open.)</summary>
         public static event EventHandler OnPostRenderHudEvent;
 
-        /// <summary>Equivalent to <see cref="OnPostRenderHudEvent"/>, but invoked even if the HUD isn't available.</summary>
-        public static event EventHandler OnPostRenderHudEventNoCheck;
-
         /****
         ** GUI events
         ****/
         /// <summary>Raised before drawing a menu to the screen during a draw loop. This includes the game's internal menus like the title screen.</summary>
         public static event EventHandler OnPreRenderGuiEvent;
 
-        /// <summary>Equivalent to <see cref="OnPreRenderGuiEvent"/>, but invoked even if there's no menu being drawn.</summary>
-        public static event EventHandler OnPreRenderGuiEventNoCheck;
-
         /// <summary>Raised after drawing a menu to the screen during a draw loop. This includes the game's internal menus like the title screen.</summary>
         public static event EventHandler OnPostRenderGuiEvent;
 
-        /// <summary>Equivalent to <see cref="OnPreRenderGuiEvent"/>, but invoked even if there's no menu being drawn.</summary>
-        public static event EventHandler OnPostRenderGuiEventNoCheck;
-
 
         /*********
         ** Internal methods
@@ -81,29 +58,6 @@ namespace StardewModdingAPI.Events
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.Resize)}", GraphicsEvents.Resize?.GetInvocationList(), sender, e);
         }
 
-        /// <summary>Raise a <see cref="DrawDebug"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        internal static void InvokeDrawDebug(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.DrawDebug)}", GraphicsEvents.DrawDebug?.GetInvocationList());
-        }
-
-        /// <summary>Raise a <see cref="DrawTick"/> event.</summary>
-        /// <param name="monitor">Encapsulates logging and monitoring.</param>
-        [Obsolete("Should not be used.")]
-        public static void InvokeDrawTick(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.DrawTick)}", GraphicsEvents.DrawTick?.GetInvocationList());
-        }
-
-        /// <summary>Raise a <see cref="DrawInRenderTargetTick"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        [Obsolete("Should not be used.")]
-        public static void InvokeDrawInRenderTargetTick(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.DrawInRenderTargetTick)}", GraphicsEvents.DrawInRenderTargetTick?.GetInvocationList());
-        }
-
         /****
         ** Main render events
         ****/
@@ -121,8 +75,14 @@ namespace StardewModdingAPI.Events
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPostRenderEvent)}", GraphicsEvents.OnPostRenderEvent?.GetInvocationList());
         }
 
+        /// <summary>Get whether there are any post-render event listeners.</summary>
+        internal static bool HasPostRenderListeners()
+        {
+            return GraphicsEvents.OnPostRenderEvent != null;
+        }
+
         /****
-        ** HUD events
+        ** GUI events
         ****/
         /// <summary>Raise an <see cref="OnPreRenderGuiEvent"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
@@ -131,13 +91,6 @@ namespace StardewModdingAPI.Events
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPreRenderGuiEvent)}", GraphicsEvents.OnPreRenderGuiEvent?.GetInvocationList());
         }
 
-        /// <summary>Raise an <see cref="OnPreRenderGuiEventNoCheck"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        internal static void InvokeOnPreRenderGuiEventNoCheck(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPreRenderGuiEventNoCheck)}", GraphicsEvents.OnPreRenderGuiEventNoCheck?.GetInvocationList());
-        }
-
         /// <summary>Raise an <see cref="OnPostRenderGuiEvent"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         internal static void InvokeOnPostRenderGuiEvent(IMonitor monitor)
@@ -145,15 +98,8 @@ namespace StardewModdingAPI.Events
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPostRenderGuiEvent)}", GraphicsEvents.OnPostRenderGuiEvent?.GetInvocationList());
         }
 
-        /// <summary>Raise an <see cref="OnPostRenderGuiEventNoCheck"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        internal static void InvokeOnPostRenderGuiEventNoCheck(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPostRenderGuiEventNoCheck)}", GraphicsEvents.OnPostRenderGuiEventNoCheck?.GetInvocationList());
-        }
-
         /****
-        ** GUI events
+        ** HUD events
         ****/
         /// <summary>Raise an <see cref="OnPreRenderHudEvent"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
@@ -162,25 +108,11 @@ namespace StardewModdingAPI.Events
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPreRenderHudEvent)}", GraphicsEvents.OnPreRenderHudEvent?.GetInvocationList());
         }
 
-        /// <summary>Raise an <see cref="OnPreRenderHudEventNoCheck"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        internal static void InvokeOnPreRenderHudEventNoCheck(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPreRenderHudEventNoCheck)}", GraphicsEvents.OnPreRenderHudEventNoCheck?.GetInvocationList());
-        }
-
         /// <summary>Raise an <see cref="OnPostRenderHudEvent"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         internal static void InvokeOnPostRenderHudEvent(IMonitor monitor)
         {
             monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPostRenderHudEvent)}", GraphicsEvents.OnPostRenderHudEvent?.GetInvocationList());
         }
-
-        /// <summary>Raise an <see cref="OnPostRenderHudEventNoCheck"/> event.</summary>
-        /// <param name="monitor">Encapsulates monitoring and logging.</param>
-        internal static void InvokeOnPostRenderHudEventNoCheck(IMonitor monitor)
-        {
-            monitor.SafelyRaisePlainEvent($"{nameof(GraphicsEvents)}.{nameof(GraphicsEvents.OnPostRenderHudEventNoCheck)}", GraphicsEvents.OnPostRenderHudEventNoCheck?.GetInvocationList());
-        }
     }
 }
diff --git a/src/StardewModdingAPI/Events/ItemStackChange.cs b/src/StardewModdingAPI/Events/ItemStackChange.cs
new file mode 100644
index 00000000..f9ae6df6
--- /dev/null
+++ b/src/StardewModdingAPI/Events/ItemStackChange.cs
@@ -0,0 +1,20 @@
+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
diff --git a/src/StardewModdingAPI/Events/PlayerEvents.cs b/src/StardewModdingAPI/Events/PlayerEvents.cs
index dd3ff220..b02ebfec 100644
--- a/src/StardewModdingAPI/Events/PlayerEvents.cs
+++ b/src/StardewModdingAPI/Events/PlayerEvents.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Framework;
-using StardewModdingAPI.Inheritance;
 using StardewValley;
+using SFarmer = StardewValley.Farmer;
 
 namespace StardewModdingAPI.Events
 {
@@ -11,6 +11,13 @@ namespace StardewModdingAPI.Events
     public static class PlayerEvents
     {
         /*********
+        ** Properties
+        *********/
+        /// <summary>Manages deprecation warnings.</summary>
+        private static DeprecationManager DeprecationManager;
+
+
+        /*********
         ** Events
         *********/
         /// <summary>Raised after the player loads a saved game.</summary>
@@ -31,6 +38,13 @@ namespace StardewModdingAPI.Events
         /*********
         ** Internal methods
         *********/
+        /// <summary>Injects types required for backwards compatibility.</summary>
+        /// <param name="deprecationManager">Manages deprecation warnings.</param>
+        internal static void Shim(DeprecationManager deprecationManager)
+        {
+            PlayerEvents.DeprecationManager = deprecationManager;
+        }
+
         /// <summary>Raise a <see cref="LoadedGame"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         /// <param name="loaded">Whether the save has been loaded. This is always true.</param>
@@ -42,7 +56,7 @@ namespace StardewModdingAPI.Events
             string name = $"{nameof(PlayerEvents)}.{nameof(PlayerEvents.LoadedGame)}";
             Delegate[] handlers = PlayerEvents.LoadedGame.GetInvocationList();
 
-            Program.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Notice);
+            PlayerEvents.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Info);
             monitor.SafelyRaiseGenericEvent(name, handlers, null, loaded);
         }
 
@@ -50,7 +64,7 @@ namespace StardewModdingAPI.Events
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         /// <param name="priorFarmer">The previous player character.</param>
         /// <param name="newFarmer">The new player character.</param>
-        internal static void InvokeFarmerChanged(IMonitor monitor, Farmer priorFarmer, Farmer newFarmer)
+        internal static void InvokeFarmerChanged(IMonitor monitor, SFarmer priorFarmer, SFarmer newFarmer)
         {
             if (PlayerEvents.FarmerChanged == null)
                 return;
@@ -58,7 +72,7 @@ namespace StardewModdingAPI.Events
             string name = $"{nameof(PlayerEvents)}.{nameof(PlayerEvents.FarmerChanged)}";
             Delegate[] handlers = PlayerEvents.FarmerChanged.GetInvocationList();
 
-            Program.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Notice);
+            PlayerEvents.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Info);
             monitor.SafelyRaiseGenericEvent(name, handlers, null, new EventArgsFarmerChanged(priorFarmer, newFarmer));
         }
 
diff --git a/src/StardewModdingAPI/Events/SaveEvents.cs b/src/StardewModdingAPI/Events/SaveEvents.cs
index 2921003a..50e6d729 100644
--- a/src/StardewModdingAPI/Events/SaveEvents.cs
+++ b/src/StardewModdingAPI/Events/SaveEvents.cs
@@ -18,6 +18,9 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised after the player loads a save slot.</summary>
         public static event EventHandler AfterLoad;
 
+        /// <summary>Raised after the game returns to the title screen.</summary>
+        public static event EventHandler AfterReturnToTitle;
+
 
         /*********
         ** Internal methods
@@ -42,5 +45,12 @@ namespace StardewModdingAPI.Events
         {
             monitor.SafelyRaisePlainEvent($"{nameof(SaveEvents)}.{nameof(SaveEvents.AfterLoad)}", SaveEvents.AfterLoad?.GetInvocationList(), null, EventArgs.Empty);
         }
+
+        /// <summary>Raise a <see cref="AfterReturnToTitle"/> event.</summary>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        internal static void InvokeAfterReturnToTitle(IMonitor monitor)
+        {
+            monitor.SafelyRaisePlainEvent($"{nameof(SaveEvents)}.{nameof(SaveEvents.AfterReturnToTitle)}", SaveEvents.AfterReturnToTitle?.GetInvocationList(), null, EventArgs.Empty);
+        }
     }
 }
diff --git a/src/StardewModdingAPI/Events/TimeEvents.cs b/src/StardewModdingAPI/Events/TimeEvents.cs
index dedd7e77..3f06a46b 100644
--- a/src/StardewModdingAPI/Events/TimeEvents.cs
+++ b/src/StardewModdingAPI/Events/TimeEvents.cs
@@ -7,12 +7,22 @@ namespace StardewModdingAPI.Events
     public static class TimeEvents
     {
         /*********
+        ** Properties
+        *********/
+        /// <summary>Manages deprecation warnings.</summary>
+        private static DeprecationManager DeprecationManager;
+
+
+        /*********
         ** Events
         *********/
+        /// <summary>Raised after the game begins a new day, including when loading a save.</summary>
+        public static event EventHandler AfterDayStarted;
+
         /// <summary>Raised after the in-game clock changes.</summary>
         public static event EventHandler<EventArgsIntChanged> TimeOfDayChanged;
 
-        /// <summary>Raised after the day-of-month value changes, including when loading a save (unlike <see cref="OnNewDay"/>).</summary>
+        /// <summary>Raised after the day-of-month value changes, including when loading a save. This may happen before save; in most cases you should use <see cref="AfterDayStarted"/> instead.</summary>
         public static event EventHandler<EventArgsIntChanged> DayOfMonthChanged;
 
         /// <summary>Raised after the year value changes.</summary>
@@ -22,13 +32,27 @@ namespace StardewModdingAPI.Events
         public static event EventHandler<EventArgsStringChanged> SeasonOfYearChanged;
 
         /// <summary>Raised when the player is transitioning to a new day and the game is performing its day update logic. This event is triggered twice: once after the game starts transitioning, and again after it finishes.</summary>
-        [Obsolete("Use " + nameof(TimeEvents) + "." + nameof(DayOfMonthChanged) + " or " + nameof(SaveEvents) + " instead")]
+        [Obsolete("Use " + nameof(TimeEvents) + "." + nameof(TimeEvents.AfterDayStarted) + " or " + nameof(SaveEvents) + " instead")]
         public static event EventHandler<EventArgsNewDay> OnNewDay;
 
 
         /*********
         ** Internal methods
         *********/
+        /// <summary>Injects types required for backwards compatibility.</summary>
+        /// <param name="deprecationManager">Manages deprecation warnings.</param>
+        internal static void Shim(DeprecationManager deprecationManager)
+        {
+            TimeEvents.DeprecationManager = deprecationManager;
+        }
+
+        /// <summary>Raise an <see cref="AfterDayStarted"/> event.</summary>
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        internal static void InvokeAfterDayStarted(IMonitor monitor)
+        {
+            monitor.SafelyRaisePlainEvent($"{nameof(TimeEvents)}.{nameof(TimeEvents.AfterDayStarted)}", TimeEvents.AfterDayStarted?.GetInvocationList(), null, EventArgs.Empty);
+        }
+
         /// <summary>Raise a <see cref="InvokeDayOfMonthChanged"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         /// <param name="priorTime">The previous time in military time format (e.g. 6:00pm is 1800).</param>
@@ -78,7 +102,7 @@ namespace StardewModdingAPI.Events
             string name = $"{nameof(TimeEvents)}.{nameof(TimeEvents.OnNewDay)}";
             Delegate[] handlers = TimeEvents.OnNewDay.GetInvocationList();
 
-            Program.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Notice);
+            TimeEvents.DeprecationManager.WarnForEvent(handlers, name, "1.6", DeprecationLevel.Info);
             monitor.SafelyRaiseGenericEvent(name, handlers, null, new EventArgsNewDay(priorDay, newDay, isTransitioning));
         }
     }