From 85ed48809032fdbb8461ce4c34acfbe06f68652b Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 26 Mar 2017 19:01:35 -0400
Subject: merge CIL finders & rewriters into one interface (#254)

---
 src/StardewModdingAPI/Constants.cs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/StardewModdingAPI/Constants.cs')

diff --git a/src/StardewModdingAPI/Constants.cs b/src/StardewModdingAPI/Constants.cs
index 52be6c05..de0eab57 100644
--- a/src/StardewModdingAPI/Constants.cs
+++ b/src/StardewModdingAPI/Constants.cs
@@ -137,12 +137,15 @@ namespace StardewModdingAPI
             return new PlatformAssemblyMap(targetPlatform, removeAssemblyReferences, targetAssemblies);
         }
 
-        /// <summary>Get finders which match incompatible CIL instructions in mod assemblies.</summary>
-        internal static IEnumerable<IInstructionFinder> GetIncompatibilityFinders()
+        /// <summary>Get rewriters which detect or fix incompatible CIL instructions in mod assemblies.</summary>
+        internal static IEnumerable<IInstructionRewriter> GetRewriters()
         {
-            return new IInstructionFinder[]
+            return new IInstructionRewriter[]
             {
-                // changes in Stardew Valley 1.2 (that don't have rewriters)
+                /****
+                ** Finders throw an exception when incompatible code is found.
+                ****/
+                // changes in Stardew Valley 1.2 (with no rewriters)
                 new FieldFinder("StardewValley.Item", "set_Name"),
 
                 // APIs removed in SMAPI 1.9
@@ -161,15 +164,11 @@ namespace StardewModdingAPI
                 new EventFinder("StardewModdingAPI.Events.GraphicsEvents", "OnPostRenderHudEventNoCheck"),
                 new EventFinder("StardewModdingAPI.Events.GraphicsEvents", "OnPostRenderGuiEventNoCheck"),
                 new EventFinder("StardewModdingAPI.Events.GraphicsEvents", "OnPreRenderHudEventNoCheck"),
-                new EventFinder("StardewModdingAPI.Events.GraphicsEvents", "OnPreRenderGuiEventNoCheck")
-            };
-        }
+                new EventFinder("StardewModdingAPI.Events.GraphicsEvents", "OnPreRenderGuiEventNoCheck"),
 
-        /// <summary>Get rewriters which fix incompatible CIL instructions in mod assemblies.</summary>
-        internal static IEnumerable<IInstructionRewriter> GetRewriters()
-        {
-            return new IInstructionRewriter[]
-            {
+                /****
+                ** Rewriters change CIL as needed to fix incompatible code
+                ****/
                 // crossplatform
                 new MethodParentRewriter(typeof(SpriteBatch), typeof(SpriteBatchWrapper), onlyIfPlatformChanged: true),
 
-- 
cgit