3 files changed, 58 insertions, 16 deletions
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index b607f95d..419afd4b 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -255,7 +255,8 @@ namespace StardewModdingAPI.Framework
                 // apply game patches
                 MiniMonoModHotfix.Apply();
                 new GamePatcher(this.Monitor).Apply(
-                    new LoadContextPatch(this.Reflection, this.OnLoadStageChanged)
+                    new LoadContextPatch(this.Reflection, this.OnLoadStageChanged),
+                    new TitleMenuPatcher(this.OnLoadStageChanged)
                 );
 
                 // add exit handler
diff --git a/src/SMAPI/Patches/LoadContextPatch.cs b/src/SMAPI/Patches/LoadContextPatch.cs
index 721cf53d..c7f7d986 100644
--- a/src/SMAPI/Patches/LoadContextPatch.cs
+++ b/src/SMAPI/Patches/LoadContextPatch.cs
@@ -44,12 +44,6 @@ namespace StardewModdingAPI.Patches
         /// <inheritdoc />
         public void Apply(Harmony harmony)
         {
-            // detect CreatedBasicInfo
-            harmony.Patch(
-                original: AccessTools.Method(typeof(TitleMenu), nameof(TitleMenu.createdNewCharacter)),
-                prefix: new HarmonyMethod(this.GetType(), nameof(LoadContextPatch.Before_TitleMenu_CreatedNewCharacter))
-            );
-
             // detect CreatedInitialLocations and SaveAddedLocations
             harmony.Patch(
                 original: AccessTools.Method(typeof(Game1), nameof(Game1.AddModNPCs)),
@@ -74,15 +68,6 @@ namespace StardewModdingAPI.Patches
         /*********
         ** Private methods
         *********/
-        /// <summary>Called before <see cref="TitleMenu.createdNewCharacter"/>.</summary>
-        /// <returns>Returns whether to execute the original method.</returns>
-        /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
-        private static bool Before_TitleMenu_CreatedNewCharacter()
-        {
-            LoadContextPatch.OnStageChanged(LoadStage.CreatedBasicInfo);
-            return true;
-        }
-
         /// <summary>Called before <see cref="Game1.AddModNPCs"/>.</summary>
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
diff --git a/src/SMAPI/Patches/TitleMenuPatcher.cs b/src/SMAPI/Patches/TitleMenuPatcher.cs
new file mode 100644
index 00000000..a889adfc
--- /dev/null
+++ b/src/SMAPI/Patches/TitleMenuPatcher.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using HarmonyLib;
+using StardewModdingAPI.Enums;
+using StardewModdingAPI.Framework.Patching;
+using StardewValley.Menus;
+
+namespace StardewModdingAPI.Patches
+{
+    /// <summary>Harmony patches which notify SMAPI for save creation load stages.</summary>
+    /// <remarks>Patch methods must be static for Harmony to work correctly. See the Harmony documentation before renaming patch arguments.</remarks>
+    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony and methods are named for clarity.")]
+    [SuppressMessage("ReSharper", "IdentifierTypo", Justification = "Argument names are defined by Harmony and methods are named for clarity.")]
+    internal class TitleMenuPatcher : IHarmonyPatch
+    {
+        /*********
+        ** Fields
+        *********/
+        /// <summary>A callback to invoke when the load stage changes.</summary>
+        private static Action<LoadStage> OnStageChanged;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="onStageChanged">A callback to invoke when the load stage changes.</param>
+        public TitleMenuPatcher(Action<LoadStage> onStageChanged)
+        {
+            TitleMenuPatcher.OnStageChanged = onStageChanged;
+        }
+
+        /// <inheritdoc />
+        public void Apply(Harmony harmony)
+        {
+            // detect CreatedBasicInfo
+            harmony.Patch(
+                original: AccessTools.Method(typeof(TitleMenu), nameof(TitleMenu.createdNewCharacter)),
+                prefix: new HarmonyMethod(this.GetType(), nameof(TitleMenuPatcher.Before_TitleMenu_CreatedNewCharacter))
+            );
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Called before <see cref="TitleMenu.createdNewCharacter"/>.</summary>
+        /// <returns>Returns whether to execute the original method.</returns>
+        /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
+        private static bool Before_TitleMenu_CreatedNewCharacter()
+        {
+            TitleMenuPatcher.OnStageChanged(LoadStage.CreatedBasicInfo);
+            return true;
+        }
+    }
+}