diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-02-17 08:10:31 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-02-17 08:23:57 +0100 |
| commit | 163a3095b1fb8c2735fdd379e84d99f4c583d433 (patch) | |
| tree | 69ed8e3a1958bcf2dfb84c8ac69b5b502a1ce9ca /logic/minecraft/OneSixUpdate.cpp | |
| parent | a20e2590da5b7d50201e40f717ad50b063d1e3ac (diff) | |
| download | MultiMC-163a3095b1fb8c2735fdd379e84d99f4c583d433.tar MultiMC-163a3095b1fb8c2735fdd379e84d99f4c583d433.tar.gz MultiMC-163a3095b1fb8c2735fdd379e84d99f4c583d433.tar.lz MultiMC-163a3095b1fb8c2735fdd379e84d99f4c583d433.tar.xz MultiMC-163a3095b1fb8c2735fdd379e84d99f4c583d433.zip | |
GH-1453 separate out Mojang version reading, use version file URLs
Diffstat (limited to 'logic/minecraft/OneSixUpdate.cpp')
| -rw-r--r-- | logic/minecraft/OneSixUpdate.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp index 9159f038..75a16824 100644 --- a/logic/minecraft/OneSixUpdate.cpp +++ b/logic/minecraft/OneSixUpdate.cpp @@ -74,8 +74,7 @@ void OneSixUpdate::executeTask() } connect(versionUpdateTask.get(), SIGNAL(succeeded()), SLOT(jarlibStart())); connect(versionUpdateTask.get(), &NetJob::failed, this, &OneSixUpdate::versionUpdateFailed); - connect(versionUpdateTask.get(), SIGNAL(progress(qint64, qint64)), - SIGNAL(progress(qint64, qint64))); + connect(versionUpdateTask.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64))); setStatus(tr("Getting the version files from Mojang...")); versionUpdateTask->start(); } @@ -103,8 +102,7 @@ void OneSixUpdate::assetIndexStart() connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(assetIndexFinished())); connect(jarlibDownloadJob.get(), &NetJob::failed, this, &OneSixUpdate::assetIndexFailed); - connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), - SIGNAL(progress(qint64, qint64))); + connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64))); qDebug() << m_inst->name() << ": Starting asset index download"; jarlibDownloadJob->start(); @@ -135,9 +133,7 @@ void OneSixUpdate::assetIndexFinished() QFileInfo objectFile("assets/objects/" + objectName); if ((!objectFile.isFile()) || (objectFile.size() != object.size)) { - auto objectDL = MD5EtagDownload::make( - QUrl("http://" + URLConstants::RESOURCE_BASE + objectName), - objectFile.filePath()); + auto objectDL = MD5EtagDownload::make(QUrl("http://" + URLConstants::RESOURCE_BASE + objectName), objectFile.filePath()); objectDL->m_total_progress = object.size; dls.append(objectDL); } @@ -151,8 +147,7 @@ void OneSixUpdate::assetIndexFinished() jarlibDownloadJob.reset(job); connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(assetsFinished())); connect(jarlibDownloadJob.get(), &NetJob::failed, this, &OneSixUpdate::assetsFailed); - connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), - SIGNAL(progress(qint64, qint64))); + connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64))); jarlibDownloadJob->start(); return; } |