External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE continue version file format refactors

Browse Source
This commit is contained in:
Petr Mrázek
2016-03-13 00:23:45 +01:00
parent 1854e05e1b
commit 02c1df2c3c
23 changed files with 425 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
logic/minecraft/MojangVersionFormat.cpp
View File

@@ -150,7 +150,7 @@ VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc
Bits::readString(root, "id", out->id);
Bits::readString(root, "mainClass", out->mainClass);
Bits::readString(root, "minecraftArguments", out->overwriteMinecraftArguments);
Bits::readString(root, "minecraftArguments", out->minecraftArguments);
Bits::readString(root, "type", out->type);
if(root.contains("assetIndex"))
@@ -203,8 +203,7 @@ QJsonDocument versionFileToJson(VersionFilePtr patch)
QJsonObject root;
writeString(root, "id", patch->id);
writeString(root, "mainClass", patch->mainClass);
writeString(root, "processArguments", patch->processArguments);
writeString(root, "minecraftArguments", patch->overwriteMinecraftArguments);
writeString(root, "minecraftArguments", patch->minecraftArguments);
writeString(root, "type", patch->type);
writeString(root, "assets", patch->assets);
writeString(root, "releaseTime", timeToS3Time(patch->m_releaseTime));
@@ -246,7 +245,7 @@ QJsonDocument versionFileToJson(VersionFilePtr patch)
static QJsonDocument minecraftVersionToJson(MinecraftVersionPtr patch)
{
if(patch->m_versionSource == Local && patch->getVersionFile())
if(patch->getVersionSource() == Local && patch->getVersionFile())
{
return MojangVersionFormat::profilePatchToJson(patch->getVersionFile());
}
@@ -268,7 +267,7 @@ QJsonDocument MojangVersionFormat::profilePatchToJson(const ProfilePatchPtr &pat
{
return minecraftVersionToJson(mversion);
}
throw VersionIncomplete(QObject::tr("Unhandled object type while processing %1").arg(patch->getPatchName()));
throw VersionIncomplete(QObject::tr("Unhandled object type while processing %1").arg(patch->getName()));
}
LibraryPtr MojangVersionFormat::libraryFromJson(const QJsonObject &libObj, const QString &filename)