From 8df578edb6d135796a48b219ecc7a7291c7ef460 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 13 Jul 2021 09:14:07 -0400
Subject: migrate to Harmony 2.1 (#711)

---
 src/SMAPI/Framework/Patching/GamePatcher.cs   |  8 ------
 src/SMAPI/Framework/Patching/IHarmonyPatch.cs |  8 ------
 src/SMAPI/Framework/Patching/PatchHelper.cs   | 36 ---------------------------
 3 files changed, 52 deletions(-)
 delete mode 100644 src/SMAPI/Framework/Patching/PatchHelper.cs

(limited to 'src/SMAPI/Framework/Patching')

diff --git a/src/SMAPI/Framework/Patching/GamePatcher.cs b/src/SMAPI/Framework/Patching/GamePatcher.cs
index ddecda08..3ce22ee9 100644
--- a/src/SMAPI/Framework/Patching/GamePatcher.cs
+++ b/src/SMAPI/Framework/Patching/GamePatcher.cs
@@ -1,9 +1,5 @@
 using System;
-#if HARMONY_2
 using HarmonyLib;
-#else
-using Harmony;
-#endif
 
 namespace StardewModdingAPI.Framework.Patching
 {
@@ -31,11 +27,7 @@ namespace StardewModdingAPI.Framework.Patching
         /// <param name="patches">The patches to apply.</param>
         public void Apply(params IHarmonyPatch[] patches)
         {
-#if HARMONY_2
             Harmony harmony = new Harmony("SMAPI");
-#else
-            HarmonyInstance harmony = HarmonyInstance.Create("SMAPI");
-#endif
             foreach (IHarmonyPatch patch in patches)
             {
                 try
diff --git a/src/SMAPI/Framework/Patching/IHarmonyPatch.cs b/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
index 38d30ab2..c1ff3040 100644
--- a/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
+++ b/src/SMAPI/Framework/Patching/IHarmonyPatch.cs
@@ -1,8 +1,4 @@
-#if HARMONY_2
 using HarmonyLib;
-#else
-using Harmony;
-#endif
 
 namespace StardewModdingAPI.Framework.Patching
 {
@@ -14,10 +10,6 @@ namespace StardewModdingAPI.Framework.Patching
         *********/
         /// <summary>Apply the Harmony patch.</summary>
         /// <param name="harmony">The Harmony instance.</param>
-#if HARMONY_2
         void Apply(Harmony harmony);
-#else
-        void Apply(HarmonyInstance harmony);
-#endif
     }
 }
diff --git a/src/SMAPI/Framework/Patching/PatchHelper.cs b/src/SMAPI/Framework/Patching/PatchHelper.cs
deleted file mode 100644
index d1aa0185..00000000
--- a/src/SMAPI/Framework/Patching/PatchHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#if !HARMONY_2
-using System;
-using System.Collections.Generic;
-
-namespace StardewModdingAPI.Framework.Patching
-{
-    /// <summary>Provides generic methods for implementing Harmony patches.</summary>
-    internal class PatchHelper
-    {
-        /*********
-        ** Fields
-        *********/
-        /// <summary>The interception keys currently being intercepted.</summary>
-        private static readonly HashSet<string> InterceptingKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Track a method that will be intercepted.</summary>
-        /// <param name="key">The intercept key.</param>
-        /// <returns>Returns false if the method was already marked for interception, else true.</returns>
-        public static bool StartIntercept(string key)
-        {
-            return PatchHelper.InterceptingKeys.Add(key);
-        }
-
-        /// <summary>Track a method as no longer being intercepted.</summary>
-        /// <param name="key">The intercept key.</param>
-        public static void StopIntercept(string key)
-        {
-            PatchHelper.InterceptingKeys.Remove(key);
-        }
-    }
-}
-#endif
-- 
cgit