add more events (#310)

9 files changed, 358 insertions, 25 deletions

diff --git a/src/SMAPI/Framework/Events/EventManager.cs b/src/SMAPI/Framework/Events/EventManager.cs
index 616db7d9..31b0346a 100644
--- a/src/SMAPI/Framework/Events/EventManager.cs
+++ b/src/SMAPI/Framework/Events/EventManager.cs
@@ -12,6 +12,39 @@ namespace StardewModdingAPI.Framework.Events
         ** Events (new)
         *********/
         /****
+        ** Display
+        ****/
+        /// <summary>Raised after a game menu is opened, closed, or replaced.</summary>
+        public readonly ManagedEvent<MenuChangedEventArgs> MenuChanged;
+
+        /// <summary>Raised before the game draws anything to the screen in a draw tick, as soon as the sprite batch is opened. The sprite batch may be closed and reopened multiple times after this event is called, but it's only raised once per draw tick. This event isn't useful for drawing to the screen, since the game will draw over it.</summary>
+        public readonly ManagedEvent<RenderingEventArgs> Rendering;
+
+        /// <summary>Raised after the game draws to the sprite patch in a draw tick, just before the final sprite batch is rendered to the screen. Since the game may open/close the sprite batch multiple times in a draw tick, the sprite batch may not contain everything being drawn and some things may already be rendered to the screen. Content drawn to the sprite batch at this point will be drawn over all vanilla content (including menus, HUD, and cursor).</summary>
+        public readonly ManagedEvent<RenderedEventArgs> Rendered;
+
+        /// <summary>Raised before the game world is drawn to the screen.</summary>
+        public readonly ManagedEvent<RenderingWorldEventArgs> RenderingWorld;
+
+        /// <summary>Raised after the game world is drawn to the sprite patch, before it's rendered to the screen.</summary>
+        public readonly ManagedEvent<RenderedWorldEventArgs> RenderedWorld;
+
+        /// <summary>When a menu is open (<see cref="StardewValley.Game1.activeClickableMenu"/> isn't null), raised before that menu is drawn to the screen.</summary>
+        public readonly ManagedEvent<RenderingActiveMenuEventArgs> RenderingActiveMenu;
+
+        /// <summary>When a menu is open (<see cref="StardewValley.Game1.activeClickableMenu"/> isn't null), raised after that menu is drawn to the sprite batch but before it's rendered to the screen.</summary>
+        public readonly ManagedEvent<RenderedActiveMenuEventArgs> RenderedActiveMenu;
+
+        /// <summary>Raised before drawing the HUD (item toolbar, clock, etc) to the screen.</summary>
+        public readonly ManagedEvent<RenderingHudEventArgs> RenderingHud;
+
+        /// <summary>Raised after drawing the HUD (item toolbar, clock, etc) to the sprite batch, but before it's rendered to the screen.</summary>
+        public readonly ManagedEvent<RenderedHudEventArgs> RenderedHud;
+
+        /// <summary>Raised after the game window is resized.</summary>
+        public readonly ManagedEvent<WindowResizedEventArgs> WindowResized;
+
+        /****
         ** Game loop
         ****/
         /// <summary>Raised after the game is launched, right before the first update tick.</summary>
@@ -44,6 +77,12 @@ namespace StardewModdingAPI.Framework.Events
         /// <summary>Raised before the game ends the current day. This happens before it starts setting up the next day and before <see cref="Saving"/>.</summary>
         public readonly ManagedEvent<DayEndingEventArgs> DayEnding;
 
+        /// <summary>Raised after the in-game clock time changes.</summary>
+        public readonly ManagedEvent<TimeChangedEventArgs> TimeChanged;
+
+        /// <summary>Raised after the game returns to the title screen.</summary>
+        public readonly ManagedEvent<ReturnedToTitleEventArgs> ReturnedToTitle;
+
         /****
         ** Input
         ****/
@@ -60,6 +99,18 @@ namespace StardewModdingAPI.Framework.Events
         public readonly ManagedEvent<MouseWheelScrolledEventArgs> MouseWheelScrolled;
 
         /****
+        ** Player
+        ****/
+        /// <summary>Raised after items are added or removed to a player's inventory.</summary>
+        public readonly ManagedEvent<InventoryChangedEventArgs> InventoryChanged;
+
+        /// <summary>Raised after a player skill level changes. This happens as soon as they level up, not when the game notifies the player after their character goes to bed.</summary>
+        public readonly ManagedEvent<LevelChangedEventArgs> LevelChanged;
+
+        /// <summary>Raised after a player warps to a new location.</summary>
+        public readonly ManagedEvent<WarpedEventArgs> Warped;
+
+        /****
         ** World
         ****/
         /// <summary>Raised after a game location is added or removed.</summary>
@@ -83,6 +134,15 @@ namespace StardewModdingAPI.Framework.Events
         /// <summary>Raised after terrain features (like floors and trees) are added or removed in a location.</summary>
         public readonly ManagedEvent<TerrainFeatureListChangedEventArgs> TerrainFeatureListChanged;
 
+        /****
+        ** Specialised
+        ****/
+        /// <summary>Raised before the game performs its overall update tick (≈60 times per second). See notes on <see cref="ISpecialisedEvents.UnvalidatedUpdateTicking"/>.</summary>
+        public readonly ManagedEvent<UnvalidatedUpdateTickingEventArgs> UnvalidatedUpdateTicking;
+
+        /// <summary>Raised after the game performs its overall update tick (≈60 times per second). See notes on <see cref="ISpecialisedEvents.UnvalidatedUpdateTicked"/>.</summary>
+        public readonly ManagedEvent<UnvalidatedUpdateTickedEventArgs> UnvalidatedUpdateTicked;
+
 
         /*********
         ** Events (old)
@@ -285,6 +345,17 @@ namespace StardewModdingAPI.Framework.Events
             ManagedEvent ManageEvent(string typeName, string eventName) => new ManagedEvent($"{typeName}.{eventName}", monitor, modRegistry);
 
             // init events (new)
+            this.MenuChanged = ManageEventOf<MenuChangedEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.MenuChanged));
+            this.Rendering = ManageEventOf<RenderingEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.Rendering));
+            this.Rendered = ManageEventOf<RenderedEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.Rendered));
+            this.RenderingWorld = ManageEventOf<RenderingWorldEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderingWorld));
+            this.RenderedWorld = ManageEventOf<RenderedWorldEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderedWorld));
+            this.RenderingActiveMenu = ManageEventOf<RenderingActiveMenuEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderingActiveMenu));
+            this.RenderedActiveMenu = ManageEventOf<RenderedActiveMenuEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderedActiveMenu));
+            this.RenderingHud = ManageEventOf<RenderingHudEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderingHud));
+            this.RenderedHud = ManageEventOf<RenderedHudEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.RenderedHud));
+            this.WindowResized = ManageEventOf<WindowResizedEventArgs>(nameof(IModEvents.Display), nameof(IDisplayEvents.WindowResized));
+
             this.GameLaunched = ManageEventOf<GameLaunchedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.GameLaunched));
             this.UpdateTicking = ManageEventOf<UpdateTickingEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.UpdateTicking));
             this.UpdateTicked = ManageEventOf<UpdateTickedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.UpdateTicked));
@@ -295,12 +366,18 @@ namespace StardewModdingAPI.Framework.Events
             this.SaveLoaded = ManageEventOf<SaveLoadedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.SaveLoaded));
             this.DayStarted = ManageEventOf<DayStartedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.DayStarted));
             this.DayEnding = ManageEventOf<DayEndingEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.DayEnding));
+            this.TimeChanged = ManageEventOf<TimeChangedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.TimeChanged));
+            this.ReturnedToTitle = ManageEventOf<ReturnedToTitleEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.ReturnedToTitle));
 
             this.ButtonPressed = ManageEventOf<ButtonPressedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonPressed));
             this.ButtonReleased = ManageEventOf<ButtonReleasedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonReleased));
             this.CursorMoved = ManageEventOf<CursorMovedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.CursorMoved));
             this.MouseWheelScrolled = ManageEventOf<MouseWheelScrolledEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.MouseWheelScrolled));
 
+            this.InventoryChanged = ManageEventOf<InventoryChangedEventArgs>(nameof(IModEvents.Player), nameof(IPlayerEvents.InventoryChanged));
+            this.LevelChanged = ManageEventOf<LevelChangedEventArgs>(nameof(IModEvents.Player), nameof(IPlayerEvents.LevelChanged));
+            this.Warped = ManageEventOf<WarpedEventArgs>(nameof(IModEvents.Player), nameof(IPlayerEvents.Warped));
+
             this.BuildingListChanged = ManageEventOf<BuildingListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LocationListChanged));
             this.DebrisListChanged = ManageEventOf<DebrisListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.DebrisListChanged));
             this.LargeTerrainFeatureListChanged = ManageEventOf<LargeTerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LargeTerrainFeatureListChanged));
@@ -309,6 +386,9 @@ namespace StardewModdingAPI.Framework.Events
             this.ObjectListChanged = ManageEventOf<ObjectListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.ObjectListChanged));
             this.TerrainFeatureListChanged = ManageEventOf<TerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.TerrainFeatureListChanged));
 
+            this.UnvalidatedUpdateTicking = ManageEventOf<UnvalidatedUpdateTickingEventArgs>(nameof(IModEvents.Specialised), nameof(ISpecialisedEvents.UnvalidatedUpdateTicking));
+            this.UnvalidatedUpdateTicked = ManageEventOf<UnvalidatedUpdateTickedEventArgs>(nameof(IModEvents.Specialised), nameof(ISpecialisedEvents.UnvalidatedUpdateTicked));
+
             // init events (old)
             this.Legacy_LocaleChanged = ManageEventOf<EventArgsValueChanged<string>>(nameof(ContentEvents), nameof(ContentEvents.AfterLocaleChanged));
 
diff --git a/src/SMAPI/Framework/Events/ModDisplayEvents.cs b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
new file mode 100644
index 00000000..e383eec6
--- /dev/null
+++ b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
@@ -0,0 +1,93 @@
+using System;
+using StardewModdingAPI.Events;
+using StardewValley;
+
+namespace StardewModdingAPI.Framework.Events
+{
+    /// <summary>Events related to UI and drawing to the screen.</summary>
+    internal class ModDisplayEvents : ModEventsBase, IDisplayEvents
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Raised after a game menu is opened, closed, or replaced.</summary>
+        public event EventHandler<MenuChangedEventArgs> MenuChanged
+        {
+            add => this.EventManager.MenuChanged.Add(value);
+            remove => this.EventManager.MenuChanged.Remove(value);
+        }
+
+        /// <summary>Raised before the game draws anything to the screen in a draw tick, as soon as the sprite batch is opened. The sprite batch may be closed and reopened multiple times after this event is called, but it's only raised once per draw tick. This event isn't useful for drawing to the screen, since the game will draw over it.</summary>
+        public event EventHandler<RenderingEventArgs> Rendering
+        {
+            add => this.EventManager.Rendering.Add(value);
+            remove => this.EventManager.Rendering.Remove(value);
+        }
+
+        /// <summary>Raised after the game draws to the sprite patch in a draw tick, just before the final sprite batch is rendered to the screen. Since the game may open/close the sprite batch multiple times in a draw tick, the sprite batch may not contain everything being drawn and some things may already be rendered to the screen. Content drawn to the sprite batch at this point will be drawn over all vanilla content (including menus, HUD, and cursor).</summary>
+        public event EventHandler<RenderedEventArgs> Rendered
+        {
+            add => this.EventManager.Rendered.Add(value);
+            remove => this.EventManager.Rendered.Remove(value);
+        }
+
+        /// <summary>Raised before the game world is drawn to the screen. This event isn't useful for drawing to the screen, since the game will draw over it.</summary>
+        public event EventHandler<RenderingWorldEventArgs> RenderingWorld
+        {
+            add => this.EventManager.RenderingWorld.Add(value);
+            remove => this.EventManager.RenderingWorld.Remove(value);
+        }
+
+        /// <summary>Raised after the game world is drawn to the sprite patch, before it's rendered to the screen. Content drawn to the sprite batch at this point will be drawn over the world, but under any active menu, HUD elements, or cursor.</summary>
+        public event EventHandler<RenderedWorldEventArgs> RenderedWorld
+        {
+            add => this.EventManager.RenderedWorld.Add(value);
+            remove => this.EventManager.RenderedWorld.Remove(value);
+        }
+
+        /// <summary>When a menu is open (<see cref="Game1.activeClickableMenu"/> isn't null), raised before that menu is drawn to the screen. This includes the game's internal menus like the title screen. Content drawn to the sprite batch at this point will appear under the menu.</summary>
+        public event EventHandler<RenderingActiveMenuEventArgs> RenderingActiveMenu
+        {
+            add => this.EventManager.RenderingActiveMenu.Add(value);
+            remove => this.EventManager.RenderingActiveMenu.Remove(value);
+        }
+
+        /// <summary>When a menu is open (<see cref="Game1.activeClickableMenu"/> isn't null), raised after that menu is drawn to the sprite batch but before it's rendered to the screen. Content drawn to the sprite batch at this point will appear over the menu and menu cursor.</summary>
+        public event EventHandler<RenderedActiveMenuEventArgs> RenderedActiveMenu
+        {
+            add => this.EventManager.RenderedActiveMenu.Add(value);
+            remove => this.EventManager.RenderedActiveMenu.Remove(value);
+        }
+
+        /// <summary>Raised before drawing the HUD (item toolbar, clock, etc) to the screen. The vanilla HUD may be hidden at this point (e.g. because a menu is open). Content drawn to the sprite batch at this point will appear under the HUD.</summary>
+        public event EventHandler<RenderingHudEventArgs> RenderingHud
+        {
+            add => this.EventManager.RenderingHud.Add(value);
+            remove => this.EventManager.RenderingHud.Remove(value);
+        }
+
+        /// <summary>Raised after drawing the HUD (item toolbar, clock, etc) to the sprite batch, but before it's rendered to the screen. The vanilla HUD may be hidden at this point (e.g. because a menu is open). Content drawn to the sprite batch at this point will appear over the HUD.</summary>
+        public event EventHandler<RenderedHudEventArgs> RenderedHud
+        {
+            add => this.EventManager.RenderedHud.Add(value);
+            remove => this.EventManager.RenderedHud.Remove(value);
+        }
+
+        /// <summary>Raised after the game window is resized.</summary>
+        public event EventHandler<WindowResizedEventArgs> WindowResized
+        {
+            add => this.EventManager.WindowResized.Add(value);
+            remove => this.EventManager.WindowResized.Remove(value);
+        }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="mod">The mod which uses this instance.</param>
+        /// <param name="eventManager">The underlying event manager.</param>
+        internal ModDisplayEvents(IModMetadata mod, EventManager eventManager)
+            : base(mod, eventManager) { }
+    }
+}
diff --git a/src/SMAPI/Framework/Events/ModEvents.cs b/src/SMAPI/Framework/Events/ModEvents.cs
index 9e474457..7a318e8b 100644
--- a/src/SMAPI/Framework/Events/ModEvents.cs
+++ b/src/SMAPI/Framework/Events/ModEvents.cs
@@ -8,15 +8,24 @@ namespace StardewModdingAPI.Framework.Events
         /*********
         ** Accessors
         *********/
+        /// <summary>Events related to UI and drawing to the screen.</summary>
+        public IDisplayEvents Display { get; }
+
         /// <summary>Events linked to the game's update loop. The update loop runs roughly ≈60 times/second to run game logic like state changes, action handling, etc. These can be useful, but you should consider more semantic events like <see cref="IModEvents.Input"/> if possible.</summary>
         public IGameLoopEvents GameLoop { get; }
 
         /// <summary>Events raised when the player provides input using a controller, keyboard, or mouse.</summary>
         public IInputEvents Input { get; }
 
+        /// <summary>Events raised when the player data changes.</summary>
+        public IPlayerEvents Player { get; }
+
         /// <summary>Events raised when something changes in the world.</summary>
         public IWorldEvents World { get; }
 
+        /// <summary>Events serving specialised edge cases that shouldn't be used by most mods.</summary>
+        public ISpecialisedEvents Specialised { get; }
+
 
         /*********
         ** Public methods
@@ -26,9 +35,12 @@ namespace StardewModdingAPI.Framework.Events
         /// <param name="eventManager">The underlying event manager.</param>
         public ModEvents(IModMetadata mod, EventManager eventManager)
         {
+            this.Display = new ModDisplayEvents(mod, eventManager);
             this.GameLoop = new ModGameLoopEvents(mod, eventManager);
             this.Input = new ModInputEvents(mod, eventManager);
+            this.Player = new ModPlayerEvents(mod, eventManager);
             this.World = new ModWorldEvents(mod, eventManager);
+            this.Specialised = new ModSpecialisedEvents(mod, eventManager);
         }
     }
 }
diff --git a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
index d1def91b..a5beac99 100644
--- a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
+++ b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
@@ -79,6 +79,21 @@ namespace StardewModdingAPI.Framework.Events
             remove => this.EventManager.DayEnding.Remove(value);
         }
 
+        /// <summary>Raised after the in-game clock time changes.</summary>
+        public event EventHandler<TimeChangedEventArgs> TimeChanged
+        {
+
+            add => this.EventManager.TimeChanged.Add(value);
+            remove => this.EventManager.TimeChanged.Remove(value);
+        }
+
+        /// <summary>Raised after the game returns to the title screen.</summary>
+        public event EventHandler<ReturnedToTitleEventArgs> ReturnedToTitle
+        {
+            add => this.EventManager.ReturnedToTitle.Add(value);
+            remove => this.EventManager.ReturnedToTitle.Remove(value);
+        }
+
 
         /*********
         ** Public methods
diff --git a/src/SMAPI/Framework/Events/ModPlayerEvents.cs b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
new file mode 100644
index 00000000..ca7cfd96
--- /dev/null
+++ b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
@@ -0,0 +1,43 @@
+using System;
+using StardewModdingAPI.Events;
+
+namespace StardewModdingAPI.Framework.Events
+{
+    /// <summary>Events raised when the player data changes.</summary>
+    internal class ModPlayerEvents : ModEventsBase, IPlayerEvents
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Raised after items are added or removed to a player's inventory. NOTE: this event is currently only raised for the local player.</summary>
+        public event EventHandler<InventoryChangedEventArgs> InventoryChanged
+        {
+            add => this.EventManager.InventoryChanged.Add(value);
+            remove => this.EventManager.InventoryChanged.Remove(value);
+        }
+
+        /// <summary>Raised after a player skill level changes. This happens as soon as they level up, not when the game notifies the player after their character goes to bed.  NOTE: this event is currently only raised for the local player.</summary>
+        public event EventHandler<LevelChangedEventArgs> LevelChanged
+        {
+            add => this.EventManager.LevelChanged.Add(value);
+            remove => this.EventManager.LevelChanged.Remove(value);
+        }
+
+        /// <summary>Raised after a player warps to a new location. NOTE: this event is currently only raised for the local player.</summary>
+        public event EventHandler<WarpedEventArgs> Warped
+        {
+            add => this.EventManager.Warped.Add(value);
+            remove => this.EventManager.Warped.Remove(value);
+        }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="mod">The mod which uses this instance.</param>
+        /// <param name="eventManager">The underlying event manager.</param>
+        internal ModPlayerEvents(IModMetadata mod, EventManager eventManager)
+            : base(mod, eventManager) { }
+    }
+}
diff --git a/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
new file mode 100644
index 00000000..17c32bb8
--- /dev/null
+++ b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
@@ -0,0 +1,36 @@
+using System;
+using StardewModdingAPI.Events;
+
+namespace StardewModdingAPI.Framework.Events
+{
+    /// <summary>Events serving specialised edge cases that shouldn't be used by most mods.</summary>
+    internal class ModSpecialisedEvents : ModEventsBase, ISpecialisedEvents
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Raised before the game state is updated (≈60 times per second), regardless of normal SMAPI validation. This event is not thread-safe and may be invoked while game logic is running asynchronously. Changes to game state in this method may crash the game or corrupt an in-progress save. Do not use this event unless you're fully aware of the context in which your code will be run. Mods using this event will trigger a stability warning in the SMAPI console.</summary>
+        public event EventHandler<UnvalidatedUpdateTickingEventArgs> UnvalidatedUpdateTicking
+        {
+            add => this.EventManager.UnvalidatedUpdateTicking.Add(value);
+            remove => this.EventManager.UnvalidatedUpdateTicking.Remove(value);
+        }
+
+        /// <summary>Raised after the game state is updated (≈60 times per second), regardless of normal SMAPI validation. This event is not thread-safe and may be invoked while game logic is running asynchronously. Changes to game state in this method may crash the game or corrupt an in-progress save. Do not use this event unless you're fully aware of the context in which your code will be run. Mods using this event will trigger a stability warning in the SMAPI console.</summary>
+        public event EventHandler<UnvalidatedUpdateTickedEventArgs> UnvalidatedUpdateTicked
+        {
+            add => this.EventManager.UnvalidatedUpdateTicked.Add(value);
+            remove => this.EventManager.UnvalidatedUpdateTicked.Remove(value);
+        }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="mod">The mod which uses this instance.</param>
+        /// <param name="eventManager">The underlying event manager.</param>
+        internal ModSpecialisedEvents(IModMetadata mod, EventManager eventManager)
+            : base(mod, eventManager) { }
+    }
+}
diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index b51ff6a8..f52bfe2b 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -43,8 +43,8 @@ namespace StardewModdingAPI.Framework
         /****
         ** ManagedEvent
         ****/
-        /// <summary>Raise the event and notify all handlers.</summary>
-        /// <typeparam name="TEventArgs">The empty event arguments type to construct.</typeparam>
+        /// <summary>Raise the event using the default event args and notify all handlers.</summary>
+        /// <typeparam name="TEventArgs">The event args type to construct.</typeparam>
         /// <param name="event">The event to raise.</param>
         public static void RaiseEmpty<TEventArgs>(this ManagedEvent<TEventArgs> @event) where TEventArgs : new()
         {
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index bd266ce1..57f48d11 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -11,6 +11,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Netcode;
+using StardewModdingAPI.Enums;
 using StardewModdingAPI.Events;
 using StardewModdingAPI.Framework.Events;
 using StardewModdingAPI.Framework.Input;
@@ -265,7 +266,9 @@ namespace StardewModdingAPI.Framework
                 // update tick are neglible and not worth the complications of bypassing Game1.Update.
                 if (Game1._newDayTask != null || Game1.gameMode == Game1.loadingMode)
                 {
+                    this.Events.UnvalidatedUpdateTicking.Raise(new UnvalidatedUpdateTickingEventArgs(this.TicksElapsed));
                     base.Update(gameTime);
+                    this.Events.UnvalidatedUpdateTicked.Raise(new UnvalidatedUpdateTickedEventArgs(this.TicksElapsed));
                     this.Events.Legacy_UnvalidatedUpdateTick.Raise();
                     return;
                 }
@@ -344,7 +347,9 @@ namespace StardewModdingAPI.Framework
                     }
 
                     // suppress non-save events
+                    this.Events.UnvalidatedUpdateTicking.Raise(new UnvalidatedUpdateTickingEventArgs(this.TicksElapsed));
                     base.Update(gameTime);
+                    this.Events.UnvalidatedUpdateTicked.Raise(new UnvalidatedUpdateTickedEventArgs(this.TicksElapsed));
                     this.Events.Legacy_UnvalidatedUpdateTick.Raise();
                     return;
                 }
