From 791221e923586bb717396ecf18bd13e57034df99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 27 Jan 2015 22:31:07 +0100 Subject: NOISSUE Refactors and moving of things --- logic/minecraft/VersionBuilder.h | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'logic/minecraft/VersionBuilder.h') diff --git a/logic/minecraft/VersionBuilder.h b/logic/minecraft/VersionBuilder.h index 2f7e6b6b..b2d23da5 100644 --- a/logic/minecraft/VersionBuilder.h +++ b/logic/minecraft/VersionBuilder.h @@ -19,38 +19,25 @@ #include #include "VersionFile.h" -class InstanceVersion; +class MinecraftProfile; class OneSixInstance; class QJsonObject; class QFileInfo; -typedef QStringList PatchOrder; - class VersionBuilder { VersionBuilder(); public: - static void build(InstanceVersion *version, OneSixInstance *instance, const QStringList &external); - static void readJsonAndApplyToVersion(InstanceVersion *version, const QJsonObject &obj); - static VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB = false); - static VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo); - - bool readOverrideOrders(OneSixInstance *instance, PatchOrder &order); - static bool writeOverrideOrders(OneSixInstance *instance, const PatchOrder &order); + static void build(MinecraftProfile *version, OneSixInstance *instance); + static void readJsonAndApplyToVersion(MinecraftProfile *version, const QJsonObject &obj); private: - InstanceVersion *m_version; + MinecraftProfile *m_version; OneSixInstance *m_instance; - QStringList external_patches; - QDir instance_root; - + void buildInternal(); - void buildFromExternalPatches(); - void buildFromCustomJson(); - void buildFromVersionJson(); - void buildFromMultilayer(); - + void readInstancePatches(); - + void readJsonAndApply(const QJsonObject &obj); }; -- cgit v1.2.3