NOISSUE move Java and Minecraft launch tasks to the proper places

Minecraft and Java are not generic.

6 files changed, 0 insertions, 419 deletions

diff --git a/api/logic/launch/steps/CheckJava.cpp b/api/logic/launch/steps/CheckJava.cpp
deleted file mode 100644
index a4eaa307..00000000
--- a/api/logic/launch/steps/CheckJava.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* 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/launch/steps/CheckJava.h b/api/logic/launch/steps/CheckJava.h
deleted file mode 100644
index b63dd4f4..00000000
--- a/api/logic/launch/steps/CheckJava.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 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;
-};
diff --git a/api/logic/launch/steps/LaunchMinecraft.cpp b/api/logic/launch/steps/LaunchMinecraft.cpp
deleted file mode 100644
index 9b8cc0fb..00000000
--- a/api/logic/launch/steps/LaunchMinecraft.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/* 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 "LaunchMinecraft.h"
-#include <launch/LaunchTask.h>
-#include <minecraft/MinecraftInstance.h>
-#include <FileSystem.h>
-#include <QStandardPaths>
-
-LaunchMinecraft::LaunchMinecraft(LaunchTask *parent) : LaunchStep(parent)
-{
-	connect(&m_process, &LoggedProcess::log, this, &LaunchMinecraft::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &LaunchMinecraft::on_state);
-}
-
-void LaunchMinecraft::executeTask()
-{
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-
-	m_launchScript = minecraftInstance->createLaunchScript(m_session);
-
-	QStringList args = minecraftInstance->javaArguments();
-
-	// HACK: this is a workaround for MCL-3732 - 'server-resource-packs' is created.
-	if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->minecraftRoot(), "server-resource-packs")))
-	{
-		emit logLine(tr("Couldn't create the 'server-resource-packs' folder"), MessageLevel::Error);
-	}
-
-	QString allArgs = args.join(", ");
-	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
-
-	auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-	m_process.setProcessEnvironment(instance->createEnvironment());
-
-	QString wrapperCommand = instance->getWrapperCommand();
-	if(!wrapperCommand.isEmpty())
-	{
-		auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-		if (realWrapperCommand.isEmpty())
-		{
-			QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		emit logLine("Wrapper command is:\n" + wrapperCommand + "\n\n", MessageLevel::MultiMC);
-		args.prepend(javaPath);
-		m_process.start(wrapperCommand, args);
-	}
-	else
-	{
-		m_process.start(javaPath, args);
-	}
-}
-
-void LaunchMinecraft::on_state(LoggedProcess::State state)
-{
-	switch(state)
-	{
-		case LoggedProcess::FailedToStart:
-		{
-			//: Error message displayed if instace can't start
-			QString reason = tr("Could not launch minecraft!");
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-
-		{
-			m_parent->setPid(-1);
-			emitFailed("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("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(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
-			m_parent->setPid(m_process.processId());
-			m_parent->instance()->setLastLaunch();
-			// send the launch script to the launcher part
-			m_process.write(m_launchScript.toUtf8());
-			qDebug() << m_launchScript;
-
-			mayProceed = true;
-			emit readyForLaunch();
-			break;
-		default:
-			break;
-	}
-}
-
-void LaunchMinecraft::setWorkingDirectory(const QString &wd)
-{
-	m_process.setWorkingDirectory(wd);
-}
-
-void LaunchMinecraft::proceed()
-{
-	if(mayProceed)
-	{
-		QString launchString("launch\n");
-		m_process.write(launchString.toUtf8());
-		mayProceed = false;
-	}
-}
-
-bool LaunchMinecraft::abort()
-{
-	if(mayProceed)
-	{
-		mayProceed = false;
-		QString launchString("abort\n");
-		m_process.write(launchString.toUtf8());
-	}
-	else
-	{
-		auto state = m_process.state();
-		if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-		{
-			m_process.kill();
-		}
-	}
-	return true;
-}
diff --git a/api/logic/launch/steps/LaunchMinecraft.h b/api/logic/launch/steps/LaunchMinecraft.h
deleted file mode 100644
index 6b9f7919..00000000
--- a/api/logic/launch/steps/LaunchMinecraft.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 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 <minecraft/auth/AuthSession.h>
-
-class LaunchMinecraft: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit LaunchMinecraft(LaunchTask *parent);
-	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;
-	}
-private slots:
-	void on_state(LoggedProcess::State state);
-
-private:
-	LoggedProcess m_process;
-	QString m_command;
-	QString m_launchScript;
-	AuthSessionPtr m_session;
-	bool mayProceed = false;
-};
diff --git a/api/logic/launch/steps/ModMinecraftJar.cpp b/api/logic/launch/steps/ModMinecraftJar.cpp
deleted file mode 100644
index fce2d70a..00000000
--- a/api/logic/launch/steps/ModMinecraftJar.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 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 "ModMinecraftJar.h"
-#include <launch/LaunchTask.h>
-#include <QStandardPaths>
-
-void ModMinecraftJar::executeTask()
-{
-	m_jarModTask = m_parent->instance()->createJarModdingTask();
-	if(m_jarModTask)
-	{
-		connect(m_jarModTask.get(), SIGNAL(finished()), this, SLOT(jarModdingFinished()));
-		m_jarModTask->start();
-		return;
-	}
-	emitSucceeded();
-}
-
-void ModMinecraftJar::jarModdingFinished()
-{
-	if(m_jarModTask->successful())
-	{
-		emitSucceeded();
-	}
-	else
-	{
-		QString reason = tr("jar modding failed because: %1.\n\n").arg(m_jarModTask->failReason());
-		emit logLine(reason, MessageLevel::Fatal);
-		emitFailed(reason);
-	}
-}
diff --git a/api/logic/launch/steps/ModMinecraftJar.h b/api/logic/launch/steps/ModMinecraftJar.h
deleted file mode 100644
index b35dfafa..00000000
--- a/api/logic/launch/steps/ModMinecraftJar.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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 <memory>
-
-// FIXME: temporary wrapper for existing task.
-class ModMinecraftJar: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
-	virtual ~ModMinecraftJar(){};
-
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
-private slots:
-	void jarModdingFinished();
-
-private:
-	std::shared_ptr<Task> m_jarModTask;
-};