@@ -406,6 +411,7 @@ namespace StardewModdingAPI.Framework
                 if (wasWorldReady && !Context.IsWorldReady)
                 {
                     this.Monitor.Log("Context: returned to title", LogLevel.Trace);
+                    this.Events.ReturnedToTitle.RaiseEmpty();
                     this.Events.Legacy_AfterReturnToTitle.Raise();
                 }
                 else if (!this.RaisedAfterLoadEvent && Context.IsWorldReady)
@@ -441,6 +447,11 @@ namespace StardewModdingAPI.Framework
                 {
                     if (this.VerboseLogging)
                         this.Monitor.Log($"Events: window size changed to {this.Watchers.WindowSizeWatcher.CurrentValue}.", LogLevel.Trace);
+
+                    Point oldSize = this.Watchers.WindowSizeWatcher.PreviousValue;
+                    Point newSize = this.Watchers.WindowSizeWatcher.CurrentValue;
+
+                    this.Events.WindowResized.Raise(new WindowResizedEventArgs(oldSize, newSize));
                     this.Events.Legacy_Resize.Raise();
                     this.Watchers.WindowSizeWatcher.Reset();
                 }
@@ -551,6 +562,7 @@ namespace StardewModdingAPI.Framework
                         this.Monitor.Log($"Context: menu changed from {was?.GetType().FullName ?? "none"} to {now?.GetType().FullName ?? "none"}.", LogLevel.Trace);
 
                     // raise menu events
