Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

22 files changed, 203 insertions, 539 deletions

diff --git a/launcher/minecraft/launch/ClaimAccount.cpp b/launcher/minecraft/launch/ClaimAccount.cpp
index 1cd7c0da..a3de1516 100644
--- a/launcher/minecraft/launch/ClaimAccount.cpp
+++ b/launcher/minecraft/launch/ClaimAccount.cpp
@@ -4,10 +4,9 @@
 #include "Application.h"
 #include "minecraft/auth/AccountList.h"
 
-ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchStep(parent)
+ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session) : LaunchStep(parent)
 {
-    if(session->status == AuthSession::Status::PlayableOnline && !session->demo)
-    {
+    if (session->status == AuthSession::Status::PlayableOnline && !session->demo) {
         auto accounts = APPLICATION->accounts();
         m_account = accounts->getAccountByProfileName(session->player_name);
     }
@@ -15,8 +14,7 @@ ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchSt
 
 void ClaimAccount::executeTask()
 {
-    if(m_account)
-    {
+    if (m_account) {
         lock.reset(new UseLock(m_account));
         emitSucceeded();
     }
diff --git a/launcher/minecraft/launch/ClaimAccount.h b/launcher/minecraft/launch/ClaimAccount.h
index cb4de23f..3d47539a 100644
--- a/launcher/minecraft/launch/ClaimAccount.h
+++ b/launcher/minecraft/launch/ClaimAccount.h
@@ -18,20 +18,17 @@
 #include <launch/LaunchStep.h>
 #include <minecraft/auth/MinecraftAccount.h>
 
-class ClaimAccount: public LaunchStep
-{
+class ClaimAccount : public LaunchStep {
     Q_OBJECT
-public:
-    explicit ClaimAccount(LaunchTask *parent, AuthSessionPtr session);
-    virtual ~ClaimAccount() {};
+   public:
+    explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
+    virtual ~ClaimAccount(){};
 
     void executeTask() override;
     void finalize() override;
-    bool canAbort() const override
-    {
-        return false;
-    }
-private:
+    bool canAbort() const override { return false; }
+
+   private:
     std::unique_ptr<UseLock> lock;
     MinecraftAccountPtr m_account;
 };
diff --git a/launcher/minecraft/launch/CreateGameFolders.cpp b/launcher/minecraft/launch/CreateGameFolders.cpp
index 4081e72e..36f5e640 100644
--- a/launcher/minecraft/launch/CreateGameFolders.cpp
+++ b/launcher/minecraft/launch/CreateGameFolders.cpp
@@ -1,27 +1,23 @@
 #include "CreateGameFolders.h"
-#include "minecraft/MinecraftInstance.h"
-#include "launch/LaunchTask.h"
 #include "FileSystem.h"
+#include "launch/LaunchTask.h"
+#include "minecraft/MinecraftInstance.h"
 
-CreateGameFolders::CreateGameFolders(LaunchTask* parent): LaunchStep(parent)
-{
-}
+CreateGameFolders::CreateGameFolders(LaunchTask* parent) : LaunchStep(parent) {}
 
 void CreateGameFolders::executeTask()
 {
     auto instance = m_parent->instance();
     std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
 
-    if(!FS::ensureFolderPathExists(minecraftInstance->gameRoot()))
-    {
+    if (!FS::ensureFolderPathExists(minecraftInstance->gameRoot())) {
         emit logLine("Couldn't create the main game folder", MessageLevel::Error);
         emitFailed(tr("Couldn't create the main game folder"));
         return;
     }
 
     // HACK: this is a workaround for MCL-3732 - 'server-resource-packs' folder is created.
-    if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->gameRoot(), "server-resource-packs")))
-    {
+    if (!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->gameRoot(), "server-resource-packs"))) {
         emit logLine("Couldn't create the 'server-resource-packs' folder", MessageLevel::Error);
     }
     emitSucceeded();
diff --git a/launcher/minecraft/launch/CreateGameFolders.h b/launcher/minecraft/launch/CreateGameFolders.h
index 9c7d3c94..44524ded 100644
--- a/launcher/minecraft/launch/CreateGameFolders.h
+++ b/launcher/minecraft/launch/CreateGameFolders.h
@@ -15,23 +15,17 @@
 
 #pragma once
 
-#include <launch/LaunchStep.h>
 #include <LoggedProcess.h>
+#include <launch/LaunchStep.h>
 #include <minecraft/auth/AuthSession.h>
 
 // Create the main .minecraft for the instance and any other necessary folders
-class CreateGameFolders: public LaunchStep
-{
+class CreateGameFolders : public LaunchStep {
     Q_OBJECT
-public:
-    explicit CreateGameFolders(LaunchTask *parent);
-    virtual ~CreateGameFolders() {};
+   public:
+    explicit CreateGameFolders(LaunchTask* parent);
+    virtual ~CreateGameFolders(){};
 
     virtual void executeTask();
-    virtual bool canAbort() const
-    {
-        return false;
-    }
+    virtual bool canAbort() const { return false; }
 };
-
-
diff --git a/launcher/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp
deleted file mode 100644
index ca55cd2e..00000000
--- a/launcher/minecraft/launch/DirectJavaLaunch.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "DirectJavaLaunch.h"
-
-#include <QStandardPaths>
-
-#include <launch/LaunchTask.h>
-#include <minecraft/MinecraftInstance.h>
-#include <FileSystem.h>
-#include <Commandline.h>
-
-#include "Application.h"
-
-#ifdef Q_OS_LINUX
-#include "gamemode_client.h"
-#endif
-
-DirectJavaLaunch::DirectJavaLaunch(LaunchTask *parent) : LaunchStep(parent)
-{
-    connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
-    connect(&m_process, &LoggedProcess::stateChanged, this, &DirectJavaLaunch::on_state);
-}
-
-void DirectJavaLaunch::executeTask()
-{
-    auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-    QStringList args = minecraftInstance->javaArguments();
-
-    args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
-
-    auto classPathEntries = minecraftInstance->getClassPath();
-    args.append("-cp");
-    QString classpath;
-#ifdef Q_OS_WIN32
-    classpath = classPathEntries.join(';');
-#else
-    classpath = classPathEntries.join(':');
-#endif
-    args.append(classpath);
-    args.append(minecraftInstance->getMainClass());
-
-    QString allArgs = args.join(", ");
-    emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::Launcher);
-
-    auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-    m_process.setProcessEnvironment(instance->createLaunchEnvironment());
-
-    // make detachable - this will keep the process running even if the object is destroyed
-    m_process.setDetachable(true);
-
-    auto mcArgs = minecraftInstance->processMinecraftArgs(m_session, m_serverToJoin);
-    args.append(mcArgs);
-
-    QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-    if(!wrapperCommandStr.isEmpty())
-    {
-        auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
-        auto wrapperCommand = wrapperArgs.takeFirst();
-        auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-        if (realWrapperCommand.isEmpty())
-        {
-            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
-            emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
-            emitFailed(tr(reason).arg(wrapperCommand));
-            return;
-        }
-        emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::Launcher);
-        args.prepend(javaPath);
-        m_process.start(wrapperCommand, wrapperArgs + args);
-    }
-    else
-    {
-        m_process.start(javaPath, args);
-    }
-
-#ifdef Q_OS_LINUX
-    if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode)
-    {
-        auto pid = m_process.processId();
-        if (pid)
-        {
-            gamemode_request_start_for(pid);
-        }
-    }
-#endif
-}
-
-void DirectJavaLaunch::on_state(LoggedProcess::State state)
-{
-    switch(state)
-    {
-        case LoggedProcess::FailedToStart:
-        {
-            //: Error message displayed if instance can't start
-            const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(tr(reason));
-            return;
-        }
-        case LoggedProcess::Aborted:
-        case LoggedProcess::Crashed:
-        {
-            m_parent->setPid(-1);
-            emitFailed(tr("Game crashed."));
-            return;
-        }
-        case LoggedProcess::Finished:
-        {
-            m_parent->setPid(-1);
-            // if the exit code wasn't 0, report this as a crash
-            auto exitCode = m_process.exitCode();
-            if(exitCode != 0)
-            {
-                emitFailed(tr("Game crashed."));
-                return;
-            }
-            //FIXME: make this work again
-            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-            // run post-exit
-            emitSucceeded();
-            break;
-        }
-        case LoggedProcess::Running:
-            emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::Launcher);
-            m_parent->setPid(m_process.processId());
-            m_parent->instance()->setLastLaunch();
-            break;
-        default:
-            break;
-    }
-}
-
-void DirectJavaLaunch::setWorkingDirectory(const QString &wd)
-{
-    m_process.setWorkingDirectory(wd);
-}
-
-void DirectJavaLaunch::proceed()
-{
-    // nil
-}
-
-bool DirectJavaLaunch::abort()
-{
-    auto state = m_process.state();
-    if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-    {
-        m_process.kill();
-    }
-    return true;
-}
-
diff --git a/launcher/minecraft/launch/DirectJavaLaunch.h b/launcher/minecraft/launch/DirectJavaLaunch.h
deleted file mode 100644
index 58b119b8..00000000
--- a/launcher/minecraft/launch/DirectJavaLaunch.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <LoggedProcess.h>
-#include <minecraft/auth/AuthSession.h>
-
-#include "MinecraftServerTarget.h"
-
-class DirectJavaLaunch: public LaunchStep
-{
-    Q_OBJECT
-public:
-    explicit DirectJavaLaunch(LaunchTask *parent);
-    virtual ~DirectJavaLaunch() {};
-
-    virtual void executeTask();
-    virtual bool abort();
-    virtual void proceed();
-    virtual bool canAbort() const
-    {
-        return true;
-    }
-    void setWorkingDirectory(const QString &wd);
-    void setAuthSession(AuthSessionPtr session)
-    {
-        m_session = session;
-    }
-
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin)
-    {
-        m_serverToJoin = std::move(serverToJoin);
-    }
-
-private slots:
-    void on_state(LoggedProcess::State state);
-
-private:
-    LoggedProcess m_process;
-    QString m_command;
-    AuthSessionPtr m_session;
-    MinecraftServerTargetPtr m_serverToJoin;
-};
-
diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp
index 7d5f4179..cebeaedd 100644
--- a/launcher/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
@@ -14,26 +14,25 @@
  */
 
 #include "ExtractNatives.h"
