From fc6dc349dab5a58a76926c935f7d9e8d6c45ebc9 Mon Sep 17 00:00:00 2001
From: yangzhi <ZaneYork@qq.com>
Date: Mon, 10 Jul 2023 16:47:39 +0800
Subject: [PATCH] Fix String.Split methods

---
 src/SMAPI/Patches/StringPatcher.cs | 35 ++++++++++++++++--------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/SMAPI/Patches/StringPatcher.cs b/src/SMAPI/Patches/StringPatcher.cs
index f879fcc7..f1b1a633 100644
--- a/src/SMAPI/Patches/StringPatcher.cs
+++ b/src/SMAPI/Patches/StringPatcher.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using HarmonyLib;
-using StardewModdingAPI.Enums;
 using StardewModdingAPI.Framework.Reflection;
 using StardewModdingAPI.Internal.Patching;
 using StardewValley;
-using StardewValley.Menus;
-using StardewValley.Minigames;
 
 namespace StardewModdingAPI.Patches
 {
@@ -38,22 +34,25 @@ namespace StardewModdingAPI.Patches
         /// <inheritdoc />
         public override void Apply(Harmony harmony, IMonitor monitor)
         {
-            // detect CreatedInitialLocations and SaveAddedLocations
             harmony.Patch(
                 original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(char), typeof(StringSplitOptions)}),
-                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split))
+                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split)),
+                postfix: this.GetHarmonyMethod(nameof(StringPatcher.After_Split))
             );
             harmony.Patch(
                 original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(string), typeof(StringSplitOptions)}),
-                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split))
+                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split)),
+                postfix: this.GetHarmonyMethod(nameof(StringPatcher.After_Split))
             );
             harmony.Patch(
                 original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(char), typeof(int), typeof(StringSplitOptions)}),
-                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split))
+                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split)),
+                postfix: this.GetHarmonyMethod(nameof(StringPatcher.After_Split))
             );
             harmony.Patch(
                 original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(string), typeof(int), typeof(StringSplitOptions)}),
-                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split))
+                prefix: this.GetHarmonyMethod(nameof(StringPatcher.Before_Split)),
+                postfix: this.GetHarmonyMethod(nameof(StringPatcher.After_Split))
             );
         }
 
@@ -64,18 +63,22 @@ namespace StardewModdingAPI.Patches
         /// <summary>The method to call before <see cref="string.Split"/>.</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_Split(string __instance, ref StringSplitOptions options)
+        private static bool Before_Split(ref StringSplitOptions options, out bool __state)
         {
-            if (3 == (uint)options)
+            __state = false;
+            if ((0x02 & (uint)options) != 0)
             {
-                options = StringSplitOptions.RemoveEmptyEntries;
-            }
-            else if(2 == (uint)options)
-            {
-                options = StringSplitOptions.None;
+                options = (StringSplitOptions)(0xfffffffd & (uint)options);
+                __state = true;
             }
             return true;
         }
+        private static void After_Split(bool __state, ref string[] __result)
+        {
+            if (__state)
+                for (int i = 0; i < __result.Length; i++)
+                    __result[i] = __result[i].Trim();
+        }
 
     }
 }