2 files changed, 50 insertions, 0 deletions
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
new file mode 100644
index 00000000..5301186b
--- /dev/null
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
@@ -0,0 +1,25 @@
+using System;
+using Mono.Cecil;
+using StardewModdingAPI.Framework.ModLoading.Framework;
+
+namespace StardewModdingAPI.Framework.ModLoading.Finders
+{
+    /// <summary>Finds incompatible CIL instructions that reference types in a given assembly.</summary>
+    internal class TypeAssemblyFinder : BaseTypeFinder
+    {
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="assemblyName">The full assembly name to which to find references.</param>
+        /// <param name="result">The result to return for matching instructions.</param>
+        /// <param name="shouldIgnore">A lambda which overrides a matched type.</param>
+        public TypeAssemblyFinder(string assemblyName, InstructionHandleResult result, Func<TypeReference, bool> shouldIgnore = null)
+            : base(
+                isMatch: type => type.Scope.Name == assemblyName && (shouldIgnore == null || !shouldIgnore(type)),
+                result: result,
+                nounPhrase: $"{assemblyName} assembly"
+            )
+        { }
+    }
+}
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
new file mode 100644
index 00000000..3adc31c7
--- /dev/null
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
@@ -0,0 +1,25 @@
+using System;
+using Mono.Cecil;
+using StardewModdingAPI.Framework.ModLoading.Framework;
+
+namespace StardewModdingAPI.Framework.ModLoading.Finders
+{
+    /// <summary>Finds incompatible CIL instructions that reference a given type.</summary>
+    internal class TypeFinder : BaseTypeFinder
+    {
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="fullTypeName">The full type name to match.</param>
+        /// <param name="result">The result to return for matching instructions.</param>
+        /// <param name="shouldIgnore">A lambda which overrides a matched type.</param>
+        public TypeFinder(string fullTypeName, InstructionHandleResult result, Func<TypeReference, bool> shouldIgnore = null)
+            : base(
+                isMatch: type => type.FullName == fullTypeName && (shouldIgnore == null || !shouldIgnore(type)),
+                result: result,
+                nounPhrase: $"{fullTypeName} type"
+            )
+        { }
+    }
+}