From f8c76bde39ba2afb11540c9af5d88aad4c73f789 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 24 Aug 2021 21:59:52 -0400
Subject: add 64-bit compatibility check before loading mods

That reduces time spent trying to rewrite them (which won't work anyway), and shows a more informative message than the default 'DLL couldn't be loaded' error.
---
 src/SMAPI/Framework/SCore.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 5fb4aa03..dff0fc55 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -1704,12 +1704,21 @@ namespace StardewModdingAPI.Framework
             // load as mod
             else
             {
+                // get mod info
                 IManifest manifest = mod.Manifest;
+                string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll);
+
+                // assert 64-bit
+#if SMAPI_FOR_WINDOWS_64BIT_HACK
+                if (!EnvironmentUtility.Is64BitAssembly(assemblyPath))
+                {
+                    errorReasonPhrase = "it needs to be updated for 64-bit mode.";
+                    failReason = ModFailReason.LoadFailed;
+                    return false;
+                }
+#endif
 
                 // load mod
-                string assemblyPath = manifest?.EntryDll != null
-                    ? Path.Combine(mod.DirectoryPath, manifest.EntryDll)
-                    : null;
                 Assembly modAssembly;
                 try
                 {
-- 
cgit