summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-09-02 19:31:22 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-11-28 00:01:40 -0500
commitc8c6b3897cd080ef3261f5642d31d8a51971981b (patch)
tree59f3476cba5130514fd27b87881ba6c34ed537f9 /src
parent3ca6fb562417748c87567d6bb6915d56b2c1b57c (diff)
downloadSMAPI-c8c6b3897cd080ef3261f5642d31d8a51971981b.tar.gz
SMAPI-c8c6b3897cd080ef3261f5642d31d8a51971981b.tar.bz2
SMAPI-c8c6b3897cd080ef3261f5642d31d8a51971981b.zip
update versions for Stardew Valley 1.5.5 and remove 1.5.4-specific checks
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI.Installer/InteractiveInstaller.cs20
-rw-r--r--src/SMAPI/Constants.cs4
-rw-r--r--src/SMAPI/Program.cs13
3 files changed, 2 insertions, 35 deletions
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 9f49137f..79c3b891 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -277,18 +277,6 @@ namespace StardewModdingApi.Installer
/*********
** Step 4: validate assumptions
*********/
- // not 64-bit on Windows
- if (context.Platform == Platform.Windows)
- {
- FileInfo linuxExecutable = new FileInfo(Path.Combine(paths.GamePath, "StardewValley.exe"));
- if (linuxExecutable.Exists && this.Is64Bit(linuxExecutable.FullName))
- {
- this.PrintError("Oops! The detected game install path seems to be unofficial 64-bit mode, which is no longer supported. You can update to Stardew Valley 1.5.5 or later instead. See https://stardewvalleywiki.com/Modding:Migrate_to_64-bit_on_Windows for more info.");
- Console.ReadLine();
- return;
- }
- }
-
// executable exists
if (!File.Exists(paths.ExecutablePath))
{
@@ -297,14 +285,6 @@ namespace StardewModdingApi.Installer
return;
}
- // not Stardew Valley 1.5.5+
- if (File.Exists(Path.Combine(paths.GamePath, "Stardew Valley.dll")))
- {
- this.PrintError("Oops! The detected game install path seems to be Stardew Valley 1.5.5 or later, but this version of SMAPI is only compatible up to Stardew Valley 1.5.4. Please check for a newer version of SMAPI: https://smapi.io.");
- Console.ReadLine();
- return;
- }
-
// game folder doesn't contain paths beyond the max limit
{
string[] tooLongPaths = PathUtilities.GetTooLongPaths(Path.Combine(paths.GamePath, "Mods")).ToArray();
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 42c3b21b..4d6a2a0b 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -70,10 +70,10 @@ namespace StardewModdingAPI
public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion(EarlyConstants.RawApiVersion);
/// <summary>The minimum supported version of Stardew Valley.</summary>
- public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.4");
+ public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.5");
/// <summary>The maximum supported version of Stardew Valley.</summary>
- public static ISemanticVersion MaximumGameVersion { get; } = new GameVersion("1.5.4");
+ public static ISemanticVersion MaximumGameVersion { get; } = null;
/// <summary>The target game platform.</summary>
public static GamePlatform TargetPlatform { get; } = EarlyConstants.Platform;
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 3f97e531..574e781d 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -4,7 +4,6 @@ using System.Linq;
using System.Reflection;
using System.Threading;
using StardewModdingAPI.Framework;
-using StardewModdingAPI.Toolkit.Framework;
using StardewModdingAPI.Toolkit.Serialization.Models;
namespace StardewModdingAPI
@@ -84,22 +83,10 @@ namespace StardewModdingAPI
}
catch (Exception ex)
{
- // unofficial 64-bit
- if (EarlyConstants.Platform == GamePlatform.Windows)
- {
- FileInfo linuxExecutable = new FileInfo(Path.Combine(EarlyConstants.ExecutionPath, "StardewValley.exe"));
- if (linuxExecutable.Exists && LowLevelEnvironmentUtility.Is64BitAssembly(linuxExecutable.FullName))
- Program.PrintErrorAndExit("Oops! You're running Stardew Valley in unofficial 64-bit mode, which is no longer supported. You can update to Stardew Valley 1.5.5 or later instead. See https://stardewvalleywiki.com/Modding:Migrate_to_64-bit_on_Windows for more info.");
- }
-
// file doesn't exist
if (!File.Exists(Path.Combine(EarlyConstants.ExecutionPath, $"{EarlyConstants.GameAssemblyName}.exe")))
Program.PrintErrorAndExit("Oops! SMAPI can't find the game. Make sure you're running StardewModdingAPI.exe in your game folder.");
- // Stardew Valley 1.5.5+
- if (File.Exists(Path.Combine(EarlyConstants.ExecutionPath, "Stardew Valley.dll")))
- Program.PrintErrorAndExit("Oops! You're running Stardew Valley 1.5.5 or later, but this version of SMAPI is only compatible up to Stardew Valley 1.5.4. Please check for a newer version of SMAPI: https://smapi.io.");
-
// can't load file
Program.PrintErrorAndExit(
message: "Oops! SMAPI couldn't load the game executable. The technical details below may have more info.",