diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-12 21:26:09 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-11-28 00:01:41 -0500 |
| commit | 40b74398ace748a565199fb91325815804011a98 (patch) | |
| tree | 12490faacc5eb39adc758c3dd06c8435869c5734 | |
| parent | 2b922a71a2a4f85712ab1e84b85c9229185a131a (diff) | |
| download | SMAPI-40b74398ace748a565199fb91325815804011a98.tar.gz SMAPI-40b74398ace748a565199fb91325815804011a98.tar.bz2 SMAPI-40b74398ace748a565199fb91325815804011a98.zip | |
update for game assembly name now consistent on all platforms
| -rw-r--r-- | build/find-game-folder.targets | 5 | ||||
| -rw-r--r-- | src/SMAPI/Constants.cs | 12 | ||||
| -rw-r--r-- | src/SMAPI/Program.cs | 2 |
3 files changed, 4 insertions, 15 deletions
diff --git a/build/find-game-folder.targets b/build/find-game-folder.targets index 7a9bfc50..3341226d 100644 --- a/build/find-game-folder.targets +++ b/build/find-game-folder.targets @@ -44,11 +44,6 @@ <!-- set game metadata --> <PropertyGroup> - <!--standard executable name--> <GameExecutableName>Stardew Valley</GameExecutableName> - <GameExecutableName Condition="$(OS) != 'Windows_NT'">StardewValley</GameExecutableName> - - <!--Linux install on Windows (for 64-bit hack)--> - <GameExecutableName Condition="$(OS) == 'Windows_NT' AND !Exists('$(GamePath)\$(GameExecutableName).exe') AND Exists('$(GamePath)\StardewValley.exe')">StardewValley</GameExecutableName> </PropertyGroup> </Project> 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}"); } |