NOISSUE continue reshuffling the codebase

launcher/launch/steps/CheckJava.cpp

@@ -0,0 +1,139 @@
+/* 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 "CheckJava.h"
+#include <launch/LaunchTask.h>
+#include <FileSystem.h>
+#include <QStandardPaths>
+#include <QFileInfo>
+#include <sys.h>
+
+void CheckJava::executeTask()
+{
+    auto instance = m_parent->instance();
+    auto settings = instance->settings();
+    m_javaPath = FS::ResolveExecutable(settings->get("JavaPath").toString());
+    bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
+
+    auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
+    if (realJavaPath.isEmpty())
+    {
+        if (perInstance)
+        {
+            emit logLine(
+                QString("The java binary \"%1\" couldn't be found. Please fix the java path "
+                   "override in the instance's settings or disable it.").arg(m_javaPath),
+                MessageLevel::Warning);
+        }
+        else
+        {
+            emit logLine(QString("The java binary \"%1\" couldn't be found. Please set up java in "
+                            "the settings.").arg(m_javaPath),
+                         MessageLevel::Warning);
+        }
+        emitFailed(QString("Java path is not valid."));
+        return;
+    }
+    else
+    {
+        emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::Launcher);
+    }
+
+    QFileInfo javaInfo(realJavaPath);
+    qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
+    auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
+    auto storedArchitecture = settings->get("JavaArchitecture").toString();
+    auto storedVersion = settings->get("JavaVersion").toString();
+    auto storedVendor = settings->get("JavaVendor").toString();
+    m_javaUnixTime = javaUnixTime;
+    // if timestamps are not the same, or something is missing, check!
+    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0 || storedArchitecture.size() == 0 || storedVendor.size() == 0)
+    {
+        m_JavaChecker = new JavaChecker();
+        emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
+        connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this, &CheckJava::checkJavaFinished);
+        m_JavaChecker->m_path = realJavaPath;
+        m_JavaChecker->performCheck();
+        return;
+    }
+    else
+    {
+        auto verString = instance->settings()->get("JavaVersion").toString();
+        auto archString = instance->settings()->get("JavaArchitecture").toString();
+        auto vendorString = instance->settings()->get("JavaVendor").toString();
+        printJavaInfo(verString, archString, vendorString);
+    }
+    emitSucceeded();
+}
+
+void CheckJava::checkJavaFinished(JavaCheckResult result)
+{
+    switch (result.validity)
+    {
+        case JavaCheckResult::Validity::Errored:
+        {
+            // Error message displayed if java can't start
+            emit logLine(QString("Could not start java:"), MessageLevel::Error);
+            emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
+            emit logLine("\nCheck your MultiMC Java settings.", MessageLevel::Launcher);
+            printSystemInfo(false, false);
+            emitFailed(QString("Could not start java!"));
+            return;
+        }
+        case JavaCheckResult::Validity::ReturnedInvalidData:
+        {
+            emit logLine(QString("Java checker returned some invalid data MultiMC doesn't understand:"), MessageLevel::Error);
+            emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
+            emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
+            printSystemInfo(false, false);
+            emitSucceeded();
+            return;
+        }
+        case JavaCheckResult::Validity::Valid:
+        {
+            auto instance = m_parent->instance();
+            printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.javaVendor);
+            instance->settings()->set("JavaVersion", result.javaVersion.toString());
+            instance->settings()->set("JavaArchitecture", result.mojangPlatform);
+            instance->settings()->set("JavaVendor", result.javaVendor);
+            instance->settings()->set("JavaTimestamp", m_javaUnixTime);
+            emitSucceeded();
+            return;
+        }
+    }
+}
+
+void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString & vendor)
+{
+    emit logLine(QString("Java is version %1, using %2-bit architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::Launcher);
+    printSystemInfo(true, architecture == "64");
+}
+
+void CheckJava::printSystemInfo(bool javaIsKnown, bool javaIs64bit)
+{
+    auto cpu64 = Sys::isCPU64bit();
+    auto system64 = Sys::isSystem64bit();
+    if(cpu64 != system64)
+    {
+        emit logLine(QString("Your CPU architecture is not matching your system architecture. You might want to install a 64bit Operating System.\n\n"), MessageLevel::Error);
+    }
+    if(javaIsKnown)
+    {
+        if(javaIs64bit != system64)
+        {
+            emit logLine(QString("Your Java architecture is not matching your system architecture. You might want to install a 64bit Java version.\n\n"), MessageLevel::Error);
+        }
+    }
+}

launcher/launch/steps/CheckJava.h

@@ -0,0 +1,45 @@
+/* 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 <java/JavaChecker.h>
+
+class CheckJava: public LaunchStep
+{
+    Q_OBJECT
+public:
+    explicit CheckJava(LaunchTask *parent) :LaunchStep(parent){};
+    virtual ~CheckJava() {};
+
+    virtual void executeTask();
+    virtual bool canAbort() const
+    {
+        return false;
+    }
+private slots:
+    void checkJavaFinished(JavaCheckResult result);
+
+private:
+    void printJavaInfo(const QString & version, const QString & architecture, const QString & vendor);
+    void printSystemInfo(bool javaIsKnown, bool javaIs64bit);
+
+private:
+    QString m_javaPath;
+    qlonglong m_javaUnixTime;
+    JavaCheckerPtr m_JavaChecker;
+};