From dd86061f0ff6d19482e9a43af99156a55e60cf00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 9 Jul 2013 00:52:03 +0200 Subject: Piddle-farting with 1.6 instances. Now with more json! --- libmultimc/src/gameupdatetask.cpp | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'libmultimc/src') diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp index fee2aa29..54e47410 100644 --- a/libmultimc/src/gameupdatetask.cpp +++ b/libmultimc/src/gameupdatetask.cpp @@ -95,7 +95,6 @@ void GameUpdateTask::versionFileFinished() exit(0); } - Q_ASSERT_X(jsonDoc.isObject(), "loadFromVList", "jsonDoc is not an object"); if(!jsonDoc.isObject()) { error("Error reading version file."); @@ -103,6 +102,10 @@ void GameUpdateTask::versionFileFinished() } QJsonObject root = jsonDoc.object(); + /* + * FIXME: this distinction is pretty weak. The only other option + * is to have a list of all the legacy versions. + */ QString args = root.value("processArguments").toString("legacy"); if(args == "legacy") { @@ -110,8 +113,26 @@ void GameUpdateTask::versionFileFinished() return; } + // save the version file in $instanceId/version.json and versions/$version/$version.json + QString version_id = targetVersion->descriptor(); + QString mc_dir = m_inst->minecraftDir(); + QString inst_dir = m_inst->rootDir(); + QString version1 = PathCombine(inst_dir, "/version.json"); + QString version2 = QString("versions/") + version_id + "/" + version_id + ".json"; + DownloadJob::ensurePathExists(version1); + DownloadJob::ensurePathExists(version2); + QFile vfile1 (version1); + QFile vfile2 (version2); + vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly ); + vfile2.open(QIODevice::Truncate | QIODevice::WriteOnly ); + vfile1.write(DlJob->m_data); + vfile2.write(DlJob->m_data); + vfile1.close(); + vfile2.close(); + + // download the right jar, save it in versions/$version/$version.jar + // determine and download all the libraries, save them in libraries/whatever... - error("MC 1.6 isn't supported yet..."); exit(0); } -- cgit v1.2.3