From 759db0c90f84e55c48415098d0ddfc11cd4cf234 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sun, 8 Dec 2024 14:17:04 +0100
Subject: [PATCH 1/2] change order of steps

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit dedb7a2343f7d433492dee5930802ed47294b722)
Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/minecraft/MinecraftInstance.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index d6d45af6b..80ec34d29 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -1083,6 +1083,12 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(step);
     }
 
+    // check java
+    {
+        process->appendStep(makeShared<AutoInstallJava>(pptr));
+        process->appendStep(makeShared<CheckJava>(pptr));
+    }
+
     // run pre-launch command if that's needed
     if (getPreLaunchCommand().size()) {
         auto step = makeShared<PreLaunchCommand>(pptr);
@@ -1096,12 +1102,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(makeShared<TaskStepWrapper>(pptr, makeShared<MinecraftLoadAndCheck>(this, mode)));
     }
 
-    // check java
-    {
-        process->appendStep(makeShared<AutoInstallJava>(pptr));
-        process->appendStep(makeShared<CheckJava>(pptr));
-    }
-
     // if we aren't in offline mode,.
     if (session->status != AuthSession::PlayableOffline) {
         if (!session->demo) {

From feb275a580c26663eeba7db8b806bb5fc5b3df6a Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sun, 8 Dec 2024 18:27:57 +0100
Subject: [PATCH 2/2] load meta first

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit cf2dcbd431b0c4bb03ff527465f972d72f713b0c)
Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/minecraft/MinecraftInstance.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 80ec34d29..c7f639a61 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -1083,6 +1083,12 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(step);
     }
 
+    // load meta
+    {
+        auto mode = session->status != AuthSession::PlayableOffline ? Net::Mode::Online : Net::Mode::Offline;
+        process->appendStep(makeShared<TaskStepWrapper>(pptr, makeShared<MinecraftLoadAndCheck>(this, mode)));
+    }
+
     // check java
     {
         process->appendStep(makeShared<AutoInstallJava>(pptr));
@@ -1096,12 +1102,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(step);
     }
 
-    // load meta
-    {
-        auto mode = session->status != AuthSession::PlayableOffline ? Net::Mode::Online : Net::Mode::Offline;
-        process->appendStep(makeShared<TaskStepWrapper>(pptr, makeShared<MinecraftLoadAndCheck>(this, mode)));
-    }
-
     // if we aren't in offline mode,.
     if (session->status != AuthSession::PlayableOffline) {
         if (!session->demo) {