Merge branch 'develop' into stable

1 files changed, 44 insertions, 0 deletions

diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
new file mode 100644
index 00000000..102f3364
--- /dev/null
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
@@ -0,0 +1,44 @@
+#if HARMONY_2
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using HarmonyLib;
+
+namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
+{
+    /// <summary>Maps Harmony 1.x <see cref="AccessTools"/> methods to Harmony 2.x to avoid breaking older mods.</summary>
+    /// <remarks>This is public to support SMAPI rewriting and should not be referenced directly by mods.</remarks>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Used via assembly rewriting")]
+    [SuppressMessage("ReSharper", "CS1591", Justification = "Documentation not needed for facade classes.")]
+    public class AccessToolsFacade
+    {
+        /*********
+        ** Public methods
+        *********/
+        public static ConstructorInfo DeclaredConstructor(Type type, Type[] parameters = null)
+        {
+            // Harmony 1.x matched both static and instance constructors
+            return
+                AccessTools.DeclaredConstructor(type, parameters, searchForStatic: false)
+                ?? AccessTools.DeclaredConstructor(type, parameters, searchForStatic: true);
+        }
+
+        public static ConstructorInfo Constructor(Type type, Type[] parameters = null)
+        {
+            // Harmony 1.x matched both static and instance constructors
+            return
+                AccessTools.Constructor(type, parameters, searchForStatic: false)
+                ?? AccessTools.Constructor(type, parameters, searchForStatic: true);
+        }
+
+        public static List<ConstructorInfo> GetDeclaredConstructors(Type type)
+        {
+            // Harmony 1.x matched both static and instance constructors
+            return
+                AccessTools.GetDeclaredConstructors(type, searchForStatic: false)
+                ?? AccessTools.GetDeclaredConstructors(type, searchForStatic: true);
+        }
+    }
+}
+#endif