+                    this.Events.MenuChanged.Raise(new MenuChangedEventArgs(was, now));
                     if (now != null)
                         this.Events.Legacy_MenuChanged.Raise(new EventArgsClickableMenuChanged(was, now));
                     else
@@ -673,6 +685,7 @@ namespace StardewModdingAPI.Framework
                         if (this.VerboseLogging)
                             this.Monitor.Log($"Events: time changed from {was} to {now}.", LogLevel.Trace);
 
+                        this.Events.TimeChanged.Raise(new TimeChangedEventArgs(was, now));
                         this.Events.Legacy_TimeOfDayChanged.Raise(new EventArgsIntChanged(was, now));
                     }
                     else
@@ -681,39 +694,45 @@ namespace StardewModdingAPI.Framework
                     // raise player events
                     if (raiseWorldEvents)
                     {
-                        PlayerTracker curPlayer = this.Watchers.CurrentPlayerTracker;
+                        PlayerTracker playerTracker = this.Watchers.CurrentPlayerTracker;
 
                         // raise current location changed
-                        if (curPlayer.TryGetNewLocation(out GameLocation newLocation))
+                        if (playerTracker.TryGetNewLocation(out GameLocation newLocation))
                         {
                             if (this.VerboseLogging)
                                 this.Monitor.Log($"Context: set location to {newLocation.Name}.", LogLevel.Trace);
-                            this.Events.Legacy_PlayerWarped.Raise(new EventArgsPlayerWarped(curPlayer.LocationWatcher.PreviousValue, newLocation));
+
+                            GameLocation oldLocation = playerTracker.LocationWatcher.PreviousValue;
+                            this.Events.Warped.Raise(new WarpedEventArgs(playerTracker.Player, oldLocation, newLocation));
+                            this.Events.Legacy_PlayerWarped.Raise(new EventArgsPlayerWarped(oldLocation, newLocation));
                         }
 
                         // raise player leveled up a skill
-                        foreach (KeyValuePair<EventArgsLevelUp.LevelType, IValueWatcher<int>> pair in curPlayer.GetChangedSkills())
+                        foreach (KeyValuePair<SkillType, IValueWatcher<int>> pair in playerTracker.GetChangedSkills())
                         {
                             if (this.VerboseLogging)
                                 this.Monitor.Log($"Events: player skill '{pair.Key}' changed from {pair.Value.PreviousValue} to {pair.Value.CurrentValue}.", LogLevel.Trace);
-                            this.Events.Legacy_LeveledUp.Raise(new EventArgsLevelUp(pair.Key, pair.Value.CurrentValue));
+
+                            this.Events.LevelChanged.Raise(new LevelChangedEventArgs(playerTracker.Player, pair.Key, pair.Value.PreviousValue, pair.Value.CurrentValue));
+                            this.Events.Legacy_LeveledUp.Raise(new EventArgsLevelUp((EventArgsLevelUp.LevelType)pair.Key, pair.Value.CurrentValue));
                         }
 
                         // raise player inventory changed
-                        ItemStackChange[] changedItems = curPlayer.GetInventoryChanges().ToArray();
+                        ItemStackChange[] changedItems = playerTracker.GetInventoryChanges().ToArray();
                         if (changedItems.Any())
                         {
                             if (this.VerboseLogging)
                                 this.Monitor.Log("Events: player inventory changed.", LogLevel.Trace);
-                            this.Events.Legacy_InventoryChanged.Raise(new EventArgsInventoryChanged(Game1.player.Items, changedItems.ToList()));
+                            this.Events.InventoryChanged.Raise(new InventoryChangedEventArgs(playerTracker.Player, changedItems));
+                            this.Events.Legacy_InventoryChanged.Raise(new EventArgsInventoryChanged(Game1.player.Items, changedItems));
                         }
 
                         // raise mine level changed
-                        if (curPlayer.TryGetNewMineLevel(out int mineLevel))
+                        if (playerTracker.TryGetNewMineLevel(out int mineLevel))
                         {
                             if (this.VerboseLogging)
                                 this.Monitor.Log($"Context: mine level changed to {mineLevel}.", LogLevel.Trace);
-                            this.Events.Legacy_MineLevelChanged.Raise(new EventArgsMineLevelChanged(curPlayer.MineLevelWatcher.PreviousValue, mineLevel));
+                            this.Events.Legacy_MineLevelChanged.Raise(new EventArgsMineLevelChanged(playerTracker.MineLevelWatcher.PreviousValue, mineLevel));
                         }
                     }
                     this.Watchers.CurrentPlayerTracker?.Reset();
