StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix String.Split methods

This commit is contained in:
yangzhi 2023-07-10 16:47:39 +08:00
parent 0de3a3ad41
commit fc6dc349da
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/SMAPI/Patches/StringPatcher.cs
View File

@ -1,13 +1,9 @@
using System; using System;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using HarmonyLib; using HarmonyLib;
using StardewModdingAPI.Enums;
using StardewModdingAPI.Framework.Reflection; using StardewModdingAPI.Framework.Reflection;
using StardewModdingAPI.Internal.Patching; using StardewModdingAPI.Internal.Patching;
using StardewValley; using StardewValley;
using StardewValley.Menus;
using StardewValley.Minigames;
namespace StardewModdingAPI.Patches namespace StardewModdingAPI.Patches
{ {
@ -38,22 +34,25 @@ namespace StardewModdingAPI.Patches
/// <inheritdoc /> /// <inheritdoc />
public override void Apply(Harmony harmony, IMonitor monitor) public override void Apply(Harmony harmony, IMonitor monitor)
{ {
// detect CreatedInitialLocations and SaveAddedLocations
harmony.Patch( harmony.Patch(
original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(char), typeof(StringSplitOptions)}), 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( harmony.Patch(
original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(string), typeof(StringSplitOptions)}), 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( harmony.Patch(
original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(char), typeof(int), typeof(StringSplitOptions)}), 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( harmony.Patch(
original: this.RequireMethod<string>(nameof(string.Split), new []{typeof(string), typeof(int), typeof(StringSplitOptions)}), 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> /// <summary>The method to call before <see cref="string.Split"/>.</summary>
/// <returns>Returns whether to execute the original method.</returns> /// <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> /// <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; options = (StringSplitOptions)(0xfffffffd & (uint)options);
} __state = true;
else if(2 == (uint)options)
{
options = StringSplitOptions.None;
} }
return 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();
}
} }
} }