diff --git a/docs/release-notes.md b/docs/release-notes.md
index 1a6f4078..56564953 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -8,6 +8,7 @@
* Added automatic save recovery when the custom farm type isn't available anymore.
* Added the new game build number to the SMAPI console + log.
* The installer now detects Xbox app game folders.
+ * Reduced mod loading time a bit.
* Fixed extra newlines shown in the console in non-developer mode.
* Fixed macOS launch issue when using some terminals (thanks to bruce2409!).
* Fixed Linux/macOS terminal ignoring backspace in Stardew Valley 1.5.5+.
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
index 60bbd2c7..d7cb2471 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
** Fields
*********/
/// The comparer which heuristically compares type definitions.
- private static readonly TypeReferenceComparer TypeDefinitionComparer = new TypeReferenceComparer();
+ private static readonly TypeReferenceComparer TypeDefinitionComparer = new();
/*********
@@ -28,28 +28,6 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
: null;
}
- /// Get whether the field is a reference to the expected type and field.
- /// The IL instruction.
- /// The full type name containing the expected field.
- /// The name of the expected field.
- public static bool IsFieldReferenceTo(Instruction instruction, string fullTypeName, string fieldName)
- {
- FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
- return RewriteHelper.IsFieldReferenceTo(fieldRef, fullTypeName, fieldName);
- }
-
- /// Get whether the field is a reference to the expected type and field.
- /// The field reference to check.
- /// The full type name containing the expected field.
- /// The name of the expected field.
- public static bool IsFieldReferenceTo(FieldReference fieldRef, string fullTypeName, string fieldName)
- {
- return
- fieldRef != null
- && fieldRef.DeclaringType.FullName == fullTypeName
- && fieldRef.Name == fieldName;
- }
-
/// Get the method reference from an instruction if it matches.
/// The IL instruction.
public static MethodReference AsMethodReference(Instruction instruction)
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
index 0b679e9d..857a2230 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Reflection;
using Mono.Cecil;
using Mono.Cecil.Cil;
@@ -12,54 +13,55 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
/*********
** Fields
*********/
- /// The type containing the field to which references should be rewritten.
- private readonly Type Type;
-
- /// The field name to which references should be rewritten.
- private readonly string FromFieldName;
-
- /// The new field to reference.
- private readonly FieldInfo ToField;
+ /// The new fields to reference indexed by the old field/type names.
+ private readonly Dictionary> FieldMaps = new();
/*********
** Public methods
*********/
/// Construct an instance.
+ public FieldReplaceRewriter()
+ : base(defaultPhrase: "field replacement") { } // will be overridden when a field is replaced
+
+ /// Add a field to replace.
/// The type whose field to rewrite.
/// The field name to rewrite.
/// The new type which will have the field.
/// The new field name to reference.
- public FieldReplaceRewriter(Type fromType, string fromFieldName, Type toType, string toFieldName)
- : base(defaultPhrase: $"{fromType.FullName}.{fromFieldName} field")
+ public FieldReplaceRewriter AddField(Type fromType, string fromFieldName, Type toType, string toFieldName)
{
- this.Type = fromType;
- this.FromFieldName = fromFieldName;
- this.ToField = toType.GetField(toFieldName);
- if (this.ToField == null)
- throw new InvalidOperationException($"The {toType.FullName} class doesn't have a {toFieldName} field.");
- }
+ // get full type name
+ string fromTypeName = fromType?.FullName;
+ if (fromTypeName == null)
+ throw new InvalidOperationException($"Can't replace field for invalid type reference {toType}.");
- /// Construct an instance.
- /// The type whose field to rewrite.
- /// The field name to rewrite.
- /// The new field name to reference.
- public FieldReplaceRewriter(Type type, string fromFieldName, string toFieldName)
- : this(type, fromFieldName, type, toFieldName)
- {
+ // get target field
+ FieldInfo toField = toType.GetField(toFieldName);
+ if (toField == null)
+ throw new InvalidOperationException($"The {toType.FullName} class doesn't have a {toFieldName} field.");
+
+ // add mapping
+ if (!this.FieldMaps.TryGetValue(fromTypeName, out var fieldMap))
+ this.FieldMaps[fromTypeName] = fieldMap = new();
+ fieldMap[fromFieldName] = toField;
+
+ return this;
}
///
public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
{
- // get field reference
FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
- if (!RewriteHelper.IsFieldReferenceTo(fieldRef, this.Type.FullName, this.FromFieldName))
+ string declaringType = fieldRef?.DeclaringType?.FullName;
+
+ // get mapped field
+ if (declaringType == null || !this.FieldMaps.TryGetValue(declaringType, out var fieldMap) || !fieldMap.TryGetValue(fieldRef.Name, out FieldInfo toField))
return false;
// replace with new field
- instruction.Operand = module.ImportReference(this.ToField);
-
+ this.Phrases.Add($"{fieldRef.DeclaringType.Name}.{fieldRef.Name} field");
+ instruction.Operand = module.ImportReference(toField);
return this.MarkRewritten();
}
}
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index 232e54ce..367372b2 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -37,9 +37,10 @@ namespace StardewModdingAPI.Metadata
if (rewriteMods)
{
// rewrite for Stardew Valley 1.5
- yield return new FieldReplaceRewriter(typeof(DecoratableLocation), "furniture", typeof(GameLocation), nameof(GameLocation.furniture));
- yield return new FieldReplaceRewriter(typeof(Farm), "resourceClumps", typeof(GameLocation), nameof(GameLocation.resourceClumps));
- yield return new FieldReplaceRewriter(typeof(MineShaft), "resourceClumps", typeof(GameLocation), nameof(GameLocation.resourceClumps));
+ yield return new FieldReplaceRewriter()
+ .AddField(typeof(DecoratableLocation), "furniture", typeof(GameLocation), nameof(GameLocation.furniture))
+ .AddField(typeof(Farm), "resourceClumps", typeof(GameLocation), nameof(GameLocation.resourceClumps))
+ .AddField(typeof(MineShaft), "resourceClumps", typeof(GameLocation), nameof(GameLocation.resourceClumps));
// heuristic rewrites
yield return new HeuristicFieldRewriter(this.ValidateReferencesToAssemblies);
@@ -87,7 +88,7 @@ namespace StardewModdingAPI.Metadata
typeof(System.IO.DirectoryInfo).FullName,
typeof(System.IO.DriveInfo).FullName,
typeof(System.IO.FileSystemWatcher).FullName
- },
+ },
InstructionHandleResult.DetectedFilesystemAccess
);