NOISSUE Error on launch when launching 1.18 with < Java 17

1 files changed, 10 insertions, 1 deletions

diff --git a/launcher/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp
index 657669af..d9f7ecdc 100644
--- a/launcher/minecraft/launch/VerifyJavaInstall.cpp
+++ b/launcher/minecraft/launch/VerifyJavaInstall.cpp
@@ -11,8 +11,17 @@ void VerifyJavaInstall::executeTask() {
     auto javaVersion = m_inst->getJavaVersion();
     auto minecraftComponent = m_inst->getPackProfile()->getComponent("net.minecraft");
 
+    // Java 17 requirement
+    if (minecraftComponent->getReleaseDateTime() >= g_VersionFilterData.java17BeginsDate) {
+        if (javaVersion.major() < 17) {
+            emit logLine("Minecraft 1.18 Pre Release 2 and above require the use of Java 17",
+                         MessageLevel::Fatal);
+            emitFailed(tr("Minecraft 1.18 Pre Release 2 and above require the use of Java 17"));
+            return;
+        }
+    }
     // Java 16 requirement
-    if (minecraftComponent->getReleaseDateTime() >= g_VersionFilterData.java16BeginsDate) {
+    else if (minecraftComponent->getReleaseDateTime() >= g_VersionFilterData.java16BeginsDate) {
         if (javaVersion.major() < 16) {
             emit logLine("Minecraft 21w19a and above require the use of Java 16",
                          MessageLevel::Fatal);