GH-1034 do jar modding separate from update

This commit is contained in:
Petr Mrázek
2015-07-10 00:06:05 +02:00
parent 5133b0f34f
commit 5dd48e89f5
18 changed files with 214 additions and 141 deletions

View File

@ -141,8 +141,8 @@ SET(MULTIMC_SOURCES
SettingsUI.cpp
# Processes
LaunchController.h
LaunchController.cpp
LaunchInteraction.h
LaunchInteraction.cpp
# page provider for instances
InstancePageProvider.h

View File

@ -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;

View File

@ -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);

View File

@ -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;