From 499cd8ab317080096c373c6ed6649bd51fb01c7d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 5 May 2020 21:45:53 -0400
Subject: combine Harmony 1.x rewrite logs (#711)

---
 .../Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs   | 9 ++++++++-
 src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs | 5 +++--
 src/SMAPI/Metadata/InstructionMetadata.cs                        | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
index 29e44bfe..9faca235 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
@@ -18,12 +18,19 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         private readonly Type HarmonyType = typeof(HarmonyLib.Harmony);
 
 
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>A brief noun phrase indicating what the rewriter matches.</summary>
+        public const string DefaultNounPhrase = "Harmony 1.x";
+
+
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
         public Harmony1AssemblyRewriter()
-            : base(new TypeAssemblyFinder(Harmony1AssemblyRewriter.FromAssemblyName, InstructionHandleResult.None), "Harmony 1.x types")
+            : base(new TypeAssemblyFinder(Harmony1AssemblyRewriter.FromAssemblyName, InstructionHandleResult.None), Harmony1AssemblyRewriter.DefaultNounPhrase)
         { }
 
 
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
index 0984dc44..c4c740b3 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
@@ -35,11 +35,12 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <param name="fromType">The type whose methods to remap.</param>
         /// <param name="toType">The type with methods to map to.</param>
         /// <param name="onlyIfPlatformChanged">Whether to only rewrite references if loading the assembly on a different platform than it was compiled on.</param>
-        public MethodParentRewriter(string fromType, Type toType, bool onlyIfPlatformChanged = false)
+        /// <param name="nounPhrase">A brief noun phrase indicating what the instruction finder matches (or <c>null</c> to generate one).</param>
+        public MethodParentRewriter(string fromType, Type toType, bool onlyIfPlatformChanged = false, string nounPhrase = null)
         {
             this.FromType = fromType;
             this.ToType = toType;
-            this.NounPhrase = $"{fromType.Split('.').Last()} methods";
+            this.NounPhrase = nounPhrase ?? $"{fromType.Split('.').Last()} methods";
             this.OnlyIfPlatformChanged = onlyIfPlatformChanged;
         }
 
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index fb7141e7..665147e4 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -38,7 +38,7 @@ namespace StardewModdingAPI.Metadata
 
             // rewrite for SMAPI 3.6 (Harmony 1.x => 2.0 update)
             yield return new Harmony1AssemblyRewriter();
-            yield return new MethodParentRewriter("HarmonyLib.Harmony", typeof(HarmonyInstanceMethods), onlyIfPlatformChanged: false);
+            yield return new MethodParentRewriter("HarmonyLib.Harmony", typeof(HarmonyInstanceMethods), onlyIfPlatformChanged: false, nounPhrase: Harmony1AssemblyRewriter.DefaultNounPhrase);
 
             /****
             ** detect mod issues
-- 
cgit