summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/legacy
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/legacy
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/legacy')
-rw-r--r--api/logic/minecraft/legacy/LegacyInstance.cpp4
-rw-r--r--api/logic/minecraft/legacy/LegacyUpdate.cpp16
2 files changed, 10 insertions, 10 deletions
diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index 0987d56f..5894d7f0 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
@@ -131,7 +131,7 @@ std::shared_ptr<Task> LegacyInstance::createJarModdingTask()
return;
}
- setStatus(tr("Installing mods: Backing up minecraft.jar ..."));
+ setStatusText(tr("Installing mods: Backing up minecraft.jar ..."));
if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath()))
{
emitFailed("It seems both the active and base jar are gone. A fresh base jar will "
@@ -155,7 +155,7 @@ std::shared_ptr<Task> LegacyInstance::createJarModdingTask()
return;
}
- setStatus(tr("Installing mods: Opening minecraft.jar ..."));
+ setStatusText(tr("Installing mods: Opening minecraft.jar ..."));
QString outputJarPath = runnableJar.filePath();
QString inputJarPath = baseJar.filePath();
diff --git a/api/logic/minecraft/legacy/LegacyUpdate.cpp b/api/logic/minecraft/legacy/LegacyUpdate.cpp
index 337a3e4e..4bde6ff8 100644
--- a/api/logic/minecraft/legacy/LegacyUpdate.cpp
+++ b/api/logic/minecraft/legacy/LegacyUpdate.cpp
@@ -58,7 +58,7 @@ void LegacyUpdate::fmllibsStart()
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..."));
for (unsigned i = 0; i < modList->size(); i++)
{
auto &mod = modList->operator[](i);
@@ -105,7 +105,7 @@ void LegacyUpdate::fmllibsStart()
}
// 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)
@@ -128,7 +128,7 @@ void LegacyUpdate::fmllibsFinished()
legacyDownloadJob.reset();
if(!fmlLibsToProcess.isEmpty())
{
- setStatus(tr("Copying FML libraries into the instance..."));
+ setStatusText(tr("Copying FML libraries into the instance..."));
LegacyInstance *inst = (LegacyInstance *)m_inst;
auto metacache = ENV.metacache();
int index = 0;
@@ -183,7 +183,7 @@ void LegacyUpdate::lwjglStart()
return;
}
- setStatus(tr("Downloading new LWJGL..."));
+ setStatusText(tr("Downloading new LWJGL..."));
auto version = std::dynamic_pointer_cast<LWJGLVersion>(list->findVersion(lwjglVersion));
if (!version)
{
@@ -247,7 +247,7 @@ void LegacyUpdate::lwjglFinished(QNetworkReply *reply)
saveMe.open(QIODevice::WriteOnly);
saveMe.write(m_reply->readAll());
saveMe.close();
- setStatus(tr("Installing new LWJGL..."));
+ setStatusText(tr("Installing new LWJGL..."));
extractLwjgl();
jarStart();
}
@@ -323,7 +323,7 @@ void LegacyUpdate::extractLwjgl()
// Now if destFileName is still empty, go to the next file.
if (!destFileName.isEmpty())
{
- setStatus(tr("Installing new LWJGL - extracting ") + name + "...");
+ setStatusText(tr("Installing new LWJGL - extracting ") + name + "...");
QFile output(destFileName);
output.open(QIODevice::WriteOnly);
output.write(file.readAll());
@@ -353,7 +353,7 @@ void LegacyUpdate::jarStart()
return;
}
- setStatus(tr("Checking for jar updates..."));
+ setStatusText(tr("Checking for jar updates..."));
// Make directories
QDir binDir(inst->binRoot());
if (!binDir.exists() && !binDir.mkpath("."))
@@ -363,7 +363,7 @@ void LegacyUpdate::jarStart()
}
// Build a list of URLs that will need to be downloaded.
- setStatus(tr("Downloading new minecraft.jar ..."));
+ setStatusText(tr("Downloading new minecraft.jar ..."));
QString version_id = inst->intendedVersionId();