From e08979acd301792435661d2c0008469a800f8dbb Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 5 May 2020 20:49:05 -0400
Subject: migrate to Harmony 2.0 (#711)

---
 src/SMAPI/Framework/Patching/GamePatcher.cs                     | 4 ++--
 src/SMAPI/Framework/Patching/IHarmonyPatch.cs                   | 4 ++--
 src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/Patching/GamePatcher.cs b/src/SMAPI/Framework/Patching/GamePatcher.cs
index f82159d0..cdb54453 100644
--- a/src/SMAPI/Framework/Patching/GamePatcher.cs
+++ b/src/SMAPI/Framework/Patching/GamePatcher.cs
@@ -1,5 +1,5 @@
 using System;
-using Harmony;
+using HarmonyLib;
 
 namespace StardewModdingAPI.Framework.Patching
 {
@@ -27,7 +27,7 @@ namespace StardewModdingAPI.Framework.Patching
         /// <param name="patches">The patches to apply.</param>
         public void Apply(params IHarmonyPatch[] patches)
         {
-            HarmonyInstance harmony = HarmonyInstance.Create("io.smapi");
+            Harmony harmony = new Harmony("io.smapi");
             foreach (IHarmonyPatch patch in patches)
             {
                 try
diff --git a/src/SMAPI/Framework/Patching/IHarmonyPatch.cs b/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
index cb42f40e..7d5eb3d4 100644
--- a/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
+++ b/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 
 namespace StardewModdingAPI.Framework.Patching
 {
@@ -10,6 +10,6 @@ namespace StardewModdingAPI.Framework.Patching
 
         /// <summary>Apply the Harmony patch.</summary>
         /// <param name="harmony">The Harmony instance.</param>
-        void Apply(HarmonyInstance harmony);
+        void Apply(Harmony harmony);
     }
 }
diff --git a/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs b/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs
index 3cf668ee..42825999 100644
--- a/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs
+++ b/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Harmony;
 
 namespace StardewModdingAPI.Framework.PerformanceMonitoring
 {
@@ -57,7 +56,7 @@ namespace StardewModdingAPI.Framework.PerformanceMonitoring
             // add entry
             if (this.Entries.Count > this.MaxEntries)
                 this.Entries.Pop();
-            this.Entries.Add(entry);
+            this.Entries.Push(entry);
 
             // update metrics
             if (this.PeakPerformanceCounterEntry == null || entry.ElapsedMilliseconds > this.PeakPerformanceCounterEntry.Value.ElapsedMilliseconds)
-- 
cgit