2 files changed, 42 insertions, 1 deletions
diff --git a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/ActiveClickableMenuRewriter.cs b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/ActiveClickableMenuRewriter.cs
new file mode 100644
index 00000000..b8aef019
--- /dev/null
+++ b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/ActiveClickableMenuRewriter.cs
@@ -0,0 +1,40 @@
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using StardewModdingAPI.AssemblyRewriters.Framework;
+using StardewValley;
+
+namespace StardewModdingAPI.AssemblyRewriters.Rewriters
+{
+    /// <summary>Rewrites field references to <see cref="Game1.activeClickableMenu"/>.</summary>
+    /// <remarks>Stardew Valley changed the <see cref="Game1.activeClickableMenu"/> field to a property, which broke many mods that reference it.</remarks>
+    public class ActiveClickableMenuRewriter : BaseFieldRewriter
+    {
+        /*********
+        ** Protected methods
+        *********/
+        /// <summary>Get whether a field reference should be rewritten.</summary>
+        /// <param name="instruction">The IL instruction.</param>
+        /// <param name="fieldRef">The field reference.</param>
+        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
+        protected override bool ShouldRewrite(Instruction instruction, FieldReference fieldRef, bool platformChanged)
+        {
+            return
+                (instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Stsfld) // static field
+                && fieldRef.DeclaringType.FullName == typeof(Game1).FullName
+                && fieldRef.Name == nameof(Game1.activeClickableMenu);
+        }
+
+        /// <summary>Rewrite a method for compatibility.</summary>
+        /// <param name="module">The module being rewritten.</param>
+        /// <param name="cil">The CIL rewriter.</param>
+        /// <param name="instruction">The instruction which references the field.</param>
+        /// <param name="fieldRef">The field reference invoked by the <paramref name="instruction"/>.</param>
+        /// <param name="assemblyMap">Metadata for mapping assemblies to the current platform.</param>
+        protected override void Rewrite(ModuleDefinition module, ILProcessor cil, Instruction instruction, FieldReference fieldRef, PlatformAssemblyMap assemblyMap)
+        {
+            string methodPrefix = instruction.OpCode == OpCodes.Ldsfld ? "get" : "set";
+            MethodReference propertyRef = module.Import(typeof(Game1).GetMethod($"{methodPrefix}_{nameof(Game1.activeClickableMenu)}"));
+            cil.Replace(instruction, cil.Create(OpCodes.Call, propertyRef));
+        }
+    }
+}
diff --git a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SpriteBatchRewriter.cs b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SpriteBatchRewriter.cs
index 819578e0..109a6a6e 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SpriteBatchRewriter.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Rewriters/SpriteBatchRewriter.cs
@@ -15,9 +15,10 @@ namespace StardewModdingAPI.AssemblyRewriters.Rewriters
         ** Protected methods
         *********/
         /// <summary>Get whether a method reference should be rewritten.</summary>
+        /// <param name="instruction">The IL instruction.</param>
         /// <param name="methodRef">The method reference.</param>
         /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
-        protected override bool ShouldRewrite(MethodReference methodRef, bool platformChanged)
+        protected override bool ShouldRewrite(Instruction instruction, MethodReference methodRef, bool platformChanged)
         {
             return platformChanged
                 && methodRef.DeclaringType.FullName == typeof(SpriteBatch).FullName