From c023118356d9d7877dbdc9e88c4512fcdf33c256 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 30 Mar 2017 20:21:15 -0400
Subject: always show friendly game version

---
 src/StardewModdingAPI/Constants.cs | 29 +++++++++++++----------------
 src/StardewModdingAPI/Program.cs   | 10 +++++-----
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/StardewModdingAPI/Constants.cs b/src/StardewModdingAPI/Constants.cs
index 37fa4d31..e28b33d7 100644
--- a/src/StardewModdingAPI/Constants.cs
+++ b/src/StardewModdingAPI/Constants.cs
@@ -80,9 +80,6 @@ namespace StardewModdingAPI
         /// <summary>The game's current semantic version.</summary>
         internal static ISemanticVersion GameVersion { get; } = Constants.GetGameVersion();
 
-        /// <summary>The game's current version as it should be displayed to players.</summary>
-        internal static ISemanticVersion GameDisplayVersion { get; } = Constants.GetGameDisplayVersion(Constants.GameVersion);
-
         /// <summary>The target game platform.</summary>
         internal static Platform TargetPlatform { get; } =
 #if SMAPI_FOR_WINDOWS
@@ -177,6 +174,19 @@ namespace StardewModdingAPI
             };
         }
 
+        /// <summary>Get game current version as it should be displayed to players.</summary>
+        /// <param name="version">The semantic game version.</param>
+        internal static ISemanticVersion GetGameDisplayVersion(ISemanticVersion version)
+        {
+            switch (version.ToString())
+            {
+                case "1.1.1":
+                    return new SemanticVersion(1, 11, 0); // The 1.1 patch was released as 1.11
+                default:
+                    return version;
+            }
+        }
+
         /// <summary>Get the name of a save directory for the current player.</summary>
         private static string GetSaveFolderName()
         {
@@ -199,18 +209,5 @@ namespace StardewModdingAPI
                 version = "1.1.1"; // The 1.1 patch was released as 1.11, which means it's out of order for semantic version checks
             return new SemanticVersion(version);
         }
-
-        /// <summary>Get game current version as it should be displayed to players.</summary>
-        /// <param name="version">The semantic game version.</param>
-        private static ISemanticVersion GetGameDisplayVersion(ISemanticVersion version)
-        {
-            switch (version.ToString())
-            {
-                case "1.1.1":
-                    return new SemanticVersion(1, 11, 0); // The 1.1 patch was released as 1.11
-                default:
-                    return version;
-            }
-        }
     }
 }
diff --git a/src/StardewModdingAPI/Program.cs b/src/StardewModdingAPI/Program.cs
index 90839216..ac98f2e4 100644
--- a/src/StardewModdingAPI/Program.cs
+++ b/src/StardewModdingAPI/Program.cs
@@ -88,8 +88,8 @@ namespace StardewModdingAPI
         {
             // initialise logging
             Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-GB"); // for consistent log formatting
-            this.Monitor.Log($"SMAPI {Constants.ApiVersion} with Stardew Valley {Constants.GameVersion} on {this.GetFriendlyPlatformName()}", LogLevel.Info);
-            Console.Title = $"SMAPI {Constants.ApiVersion} - running Stardew Valley {Constants.GameVersion}";
+            this.Monitor.Log($"SMAPI {Constants.ApiVersion} with Stardew Valley {Constants.GetGameDisplayVersion(Constants.GameVersion)} on {this.GetFriendlyPlatformName()}", LogLevel.Info);
+            Console.Title = $"SMAPI {Constants.ApiVersion} - running Stardew Valley {Constants.GetGameDisplayVersion(Constants.GameVersion)}";
 
             // inject compatibility shims
 #pragma warning disable 618
@@ -131,13 +131,13 @@ namespace StardewModdingAPI
                 // verify version
                 if (Constants.GameVersion.IsOlderThan(Constants.MinimumGameVersion))
                 {
-                    this.Monitor.Log($"Oops! You're running Stardew Valley {Constants.GameDisplayVersion}, but the oldest supported version is {Constants.MinimumGameVersion}. Please update your game before using SMAPI. If you have the beta version on Steam, you may need to opt out to get the latest non-beta updates.", LogLevel.Error);
+                    this.Monitor.Log($"Oops! You're running Stardew Valley {Constants.GetGameDisplayVersion(Constants.GameVersion)}, but the oldest supported version is {Constants.GetGameDisplayVersion(Constants.MinimumGameVersion)}. Please update your game before using SMAPI. If you have the beta version on Steam, you may need to opt out to get the latest non-beta updates.", LogLevel.Error);
                     this.PressAnyKeyToExit();
                     return;
                 }
                 if (Constants.MaximumGameVersion != null && Constants.GameVersion.IsNewerThan(Constants.MaximumGameVersion))
                 {
-                    this.Monitor.Log($"Oops! You're running Stardew Valley {Constants.GameDisplayVersion}, but this version of SMAPI is only compatible up to Stardew Valley {Constants.MaximumGameVersion}. Please check for a newer version of SMAPI.", LogLevel.Error);
+                    this.Monitor.Log($"Oops! You're running Stardew Valley {Constants.GetGameDisplayVersion(Constants.GameVersion)}, but this version of SMAPI is only compatible up to Stardew Valley {Constants.GetGameDisplayVersion(Constants.MaximumGameVersion)}. Please check for a newer version of SMAPI.", LogLevel.Error);
                     this.PressAnyKeyToExit();
                     return;
                 }
@@ -530,7 +530,7 @@ namespace StardewModdingAPI
             this.Monitor.Log($"Loaded {modsLoaded} mods.");
             foreach (Action warning in deprecationWarnings)
                 warning();
-            Console.Title = $"SMAPI {Constants.ApiVersion} - running Stardew Valley {Constants.GameVersion} with {modsLoaded} mods";
+            Console.Title = $"SMAPI {Constants.ApiVersion} - running Stardew Valley {Constants.GetGameDisplayVersion(Constants.GameVersion)} with {modsLoaded} mods";
         }
 
         /// <summary>Run a loop handling console input.</summary>
-- 
cgit