diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-05-11 12:37:21 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:30 +0200 |
| commit | 69c3e7111f93290d1278d6116e9fd50079b4fe79 (patch) | |
| tree | cbaed3022e8705f1da29777afea0fca16c1abe60 /logic/minecraft/VersionBuilder.h | |
| parent | 92abe4c603e1f4931cd02ae6b752cb7054d8e30d (diff) | |
| download | MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.gz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.lz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.xz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.zip | |
Make 1.6+ work with new instance format.
Diffstat (limited to 'logic/minecraft/VersionBuilder.h')
| -rw-r--r-- | logic/minecraft/VersionBuilder.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/logic/minecraft/VersionBuilder.h b/logic/minecraft/VersionBuilder.h index c56e6c18..fc06e614 100644 --- a/logic/minecraft/VersionBuilder.h +++ b/logic/minecraft/VersionBuilder.h @@ -30,7 +30,8 @@ class VersionBuilder public: static void build(VersionFinal *version, OneSixInstance *instance, const QStringList &external); static void readJsonAndApplyToVersion(VersionFinal *version, const QJsonObject &obj); - + static VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB = false); + static QMap<QString, int> readOverrideOrders(OneSixInstance *instance); static bool writeOverrideOrders(const QMap<QString, int> &order, OneSixInstance *instance); @@ -49,7 +50,4 @@ private: void readInstancePatches(); void readJsonAndApply(const QJsonObject &obj); - - VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, - bool isFTB = false); }; |