diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-11 00:40:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:18 +0200 |
| commit | c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9 (patch) | |
| tree | 7a4bbd9428860c2d76d995c5c87cd0a96b3ea4fe /logic/minecraft/MinecraftProfile.cpp | |
| parent | 234f57b8e60fcae35bbfdf206655f4f438b99191 (diff) | |
| download | MultiMC-c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9.tar MultiMC-c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9.tar.gz MultiMC-c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9.tar.lz MultiMC-c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9.tar.xz MultiMC-c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9.zip | |
NOISSUE get rid of the obsolete version builder
Diffstat (limited to 'logic/minecraft/MinecraftProfile.cpp')
| -rw-r--r-- | logic/minecraft/MinecraftProfile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp index f38f8378..e9ff87d8 100644 --- a/logic/minecraft/MinecraftProfile.cpp +++ b/logic/minecraft/MinecraftProfile.cpp @@ -20,7 +20,6 @@ #include <pathutils.h> #include "minecraft/MinecraftProfile.h" -#include "minecraft/VersionBuilder.h" #include "ProfileUtils.h" #include "NullProfileStrategy.h" @@ -241,7 +240,10 @@ std::shared_ptr<MinecraftProfile> MinecraftProfile::fromJson(const QJsonObject & std::shared_ptr<MinecraftProfile> version(new MinecraftProfile(new NullProfileStrategy())); try { - VersionBuilder::readJsonAndApplyToVersion(version.get(), obj); + version->clear(); + auto file = VersionFile::fromJson(QJsonDocument(obj), QString(), false); + file->applyTo(version.get()); + version->appendPatch(file); } catch(MMCError & err) { |