-#include <minecraft/MinecraftInstance.h>
 #include <launch/LaunchTask.h>
+#include <minecraft/MinecraftInstance.h>
 
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
-#include "MMCZip.h"
-#include "FileSystem.h"
 #include <QDir>
+#include "FileSystem.h"
+#include "MMCZip.h"
 
 #ifdef major
-    #undef major
+#undef major
 #endif
 #ifdef minor
-    #undef minor
+#undef minor
 #endif
 
-static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
+static QString replaceSuffix(QString target, const QString& suffix, const QString& replacement)
 {
-    if (!target.endsWith(suffix))
-    {
+    if (!target.endsWith(suffix)) {
         return target;
     }
     target.resize(target.length() - suffix.length());
@@ -43,17 +42,14 @@ static QString replaceSuffix (QString target, const QString &suffix, const QStri
 static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibHack, bool nativeOpenAL, bool nativeGLFW)
 {
     QuaZip zip(source);
-    if(!zip.open(QuaZip::mdUnzip))
-    {
+    if (!zip.open(QuaZip::mdUnzip)) {
         return false;
     }
     QDir directory(targetFolder);
-    if (!zip.goToFirstFile())
-    {
+    if (!zip.goToFirstFile()) {
         return false;
     }
-    do
-    {
+    do {
         QString name = zip.getCurrentFileName();
         auto lowercase = name.toLower();
         if (nativeGLFW && name.contains("glfw")) {
@@ -62,19 +58,16 @@ static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibH
         if (nativeOpenAL && name.contains("openal")) {
             continue;
         }
-        if(applyJnilibHack)
-        {
+        if (applyJnilibHack) {
             name = replaceSuffix(name, ".jnilib", ".dylib");
         }
         QString absFilePath = directory.absoluteFilePath(name);
-        if (!JlCompress::extractFile(&zip, "", absFilePath))
-        {
+        if (!JlCompress::extractFile(&zip, "", absFilePath)) {
             return false;
         }
     } while (zip.goToNextFile());
     zip.close();
-    if(zip.getZipError()!=0)
-    {
+    if (zip.getZipError() != 0) {
         return false;
     }
     return true;
@@ -85,8 +78,7 @@ void ExtractNatives::executeTask()
     auto instance = m_parent->instance();
     std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
     auto toExtract = minecraftInstance->getNativeJars();
-    if(toExtract.isEmpty())
-    {
+    if (toExtract.isEmpty()) {
         emitSucceeded();
         return;
     }
@@ -94,14 +86,12 @@ void ExtractNatives::executeTask()
     bool nativeOpenAL = settings->get("UseNativeOpenAL").toBool();
     bool nativeGLFW = settings->get("UseNativeGLFW").toBool();
 
-    auto outputPath  = minecraftInstance->getNativePath();
+    auto outputPath = minecraftInstance->getNativePath();
     auto javaVersion = minecraftInstance->getJavaVersion();
     bool jniHackEnabled = javaVersion.major() >= 8;
-    for(const auto &source: toExtract)
-    {
-        if(!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW))
-        {
-            const char *reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
+    for (const auto& source : toExtract) {
+        if (!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW)) {
+            const char* reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
             emit logLine(QString(reason).arg(source, outputPath), MessageLevel::Fatal);
             emitFailed(tr(reason).arg(source, outputPath));
         }
diff --git a/launcher/minecraft/launch/ExtractNatives.h b/launcher/minecraft/launch/ExtractNatives.h
index 094fcd6b..2ab8816b 100644
--- a/launcher/minecraft/launch/ExtractNatives.h
+++ b/launcher/minecraft/launch/ExtractNatives.h
@@ -20,19 +20,13 @@
 #include "minecraft/auth/AuthSession.h"
 
 // FIXME: temporary wrapper for existing task.
-class ExtractNatives: public LaunchStep
-{
+class ExtractNatives : public LaunchStep {
     Q_OBJECT
-public:
-    explicit ExtractNatives(LaunchTask *parent) : LaunchStep(parent){};
+   public:
+    explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent){};
     virtual ~ExtractNatives(){};
 
     void executeTask() override;
-    bool canAbort() const override
-    {
-        return false;
-    }
+    bool canAbort() const override { return false; }
     void finalize() override;
 };
-
-
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index 8ecf715d..05562ef2 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,29 +35,27 @@
 
 #include "LauncherPartLaunch.h"
 
-#include <QStandardPaths>
 #include <QRegularExpression>
+#include <QStandardPaths>
 
+#include "Application.h"
+#include "Commandline.h"
+#include "FileSystem.h"
 #include "launch/LaunchTask.h"
 #include "minecraft/MinecraftInstance.h"
-#include "FileSystem.h"
-#include "Commandline.h"
-#include "Application.h"
 
 #ifdef Q_OS_LINUX
 #include "gamemode_client.h"
 #endif
 
-LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
+LauncherPartLaunch::LauncherPartLaunch(LaunchTask* parent) : LaunchStep(parent)
 {
     auto instance = parent->instance();
-    if (instance->settings()->get("CloseAfterLaunch").toBool())
-    {
-        std::shared_ptr<QMetaObject::Connection> connection{new QMetaObject::Connection};
+    if (instance->settings()->get("CloseAfterLaunch").toBool()) {
+        std::shared_ptr<QMetaObject::Connection> connection{ new QMetaObject::Connection };
         *connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, MessageLevel::Enum level) {
             qDebug() << lines;
-            if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0)
-            {
+            if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0) {
                 APPLICATION->closeAllWindows();
                 disconnect(*connection);
             }
@@ -71,7 +69,7 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
 #ifdef Q_OS_WIN
 // returns 8.3 file format from long path
 #include <windows.h>
-QString shortPathName(const QString & file)
+QString shortPathName(const QString& file)
 {
     auto input = file.toStdWString();
     std::wstring output;
@@ -81,15 +79,15 @@ QString shortPathName(const QString & file)
     // when it succeeds, it returns length excluding null character
     // See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
     output.resize(length);
-    GetShortPathNameW(input.c_str(),(LPWSTR)output.c_str(),length);
-    output.resize(length-1);
+    GetShortPathNameW(input.c_str(), (LPWSTR)output.c_str(), length);
+    output.resize(length - 1);
     QString ret = QString::fromStdWString(output);
     return ret;
 }
 #endif
 
 // if the string survives roundtrip through local 8bit encoding...
-bool fitsInLocal8bit(const QString & string)
+bool fitsInLocal8bit(const QString& string)
 {
     return string == QString::fromLocal8Bit(string.toLocal8Bit());
 }
@@ -97,9 +95,8 @@ bool fitsInLocal8bit(const QString & string)
 void LauncherPartLaunch::executeTask()
 {
     QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
-    if (jarPath.isEmpty())
-    {
-        const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
+    if (jarPath.isEmpty()) {
+        const char* reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
         emit logLine(tr(reason), MessageLevel::Fatal);
         emitFailed(tr(reason));
         return;
@@ -125,12 +122,9 @@ void LauncherPartLaunch::executeTask()
 
     auto natPath = minecraftInstance->getNativePath();
 #ifdef Q_OS_WIN
-    if (!fitsInLocal8bit(natPath))
-    {
+    if (!fitsInLocal8bit(natPath)) {
         args << "-Djava.library.path=" + shortPathName(natPath);
-    }
-    else
-    {
+    } else {
         args << "-Djava.library.path=" + natPath;
     }
 #else
@@ -140,14 +134,10 @@ void LauncherPartLaunch::executeTask()
     args << "-cp";
 #ifdef Q_OS_WIN
     QStringList processed;
-    for(auto & item: classPath)
-    {
-        if (!fitsInLocal8bit(item))
-        {
+    for (auto& item : classPath) {
+        if (!fitsInLocal8bit(item)) {
             processed << shortPathName(item);
-        }
-        else
-        {
+        } else {
             processed << item;
         }
     }
@@ -160,14 +150,12 @@ void LauncherPartLaunch::executeTask()
     qDebug() << args.join(' ');
 
     QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-    if(!wrapperCommandStr.isEmpty())
-    {
+    if (!wrapperCommandStr.isEmpty()) {
         auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
         auto wrapperCommand = wrapperArgs.takeFirst();
         auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-        if (realWrapperCommand.isEmpty())
-        {
-            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
+        if (realWrapperCommand.isEmpty()) {
+            const char* reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
             emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
             emitFailed(tr(reason).arg(wrapperCommand));
             return;
@@ -175,18 +163,14 @@ void LauncherPartLaunch::executeTask()
         emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::Launcher);
         args.prepend(javaPath);
         m_process.start(wrapperCommand, wrapperArgs + args);
-    }
-    else
-    {
+    } else {
         m_process.start(javaPath, args);
     }
 
 #ifdef Q_OS_LINUX
-    if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode)
-    {
+    if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode) {
         auto pid = m_process.processId();
-        if (pid)
-        {
+        if (pid) {
             gamemode_request_start_for(pid);
         }
     }
@@ -195,25 +179,21 @@ void LauncherPartLaunch::executeTask()
 
 void LauncherPartLaunch::on_state(LoggedProcess::State state)
 {
-    switch(state)
-    {
-        case LoggedProcess::FailedToStart:
-        {
+    switch (state) {
+        case LoggedProcess::FailedToStart: {
             //: Error message displayed if instace can't start
-            const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
+            const char* reason = QT_TR_NOOP("Could not launch Minecraft!");
             emit logLine(reason, MessageLevel::Fatal);
             emitFailed(tr(reason));
             return;
         }
         case LoggedProcess::Aborted:
-        case LoggedProcess::Crashed:
-        {
+        case LoggedProcess::Crashed: {
             m_parent->setPid(-1);
             emitFailed(tr("Game crashed."));
             return;
         }
-        case LoggedProcess::Finished:
-        {
+        case LoggedProcess::Finished: {
             auto instance = m_parent->instance();
             if (instance->settings()->get("CloseAfterLaunch").toBool())
                 APPLICATION->showMainWindow();
@@ -221,14 +201,13 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
             m_parent->setPid(-1);
             // if the exit code wasn't 0, report this as a crash
             auto exitCode = m_process.exitCode();
-            if(exitCode != 0)
-            {
+            if (exitCode != 0) {
                 emitFailed(tr("Game crashed."));
                 return;
             }
-            //FIXME: make this work again
-            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-            // run post-exit
+            // FIXME: make this work again
+            //  m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
+            //  run post-exit
             emitSucceeded();
             break;
         }
@@ -247,15 +226,14 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
     }
 }
 
-void LauncherPartLaunch::setWorkingDirectory(const QString &wd)
+void LauncherPartLaunch::setWorkingDirectory(const QString& wd)
 {
     m_process.setWorkingDirectory(wd);
 }
 
 void LauncherPartLaunch::proceed()
 {
-    if(mayProceed)
-    {
+    if (mayProceed) {
         QString launchString("launch\n");
         m_process.write(launchString.toUtf8());
         mayProceed = false;
@@ -264,17 +242,13 @@ void LauncherPartLaunch::proceed()
 
 bool LauncherPartLaunch::abort()
 {
-    if(mayProceed)
-    {
+    if (mayProceed) {
         mayProceed = false;
         QString launchString("abort\n");
         m_process.write(launchString.toUtf8());
-    }
-    else
-    {
+    } else {
         auto state = m_process.state();
-        if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-        {
+        if (state == LoggedProcess::Running || state == LoggedProcess::Starting) {
             m_process.kill();
         }
     }
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.h b/launcher/minecraft/launch/LauncherPartLaunch.h
index 6a7ee0e5..9f6ca1e7 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.h
+++ b/launcher/minecraft/launch/LauncherPartLaunch.h
@@ -15,41 +15,31 @@
 
 #pragma once
 
-#include <launch/LaunchStep.h>
 #include <LoggedProcess.h>
+#include <launch/LaunchStep.h>
 #include <minecraft/auth/AuthSession.h>
 
 #include "MinecraftServerTarget.h"
 
-class LauncherPartLaunch: public LaunchStep
-{
+class LauncherPartLaunch : public LaunchStep {
     Q_OBJECT
-public:
-    explicit LauncherPartLaunch(LaunchTask *parent);
-    virtual ~LauncherPartLaunch() {};
+   public:
+    explicit LauncherPartLaunch(LaunchTask* parent);
+    virtual ~LauncherPartLaunch(){};
 
     virtual void executeTask();
     virtual bool abort();
     virtual void proceed();
-    virtual bool canAbort() const
-    {
-        return true;
-    }
-    void setWorkingDirectory(const QString &wd);
-    void setAuthSession(AuthSessionPtr session)
-    {
-        m_session = session;
-    }
-
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin)
-    {
-        m_serverToJoin = std::move(serverToJoin);
-    }
-
-private slots:
+    virtual bool canAbort() const { return true; }
+    void setWorkingDirectory(const QString& wd);
+    void setAuthSession(A