summaryrefslogtreecommitdiffstats
path: root/logic/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-10 01:11:06 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-10 01:11:06 +0200
commit8e7caf4e25dc3f56877a504c45d157860215496b (patch)
tree4ce3ea68190d4b693519ad6f76473b5b8f4da8be /logic/minecraft
parent5dd48e89f5a7facf8355641d0caf8deaec2a03ec (diff)
downloadMultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.gz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.lz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.xz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.zip
GH-1053 move launch related things and rename them
Diffstat (limited to 'logic/minecraft')
-rw-r--r--logic/minecraft/LegacyInstance.cpp6
-rw-r--r--logic/minecraft/LegacyInstance.h2
-rw-r--r--logic/minecraft/OneSixInstance.cpp6
-rw-r--r--logic/minecraft/OneSixInstance.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index 8431c35b..0991b7b5 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -24,7 +24,7 @@
#include "minecraft/LegacyUpdate.h"
#include "icons/IconList.h"
-#include "BaseLauncher.h"
+#include "launch/LaunchTask.h"
#include "minecraft/ModList.h"
#include <MMCZip.h>
@@ -96,7 +96,7 @@ std::shared_ptr<Task> LegacyInstance::createUpdateTask()
return std::shared_ptr<Task>(new LegacyUpdate(this, this));
}
-std::shared_ptr<BaseLauncher> LegacyInstance::createLaunchTask(AuthSessionPtr account)
+std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr account)
{
QString launchScript;
QIcon icon = ENV.icons()->getIcon(iconKey());
@@ -123,7 +123,7 @@ std::shared_ptr<BaseLauncher> LegacyInstance::createLaunchTask(AuthSessionPtr ac
launchScript += "lwjgl " + lwjgl + "\n";
launchScript += "launcher legacy\n";
}
- auto process = BaseLauncher::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
+ auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
process->setLaunchScript(launchScript);
process->setWorkdir(minecraftRoot());
process->setLogin(account);
diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h
index 51871876..0930c290 100644
--- a/logic/minecraft/LegacyInstance.h
+++ b/logic/minecraft/LegacyInstance.h
@@ -111,7 +111,7 @@ public:
virtual void setShouldUpdate(bool val) override;
virtual std::shared_ptr<Task> createUpdateTask() override;
- virtual std::shared_ptr<BaseLauncher> createLaunchTask(AuthSessionPtr account) override;
+ virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override;
virtual std::shared_ptr<Task> createJarModdingTask() override;
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 4af56b54..d66236f4 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -22,7 +22,7 @@
#include "minecraft/OneSixUpdate.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/VersionBuildError.h"
-#include "BaseLauncher.h"
+#include "launch/LaunchTask.h"
#include "minecraft/OneSixProfileStrategy.h"
#include "MMCZip.h"
@@ -123,7 +123,7 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session)
return parts;
}
-std::shared_ptr<BaseLauncher> OneSixInstance::createLaunchTask(AuthSessionPtr session)
+std::shared_ptr<LaunchTask> OneSixInstance::createLaunchTask(AuthSessionPtr session)
{
QString launchScript;
QIcon icon = ENV.icons()->getIcon(iconKey());
@@ -230,7 +230,7 @@ std::shared_ptr<BaseLauncher> OneSixInstance::createLaunchTask(AuthSessionPtr se
}
launchScript += "launcher onesix\n";
- auto process = BaseLauncher::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
+ auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
process->setLaunchScript(launchScript);
process->setWorkdir(minecraftRoot());
process->setLogin(session);
diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h
index 46545462..42902366 100644
--- a/logic/minecraft/OneSixInstance.h
+++ b/logic/minecraft/OneSixInstance.h
@@ -49,7 +49,7 @@ public:
virtual QString instanceConfigFolder() const override;
virtual std::shared_ptr<Task> createUpdateTask() override;
- virtual std::shared_ptr<BaseLauncher> createLaunchTask(AuthSessionPtr account) override;
+ virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override;
virtual std::shared_ptr<Task> createJarModdingTask() override;
virtual void cleanupAfterRun() override;