summaryrefslogtreecommitdiffstats
path: root/libmultimc
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-07-09 00:52:03 +0200
committerPetr Mrázek <peterix@gmail.com>2013-07-09 00:52:03 +0200
commitdd86061f0ff6d19482e9a43af99156a55e60cf00 (patch)
tree7a943fb95037a7777315d8f6cead00c118e1bc17 /libmultimc
parentee5583251d92d47f96b03c3b447c115bab901c17 (diff)
downloadMultiMC-dd86061f0ff6d19482e9a43af99156a55e60cf00.tar
MultiMC-dd86061f0ff6d19482e9a43af99156a55e60cf00.tar.gz
MultiMC-dd86061f0ff6d19482e9a43af99156a55e60cf00.tar.lz
MultiMC-dd86061f0ff6d19482e9a43af99156a55e60cf00.tar.xz
MultiMC-dd86061f0ff6d19482e9a43af99156a55e60cf00.zip
Piddle-farting with 1.6 instances. Now with more json!
Diffstat (limited to 'libmultimc')
-rw-r--r--libmultimc/src/gameupdatetask.cpp25
1 files changed, 23 insertions, 2 deletions
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);
}