summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/onesix/update
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-04-29 02:24:00 +0200
committerPetr Mrázek <peterix@gmail.com>2017-04-29 02:24:00 +0200
commite1465f4848d003cab3d3d1288c1a0f3b945083ee (patch)
tree6721fbaac70aa39cb0f0dd75b75e8e6f87d42743 /api/logic/minecraft/onesix/update
parent243f7e4fb4d58fa530404930566f83d1dc481588 (diff)
downloadMultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.gz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.lz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.xz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.zip
NOISSUE refactor NetAction to be based on Task
Still missing some things, this is part 1.
Diffstat (limited to 'api/logic/minecraft/onesix/update')
-rw-r--r--api/logic/minecraft/onesix/update/AssetUpdateTask.cpp4
-rw-r--r--api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp6
-rw-r--r--api/logic/minecraft/onesix/update/LibrariesTask.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp b/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp
index 21600ff0..bdd50fd1 100644
--- a/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp
+++ b/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp
@@ -10,7 +10,7 @@ AssetUpdateTask::AssetUpdateTask(OneSixInstance * inst)
}
void AssetUpdateTask::executeTask()
{
- setStatus(tr("Updating assets index..."));
+ setStatusText(tr("Updating assets index..."));
auto profile = m_inst->getMinecraftProfile();
auto assets = profile->getMinecraftAssets();
QUrl indexUrl = assets->url;
@@ -63,7 +63,7 @@ void AssetUpdateTask::assetIndexFinished()
auto job = index.getDownloadJob();
if(job)
{
- setStatus(tr("Getting the assets files from Mojang..."));
+ setStatusText(tr("Getting the assets files from Mojang..."));
downloadJob = job;
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
diff --git a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
index 1cbee95e..4a0a97ea 100644
--- a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
+++ b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
@@ -32,7 +32,7 @@ void FMLLibrariesTask::executeTask()
auto &libList = fmlLibsMapping[version];
// determine if we need some libs for FML or forge
- setStatus(tr("Checking for FML libraries..."));
+ setStatusText(tr("Checking for FML libraries..."));
forge_present = (profile->versionPatch("net.minecraftforge") != nullptr);
// we don't...
if (!forge_present)
@@ -58,7 +58,7 @@ void FMLLibrariesTask::executeTask()
}
// download missing libs to our place
- setStatus(tr("Dowloading FML libraries..."));
+ setStatusText(tr("Dowloading FML libraries..."));
auto dljob = new NetJob("FML libraries");
auto metacache = ENV.metacache();
for (auto &lib : fmlLibsToProcess)
@@ -86,7 +86,7 @@ void FMLLibrariesTask::fmllibsFinished()
downloadJob.reset();
if (!fmlLibsToProcess.isEmpty())
{
- setStatus(tr("Copying FML libraries into the instance..."));
+ setStatusText(tr("Copying FML libraries into the instance..."));
OneSixInstance *inst = (OneSixInstance *)m_inst;
auto metacache = ENV.metacache();
int index = 0;
diff --git a/api/logic/minecraft/onesix/update/LibrariesTask.cpp b/api/logic/minecraft/onesix/update/LibrariesTask.cpp
index 2cd41ded..748ab10c 100644
--- a/api/logic/minecraft/onesix/update/LibrariesTask.cpp
+++ b/api/logic/minecraft/onesix/update/LibrariesTask.cpp
@@ -9,7 +9,7 @@ LibrariesTask::LibrariesTask(OneSixInstance * inst)
void LibrariesTask::executeTask()
{
- setStatus(tr("Getting the library files from Mojang..."));
+ setStatusText(tr("Getting the library files from Mojang..."));
qDebug() << m_inst->name() << ": downloading libraries";
OneSixInstance *inst = (OneSixInstance *)m_inst;
inst->reloadProfile();