Merge branch 'develop' into stable

1 files changed, 34 insertions, 23 deletions

diff --git a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
index 01ed153b..124951a5 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -13,8 +15,8 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <summary>The full type name for which to find references.</summary>
         private readonly string FullTypeName;
 
-        /// <summary>The event name for which to find references.</summary>
-        private readonly string EventName;
+        /// <summary>The method names for which to find references.</summary>
+        private readonly ISet<string> MethodNames;
 
         /// <summary>The result to return for matching instructions.</summary>
         private readonly InstructionHandleResult Result;
@@ -25,38 +27,47 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="fullTypeName">The full type name for which to find references.</param>
-        /// <param name="eventName">The event name for which to find references.</param>
+        /// <param name="eventNames">The event names for which to find references.</param>
         /// <param name="result">The result to return for matching instructions.</param>
-        public EventFinder(string fullTypeName, string eventName, InstructionHandleResult result)
-            : base(defaultPhrase: $"{fullTypeName}.{eventName} event")
+        public EventFinder(string fullTypeName, string[] eventNames, InstructionHandleResult result)
+            : base(defaultPhrase: $"{string.Join(", ", eventNames.Select(p => $"{fullTypeName}.{p}"))} event{(eventNames.Length != 1 ? "s" : "")}") // default phrase should never be used
         {
             this.FullTypeName = fullTypeName;
-            this.EventName = eventName;
             this.Result = result;
+
+            this.MethodNames = new HashSet<string>();
+            foreach (string name in eventNames)
+            {
+                this.MethodNames.Add($"add_{name}");
+                this.MethodNames.Add($"remove_{name}");
+            }
         }
 
+        /// <summary>Construct an instance.</summary>
+        /// <param name="fullTypeName">The full type name for which to find references.</param>
+        /// <param name="eventName">The event name for which to find references.</param>
+        /// <param name="result">The result to return for matching instructions.</param>
+        public EventFinder(string fullTypeName, string eventName, InstructionHandleResult result)
+            : this(fullTypeName, new[] { eventName }, result) { }
+
         /// <inheritdoc />
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
-            if (!this.Flags.Contains(this.Result) && this.IsMatch(instruction))
-                this.MarkFlag(this.Result);
-
-            return false;
-        }
+            if (this.MethodNames.Any())
+            {
+                MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+                if (methodRef != null && methodRef.DeclaringType.FullName == this.FullTypeName && this.MethodNames.Contains(methodRef.Name))
+                {
+                    string eventName = methodRef.Name.Split(new[] { '_' }, 2)[1];
+                    this.MethodNames.Remove($"add_{eventName}");
+                    this.MethodNames.Remove($"remove_{eventName}");
 
+                    this.MarkFlag(this.Result);
+                    this.Phrases.Add($"{this.FullTypeName}.{eventName} event");
+                }
+            }
 
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Get whether a CIL instruction matches.</summary>
-        /// <param name="instruction">The IL instruction.</param>
-        protected bool IsMatch(Instruction instruction)
-        {
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
-            return
-                methodRef != null
-                && methodRef.DeclaringType.FullName == this.FullTypeName
-                && (methodRef.Name == "add_" + this.EventName || methodRef.Name == "remove_" + this.EventName);
+            return false;
         }
     }
 }