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

migrate to Harmony 2.0 (#711)

This commit is contained in:
Jesse Plamondon-Willard 2020-05-05 20:49:05 -04:00
parent 9728fe3f34
commit e08979acd3
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
10 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMAPI/Framework/Patching/GamePatcher.cs
View File

@ -1,5 +1,5 @@
using System; using System;
using Harmony; using HarmonyLib;
namespace StardewModdingAPI.Framework.Patching namespace StardewModdingAPI.Framework.Patching
{ {
@ -27,7 +27,7 @@ namespace StardewModdingAPI.Framework.Patching
/// <param name="patches">The patches to apply.</param> /// <param name="patches">The patches to apply.</param>
public void Apply(params IHarmonyPatch[] patches) public void Apply(params IHarmonyPatch[] patches)
{ {
HarmonyInstance harmony = HarmonyInstance.Create("io.smapi"); Harmony harmony = new Harmony("io.smapi");
foreach (IHarmonyPatch patch in patches) foreach (IHarmonyPatch patch in patches)
{ {
try try

4
src/SMAPI/Framework/Patching/IHarmonyPatch.cs
View File

@ -1,4 +1,4 @@
using Harmony; using HarmonyLib;
namespace StardewModdingAPI.Framework.Patching namespace StardewModdingAPI.Framework.Patching
{ {
@ -10,6 +10,6 @@ namespace StardewModdingAPI.Framework.Patching
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
void Apply(HarmonyInstance harmony); void Apply(Harmony harmony);
} }
} }

3
src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Harmony;
namespace StardewModdingAPI.Framework.PerformanceMonitoring namespace StardewModdingAPI.Framework.PerformanceMonitoring
{ {
@ -57,7 +56,7 @@ namespace StardewModdingAPI.Framework.PerformanceMonitoring
// add entry // add entry
if (this.Entries.Count > this.MaxEntries) if (this.Entries.Count > this.MaxEntries)
this.Entries.Pop(); this.Entries.Pop();
this.Entries.Add(entry); this.Entries.Push(entry);
// update metrics // update metrics
if (this.PeakPerformanceCounterEntry == null || entry.ElapsedMilliseconds > this.PeakPerformanceCounterEntry.Value.ElapsedMilliseconds) if (this.PeakPerformanceCounterEntry == null || entry.ElapsedMilliseconds > this.PeakPerformanceCounterEntry.Value.ElapsedMilliseconds)

4
src/SMAPI/Patches/DialogueErrorPatch.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewModdingAPI.Framework.Reflection; using StardewModdingAPI.Framework.Reflection;
using StardewValley; using StardewValley;
@ -47,7 +47,7 @@ namespace StardewModdingAPI.Patches
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
harmony.Patch( harmony.Patch(
original: AccessTools.Constructor(typeof(Dialogue), new[] { typeof(string), typeof(NPC) }), original: AccessTools.Constructor(typeof(Dialogue), new[] { typeof(string), typeof(NPC) }),

4
src/SMAPI/Patches/EventErrorPatch.cs
View File

@ -1,6 +1,6 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewValley; using StardewValley;
@ -38,7 +38,7 @@ namespace StardewModdingAPI.Patches
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
harmony.Patch( harmony.Patch(
original: AccessTools.Method(typeof(GameLocation), "checkEventPrecondition"), original: AccessTools.Method(typeof(GameLocation), "checkEventPrecondition"),

4
src/SMAPI/Patches/LoadContextPatch.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Enums; using StardewModdingAPI.Enums;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewModdingAPI.Framework.Reflection; using StardewModdingAPI.Framework.Reflection;
@ -47,7 +47,7 @@ namespace StardewModdingAPI.Patches
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
// detect CreatedBasicInfo // detect CreatedBasicInfo
harmony.Patch( harmony.Patch(

4
src/SMAPI/Patches/LoadErrorPatch.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Framework.Exceptions; using StardewModdingAPI.Framework.Exceptions;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewValley; using StardewValley;
@ -49,7 +49,7 @@ namespace StardewModdingAPI.Patches
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
harmony.Patch( harmony.Patch(
original: AccessTools.Method(typeof(SaveGame), nameof(SaveGame.loadDataToLocations)), original: AccessTools.Method(typeof(SaveGame), nameof(SaveGame.loadDataToLocations)),

4
src/SMAPI/Patches/ObjectErrorPatch.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewValley; using StardewValley;
using StardewValley.Menus; using StardewValley.Menus;
@ -27,7 +27,7 @@ namespace StardewModdingAPI.Patches
*********/ *********/
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
// object.getDescription // object.getDescription
harmony.Patch( harmony.Patch(

4
src/SMAPI/Patches/ScheduleErrorPatch.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using StardewModdingAPI.Framework.Patching; using StardewModdingAPI.Framework.Patching;
using StardewValley; using StardewValley;
@ -39,7 +39,7 @@ namespace StardewModdingAPI.Patches
/// <summary>Apply the Harmony patch.</summary> /// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param> /// <param name="harmony">The Harmony instance.</param>
public void Apply(HarmonyInstance harmony) public void Apply(Harmony harmony)
{ {
harmony.Patch( harmony.Patch(
original: AccessTools.Method(typeof(NPC), "parseMasterSchedule"), original: AccessTools.Method(typeof(NPC), "parseMasterSchedule"),

2
src/SMAPI/SMAPI.csproj
View File

@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="LargeAddressAware" Version="1.0.4" /> <PackageReference Include="LargeAddressAware" Version="1.0.4" />
<PackageReference Include="Lib.Harmony" Version="1.2.0.1" /> <PackageReference Include="Lib.Harmony" Version="2.0.0.10" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" /> <PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Platonymous.TMXTile" Version="1.3.4" /> <PackageReference Include="Platonymous.TMXTile" Version="1.3.4" />