Merge branch 'develop' into stable

1 files changed, 22 insertions, 8 deletions

diff --git a/src/StardewModdingAPI/Events/GameEvents.cs b/src/StardewModdingAPI/Events/GameEvents.cs
index 8e3cf662..557b451f 100644
--- a/src/StardewModdingAPI/Events/GameEvents.cs
+++ b/src/StardewModdingAPI/Events/GameEvents.cs
@@ -11,6 +11,7 @@ namespace StardewModdingAPI.Events
         /*********
         ** Properties
         *********/
+#if !SMAPI_2_0
         /// <summary>Manages deprecation warnings.</summary>
         private static DeprecationManager DeprecationManager;
 
@@ -29,6 +30,7 @@ namespace StardewModdingAPI.Events
         /// <summary>The backing field for <see cref="FirstUpdateTick"/>.</summary>
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         private static event EventHandler _FirstUpdateTick;
+#endif
 
 
         /*********
@@ -40,13 +42,14 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised during launch after configuring Stardew Valley, loading it into memory, and opening the game window. The window is still blank by this point.</summary>
         internal static event EventHandler GameLoadedInternal;
 
+#if !SMAPI_2_0
         /// <summary>Raised during launch after configuring XNA or MonoGame. The game window hasn't been opened by this point. Called after <see cref="Microsoft.Xna.Framework.Game.Initialize"/>.</summary>
         [Obsolete("The " + nameof(Mod) + "." + nameof(Mod.Entry) + " method is now called after the " + nameof(GameEvents.Initialize) + " event, so any contained logic can be done directly in " + nameof(Mod.Entry) + ".")]
         public static event EventHandler Initialize
         {
             add
             {
-                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.Initialize)}", "1.10", DeprecationLevel.Info);
+                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.Initialize)}", "1.10", DeprecationLevel.PendingRemoval);
                 GameEvents._Initialize += value;
             }
             remove => GameEvents._Initialize -= value;
@@ -58,7 +61,7 @@ namespace StardewModdingAPI.Events
         {
             add
             {
-                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.LoadContent)}", "1.10", DeprecationLevel.Info);
+                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.LoadContent)}", "1.10", DeprecationLevel.PendingRemoval);
                 GameEvents._LoadContent += value;
             }
             remove => GameEvents._LoadContent -= value;
@@ -70,7 +73,7 @@ namespace StardewModdingAPI.Events
         {
             add
             {
-                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.GameLoaded)}", "1.12", DeprecationLevel.Info);
+                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.GameLoaded)}", "1.12", DeprecationLevel.PendingRemoval);
                 GameEvents._GameLoaded += value;
             }
             remove => GameEvents._GameLoaded -= value;
@@ -82,11 +85,12 @@ namespace StardewModdingAPI.Events
         {
             add
             {
-                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.FirstUpdateTick)}", "1.12", DeprecationLevel.Info);
+                GameEvents.DeprecationManager.Warn($"{nameof(GameEvents)}.{nameof(GameEvents.FirstUpdateTick)}", "1.12", DeprecationLevel.PendingRemoval);
                 GameEvents._FirstUpdateTick += value;
             }
             remove => GameEvents._FirstUpdateTick -= value;
         }
+#endif
 
         /// <summary>Raised when the game updates its state (≈60 times per second).</summary>
         public static event EventHandler UpdateTick;
@@ -113,42 +117,52 @@ namespace StardewModdingAPI.Events
         /*********
         ** Internal methods
         *********/
+#if !SMAPI_2_0
         /// <summary>Injects types required for backwards compatibility.</summary>
         /// <param name="deprecationManager">Manages deprecation warnings.</param>
         internal static void Shim(DeprecationManager deprecationManager)
         {
             GameEvents.DeprecationManager = deprecationManager;
         }
+#endif
 
-        /// <summary>Raise an <see cref="Initialize"/> event.</summary>
-        /// <param name="monitor">Encapsulates logging and monitoring.</param>
-        internal static void InvokeInitialize(IMonitor monitor)
+    /// <summary>Raise an <see cref="InitializeInternal"/> event.</summary>
+    /// <param name="monitor">Encapsulates logging and monitoring.</param>
+    internal static void InvokeInitialize(IMonitor monitor)
         {
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.InitializeInternal)}", GameEvents.InitializeInternal?.GetInvocationList());
+#if !SMAPI_2_0
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.Initialize)}", GameEvents._Initialize?.GetInvocationList());
+#endif
         }
 
+#if !SMAPI_2_0
         /// <summary>Raise a <see cref="LoadContent"/> event.</summary>
         /// <param name="monitor">Encapsulates logging and monitoring.</param>
         internal static void InvokeLoadContent(IMonitor monitor)
         {
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.LoadContent)}", GameEvents._LoadContent?.GetInvocationList());
         }
+#endif
 
-        /// <summary>Raise a <see cref="GameLoaded"/> event.</summary>
+        /// <summary>Raise a <see cref="GameLoadedInternal"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         internal static void InvokeGameLoaded(IMonitor monitor)
         {
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.GameLoadedInternal)}", GameEvents.GameLoadedInternal?.GetInvocationList());
+#if !SMAPI_2_0
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.GameLoaded)}", GameEvents._GameLoaded?.GetInvocationList());
+#endif
         }
 
+#if !SMAPI_2_0
         /// <summary>Raise a <see cref="FirstUpdateTick"/> event.</summary>
         /// <param name="monitor">Encapsulates monitoring and logging.</param>
         internal static void InvokeFirstUpdateTick(IMonitor monitor)
         {
             monitor.SafelyRaisePlainEvent($"{nameof(GameEvents)}.{nameof(GameEvents.FirstUpdateTick)}", GameEvents._FirstUpdateTick?.GetInvocationList());
         }
+#endif
 
         /// <summary>Raise an <see cref="UpdateTick"/> event.</summary>
         /// <param name="monitor">Encapsulates logging and monitoring.</param>