1 files changed, 24 insertions, 13 deletions

diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
index ff86c6e2..8043b13a 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
@@ -2,16 +2,22 @@ using System;
 using System.Reflection;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using StardewModdingAPI.Framework.ModLoading.Finders;
+using StardewModdingAPI.Framework.ModLoading.Framework;
 
 namespace StardewModdingAPI.Framework.ModLoading.Rewriters
 {
     /// <summary>Rewrites references to one field with another.</summary>
-    internal class FieldReplaceRewriter : FieldFinder
+    internal class FieldReplaceRewriter : BaseInstructionHandler
     {
         /*********
         ** Fields
         *********/
+        /// <summary>The type containing the field to which references should be rewritten.</summary>
+        private readonly Type Type;
+
+        /// <summary>The field name to which references should be rewritten.</summary>
+        private readonly string FromFieldName;
+
         /// <summary>The new field to reference.</summary>
         private readonly FieldInfo ToField;
 
@@ -20,31 +26,36 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="type">The type whose field to which references should be rewritten.</param>
+        /// <param name="type">The type whose field to rewrite.</param>
         /// <param name="fromFieldName">The field name to rewrite.</param>
         /// <param name="toFieldName">The new field name to reference.</param>
         public FieldReplaceRewriter(Type type, string fromFieldName, string toFieldName)
-            : base(type.FullName, fromFieldName, InstructionHandleResult.None)
+            : base(defaultPhrase: $"{type.FullName}.{fromFieldName} field")
         {
+            this.Type = type;
+            this.FromFieldName = fromFieldName;
             this.ToField = type.GetField(toFieldName);
             if (this.ToField == null)
                 throw new InvalidOperationException($"The {type.FullName} class doesn't have a {toFieldName} field.");
         }
 
-        /// <summary>Perform the predefined logic for an instruction if applicable.</summary>
+        /// <summary>Rewrite a CIL instruction reference if needed.</summary>
         /// <param name="module">The assembly module containing the instruction.</param>
         /// <param name="cil">The CIL processor.</param>
-        /// <param name="instruction">The instruction to handle.</param>
-        /// <param name="assemblyMap">Metadata for mapping assemblies to the current platform.</param>
-        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
-        public override InstructionHandleResult Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction, PlatformAssemblyMap assemblyMap, bool platformChanged)
+        /// <param name="instruction">The CIL instruction to handle.</param>
+        /// <param name="replaceWith">Replaces the CIL instruction with a new one.</param>
+        /// <returns>Returns whether the instruction was changed.</returns>
+        public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction, Action<Instruction> replaceWith)
         {
-            if (!this.IsMatch(instruction))
-                return InstructionHandleResult.None;
+            // get field reference
+            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+            if (!RewriteHelper.IsFieldReferenceTo(fieldRef, this.Type.FullName, this.FromFieldName))
+                return false;
 
+            // replace with new field
             FieldReference newRef = module.ImportReference(this.ToField);
-            cil.Replace(instruction, cil.Create(instruction.OpCode, newRef));
-            return InstructionHandleResult.Rewritten;
+            replaceWith(cil.Create(instruction.OpCode, newRef));
+            return this.MarkRewritten();
         }
     }
 }