diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-07-10 00:06:05 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-07-10 00:06:05 +0200 |
| commit | 5dd48e89f5a7facf8355641d0caf8deaec2a03ec (patch) | |
| tree | b23f1d3bdb09afe8f642e07df30f5a68f2b42a5e /application | |
| parent | 5133b0f34f1e6fc046787e7369b403a381a2f60c (diff) | |
| download | MultiMC-5dd48e89f5a7facf8355641d0caf8deaec2a03ec.tar MultiMC-5dd48e89f5a7facf8355641d0caf8deaec2a03ec.tar.gz MultiMC-5dd48e89f5a7facf8355641d0caf8deaec2a03ec.tar.lz MultiMC-5dd48e89f5a7facf8355641d0caf8deaec2a03ec.tar.xz MultiMC-5dd48e89f5a7facf8355641d0caf8deaec2a03ec.zip | |
GH-1034 do jar modding separate from update
Diffstat (limited to 'application')
| -rw-r--r-- | application/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | application/LaunchInteraction.cpp (renamed from application/LaunchController.cpp) | 5 | ||||
| -rw-r--r-- | application/LaunchInteraction.h (renamed from application/LaunchController.h) | 0 | ||||
| -rw-r--r-- | application/MainWindow.cpp | 4 | ||||
| -rw-r--r-- | application/pages/VersionPage.cpp | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 281f402a..ae4c0a88 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -141,8 +141,8 @@ SET(MULTIMC_SOURCES SettingsUI.cpp # Processes - LaunchController.h - LaunchController.cpp + LaunchInteraction.h + LaunchInteraction.cpp # page provider for instances InstancePageProvider.h diff --git a/application/LaunchController.cpp b/application/LaunchInteraction.cpp index b1116e07..ea966129 100644 --- a/application/LaunchController.cpp +++ b/application/LaunchInteraction.cpp @@ -1,4 +1,4 @@ -#include "LaunchController.h" +#include "LaunchInteraction.h" #include <auth/MojangAccountList.h> #include "MultiMC.h" #include "dialogs/CustomMessageBox.h" @@ -23,6 +23,7 @@ void LaunchController::launch() login(); } +// FIXME: minecraft specific void LaunchController::login() { if (!m_instance) @@ -156,7 +157,7 @@ void LaunchController::launchInstance() return; } - m_launcher = m_instance->prepareForLaunch(m_session); + m_launcher = m_instance->createLaunchTask(m_session); if (!m_launcher) { return; diff --git a/application/LaunchController.h b/application/LaunchInteraction.h index f62d5124..f62d5124 100644 --- a/application/LaunchController.h +++ b/application/LaunchInteraction.h diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 4be80492..bd50e06d 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -372,7 +372,7 @@ namespace Ui { #include "java/JavaUtils.h" #include "JavaCommon.h" #include "InstancePageProvider.h" -#include "LaunchController.h" +#include "LaunchInteraction.h" #include "SettingsUI.h" #include "minecraft/SkinUtils.h" #include "resources/Resource.h" @@ -1184,7 +1184,7 @@ void MainWindow::finalizeInstance(InstancePtr inst) if (MMC->accounts()->anyAccountIsValid()) { ProgressDialog loadDialog(this); - auto update = inst->doUpdate(); + auto update = inst->createUpdateTask(); connect(update.get(), &Task::failed, [this](QString reason) { QString error = QString("Instance load failed: %1").arg(reason); diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp index efc0b446..81da0180 100644 --- a/application/pages/VersionPage.cpp +++ b/application/pages/VersionPage.cpp @@ -269,7 +269,7 @@ void VersionPage::on_changeVersionBtn_clicked() int VersionPage::doUpdate() { - auto updateTask = m_inst->doUpdate(); + auto updateTask = m_inst->createUpdateTask(); if (!updateTask) { return 1; |