diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs b/src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs
new file mode 100644
index 00000000..322a7df1
--- /dev/null
+++ b/src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs
@@ -0,0 +1,90 @@
+using System;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+
+namespace StardewModdingAPI.Framework.ModLoading.Rewriters
+{
+ /// Rewrites virtual calls to the method.
+ internal class VirtualEntryCallRemover : IInstructionHandler
+ {
+ /*********
+ ** Properties
+ *********/
+ /// The type containing the method.
+ private readonly Type ToType;
+
+ /// The name of the method.
+ private readonly string MethodName;
+
+
+ /*********
+ ** Accessors
+ *********/
+ /// A brief noun phrase indicating what the instruction finder matches.
+ public string NounPhrase { get; }
+
+
+ /*********
+ ** Public methods
+ *********/
+ /// Construct an instance.
+ public VirtualEntryCallRemover()
+ {
+ this.ToType = typeof(Mod);
+ this.MethodName = nameof(Mod.Entry);
+ this.NounPhrase = $"{this.ToType.Name}::{this.MethodName}";
+ }
+
+ /// Perform the predefined logic for a method if applicable.
+ /// The assembly module containing the instruction.
+ /// The method definition containing the instruction.
+ /// Metadata for mapping assemblies to the current platform.
+ /// Whether the mod was compiled on a different platform.
+ public InstructionHandleResult Handle(ModuleDefinition module, MethodDefinition method, PlatformAssemblyMap assemblyMap, bool platformChanged)
+ {
+ return InstructionHandleResult.None;
+ }
+
+ /// Perform the predefined logic for an instruction if applicable.
+ /// The assembly module containing the instruction.
+ /// The CIL processor.
+ /// The instruction to handle.
+ /// Metadata for mapping assemblies to the current platform.
+ /// Whether the mod was compiled on a different platform.
+ 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
+ *********/
+ /// Get whether a CIL instruction matches.
+ /// The IL instruction.
+ 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/StardewModdingAPI/Metadata/InstructionMetadata.cs b/src/StardewModdingAPI/Metadata/InstructionMetadata.cs
index 35989801..1842d5d8 100644
--- a/src/StardewModdingAPI/Metadata/InstructionMetadata.cs
+++ b/src/StardewModdingAPI/Metadata/InstructionMetadata.cs
@@ -90,7 +90,10 @@ namespace StardewModdingAPI.Metadata
new FieldReplaceRewriter(typeof(Game1), "smoothFont", nameof(Game1.smallFont)),
// SMAPI 1.9
- new TypeReferenceRewriter("StardewModdingAPI.Inheritance.ItemStackChange", typeof(ItemStackChange))
+ new TypeReferenceRewriter("StardewModdingAPI.Inheritance.ItemStackChange", typeof(ItemStackChange)),
+
+ // SMAPI 2.0
+ new VirtualEntryCallRemover() // Mod.Entry changed from virtual to abstract in SMAPI 2.0, which breaks the few mods which called base.Entry()
};
}
}
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 8863590b..78d2bc8e 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -104,6 +104,7 @@
+