Merge branch 'develop' into stable

4 files changed, 10 insertions, 8 deletions

diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
index be2a1c58..afe38bfd 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
@@ -17,7 +17,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         /*********
         ** Public methods
         *********/
-        public static ConstructorInfo DeclaredConstructor(Type type, Type[] parameters = null)
+        public static ConstructorInfo DeclaredConstructor(Type type, Type[]? parameters = null)
         {
             // Harmony 1.x matched both static and instance constructors
             return
@@ -25,7 +25,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
                 ?? AccessTools.DeclaredConstructor(type, parameters, searchForStatic: true);
         }
 
-        public static ConstructorInfo Constructor(Type type, Type[] parameters = null)
+        public static ConstructorInfo Constructor(Type type, Type[]? parameters = null)
         {
             // Harmony 1.x matched both static and instance constructors
             return
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
index 135bd218..9c8ba2b0 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
@@ -28,7 +28,8 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             return new Harmony(id);
         }
 
-        public DynamicMethod Patch(MethodBase original, HarmonyMethod prefix = null, HarmonyMethod postfix = null, HarmonyMethod transpiler = null)
+        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse", Justification = "If the user passes a null original method, we let it fail in the underlying Harmony instance instead of handling it here.")]
+        public DynamicMethod Patch(MethodBase original, HarmonyMethod? prefix = null, HarmonyMethod? postfix = null, HarmonyMethod? transpiler = null)
         {
             // In Harmony 1.x you could target a virtual method that's not implemented by the
             // target type, but in Harmony 2.0 you need to target the concrete implementation.
@@ -58,7 +59,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         /// <param name="prefix">The prefix method, if any.</param>
         /// <param name="postfix">The postfix method, if any.</param>
         /// <param name="transpiler">The transpiler method, if any.</param>
-        private string GetPatchTypesLabel(HarmonyMethod prefix = null, HarmonyMethod postfix = null, HarmonyMethod transpiler = null)
+        private string GetPatchTypesLabel(HarmonyMethod? prefix = null, HarmonyMethod? postfix = null, HarmonyMethod? transpiler = null)
         {
             var patchTypes = new List<string>();
 
@@ -74,7 +75,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
 
         /// <summary>Get a human-readable label for the method being patched.</summary>
         /// <param name="method">The method being patched.</param>
-        private string GetMethodLabel(MethodBase method)
+        private string GetMethodLabel(MethodBase? method)
         {
             return method != null
                 ? $"method {method.DeclaringType?.FullName}.{method.Name}"
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
index 5162dda4..2b1ca54b 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
@@ -21,7 +21,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             this.ImportMethodImpl(method);
         }
 
-        public HarmonyMethodFacade(Type type, string name, Type[] parameters = null)
+        public HarmonyMethodFacade(Type type, string name, Type[]? parameters = null)
         {
             this.ImportMethodImpl(AccessTools.Method(type, name, parameters));
         }
@@ -38,7 +38,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             // internal code still handles null fine. For backwards compatibility, this bypasses
             // the new restriction when the mod hasn't been updated for Harmony 2.0 yet.
 
-            MethodInfo importMethod = typeof(HarmonyMethod).GetMethod("ImportMethod", BindingFlags.Instance | BindingFlags.NonPublic);
+            MethodInfo? importMethod = typeof(HarmonyMethod).GetMethod("ImportMethod", BindingFlags.Instance | BindingFlags.NonPublic);
             if (importMethod == null)
                 throw new InvalidOperationException("Can't find 'HarmonyMethod.ImportMethod' method");
             importMethod.Invoke(this, new object[] { methodInfo });
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
index 5f68f8d9..67569424 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
@@ -18,7 +18,8 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        public SpriteBatchFacade(GraphicsDevice graphicsDevice) : base(graphicsDevice) { }
+        public SpriteBatchFacade(GraphicsDevice graphicsDevice)
+            : base(graphicsDevice) { }
 
 
         /****