CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE stuff and things happened. Maybe.

Browse Source
This commit is contained in:
Petr Mrázek
2017-03-19 23:58:54 +01:00
parent 2660418d58
commit f557c13679
23 changed files with 210 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/logic/minecraft/onesix/OneSixVersionFormat.cpp
View File

@ -51,7 +51,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
{
if (root.contains("order"))
{
out->order = requireInteger(root.value("order"));
out->setOrder(requireInteger(root.value("order")));
}
else
{
@ -61,7 +61,16 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
}
out->name = root.value("name").toString();
out->fileId = root.value("fileId").toString();
if(root.contains("uid"))
{
out->uid = root.value("uid").toString();
}
else
{
out->uid = root.value("fileId").toString();
}
out->version = root.value("version").toString();
out->dependsOnMinecraftVersion = root.value("mcVersion").toString();
out->filename = filename;
@ -161,10 +170,13 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch
QJsonObject root;
if (saveOrder)
{
root.insert("order", patch->order);
root.insert("order", patch->getOrder());
}
writeString(root, "name", patch->name);
writeString(root, "fileId", patch->fileId);
writeString(root, "uid", patch->uid);
writeString(root, "fileId", patch->uid);
writeString(root, "version", patch->version);
writeString(root, "mcVersion", patch->dependsOnMinecraftVersion);