summaryrefslogtreecommitdiffstats
path: root/logic/OneSixVersionBuilder.h
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-21 18:01:06 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-21 18:01:06 +0100
commitf54705e1c5311e023b2e1ebd5d4db226a7c7149e (patch)
tree83f7daccc58bb2bdeb89815f8a962356f35d5b79 /logic/OneSixVersionBuilder.h
parent43881b9cdba95259395c8bf633b670c8a6fead9a (diff)
downloadMultiMC-f54705e1c5311e023b2e1ebd5d4db226a7c7149e.tar
MultiMC-f54705e1c5311e023b2e1ebd5d4db226a7c7149e.tar.gz
MultiMC-f54705e1c5311e023b2e1ebd5d4db226a7c7149e.tar.lz
MultiMC-f54705e1c5311e023b2e1ebd5d4db226a7c7149e.tar.xz
MultiMC-f54705e1c5311e023b2e1ebd5d4db226a7c7149e.zip
Don't assume forge for FTB instances. Fix FTB related stuff.
Diffstat (limited to 'logic/OneSixVersionBuilder.h')
-rw-r--r--logic/OneSixVersionBuilder.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/logic/OneSixVersionBuilder.h b/logic/OneSixVersionBuilder.h
index ab0966df..8cf6f32f 100644
--- a/logic/OneSixVersionBuilder.h
+++ b/logic/OneSixVersionBuilder.h
@@ -29,19 +29,27 @@ class OneSixVersionBuilder
{
OneSixVersionBuilder();
public:
- static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla);
+ static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla, const QStringList &external);
static bool read(OneSixVersion *version, const QJsonObject &obj);
static QMap<QString, int> readOverrideOrders(OneSixInstance *instance);
static bool writeOverrideOrders(const QMap<QString, int> &order, OneSixInstance *instance);
+ enum ParseFlag
+ {
+ NoFlags = 0x0,
+ IsFTBPackJson = 0x1
+ };
+ Q_DECLARE_FLAGS(ParseFlags, ParseFlag)
+
private:
OneSixVersion *m_version;
OneSixInstance *m_instance;
QWidget *m_widgetParent;
- bool build(const bool onlyVanilla);
+ bool build(const bool onlyVanilla, const QStringList &external);
bool read(const QJsonObject &obj);
- bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out);
-
+ bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out, const ParseFlags flags = NoFlags);
};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(OneSixVersionBuilder::ParseFlags)