Fix custom profiles having latest-release or latest-beta versionId

MinecraftZenova · Jun 24, 2020 · 8bd5954 · 8bd5954
1 parent d474845
commit 8bd5954
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/ZenovaLauncher/Mods/Mod.cs b/ZenovaLauncher/Mods/Mod.cs
@@ -18,12 +18,12 @@ public class Mod
         public Version Version { get; set; }
         public string MinVersion
         {
-            get { return MinMCVersion.InternalName; }
+            get { return MinMCVersion.Name; }
             set { MinMCVersion = VersionManager.instance.GetVersionFromString(value); }
         }
         public string MaxVersion
         {
-            get { return MaxMCVersion.InternalName; }
+            get { return MaxMCVersion.Name; }
             set { MaxMCVersion = VersionManager.instance.GetVersionFromString(value); }
         }
         [JsonIgnore]

diff --git a/ZenovaLauncher/Profiles/Profile.cs b/ZenovaLauncher/Profiles/Profile.cs
@@ -44,7 +44,14 @@ public Profile() { }
         [JsonProperty]
         public string VersionId
         {
-            get { return Version.InternalName; }
+            get 
+            { 
+                if (Type == ProfileType.LatestRelease)
+                    return "latest-release";
+                if (Type == ProfileType.LatestBeta)
+                    return "latest-beta";
+                return Version.Name;
+            }
             set { Version = VersionManager.instance.GetVersionFromString(value); }
         }
         [JsonProperty]

diff --git a/ZenovaLauncher/Properties/AssemblyInfo.cs b/ZenovaLauncher/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.3")]
-[assembly: AssemblyFileVersion("1.0.1.3")]
+[assembly: AssemblyVersion("1.0.1.4")]
+[assembly: AssemblyFileVersion("1.0.1.4")]
diff --git a/ZenovaLauncher/Versions/MinecraftVersion.cs b/ZenovaLauncher/Versions/MinecraftVersion.cs
@@ -46,17 +46,6 @@ public string FullName
                 return (Release ? "release " : (Beta ? "beta " : "old_beta ")) + Name;
             }
         }
-        public string InternalName
-        {
-            get
-            {
-                if (LatestRelease)
-                    return "latest-release";
-                if (LatestBeta)
-                    return "latest-beta";
-                return Name;
-            }
-        }
         public Version Version { get; set; }
         public string UUID { get; set; }
         public bool Beta { get; set; }