Merge pull request #146 from TaigoStudio/master

add support 1.8.8 and 1.8
Corona-Studio · May 9, 2024 · 85432fc · 85432fc
2 parents 70302e8 + 4dea031
commit 85432fc
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/ForgeInstallerFactory.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/ForgeInstallerFactory.cs
@@ -11,9 +11,12 @@ public static string GetForgeArtifactVersion(string mcVersion, string forgeVersi
     {
         var mcVer = new Version(mcVersion);
 
-        return mcVer.Minor is >= 7 and <= 8
-            ? $"{mcVersion}-{forgeVersion}-{mcVersion}"
-            : $"{mcVersion}-{forgeVersion}";
+        return (mcVer.Minor, mcVer.Build) switch
+        {
+            ( 8, 8 or -1) => $"{mcVersion}-{forgeVersion}", //1.8.8, 1.8
+            ( >= 7 and <= 8, _) => $"{mcVersion}-{forgeVersion}-{mcVersion}", //1.7 - 1.8, 1.8.9
+            _ => $"{mcVersion}-{forgeVersion}" //1.8.9+
+        };
     }
 
     public static bool IsLegacyForgeInstaller(string forgeExecutable, string forgeVersion)
@@ -30,4 +33,4 @@ public static bool IsLegacyForgeInstaller(string forgeExecutable, string forgeVe
 
         return legacyUniversalJar && installProfileJson;
     }
-}
+}