From ae24fd6ccb46676c15a648eeade09431fdaeaa5b Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:51:10 +0700 Subject: [PATCH 1/4] [ANY] 5.5.3-stable --- LauncherCore/src/main/java/pro/gravit/utils/Version.java | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index 272fc6be..d42ebb45 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -8,7 +8,7 @@ public final class Version implements Comparable { public static final int MINOR = 5; public static final int PATCH = 3; public static final int BUILD = 1; - public static final Version.Type RELEASE = Type.DEV; + public static final Version.Type RELEASE = Type.STABLE; public final int major; public final int minor; public final int patch; diff --git a/build.gradle b/build.gradle index aff07ff7..30340061 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ id 'org.openjfx.javafxplugin' version '0.0.10' apply false } group = 'pro.gravit.launcher' -version = '5.5.3-SNAPSHOT' +version = '5.5.3' apply from: 'props.gradle' From 7b1f449667cbccd6a602ccbb13478e18d89e283e Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:51:26 +0700 Subject: [PATCH 2/4] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 4d376aa6..4bba9cca 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 4d376aa6fcb2167cef2fc5ed373d560ebea6e483 +Subproject commit 4bba9ccad7593577167f06124df5a9a957a81c84 From 1c90681b3b90a68344283a8c725570999b8dba5d Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:53:38 +0700 Subject: [PATCH 3/4] [FEATURE] Support Minecraft 1.20.3/1.20.4 --- .../pro/gravit/launchserver/helper/MakeProfileHelper.java | 4 ++++ .../pro/gravit/launcher/profiles/ClientProfileVersions.java | 1 + 2 files changed, 5 insertions(+) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java index 6f2354ad..8bcac9bb 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java @@ -124,6 +124,10 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti builder.setMinJavaVersion(17); builder.setRecommendJavaVersion(17); } + if(version.compareTo(ClientProfileVersions.MINECRAFT_1_20_3) >= 0) { + builder.setMinJavaVersion(21); + builder.setRecommendJavaVersion(21); + } jvmArgs.add("-Dfml.ignorePatchDiscrepancies=true"); jvmArgs.add("-Dfml.ignoreInvalidMinecraftCertificates=true"); builder.setJvmArgs(jvmArgs); diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java index 7d44b68d..e1c70b82 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java @@ -17,4 +17,5 @@ private ClientProfileVersions() { public static final ClientProfile.Version MINECRAFT_1_19 = ClientProfile.Version.of("1.19"); public static final ClientProfile.Version MINECRAFT_1_20 = ClientProfile.Version.of("1.20"); public static final ClientProfile.Version MINECRAFT_1_20_2 = ClientProfile.Version.of("1.20.2"); + public static final ClientProfile.Version MINECRAFT_1_20_3 = ClientProfile.Version.of("1.20.3"); } From a601a4ceefe86863574916510a34f96d3a352ac3 Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:53:51 +0700 Subject: [PATCH 4/4] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 4bba9cca..7581b6c0 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 4bba9ccad7593577167f06124df5a9a957a81c84 +Subproject commit 7581b6c01470a5ec32ac67170635d10f6f589b0a