Merge branch 'develop' into stable

1 files changed, 20 insertions, 3 deletions

diff --git a/src/SMAPI/Events/InputEvents.cs b/src/SMAPI/Events/InputEvents.cs
index 4c1781a5..255b9c8a 100644
--- a/src/SMAPI/Events/InputEvents.cs
+++ b/src/SMAPI/Events/InputEvents.cs
@@ -1,9 +1,12 @@
+#if !SMAPI_3_0_STRICT
 using System;
+using StardewModdingAPI.Framework;
 using StardewModdingAPI.Framework.Events;
 
 namespace StardewModdingAPI.Events
 {
     /// <summary>Events raised when the player uses a controller, keyboard, or mouse button.</summary>
+    [Obsolete("Use " + nameof(Mod.Helper) + "." + nameof(IModHelper.Events) + " instead. See https://smapi.io/3.0 for more info.")]
     public static class InputEvents
     {
         /*********
@@ -12,6 +15,9 @@ namespace StardewModdingAPI.Events
         /// <summary>The core event manager.</summary>
         private static EventManager EventManager;
 
+        /// <summary>Manages deprecation warnings.</summary>
+        private static DeprecationManager DeprecationManager;
+
 
         /*********
         ** Events
@@ -19,14 +25,22 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised when the player presses a button on the keyboard, controller, or mouse.</summary>
         public static event EventHandler<EventArgsInput> ButtonPressed
         {
-            add => InputEvents.EventManager.Legacy_ButtonPressed.Add(value);
+            add
+            {
+                InputEvents.DeprecationManager.WarnForOldEvents();
+                InputEvents.EventManager.Legacy_ButtonPressed.Add(value);
+            }
             remove => InputEvents.EventManager.Legacy_ButtonPressed.Remove(value);
         }
 
         /// <summary>Raised when the player releases a keyboard key on the keyboard, controller, or mouse.</summary>
         public static event EventHandler<EventArgsInput> ButtonReleased
         {
-            add => InputEvents.EventManager.Legacy_ButtonReleased.Add(value);
+            add
+            {
+                InputEvents.DeprecationManager.WarnForOldEvents();
+                InputEvents.EventManager.Legacy_ButtonReleased.Add(value);
+            }
             remove => InputEvents.EventManager.Legacy_ButtonReleased.Remove(value);
         }
 
@@ -36,9 +50,12 @@ namespace StardewModdingAPI.Events
         *********/
         /// <summary>Initialise the events.</summary>
         /// <param name="eventManager">The core event manager.</param>
-        internal static void Init(EventManager eventManager)
+        /// <param name="deprecationManager">Manages deprecation warnings.</param>
+        internal static void Init(EventManager eventManager, DeprecationManager deprecationManager)
         {
             InputEvents.EventManager = eventManager;
+            InputEvents.DeprecationManager = deprecationManager;
         }
     }
 }
+#endif