diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-13 00:23:45 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-26 17:05:27 +0100 |
| commit | 02c1df2c3c260fe625b9c3314e9eed2885a97456 (patch) | |
| tree | 1ca64f44fc609ba47a6a1fde4b9e93fe15b1e618 /logic/minecraft/MojangVersionFormat.cpp | |
| parent | 1854e05e1bb14d8f2bbc4676f44024a83e972f6f (diff) | |
| download | MultiMC-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar MultiMC-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar.gz MultiMC-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar.lz MultiMC-02c1df2c3c260fe625b9c3314e9eed2885a97456.tar.xz MultiMC-02c1df2c3c260fe625b9c3314e9eed2885a97456.zip | |
NOISSUE continue version file format refactors
Diffstat (limited to 'logic/minecraft/MojangVersionFormat.cpp')
| -rw-r--r-- | logic/minecraft/MojangVersionFormat.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/logic/minecraft/MojangVersionFormat.cpp b/logic/minecraft/MojangVersionFormat.cpp index def388bf..2d4f26c5 100644 --- a/logic/minecraft/MojangVersionFormat.cpp +++ b/logic/minecraft/MojangVersionFormat.cpp @@ -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) |