diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-07-21 22:49:53 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-07-21 22:49:53 -0400 |
| commit | 92bcb8405c4dc0f4af283146a2ad6ea3a178fd06 (patch) | |
| tree | 2e5bae4b7e8c1a625c2c8f1e3b8729c5ca61c8aa /src/SMAPI/Metadata | |
| parent | 7e5d77fb8c2606795af239717a596de460bc58f7 (diff) | |
| parent | 72b3c9d14314a3f69a0ca9d6ac9de9de1d31943d (diff) | |
| download | SMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.tar.gz SMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.tar.bz2 SMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.zip | |
Merge branch 'harmony-2' into develop
Diffstat (limited to 'src/SMAPI/Metadata')
| -rw-r--r-- | src/SMAPI/Metadata/InstructionMetadata.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs index d1699636..a787993a 100644 --- a/src/SMAPI/Metadata/InstructionMetadata.cs +++ b/src/SMAPI/Metadata/InstructionMetadata.cs @@ -48,10 +48,8 @@ namespace StardewModdingAPI.Metadata yield return new HeuristicFieldRewriter(this.ValidateReferencesToAssemblies); yield return new HeuristicMethodRewriter(this.ValidateReferencesToAssemblies); -#if HARMONY_2 - // rewrite for SMAPI 3.x (Harmony 1.x => 2.0 update) + // rewrite for SMAPI 3.12 (Harmony 1.x => 2.0 update) yield return new Harmony1AssemblyRewriter(); -#endif } /**** @@ -64,11 +62,7 @@ namespace StardewModdingAPI.Metadata /**** ** detect code which may impact game stability ****/ -#if HARMONY_2 yield return new TypeFinder(typeof(HarmonyLib.Harmony).FullName, InstructionHandleResult.DetectedGamePatch); -#else - yield return new TypeFinder(typeof(Harmony.HarmonyInstance).FullName, InstructionHandleResult.DetectedGamePatch); -#endif yield return new TypeFinder("System.Runtime.CompilerServices.CallSite", InstructionHandleResult.DetectedDynamic); yield return new FieldFinder(typeof(SaveGame).FullName, nameof(SaveGame.serializer), InstructionHandleResult.DetectedSaveSerializer); yield return new FieldFinder(typeof(SaveGame).FullName, nameof(SaveGame.farmerSerializer), InstructionHandleResult.DetectedSaveSerializer); |