summaryrefslogtreecommitdiffstats
path: root/api/logic/java
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-04-10 17:43:41 +0200
committerPetr Mrázek <peterix@gmail.com>2016-05-01 00:00:24 +0200
commited3884fd38c26185522248994c79c9525b8892ad (patch)
treeb65752e0575597798b1f2625a30d861d113dca6c /api/logic/java
parent1be7d573326570d63e55e36235537ed2b1831ae1 (diff)
downloadMultiMC-ed3884fd38c26185522248994c79c9525b8892ad.tar
MultiMC-ed3884fd38c26185522248994c79c9525b8892ad.tar.gz
MultiMC-ed3884fd38c26185522248994c79c9525b8892ad.tar.lz
MultiMC-ed3884fd38c26185522248994c79c9525b8892ad.tar.xz
MultiMC-ed3884fd38c26185522248994c79c9525b8892ad.zip
NOISSUE move Java and Minecraft launch tasks to the proper places
Minecraft and Java are not generic.
Diffstat (limited to 'api/logic/java')
-rw-r--r--api/logic/java/launch/CheckJava.cpp92
-rw-r--r--api/logic/java/launch/CheckJava.h41
2 files changed, 133 insertions, 0 deletions
diff --git a/api/logic/java/launch/CheckJava.cpp b/api/logic/java/launch/CheckJava.cpp
new file mode 100644
index 00000000..a4eaa307
--- /dev/null
+++ b/api/logic/java/launch/CheckJava.cpp
@@ -0,0 +1,92 @@
+/* Copyright 2013-2015 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>
+
+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(
+ tr("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(tr("The java binary \"%1\" couldn't be found. Please set up java in "
+ "the settings.").arg(m_javaPath),
+ MessageLevel::Warning);
+ }
+ emitFailed(tr("Java path is not valid."));
+ return;
+ }
+ else
+ {
+ emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::MultiMC);
+ }
+
+ QFileInfo javaInfo(realJavaPath);
+ qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
+ auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
+ m_javaUnixTime = javaUnixTime;
+ // if they are not the same, check!
+ if (javaUnixTime != storedUnixTime)
+ {
+ m_JavaChecker = std::make_shared<JavaChecker>();
+ QString errorLog;
+ QString version;
+ emit logLine(tr("Checking Java version..."), MessageLevel::MultiMC);
+ connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this,
+ &CheckJava::checkJavaFinished);
+ m_JavaChecker->m_path = realJavaPath;
+ m_JavaChecker->performCheck();
+ return;
+ }
+ emitSucceeded();
+}
+
+void CheckJava::checkJavaFinished(JavaCheckResult result)
+{
+ if (!result.valid)
+ {
+ // Error message displayed if java can't start
+ emit logLine(tr("Could not start java:"), MessageLevel::Error);
+ emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
+ emit logLine("\nCheck your MultiMC Java settings.", MessageLevel::MultiMC);
+ emitFailed(tr("Could not start java!"));
+ }
+ else
+ {
+ auto instance = m_parent->instance();
+ emit logLine(tr("Java version is %1!\n").arg(result.javaVersion.toString()),
+ MessageLevel::MultiMC);
+ instance->settings()->set("JavaVersion", result.javaVersion.toString());
+ instance->settings()->set("JavaTimestamp", m_javaUnixTime);
+ emitSucceeded();
+ }
+}
diff --git a/api/logic/java/launch/CheckJava.h b/api/logic/java/launch/CheckJava.h
new file mode 100644
index 00000000..b63dd4f4
--- /dev/null
+++ b/api/logic/java/launch/CheckJava.h
@@ -0,0 +1,41 @@
+/* Copyright 2013-2015 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 <launch/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:
+ QString m_javaPath;
+ qlonglong m_javaUnixTime;
+ JavaCheckerPtr m_JavaChecker;
+};