From 4dea031368cc1a926d141ed95637ed6d33c7140b Mon Sep 17 00:00:00 2001 From: TaigoStudio <126141594+TaigoStudio@users.noreply.github.com> Date: Thu, 9 May 2024 15:39:35 +0600 Subject: [PATCH] add support 1.8.8 and 1.8 --- .../Installer/ForgeInstaller/ForgeInstallerFactory.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/ForgeInstallerFactory.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/ForgeInstallerFactory.cs index 229bd3f4..701fee89 100644 --- 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; } -} \ No newline at end of file +}