@@ -728,6 +747,7 @@ namespace StardewModdingAPI.Framework
                 this.TicksElapsed++;
                 if (this.TicksElapsed == 1)
                     this.Events.GameLaunched.Raise(new GameLaunchedEventArgs());
+                this.Events.UnvalidatedUpdateTicking.Raise(new UnvalidatedUpdateTickingEventArgs(this.TicksElapsed));
                 this.Events.UpdateTicking.Raise(new UpdateTickingEventArgs(this.TicksElapsed));
                 try
                 {
@@ -738,6 +758,7 @@ namespace StardewModdingAPI.Framework
                 {
                     this.MonitorForGame.Log($"An error occured in the base update loop: {ex.GetLogSummary()}", LogLevel.Error);
                 }
+                this.Events.UnvalidatedUpdateTicked.Raise(new UnvalidatedUpdateTickedEventArgs(this.TicksElapsed));
                 this.Events.UpdateTicked.Raise(new UpdateTickedEventArgs(this.TicksElapsed));
 
                 /*********
@@ -844,10 +865,13 @@ namespace StardewModdingAPI.Framework
                     if (activeClickableMenu != null)
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                        this.Events.Rendering.RaiseEmpty();
                         try
                         {
+                            this.Events.RenderingActiveMenu.RaiseEmpty();
                             this.Events.Legacy_OnPreRenderGuiEvent.Raise();
                             activeClickableMenu.draw(Game1.spriteBatch);
+                            this.Events.RenderedActiveMenu.RaiseEmpty();
                             this.Events.Legacy_OnPostRenderGuiEvent.Raise();
                         }
                         catch (Exception ex)
@@ -855,7 +879,9 @@ namespace StardewModdingAPI.Framework
                             this.Monitor.Log($"The {activeClickableMenu.GetType().FullName} menu crashed while drawing itself during save. SMAPI will force it to exit to avoid crashing the game.\n{ex.GetLogSummary()}", LogLevel.Error);
                             activeClickableMenu.exitThisMenu();
                         }
-                        this.RaisePostRender();
+                        this.Events.Rendered.RaiseEmpty();
+                        this.Events.Legacy_OnPostRenderEvent.Raise();
+
                         Game1.spriteBatch.End();
                     }
                     if (Game1.overlayMenu != null)
@@ -872,11 +898,15 @@ namespace StardewModdingAPI.Framework
                     if (Game1.activeClickableMenu != null && Game1.options.showMenuBackground && Game1.activeClickableMenu.showWithoutTransparencyIfOptionIsSet())
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+
+                        this.Events.Rendering.RaiseEmpty();
                         try
                         {
                             Game1.activeClickableMenu.drawBackground(Game1.spriteBatch);
+                            this.Events.RenderingActiveMenu.RaiseEmpty();
                             this.Events.Legacy_OnPreRenderGuiEvent.Raise();
                             Game1.activeClickableMenu.draw(Game1.spriteBatch);
+                            this.Events.RenderedActiveMenu.RaiseEmpty();
                             this.Events.Legacy_OnPostRenderGuiEvent.Raise();
                         }
                         catch (Exception ex)
@@ -884,7 +914,8 @@ namespace StardewModdingAPI.Framework
                             this.Monitor.Log($"The {Game1.activeClickableMenu.GetType().FullName} menu crashed while drawing itself. SMAPI will force it to exit to avoid crashing the game.\n{ex.GetLogSummary()}", LogLevel.Error);
                             Game1.activeClickableMenu.exitThisMenu();
                         }
-                        this.RaisePostRender();
+                        this.Events.Rendered.RaiseEmpty();
+                        this.Events.Legacy_OnPostRenderEvent.Raise();
                         Game1.spriteBatch.End();
                         this.drawOverlays(Game1.spriteBatch);
                         if ((double)Game1.options.zoomLevel != 1.0)
@@ -904,10 +935,12 @@ namespace StardewModdingAPI.Framework
                     else if (Game1.gameMode == (byte)11)
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                        this.Events.Rendering.RaiseEmpty();
                         Game1.spriteBatch.DrawString(Game1.dialogueFont, Game1.content.LoadString("Strings\\StringsFromCSFiles:Game1.cs.3685"), new Vector2(16f, 16f), Color.HotPink);
                         Game1.spriteBatch.DrawString(Game1.dialogueFont, Game1.content.LoadString("Strings\\StringsFromCSFiles:Game1.cs.3686"), new Vector2(16f, 32f), new Color(0, (int)byte.MaxValue, 0));
                         Game1.spriteBatch.DrawString(Game1.dialogueFont, Game1.parseText(Game1.errorMessage, Game1.dialogueFont, Game1.graphics.GraphicsDevice.Viewport.Width), new Vector2(16f, 48f), Color.White);
-                        this.RaisePostRender();
+                        this.Events.Rendered.RaiseEmpty();
+                        this.Events.Legacy_OnPostRenderEvent.Raise();
                         Game1.spriteBatch.End();
                     }
                     else if (Game1.currentMinigame != null)
@@ -932,12 +965,15 @@ namespace StardewModdingAPI.Framework
                     else if (Game1.showingEndOfNightStuff)
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                        this.Events.Rendering.RaiseEmpty();
                         if (Game1.activeClickableMenu != null)
                         {
                             try
                             {
+                                this.Events.RenderingActiveMenu.RaiseEmpty();
                                 this.Events.Legacy_OnPreRenderGuiEvent.Raise();
                                 Game1.activeClickableMenu.draw(Game1.spriteBatch);
+                                this.Events.RenderedActiveMenu.RaiseEmpty();
                                 this.Events.Legacy_OnPostRenderGuiEvent.Raise();
                             }
                             catch (Exception ex)
@@ -946,7 +982,7 @@ namespace StardewModdingAPI.Framework
                                 Game1.activeClickableMenu.exitThisMenu();
                             }
                         }
-                        this.RaisePostRender();
+                        this.Events.Rendered.RaiseEmpty();
                         Game1.spriteBatch.End();
                         this.drawOverlays(Game1.spriteBatch);
                         if ((double)Game1.options.zoomLevel == 1.0)
@@ -960,6 +996,7 @@ namespace StardewModdingAPI.Framework
                     else if (Game1.gameMode == (byte)6 || Game1.gameMode == (byte)3 && Game1.currentLocation == null)
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                        this.Events.Rendering.RaiseEmpty();
                         string str1 = "";
                         for (int index = 0; (double)index < gameTime.TotalGameTime.TotalMilliseconds % 999.0 / 333.0; ++index)
                             str1 += ".";
@@ -971,6 +1008,7 @@ namespace StardewModdingAPI.Framework
                         int x = 64;
                         int y = Game1.graphics.GraphicsDevice.Viewport.GetTitleSafeArea().Bottom - height;
                         SpriteText.drawString(Game1.spriteBatch, s, x, y, 999999, widthOfString, height, 1f, 0.88f, false, 0, str3, -1);
+                        this.Events.Rendered.RaiseEmpty();
                         Game1.spriteBatch.End();
                         this.drawOverlays(Game1.spriteBatch);
                         if ((double)Game1.options.zoomLevel != 1.0)
@@ -991,11 +1029,15 @@ namespace StardewModdingAPI.Framework
                     }
                     else
                     {
+                        byte batchOpens = 0; // used for rendering event
+
                         Microsoft.Xna.Framework.Rectangle rectangle;
                         Viewport viewport;
                         if (Game1.gameMode == (byte)0)
                         {
                             Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                            if (++batchOpens == 1)
+                                this.Events.Rendering.RaiseEmpty();
                         }
                         else
                         {
@@ -1004,6 +1046,8 @@ namespace StardewModdingAPI.Framework
                                 this.GraphicsDevice.SetRenderTarget(Game1.lightmap);
                                 this.GraphicsDevice.Clear(Color.White * 0.0f);
                                 Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                                if (++batchOpens == 1)
+                                    this.Events.Rendering.RaiseEmpty();
                                 Game1.spriteBatch.Draw(Game1.staminaRect, Game1.lightmap.Bounds, Game1.currentLocation.Name.StartsWith("UndergroundMine") ? Game1.mine.getLightingColor(gameTime) : (Game1.ambientLight.Equals(Color.White) || Game1.isRaining && (bool)((NetFieldBase<bool, NetBool>)Game1.currentLocation.isOutdoors) ? Game1.outdoorLight : Game1.ambientLight));
                                 for (int index = 0; index < Game1.currentLightSources.Count; ++index)
                                 {
@@ -1017,6 +1061,9 @@ namespace StardewModdingAPI.Framework
                                 Game1.bloom.BeginDraw();
                             this.GraphicsDevice.Clear(this.bgColor);
                             Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+                            if (++batchOpens == 1)
+                                this.Events.Rendering.RaiseEmpty();
+                            this.Events.RenderingWorld.RaiseEmpty();
                             this.Events.Legacy_OnPreRenderEvent.Raise();
                             if (Game1.background != null)
                                 Game1.background.draw(Game1.spriteBatch);
@@ -1328,8 +1375,10 @@ namespace StardewModdingAPI.Framework
                                 this.drawBillboard();
                             if ((Game1.displayHUD || Game1.eventUp) && (Game1.currentBillboard == 0 && Game1.gameMode == (byte)3) && (!Game1.freezeControls && !Game1.panMode && !Game1.HostPaused))
                             {
+                                this.Events.RenderingHud.RaiseEmpty();
                                 this.Events.Legacy_OnPreRenderHudEvent.Raise();
                                 this.drawHUD();
+                                this.Events.RenderedHud.RaiseEmpty();
                                 this.Events.Legacy_OnPostRenderHudEvent.Raise();
                             }
                             else if (Game1.activeClickableMenu == null && Game1.farmEvent == null)
@@ -1438,8 +1487,10 @@ namespace StardewModdingAPI.Framework
                         {
                             try
                             {
+                                this.Events.RenderingActiveMenu.RaiseEmpty();
                                 this.Events.Legacy_OnPreRenderGuiEvent.Raise();
                                 Game1.activeClickableMenu.draw(Game1.spriteBatch);
+                                this.Events.RenderedActiveMenu.RaiseEmpty();
                                 this.Events.Legacy_OnPostRenderGuiEvent.Raise();
                             }
                             catch (Exception ex)
@@ -1455,7 +1506,9 @@ namespace StardewModdingAPI.Framework
                             string s = Game1.content.LoadString("Strings\\StringsFromCSFiles:DayTimeMoneyBox.cs.10378");
                             SpriteText.drawStringWithScrollBackground(Game1.spriteBatch, s, 96, 32, "", 1f, -1);
                         }
-                        this.RaisePostRender();
+                        this.Events.RenderedWorld.RaiseEmpty();
+                        this.Events.Rendered.RaiseEmpty();
+                        this.Events.Legacy_OnPostRenderEvent.Raise();
                         Game1.spriteBatch.End();
                         this.drawOverlays(Game1.spriteBatch);
                         this.renderScreenBuffer();
diff --git a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
index 59e80d8a..6a705e50 100644
--- a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using StardewModdingAPI.Enums;
 using StardewModdingAPI.Events;
 using StardewModdingAPI.Framework.StateTracking.FieldWatchers;
 using StardewValley;
@@ -41,7 +42,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         public IValueWatcher<int> MineLevelWatcher { get; }
 
         /// <summary>Tracks changes to the player's skill levels.</summary>
-        public IDictionary<EventArgsLevelUp.LevelType, IValueWatcher<int>> SkillWatchers { get; }
+        public IDictionary<SkillType, IValueWatcher<int>> SkillWatchers { get; }
 
 
         /*********
@@ -58,14 +59,14 @@ namespace StardewModdingAPI.Framework.StateTracking
             // init trackers
             this.LocationWatcher = WatcherFactory.ForReference(this.GetCurrentLocation);
             this.MineLevelWatcher = WatcherFactory.ForEquatable(() => this.LastValidLocation is MineShaft mine ? mine.mineLevel : 0);
-            this.SkillWatchers = new Dictionary<EventArgsLevelUp.LevelType, IValueWatcher<int>>
+            this.SkillWatchers = new Dictionary<SkillType, IValueWatcher<int>>
             {
-                [EventArgsLevelUp.LevelType.Combat] = WatcherFactory.ForNetValue(player.combatLevel),
-                [EventArgsLevelUp.LevelType.Farming] = WatcherFactory.ForNetValue(player.farmingLevel),
-                [EventArgsLevelUp.LevelType.Fishing] = WatcherFactory.ForNetValue(player.fishingLevel),
-                [EventArgsLevelUp.LevelType.Foraging] = WatcherFactory.ForNetValue(player.foragingLevel),
-                [EventArgsLevelUp.LevelType.Luck] = WatcherFactory.ForNetValue(player.luckLevel),
-                [EventArgsLevelUp.LevelType.Mining] = WatcherFactory.ForNetValue(player.miningLevel)
+                [SkillType.Combat] = WatcherFactory.ForNetValue(player.combatLevel),
+                [SkillType.Farming] = WatcherFactory.ForNetValue(player.farmingLevel),
+                [SkillType.Fishing] = WatcherFactory.ForNetValue(player.fishingLevel),
+                [SkillType.Foraging] = WatcherFactory.ForNetValue(player.foragingLevel),
+                [SkillType.Luck] = WatcherFactory.ForNetValue(player.luckLevel),
+                [SkillType.Mining] = WatcherFactory.ForNetValue(player.miningLevel)
             };
 
             // track watchers for convenience
@@ -124,7 +125,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         }
 
         /// <summary>Get the player skill levels which changed.</summary>
-        public IEnumerable<KeyValuePair<EventArgsLevelUp.LevelType, IValueWatcher<int>>> GetChangedSkills()
+        public IEnumerable<KeyValuePair<SkillType, IValueWatcher<int>>> GetChangedSkills()
         {
             return this.SkillWatchers.Where(p => p.Value.IsChanged);
         }