From 40b74398ace748a565199fb91325815804011a98 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 12 Aug 2021 21:26:09 -0400
Subject: update for game assembly name now consistent on all platforms

---
 src/SMAPI/Constants.cs | 12 +++---------
 src/SMAPI/Program.cs   |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 776b3e3c..2c16052b 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -43,7 +43,7 @@ namespace StardewModdingAPI
         internal static GameFramework GameFramework { get; } = GameFramework.MonoGame;
 
         /// <summary>The game's assembly name.</summary>
-        internal static string GameAssemblyName => EarlyConstants.Platform == GamePlatform.Windows ? "Stardew Valley" : "StardewValley";
+        internal static string GameAssemblyName { get; } = "Stardew Valley";
 
         /// <summary>The <see cref="Context.ScreenId"/> value which should appear in the SMAPI log, if any.</summary>
         internal static int? LogScreenId { get; set; }
@@ -269,14 +269,8 @@ namespace StardewModdingAPI
             );
 
             // Stardew Valley reference
-            removeAssemblyReferences.Add(
-                Constants.Platform == Platform.Windows
-                    ? "StardewValley"
-                    : "Stardew Valley"
-            );
-            targetAssemblies.Add(
-                typeof(StardewValley.Game1).Assembly
-            );
+            removeAssemblyReferences.Add("StardewValley");
+            targetAssemblies.Add(typeof(StardewValley.Game1).Assembly);
 
             return new PlatformAssemblyMap(targetPlatform, removeAssemblyReferences.ToArray(), targetAssemblies.ToArray());
         }
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 574e781d..3e2213ba 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -35,7 +35,7 @@ namespace StardewModdingAPI
                 Program.AssertSmapiVersions();
                 Program.Start(args);
             }
-            catch (BadImageFormatException ex) when (ex.FileName == "StardewValley" || ex.FileName == "Stardew Valley") // don't use EarlyConstants.GameAssemblyName, since we want to check both possible names
+            catch (BadImageFormatException ex) when (ex.FileName == EarlyConstants.GameAssemblyName)
             {
                 Console.WriteLine($"SMAPI failed to initialize because your game's {ex.FileName}.exe seems to be invalid.\nThis may be a pirated version which modified the executable in an incompatible way; if so, you can try a different download or buy a legitimate version.\n\nTechnical details:\n{ex}");
             }
-- 
cgit