From 153a2262e362c01c32bce4668774456b9bd1e778 Mon Sep 17 00:00:00 2001 From: DovydasTEDS <61357186+DovydasTEDS@users.noreply.github.com> Date: Sun, 19 May 2024 12:33:37 +0100 Subject: [PATCH 1/3] Update PackInstaller.kt Added handling for 1.20.5+ (Java 21 needed) --- .../github/gaming32/additiveinstaller/PackInstaller.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt b/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt index bd8a98d..a5be361 100644 --- a/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt +++ b/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt @@ -132,13 +132,20 @@ class PackInstaller( .asJsonArray .add("-D$prefix=$modsDir$suffix") } - if (packVersion.packVersion.toVersion() >= "1.15.9".toVersion()) { + if ((packVersion.packVersion.toVersion() >= "1.15.9".toVersion()) && (packVersion.packVersion.toVersion() <= "1.20.4".toVersion())) { // HACK HACK HACK World Host has a bug where Java 17 is required clientJson["javaVersion"] = JsonObject().apply { this["component"] = "java-runtime-gamma" this["majorVersion"] = 17 } } + if (packVersion.packVersion.toVersion() >= "1.20.5".toVersion()) { + // 1.20.5 + Require Java 21 + clientJson["javaVersion"] = JsonObject().apply { + this["component"] = "java-runtime-delta" + this["majorVersion"] = 21 + } + } writeVersionDir(clientJson) updateLauncherProfiles() From da2f98deb7502ac4b9a209b041bb093a7f22c8e5 Mon Sep 17 00:00:00 2001 From: DovydasTEDS <61357186+DovydasTEDS@users.noreply.github.com> Date: Sun, 19 May 2024 12:34:32 +0100 Subject: [PATCH 2/3] Update build.gradle.kts Upgraded Fabric Bootstrap version - Handle 1.20.5+ --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3673e6a..e611351 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -57,7 +57,7 @@ abstract class FileOutput : DefaultTask() { abstract val output: Property } -val bootstrapVersion = "0.2.0" +val bootstrapVersion = "0.5.2" val bootstrapArch = "i686" val downloadBootstrap by tasks.registering(Download::class) { From 7099142790c13609e80e24df593d614f02aab68f Mon Sep 17 00:00:00 2001 From: DovydasTEDS <61357186+DovydasTEDS@users.noreply.github.com> Date: Sun, 19 May 2024 21:27:28 +0100 Subject: [PATCH 3/3] Update PackInstaller.kt --- .../gaming32/additiveinstaller/PackInstaller.kt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt b/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt index a5be361..6f92bde 100644 --- a/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt +++ b/src/main/kotlin/io/github/gaming32/additiveinstaller/PackInstaller.kt @@ -132,20 +132,6 @@ class PackInstaller( .asJsonArray .add("-D$prefix=$modsDir$suffix") } - if ((packVersion.packVersion.toVersion() >= "1.15.9".toVersion()) && (packVersion.packVersion.toVersion() <= "1.20.4".toVersion())) { - // HACK HACK HACK World Host has a bug where Java 17 is required - clientJson["javaVersion"] = JsonObject().apply { - this["component"] = "java-runtime-gamma" - this["majorVersion"] = 17 - } - } - if (packVersion.packVersion.toVersion() >= "1.20.5".toVersion()) { - // 1.20.5 + Require Java 21 - clientJson["javaVersion"] = JsonObject().apply { - this["component"] = "java-runtime-delta" - this["majorVersion"] = 21 - } - } writeVersionDir(clientJson) updateLauncherProfiles()