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

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

12 files changed, 272 insertions, 350 deletions

diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index e4a686c2..20caba18 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.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,26 +35,23 @@
 
 #include "JavaChecker.h"
 
+#include <QDebug>
 #include <QFile>
-#include <QProcess>
 #include <QMap>
-#include <QDebug>
+#include <QProcess>
 
-#include "JavaUtils.h"
-#include "FileSystem.h"
-#include "Commandline.h"
 #include "Application.h"
+#include "Commandline.h"
+#include "FileSystem.h"
+#include "JavaUtils.h"
 
-JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
-{
-}
+JavaChecker::JavaChecker(QObject* parent) : QObject(parent) {}
 
 void JavaChecker::performCheck()
 {
     QString checkerJar = JavaUtils::getJavaCheckPath();
 
-    if (checkerJar.isEmpty())
-    {
+    if (checkerJar.isEmpty()) {
         qDebug() << "Java checker library could not be found. Please check your installation.";
         return;
     }
@@ -62,25 +59,21 @@ void JavaChecker::performCheck()
     QStringList args;
 
     process.reset(new QProcess());
-    if(m_args.size())
-    {
+    if (m_args.size()) {
         auto extraArgs = Commandline::splitArgs(m_args);
         args.append(extraArgs);
     }
-    if(m_minMem != 0)
-    {
+    if (m_minMem != 0) {
         args << QString("-Xms%1m").arg(m_minMem);
     }
-    if(m_maxMem != 0)
-    {
+    if (m_maxMem != 0) {
         args << QString("-Xmx%1m").arg(m_maxMem);
     }
-    if(m_permGen != 64)
-    {
+    if (m_permGen != 64) {
         args << QString("-XX:PermSize=%1m").arg(m_permGen);
     }
 
-    args.append({"-jar", checkerJar});
+    args.append({ "-jar", checkerJar });
     process->setArguments(args);
     process->setProgram(m_path);
     process->setProcessChannelMode(QProcess::SeparateChannels);
@@ -130,8 +123,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     qWarning() << "STDERR" << m_stderr;
     qDebug() << "Java checker finished with status" << status << "exit code" << exitcode;
 
-    if (status == QProcess::CrashExit || exitcode == 1)
-    {
+    if (status == QProcess::CrashExit || exitcode == 1) {
         result.validity = JavaCheckResult::Validity::Errored;
         emit checkFinished(result);
         return;
@@ -146,8 +138,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 #else
     QStringList lines = m_stdout.split("\n", QString::SkipEmptyParts);
 #endif
-    for(QString line : lines)
-    {
+    for (QString line : lines) {
         line = line.trimmed();
         // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux
         if (line.contains("/bedrock/strata")) {
@@ -159,18 +150,14 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 #else
         auto parts = line.split('=', QString::SkipEmptyParts);
 #endif
-        if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
-        {
+        if (parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty()) {
             continue;
-        }
-        else
-        {
+        } else {
             results.insert(parts[0], parts[1]);
         }
     }
 
-    if(!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success)
-    {
+    if (!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success) {
         result.validity = JavaCheckResult::Validity::ReturnedInvalidData;
         emit checkFinished(result);
         return;
@@ -181,7 +168,6 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     auto java_vendor = results["java.vendor"];
     bool is_64 = os_arch == "x86_64" || os_arch == "amd64" || os_arch == "aarch64" || os_arch == "arm64";
 
-
     result.validity = JavaCheckResult::Validity::Valid;
     result.is_64bit = is_64;
     result.mojangPlatform = is_64 ? "64" : "32";
@@ -194,8 +180,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 
 void JavaChecker::error(QProcess::ProcessError err)
 {
-    if(err == QProcess::FailedToStart)
-    {
+    if (err == QProcess::FailedToStart) {
         qDebug() << "Java checker has failed to start.";
         qDebug() << "Process environment:";
         qDebug() << process->environment();
@@ -216,8 +201,7 @@ void JavaChecker::error(QProcess::ProcessError err)
 void JavaChecker::timeout()
 {
     // NO MERCY. NO ABUSE.
-    if(process)
-    {
+    if (process) {
         qDebug() << "Java checker has been killed by timeout.";
         process->kill();
     }
diff --git a/launcher/java/JavaChecker.h b/launcher/java/JavaChecker.h
index 122861cf..743f4941 100644
--- a/launcher/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@@ -9,8 +9,7 @@
 
 class JavaChecker;
 
-struct JavaCheckResult
-{
+struct JavaCheckResult {
     QString path;
     QString mojangPlatform;
     QString realPlatform;
@@ -20,21 +19,15 @@ struct JavaCheckResult
     QString errorLog;
     bool is_64bit = false;
     int id;
-    enum class Validity
-    {
-        Errored,
-        ReturnedInvalidData,
-        Valid
-    } validity = Validity::Errored;
+    enum class Validity { Errored, ReturnedInvalidData, Valid } validity = Validity::Errored;
 };
 
 typedef shared_qobject_ptr<QProcess> QProcessPtr;
 typedef shared_qobject_ptr<JavaChecker> JavaCheckerPtr;
-class JavaChecker : public QObject
-{
+class JavaChecker : public QObject {
     Q_OBJECT
-public:
-    explicit JavaChecker(QObject *parent = 0);
+   public:
+    explicit JavaChecker(QObject* parent = 0);
     void performCheck();
 
     QString m_path;
@@ -44,15 +37,15 @@ public:
     int m_maxMem = 0;
     int m_permGen = 64;
 
-signals:
+   signals:
     void checkFinished(JavaCheckResult result);
-private:
+
+   private:
     QProcessPtr process;
     QTimer killTimer;
     QString m_stdout;
     QString m_stderr;
-public
-slots:
+   public slots:
     void timeout();
     void finished(int exitcode, QProcess::ExitStatus);
     void error(QProcess::ProcessError);
diff --git a/launcher/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp
index 48274974..870e2a09 100644
--- a/launcher/java/JavaCheckerJob.cpp
+++ b/launcher/java/JavaCheckerJob.cpp
@@ -20,14 +20,12 @@
 void JavaCheckerJob::partFinished(JavaCheckResult result)
 {
     num_finished++;
-    qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/"
-                << javacheckers.size();
+    qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/" << javacheckers.size();
     setProgress(num_finished, javacheckers.size());
 
     javaresults.replace(result.id, result);
 
-    if (num_finished == javacheckers.size())
-    {
+    if (num_finished == javacheckers.size()) {
         emitSucceeded();
     }
 }
@@ -35,8 +33,7 @@ void JavaCheckerJob::partFinished(JavaCheckResult result)
 void JavaCheckerJob::executeTask()
 {
     qDebug() << m_job_name.toLocal8Bit() << " started.";
-    for (auto iter : javacheckers)
-    {
+    for (auto iter : javacheckers) {
         javaresults.append(JavaCheckResult());
         connect(iter.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
         iter->performCheck();
diff --git a/launcher/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h
index c0986420..00968791 100644
--- a/launcher/java/JavaCheckerJob.h
+++ b/launcher/java/JavaCheckerJob.h
@@ -23,37 +23,32 @@ class JavaCheckerJob;
 typedef shared_qobject_ptr<JavaCheckerJob> JavaCheckerJobPtr;
 
 // FIXME: this just seems horribly redundant
-class JavaCheckerJob : public Task
-{
+class JavaCheckerJob : public Task {
     Q_OBJECT
-public:
-    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
-    virtual ~JavaCheckerJob() {};
+   public:
+    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name){};
+    virtual ~JavaCheckerJob(){};
 
     bool addJavaCheckerAction(JavaCheckerPtr base)
     {
         javacheckers.append(base);
         // if this is already running, the action needs to be started right away!
-        if (isRunning())
-        {
+        if (isRunning()) {
             setProgress(num_finished, javacheckers.size());
             connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
             base->performCheck();
         }
         return true;
     }
-    QList<JavaCheckResult> getResults()
-    {
-        return javaresults;
-    }
+    QList<JavaCheckResult> getResults() { return javaresults; }
 
-private slots:
+   private slots:
     void partFinished(JavaCheckResult result);
 
-protected:
+   protected:
     virtual void executeTask() override;
 
-private:
+   private:
     QString m_job_name;
     QList<JavaCheckerPtr> javacheckers;
     QList<JavaCheckResult> javaresults;
diff --git a/launcher/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp
index d5932bcb..cfa47140 100644
--- a/launcher/java/JavaInstall.cpp
+++ b/launcher/java/JavaInstall.cpp
@@ -1,29 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #include "JavaInstall.h"
 
+#include "BaseVersion.h"
 #include "StringUtils.h"
 
-bool JavaInstall::operator<(const JavaInstall &rhs)
+bool JavaInstall::operator<(const JavaInstall& rhs)
 {
     auto archCompare = StringUtils::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive);
-    if(archCompare != 0)
+    if (archCompare != 0)
         return archCompare < 0;
-    if(id < rhs.id)
-    {
+    if (id < rhs.id) {
         return true;
     }
-    if(id > rhs.id)
-    {
+    if (id > rhs.id) {
         return false;
     }
     return StringUtils::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0;
 }
 
-bool JavaInstall::operator==(const JavaInstall &rhs)
+bool JavaInstall::operator==(const JavaInstall& rhs)
 {
     return arch == rhs.arch && id == rhs.id && path == rhs.path;
 }
 
-bool JavaInstall::operator>(const JavaInstall &rhs)
+bool JavaInstall::operator>(const JavaInstall& rhs)
 {
     return (!operator<(rhs)) && (!operator==(rhs));
 }
+
+bool JavaInstall::operator<(BaseVersion& a)
+{
+    try {
+        return operator<(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator<(a);
+    }
+}
+
+bool JavaInstall::operator>(BaseVersion& a)
+{
+    try {
+        return operator>(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator>(a);
+    }
+}
diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 64be40d1..30815b5a 100644
--- a/launcher/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
@@ -1,33 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "BaseVersion.h"
 #include "JavaVersion.h"
 
-struct JavaInstall : public BaseVersion
-{
-    JavaInstall(){}
-    JavaInstall(QString id, QString arch, QString path)
-    : id(id), arch(arch), path(path)
-    {
-    }
-    virtual QString descriptor()
-    {
-        return id.toString();
-    }
-
-    virtual QString name()
-    {
-        return id.toString();
-    }
-
-    virtual QString typeString() const
-    {
-        return arch;
-    }
-
-    bool operator<(const JavaInstall & rhs);
-    bool operator==(const JavaInstall & rhs);
-    bool operator>(const JavaInstall & rhs);
+struct JavaInstall : public BaseVersion {
+    JavaInstall() {}
+    JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
+    virtual QString descriptor() { return id.toString(); }
+
+    virtual QString name() { return id.toString(); }
+
+    virtual QString typeString() const { return arch; }
+
+    virtual bool operator<(BaseVersion& a) override;
+    virtual bool operator>(BaseVersion& a) override;
+    bool operator<(const JavaInstall& rhs);
+    bool operator==(const JavaInstall& rhs);
+    bool operator>(const JavaInstall& rhs);
 
     JavaVersion id;
     QString arch;
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index 3407fdf7..d8be4963 100644
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@@ -39,14 +39,12 @@
 
 #include <QDebug>
 
-#include "java/JavaInstallList.h"
 #include "java/JavaCheckerJob.h"
+#include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 #include "minecraft/VersionFilterData.h"
 
-JavaInstallList::JavaInstallList(QObject *parent) : BaseVersionList(parent)
-{
-}
+JavaInstallList::JavaInstallList(QObject* parent) : BaseVersionList(parent) {}
 
 Task::Ptr JavaInstallList::getLoadTask()
 {
@@ -56,8 +54,7 @@ Task::Ptr JavaInstallList::getLoadTask()
 
 Task::Ptr JavaInstallList::getCurrentTask()
 {
-    if(m_status == Status::InProgress)
-    {
+    if (m_status == Status::InProgress) {
         return m_loadTask;
     }
     return nullptr;
@@ -65,8 +62,7 @@ Task::Ptr JavaInstallList::getCurrentTask()
 
 void JavaInstallList::load()
 {
-    if(m_status != Status::InProgress)
-    {
+    if (m_status != Status::InProgress) {
         m_status = Status::InProgress;
         m_loadTask.reset(new JavaListLoadTask(this));
         m_loadTask->start();
@@ -88,7 +84,7 @@ int JavaInstallList::count() const
     return m_vlist.count();
 }
 
-QVariant JavaInstallList::data(const QModelIndex &index, int role) const
+QVariant JavaInstallList::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return QVariant();
@@ -97,8 +93,7 @@ QVariant JavaInstallList::data(const QModelIndex &index, int role) const
         return QVariant();
 
     auto version = std::dynamic_pointer_cast<JavaInstall>(m_vlist[index.row()]);
-    switch (role)
-    {
+    switch (role) {
         case SortRole:
             return -index.row();
         case VersionPointerRole:
@@ -120,17 +115,15 @@ QVariant JavaInstallList::data(const QModelIndex &index, int role) const
 
 BaseVersionList::RoleList JavaInstallList::providesRoles() const
 {
-    return {VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, ArchitectureRole};
+    return { VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, ArchitectureRole };
 }
 
-
 void JavaInstallList::updateListData(QList<BaseVersion::Ptr> versions)
 {
     beginResetModel();
     m_vlist = versions;
     sortVersions();
-    if(m_vlist.size())
-    {
+    if (m_vlist.size()) {
         auto best = std::dynamic_pointer_cast<JavaInstall>(m_vlist[0]);
         best->recommended = true;
     }
@@ -153,15 +146,13 @@ void JavaInstallList::sortVersions()
     endResetModel();
 }
 
-JavaListLoadTask::JavaListLoadTask(JavaInstallList *vlist) : Task()
+JavaListLoadTask::JavaListLoadTask(JavaInstallList* vlist) : Task()
 {
     m_list = vlist;
     m_currentRecommended = NULL;
 }
 
-JavaListLoadTask::~JavaListLoadTask()
-{
-}
+JavaListLoadTask::~JavaListLoadTask() {}
 
 void JavaListLoadTask::executeTask()
 {
@@ -176,8 +167,7 @@ void JavaListLoadTask::executeTask()
 
     qDebug() << "Probing the following Java paths: ";
     int id = 0;
-    for(QString candidate : candidate_paths)
-    {
+    for (QString candidate : candidate_paths) {
         qDebug() << " " << candidate;
 
         auto candidate_checker = new JavaChecker();
@@ -197,10 +187,8 @@ void JavaListLoadTask::javaCheckerFinished()
     auto results = m_job->getResults();
 
     qDebug() << "Found the following valid Java installations:";
-    for(JavaCheckResult result : results)
-    {
-        if(result.validity == JavaCheckResult::Validity::Valid)
-        {
+    for (JavaCheckResult result : results) {
+        if (result.validity == JavaCheckResult::Validity::Valid) {
             JavaInstallPtr javaVersion(new JavaInstall());
 
             javaVersion->id = result.javaVersion;
@@ -213,13 +201,11 @@ void JavaListLoadTask::javaCheckerFinished()
     }
 
     QList<BaseVersion::Ptr> javas_bvp;
-    for (auto java : candidates)
-    {
-        //qDebug() << java->id << java->arch << " at " << java->path;
+    for (auto java : candidates) {
+        // qDebug() << java->id << java->arch << " at " << java->path;
         BaseVersion::Ptr bp_java = std::dynamic_pointer_cast<BaseVersion>(java);
 
-        if (bp_java)
-        {
+        if (bp_java) {
             javas_bvp.append(java);
         }
     }
diff --git a/launcher/java/JavaInstallList.h b/launcher/java/JavaInstallList.h
index 733dc7e1..1eebadf2 100644
--- a/launcher/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <QObject>
 #include <QAbstractListModel>
+#include <QObject>
 
 #include "BaseVersionList.h"
 #include "tasks/Task.h"
@@ -28,17 +28,12 @@
 
 class JavaListLoadTask;
 
-class JavaInstallList : public BaseVersionList
-{
+class JavaInstallList : public BaseVersionList {
     Q_OBJECT
-    enum class Status
-    {
-        NotDone,
-        InProgress,
-        Done
-    };
-public:
-    explicit JavaInstallList(QObject *parent = 0);
+    enum class Status { NotDone, InProgress, Done };
+
+   public:
+    explicit JavaInstallList(QObject* parent = 0);
 
     Task::Ptr getLoadTask() override;
     bool isLoaded() override;
@@ -46,36 +41,35 @@ public:
     int count() const override;
     void sortVersions() override;
 
-    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
     RoleList providesRoles() const override;
 
-public slots:
+   public slots:
     void updateListData(QList<BaseVersion::Ptr> versions) override;
 
-protected:
+   protected:
     void load();
     Task::Ptr getCurrentTask();
 
-protected:
+   protected:
     Status m_status = Status::NotDone;
     shared_qobject_ptr<JavaListLoadTask> m_loadTask;
     QList<BaseVersion::Ptr> m_vlist;
 };
 
-class JavaListLoadTask : public Task
-{
+class JavaListLoadTask : public Task {
     Q_OBJECT
 
-public:
-    explicit JavaListLoadTask(JavaInstallList *vlist);
+   public:
+    explicit JavaListLoadTask(JavaInstallList* vlist);
     virtual ~JavaListLoadTask();
 
     void executeTask() override;
-public slots:
+   public slots:
     void javaCheckerFinished();
 
-protected:
+   protected:
     shared_qobject_ptr<JavaCheckerJob> m_job;
-    JavaInstallList *m_list;
-    JavaInstall *m_currentRecommended;
+    JavaInstallList* m_list;
+    JavaInstall* m_currentRecommended;
 };
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index e55663aa..3512c307 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.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
@@ -33,24 +33,21 @@
  *      limitations under the License.
  */
 
-#include <QStringList>
-#include <QString>
 #include <QDir>
+#include <QString>
 #include <QStringList>
 
 #include <settings/Setting.h>
 
 #include <QDebug>
-#include "java/JavaUtils.h"
-#include "java/JavaInstallList.h"
-#include "FileSystem.h"
 #include "Application.h"
+#include "FileSystem.h"
+#include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
 
 #define IBUS "@im=ibus"
 
-JavaUtils::JavaUtils()
-{
-}
+JavaUtils::JavaUtils() {}
 
 QString stripVariableEntries(QString name, QString target, QString remove)
 {
@@ -65,8 +62,7 @@ QString stripVariableEntries(QString name, QString target, QString remove)
     for (QString item : toRemove) {
         bool removed = targetItems.removeOne(item);
         if (!removed)
-            qWarning() << "Entry" << item
-                << "could not be stripped from variable" << name;
+            qWarning() << "Entry" << item << "could not be stripped from variable" << name;
     }
     return targetItems.join(delimiter);
 }
@@ -77,20 +73,10 @@ QProcessEnvironment CleanEnviroment()
     QProcessEnvironment rawenv = QProcessEnvironment::systemEnvironment();
     QProcessEnvironment env;
 
-    QStringList ignored =
-    {
-        "JAVA_ARGS",
-        "CLASSPATH",
-        "CONFIGPATH",
-        "JAVA_HOME",
-        "JRE_HOME",
-        "_JAVA_OPTIONS",
-        "JAVA_OPTIONS",
-        "JAVA_TOOL_OPTIONS"
-    };
+    QStringList ignored = { "JAVA_ARGS", "CLASSPATH",     "CONFIGPATH",   "JAVA_HOME",
+                            "JRE_HOME",  "_JAVA_OPTIONS", "JAVA_OPTIONS", "JAVA_TOOL_OPTIONS" };
 
-    QStringList stripped =
-    {
+    QStringList stripped = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         "LD_LIBRARY_PATH",
         "LD_PRELOAD",
@@ -98,12 +84,10 @@ QProcessEnvironment CleanEnviroment()
         "QT_PLUGIN_PATH",
         "QT_FONTPATH"
     };
-    for(auto key: rawenv.keys())
-    {
+    for (auto key : rawenv.keys()) {
         auto value = rawenv.value(key);
         // filter out dangerous java crap
-        if(ignored.contains(key))
-        {
+        if (ignored.contains(key)) {
             qDebug() << "Env: ignoring" << key << value;
             continue;
         }
@@ -111,13 +95,11 @@ QProcessEnvironment CleanEnviroment()
         // These are used to strip the original variables
         // If there is "LD_LIBRARY_PATH" and "LAUNCHER_LD_LIBRARY_PATH", we want to
         // remove all values in "LAUNCHER_LD_LIBRARY_PATH" from "LD_LIBRARY_PATH"
-        if(key.startsWith("LAUNCHER_"))
-        {
+        if (key.startsWith("LAUNCHER_")) {
             qDebug() << "Env: ignoring" << key << value;
             continue;
         }
-        if(stripped.contains(key))
-        {
+        if (stripped.contains(key)) {
             QString newValue = stripVariableEntries(key, value, rawenv.value("LAUNCHER_" + key));
 
             qDebug() << "Env: stripped" << key << value << "to" << newValue;
@@ -125,8 +107,7 @@ QProcessEnvironment CleanEnviroment()
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         // Strip IBus
         // IBus is a Linux IME framework. For some reason, it breaks MC?
-        if (key == "XMODIFIERS" && value.contains(IBUS))
-        {
+        if (key == "XMODIFIERS" && value.contains(IBUS)) {
             QString save = value;
             value.replace(IBUS, "");
             qDebug() << "Env: stripped" << IBUS << "from" << save << ":" << value;
@@ -137,8 +118,7 @@ QProcessEnvironment CleanEnviroment()
     }
 #ifdef Q_OS_LINUX
     // HACK: Workaround for QTBUG-42500
-    if(!env.contains("LD_LIBRARY_PATH"))
-    {
+    if (!env.contains("LD_LIBRARY_PATH")) {
         env.insert("LD_LIBRARY_PATH", "");
     }
 #endif
@@ -177,7 +157,7 @@ QStringList addJavasFromEnv(QList<QString> javas)
     auto env = qEnvironmentVariable("PRISMLAUNCHER_JAVA_PATHS");  // FIXME: use launcher name from buildconfig
 #if defined(Q_OS_WIN32)
     QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));
-    
+
     auto envPath = qEnvironmentVariable("PATH");
     QList<QString> javaPathsfromPath = envPath.replace("\\", "/").split(QLatin1String(";"));
     for (QString string : javaPathsfromPath) {
@@ -186,8 +166,7 @@ QStringList addJavasFromEnv(QList<QString> javas)
 #else
     QList<QString> javaPaths = env.split(QLatin1String(":"));
 #endif
-    for(QString i : javaPaths)
-    {
+    for (QString i : javaPaths) {
         javas.append(i);
     };
     return javas;
@@ -205,9 +184,8 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
         archType = "32";
 
     HKEY jreKey;
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().c_str(), 0,
-                      KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) == ERROR_SUCCESS)
-    {
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().c_str(), 0, KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) ==
+        ERROR_SUCCESS) {
         // Read the current type version from the registry.
         // This will be used to find any key that contains the JavaHome value.
 
@@ -215,46 +193,36 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
         DWORD subKeyNameSize, numSubKeys, retCode;
 
         // Get the number of subkeys
-        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
-                        NULL, NULL);
+        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
         // Iterate until RegEnumKeyEx fails
-        if (numSubKeys > 0)
-        {
-            for (DWORD i = 0; i < numSubKeys; i++)
-            {
+        if (numSubKeys > 0) {
+            for (DWORD i = 0; i < numSubKeys; i++) {
                 subKeyNameSize = 255;
-                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
-                                        NULL);
+                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL, NULL);
                 QString newSubkeyName = QString::fromWCharArray(subKeyName);
-                if (retCode == ERROR_SUCCESS)
-                {
+                if (retCode == ERROR_SUCCESS) {
                     // Now open the registry key for the version that we just got.
                     QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;
 
                     HKEY newKey;
-                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0,
-                                      KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
-                    {
+                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &newKey) ==
+                        ERROR_SUCCESS) {
                         // Read the JavaHome value to find where Java is installed.
                         DWORD valueSz = 0;
-                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL,
-                                             &valueSz) == ERROR_SUCCESS)
-                        {
-                            WCHAR *value = new WCHAR[valueSz];
-                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE *)value,
-                                             &valueSz);
+                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL, &valueSz) == ERROR_SUCCESS) {
+                            WCHAR* value = new WCHAR[valueSz];
+                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE*)value, &valueSz);
 
                             QString newValue = QString::fromWCharArray(value);
-                            delete [] value;
+                            delete[] value;
 
                             // Now, we construct the version object and add it to the list.
                             JavaInstallPtr javaVersion(new JavaInstall());
 
                             javaVersion->id = newSubkeyName;
                             javaVersion->arch = archType;
-                            javaVersion->path =
-                                QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
+                            javaVersion->path = QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
                             javas.append(javaVersion);
                         }
 
@@ -275,66 +243,56 @@ QList<QString> JavaUtils::FindJavaPaths()
     QList<JavaInstallPtr> java_candidates;
 
     // Oracle
-    QList<JavaInstallPtr> JRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
-    QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
-    QList<JavaInstallPtr> JRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
-    QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
+    QList<JavaInstallPtr> JRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
+    QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
+    QList<JavaInstallPtr> JRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
+    QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
 
     // Oracle for Java 9 and newer
-    QList<JavaInstallPtr> NEWJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
-    QList<JavaInstallPtr> NEWJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
-    QList<JavaInstallPtr> NEWJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
-    QList<JavaInstallPtr> NEWJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
+    QList<JavaInstallPtr> NEWJRE64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
+    QList<JavaInstallPtr> NEWJDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
+    QList<JavaInstallPtr> NEWJRE32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
+    QList<JavaInstallPtr> NEWJDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
 
     // AdoptOpenJDK
-    QList<JavaInstallPtr> ADOPTOPENJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
 
     // Eclipse Foundation
-    QList<JavaInstallPtr> FOUNDATIONJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> FOUNDATIONJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> FOUNDATIONJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> FOUNDATIONJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
 
     // Eclipse Adoptium
-    QList<JavaInstallPtr> ADOPTIUMJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
 
     // Microsoft
-    QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> MICROSOFTJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");
 
     // Azul Zulu
-    QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
-    QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
+    QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
+    QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
 
     // BellSoft Liberica
-    QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
-    QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
+    QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
+    QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
 
     // List x64 before x86
     java_candidates.append(JRE64s);
@@ -371,10 +329,8 @@ QList<QString> JavaUtils::FindJavaPaths()
     java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));
 
     QList<QString> candidates;
-    for(JavaInstallPtr java_candidate : java_candidates)
-    {
-        if(!candidates.contains(java_candidate->path))
-        {
+    for (JavaInstallPtr java_candidate : java_candidates) {
+        if (!candidates.contains(java_candidate->path)) {
             candidates.append(java_candidate->path);
         }
     }
@@ -394,13 +350,13 @@ QList<QString> JavaUtils::FindJavaPaths()
     javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
     QDir libraryJVMDir("/Library/Java/JavaVirtualMachines/");
     QStringList libraryJVMJavas = libraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (const QString &java, libraryJVMJavas) {
+    foreach (const QString& java, libraryJVMJavas) {
         javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
         javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/jre/bin/java");
     }
     QDir systemLibraryJVMDir("/System/Library/Java/JavaVirtualMachines/");
     QStringList systemLibraryJVMJavas = systemLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (const QString &java, systemLibraryJVMJavas) {
+    foreach (const QString& java, systemLibraryJVMJavas) {
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
     }
@@ -414,14 +370,12 @@ QList<QString> JavaUtils::FindJavaPaths()
 {
     QList<QString> javas;
     javas.append(this->GetDefaultJava()->path);
-    auto scanJavaDir = [&](const QString & dirPath)
-    {
+    auto scanJavaDir = [&](const QString& dirPath) {
         QDir dir(dirPath);
-        if(!dir.exists())
+        if (!dir.exists())
             return;
         auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-        for(auto & entry: entries)
-        {
+        for (auto& entry : entries) {
             QString prefix;
             prefix = entry.canonicalFilePath();
             javas.append(FS::PathCombine(prefix, "jre/bin/java"));
@@ -430,8 +384,7 @@ QList<QString> JavaUtils::FindJavaPaths()
     };
     // java installed in a snap is installed in the standard directory, but underneath $SNAP
     auto snap = qEnvironmentVariable("SNAP");
-    auto scanJavaDirs = [&](const QString & dirPath)
-    {
+    auto scanJavaDirs = [&](const QString& dirPath) {
         scanJavaDir(dirPath);
         if (!snap.isNull()) {
             scanJavaDir(snap + dirPath);
diff --git a/launcher/java/JavaUtils.h b/launcher/java/JavaUtils.h
index 9b69b516..61617970 100644
--- a/launcher/java/JavaUtils.h
+++ b/launcher/java/JavaUtils.h
@@ -27,10 +27,9 @@
 QString stripVariableEntries(QString name, QString target, QString remove);
 QProcessEnvironment CleanEnviroment();
 
-class JavaUtils : public QObject
-{
+class JavaUtils : public QObject {
     Q_OBJECT
-public:
+   public:
     JavaUtils();
 
     JavaInstallPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown");
diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index 0e4fc1d3..f9ac4782 100644
--- a/launcher/java/JavaVersion.cpp
+++ b/launcher/java/JavaVersion.cpp
@@ -5,27 +5,22 @@
 #include <QRegularExpression>
 #include <QString>
 
-JavaVersion & JavaVersion::operator=(const QString & javaVersionString)
+JavaVersion& JavaVersion::operator=(const QString& javaVersionString)
 {
     m_string = javaVersionString;
 
-    auto getCapturedInteger = [](const QRegularExpressionMatch & match, const QString &what) -> int
-    {
+    auto getCapturedInteger = [](const QRegularExpressionMatch& match, const QString& what) -> int {
         auto str = match.captured(what);
-        if(str.isEmpty())
-        {
+        if (str.isEmpty()) {
             return 0;
         }
         return str.toInt();
     };
 
     QRegularExpression pattern;
-    if(javaVersionString.startsWith("1."))
-    {
-        pattern = QRegularExpression ("1[.](?<major>[0-9]+)([.](?<minor>[0-9]+))?(_(?<security>[0-9]+)?)?(-(?<prerelease>[a-zA-Z0-9]+))?");
-    }
-    else
-    {
+    if (javaVersionString.startsWith("1.")) {
+        pattern = QRegularExpression("1[.](?<major>[0-9]+)([.](?<minor>[0-9]+))?(_(?<security>[0-9]+)?)?(-(?<prerelease>[a-zA-Z0-9]+))?");
+    } else {
         pattern = QRegularExpression("(?<major>[0-9]+)([.](?<minor>[0-9]+))?([.](?<security>[0-9]+))?(-(?<prerelease>[a-zA-Z0-9]+))?");
     }
 
@@ -38,85 +33,77 @@ JavaVersion & JavaVersion::operator=(const QString & javaVersionString)
     return *this;
 }
 
-JavaVersion::JavaVersion(const QString &rhs)
+JavaVersion::JavaVersion(const QString& rhs)
 {
     operator=(rhs);
 }
 
-QString JavaVersion::toString()
+QString JavaVersion::toString() const
 {
     return m_string;
 }
 
 bool JavaVersion::requiresPermGen()
 {
-    if(m_parseable)
-    {
+    if (m_parseable) {
         return m_major < 8;
     }
     return true;
 }
 
-bool JavaVersion::operator<(const JavaVersion &rhs)
+bool JavaVersion::operator<(const JavaVersion& rhs)
 {
-    if(m_parseable && rhs.m_parseable)
-    {
+    if (m_parseable && rhs.m_parseable) {
         auto major = m_major;
         auto rmajor = rhs.m_major;
 
         // HACK: discourage using java 9
-        if(major > 8)
+        if (major > 8)
             major = -major;
-        if(rmajor > 8)
+        if (rmajor > 8)
             rmajor = -rmajor;
 
-        if(major < rmajor)
+        if (major < rmajor)
             return true;
-        if(major > rmajor)
+        if (major > rmajor)
             return false;
-        if(m_minor < rhs.m_minor)
+        if (m_minor < rhs.m_minor)
             return true;
-        if(m_minor > rhs.m_minor)
+        if (m_minor > rhs.m_minor)
             return false;
-        if(m_security < rhs.m_security)
+        if (m_security < rhs.m_security)
             return true;
-        if(m_security > rhs.m_security)
+        if (m_security > rhs.m_security)
             return false;
 
         // everything else being equal, consider prerelease status
         bool thisPre = !m_prerelease.isEmpty();
         bool rhsPre = !rhs.m_prerelease.isEmpty();
-        if(thisPre && !rhsPre)
-        {
+        if (thisPre && !rhsPre) {
             // this is a prerelease and the other one isn't -> lesser
             return true;
-        }
-        else if(!thisPre && rhsPre)
-        {
+        } else if (!thisPre && rhsPre) {
             // this isn't a prerelease and the other one is -> greater
             return false;
-        }
-        else if(thisPre && rhsPre)
-        {
+        } else if (thisPre && rhsPre) {
             // both are prereleases - use natural compare...
             return StringUtils::naturalCompare(m_prerelease, rhs.m_prerelease, Qt::CaseSensitive) < 0;
         }
         // neither is prerelease, so they are the same -> this cannot be less than rhs
         return false;
-    }
-    else return StringUtils::naturalCompare(m_string, rhs.m_string, Qt::CaseSensitive) < 0;
+    } else
+        return StringUtils::naturalCompare(m_string, rhs.m_string, Qt::CaseSensitive) < 0;
 }
 
-bool JavaVersion::operator==(const JavaVersion &rhs)
+bool JavaVersion::operator==(const JavaVersion& rhs)
 {
-    if(m_parseable && rhs.m_parseable)
-    {
+    if (m_parseable && rhs.m_parseable) {
         return m_major == rhs.m_major && m_minor == rhs.m_minor && m_security == rhs.m_security && m_prerelease == rhs.m_prerelease;
     }
     return m_string == rhs.m_string;
 }
 
-bool JavaVersion::operator>(const JavaVersion &rhs)
+bool JavaVersion::operator>(const JavaVersion& rhs)
 {
     return (!operator<(rhs)) && (!operator==(rhs));
 }
diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 9bbf0642..69473203 100644
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -4,42 +4,34 @@
 
 // NOTE: apparently the GNU C library pollutes the global namespace with these... undef them.
 #ifdef major
-    #undef major
+#undef major
 #endif
 #ifdef minor
-    #undef minor
+#undef minor
 #endif
 
-class JavaVersion
-{
+class JavaVersion {
     friend class JavaVersionTest;
-public:
-    JavaVersion() {};
-    JavaVersion(const QString & rhs);
 
-    JavaVersion & operator=(const QString & rhs);
+   public:
+    JavaVersion(){};
+    JavaVersion(const QString& rhs);
 
-    bool operator<(const JavaVersion & rhs);
-    bool operator==(const JavaVersion & rhs);
-    bool operator>(const JavaVersion & rhs);
+    JavaVersion& operator=(const QString& rhs);
+
+    bool operator<(const JavaVersion& rhs);
+    bool operator==(const JavaVersion& rhs);
+    bool operator>(const JavaVersion& rhs);
 
     bool requiresPermGen();
 
-    QString toString();
-
-    int major()
-    {
-        return m_major;
-    }
-    int minor()
-    {
-        return m_minor;
-    }
-    int security()
-    {
-        return m_security;
-    }
-private:
+    QString toString() const;
+
+    int major() { return m_major; }
+    int minor() { return m_minor; }
+    int security() { return m_security; }
+
+   private:
     QString m_string;
     int m_major = 0;
     int m_minor = 0;