From fe56c6396a3d0817077ca9ae3b179f322957dfc4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 18 Nov 2018 20:39:28 -0500
Subject: remove rewrite rules only used by mods that broke in SDV 1.3

---
 .../Rewriters/VirtualEntryCallRemover.cs           | 90 ----------------------
 src/SMAPI/Metadata/InstructionMetadata.cs          |  9 ---
 src/SMAPI/StardewModdingAPI.csproj                 |  1 -
 3 files changed, 100 deletions(-)
 delete mode 100644 src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs b/src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs
deleted file mode 100644
index 322a7df1..00000000
--- a/src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
-namespace StardewModdingAPI.Framework.ModLoading.Rewriters
-{
-    /// <summary>Rewrites virtual calls to the <see cref="Mod.Entry"/> method.</summary>
-    internal class VirtualEntryCallRemover : IInstructionHandler
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The type containing the method.</summary>
-        private readonly Type ToType;
-
-        /// <summary>The name of the method.</summary>
-        private readonly string MethodName;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>A brief noun phrase indicating what the instruction finder matches.</summary>
-        public string NounPhrase { get; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        public VirtualEntryCallRemover()
-        {
-            this.ToType = typeof(Mod);
-            this.MethodName = nameof(Mod.Entry);
-            this.NounPhrase = $"{this.ToType.Name}::{this.MethodName}";
-        }
-
-        /// <summary>Perform the predefined logic for a method if applicable.</summary>
-        /// <param name="module">The assembly module containing the instruction.</param>
-        /// <param name="method">The method definition containing the instruction.</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 InstructionHandleResult Handle(ModuleDefinition module, MethodDefinition method, PlatformAssemblyMap assemblyMap, bool platformChanged)
-        {
-            return InstructionHandleResult.None;
-        }
-
-        /// <summary>Perform the predefined logic for an instruction if applicable.</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 InstructionHandleResult Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction, PlatformAssemblyMap assemblyMap, bool platformChanged)
-        {
-            if (!this.IsMatch(instruction))
-                return InstructionHandleResult.None;
-
-            // get instructions comprising method call
-            int index = cil.Body.Instructions.IndexOf(instruction);
-            Instruction loadArg0 = cil.Body.Instructions[index - 2];
-            Instruction loadArg1 = cil.Body.Instructions[index - 1];
-            if (loadArg0.OpCode != OpCodes.Ldarg_0)
-                throw new InvalidOperationException($"Unexpected instruction sequence while removing virtual {this.ToType.Name}.{this.MethodName} call: found {loadArg0.OpCode.Name} instead of {OpCodes.Ldarg_0.Name}");
-            if (loadArg1.OpCode != OpCodes.Ldarg_1)
-                throw new InvalidOperationException($"Unexpected instruction sequence while removing virtual {this.ToType.Name}.{this.MethodName} call: found {loadArg1.OpCode.Name} instead of {OpCodes.Ldarg_1.Name}");
-
-            // remove method call
-            cil.Remove(loadArg0);
-            cil.Remove(loadArg1);
-            cil.Remove(instruction);
-            return InstructionHandleResult.Rewritten;
-        }
-
-
-        /*********
-        ** 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.ToType.FullName
-                && methodRef.Name == this.MethodName;
-        }
-    }
-}
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index 5a47fb1a..ff8d54e3 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -34,15 +34,6 @@ namespace StardewModdingAPI.Metadata
                 // rewrite for crossplatform compatibility
                 new MethodParentRewriter(typeof(SpriteBatch), typeof(SpriteBatchMethods), onlyIfPlatformChanged: true),
 
-                // rewrite for SMAPI 2.0
-                new VirtualEntryCallRemover(),
-
-                // rewrite for SMAPI 2.6 (types moved into SMAPI.Toolkit.CoreInterfaces)
-                new TypeReferenceRewriter("StardewModdingAPI.IManifest", typeof(IManifest), shouldIgnore: type => type.Scope.Name != "StardewModdingAPI"),
-                new TypeReferenceRewriter("StardewModdingAPI.IManifestContentPackFor", typeof(IManifestContentPackFor), shouldIgnore: type => type.Scope.Name != "StardewModdingAPI"),
-                new TypeReferenceRewriter("StardewModdingAPI.IManifestDependency", typeof(IManifestDependency), shouldIgnore: type => type.Scope.Name != "StardewModdingAPI"),
-                new TypeReferenceRewriter("StardewModdingAPI.ISemanticVersion", typeof(ISemanticVersion), shouldIgnore: type => type.Scope.Name != "StardewModdingAPI"),
-
                 // rewrite for Stardew Valley 1.3
                 new StaticFieldToConstantRewriter<int>(typeof(Game1), "tileSize", Game1.tileSize),
 
diff --git a/src/SMAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj
index 70fe2bed..5a098b8a 100644
--- a/src/SMAPI/StardewModdingAPI.csproj
+++ b/src/SMAPI/StardewModdingAPI.csproj
@@ -227,7 +227,6 @@
     <Compile Include="Framework\ModLoading\Rewriters\StaticFieldToConstantRewriter.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\FieldToPropertyRewriter.cs" />
     <Compile Include="Framework\ModLoading\Finders\ReferenceToMemberWithUnexpectedTypeFinder.cs" />
-    <Compile Include="Framework\ModLoading\Rewriters\VirtualEntryCallRemover.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\MethodParentRewriter.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\TypeReferenceRewriter.cs" />
     <Compile Include="Framework\Exceptions\SAssemblyLoadFailedException.cs" />
-- 
cgit