From ec5fbb06113b29342e6d4b213144f4dc3e358b03 Mon Sep 17 00:00:00 2001
From: Chase Warrington <spacechase0.and.cat@gmail.com>
Date: Sun, 29 Aug 2021 15:48:28 -0400
Subject: Rewrite 32-bit assemblies for 64-bit

---
 .../Rewriters/ArchitectureAssemblyRewriter.cs      | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs

(limited to 'src/SMAPI/Framework/ModLoading/Rewriters')

diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
new file mode 100644
index 00000000..216c042a
--- /dev/null
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
@@ -0,0 +1,34 @@
+using System;
+using HarmonyLib;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using StardewModdingAPI.Framework.ModLoading.Framework;
+using StardewModdingAPI.Framework.ModLoading.RewriteFacades;
+
+namespace StardewModdingAPI.Framework.ModLoading.Rewriters
+{
+    /// <summary>Rewrites Harmony 1.x assembly references to work with Harmony 2.x.</summary>
+    internal class ArchitectureAssemblyRewriter : BaseInstructionHandler
+    {
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        public ArchitectureAssemblyRewriter()
+            : base(defaultPhrase: "32-bit architecture") { }
+
+
+        /// <inheritdoc />
+        public override bool Handle( ModuleDefinition module )
+        {
+            if ( module.Attributes.HasFlag( ModuleAttributes.Required32Bit ) )
+            {
+                module.Attributes = module.Attributes & ~ModuleAttributes.Required32Bit;
+                this.MarkRewritten();
+                return true;
+            }
+            return false;
+        }
+
+    }
+}
-- 
cgit 


From 6edcfb1358e470a636a9e97780e05f2a0dcb6752 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 29 Aug 2021 23:01:47 -0400
Subject: tweak new code

---
 .../ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI/Framework/ModLoading/Rewriters')

diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
index 216c042a..cc830216 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
@@ -1,13 +1,9 @@
-using System;
-using HarmonyLib;
 using Mono.Cecil;
-using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
-using StardewModdingAPI.Framework.ModLoading.RewriteFacades;
 
 namespace StardewModdingAPI.Framework.ModLoading.Rewriters
 {
-    /// <summary>Rewrites Harmony 1.x assembly references to work with Harmony 2.x.</summary>
+    /// <summary>Removes the 32-bit-only from loaded assemblies.</summary>
     internal class ArchitectureAssemblyRewriter : BaseInstructionHandler
     {
         /*********
@@ -19,14 +15,15 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
 
 
         /// <inheritdoc />
-        public override bool Handle( ModuleDefinition module )
+        public override bool Handle(ModuleDefinition module)
         {
-            if ( module.Attributes.HasFlag( ModuleAttributes.Required32Bit ) )
+            if (module.Attributes.HasFlag(ModuleAttributes.Required32Bit))
             {
-                module.Attributes = module.Attributes & ~ModuleAttributes.Required32Bit;
+                module.Attributes &= ~ModuleAttributes.Required32Bit;
                 this.MarkRewritten();
                 return true;
             }
+
             return false;
         }
 
-- 
cgit