Merge branch 'develop' into stable

3 files changed, 7 insertions, 7 deletions

diff --git a/src/SMAPI.Internal.Patching/BasePatcher.cs b/src/SMAPI.Internal.Patching/BasePatcher.cs
index 87155d7f..c1936ccc 100644
--- a/src/SMAPI.Internal.Patching/BasePatcher.cs
+++ b/src/SMAPI.Internal.Patching/BasePatcher.cs
@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="name">The method name.</param>
         /// <param name="parameters">The method parameter types, or <c>null</c> if it's not overloaded.</param>
         /// <param name="generics">The method generic types, or <c>null</c> if it's not generic.</param>
-        protected MethodInfo RequireMethod<TTarget>(string name, Type[] parameters = null, Type[] generics = null)
+        protected MethodInfo RequireMethod<TTarget>(string name, Type[]? parameters = null, Type[]? generics = null)
         {
             return PatchHelper.RequireMethod<TTarget>(name, parameters, generics);
         }
@@ -40,7 +40,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="priority">The patch priority to apply, usually specified using Harmony's <see cref="Priority"/> enum, or <c>null</c> to keep the default value.</param>
         protected HarmonyMethod GetHarmonyMethod(string name, int? priority = null)
         {
-            var method = new HarmonyMethod(
+            HarmonyMethod method = new(
                 AccessTools.Method(this.GetType(), name)
                 ?? throw new InvalidOperationException($"Can't find patcher method {PatchHelper.GetMethodString(this.GetType(), name)}.")
             );
diff --git a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
index c07e3b41..6f30c241 100644
--- a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
+++ b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
@@ -15,7 +15,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="patchers">The patchers to apply.</param>
         public static Harmony Apply(string id, IMonitor monitor, params IPatcher[] patchers)
         {
-            Harmony harmony = new Harmony(id);
+            Harmony harmony = new(id);
 
             foreach (IPatcher patcher in patchers)
             {
diff --git a/src/SMAPI.Internal.Patching/PatchHelper.cs b/src/SMAPI.Internal.Patching/PatchHelper.cs
index fc79ddf2..edd8ef57 100644
--- a/src/SMAPI.Internal.Patching/PatchHelper.cs
+++ b/src/SMAPI.Internal.Patching/PatchHelper.cs
@@ -16,7 +16,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <typeparam name="TTarget">The type containing the method.</typeparam>
         /// <param name="parameters">The method parameter types, or <c>null</c> if it's not overloaded.</param>
         /// <exception cref="InvalidOperationException">The type has no matching constructor.</exception>
-        public static ConstructorInfo RequireConstructor<TTarget>(Type[] parameters = null)
+        public static ConstructorInfo RequireConstructor<TTarget>(Type[]? parameters = null)
         {
             return
                 AccessTools.Constructor(typeof(TTarget), parameters)
@@ -29,7 +29,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="parameters">The method parameter types, or <c>null</c> if it's not overloaded.</param>
         /// <param name="generics">The method generic types, or <c>null</c> if it's not generic.</param>
         /// <exception cref="InvalidOperationException">The type has no matching method.</exception>
-        public static MethodInfo RequireMethod<TTarget>(string name, Type[] parameters = null, Type[] generics = null)
+        public static MethodInfo RequireMethod<TTarget>(string name, Type[]? parameters = null, Type[]? generics = null)
         {
             return
                 AccessTools.Method(typeof(TTarget), name, parameters, generics)
@@ -41,9 +41,9 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="name">The method name, or <c>null</c> for a constructor.</param>
         /// <param name="parameters">The method parameter types, or <c>null</c> if it's not overloaded.</param>
         /// <param name="generics">The method generic types, or <c>null</c> if it's not generic.</param>
-        public static string GetMethodString(Type type, string name, Type[] parameters = null, Type[] generics = null)
+        public static string GetMethodString(Type type, string? name, Type[]? parameters = null, Type[]? generics = null)
         {
-            StringBuilder str = new StringBuilder();
+            StringBuilder str = new();
 
             // type
             str.Append(type.FullName);