From f54705e1c5311e023b2e1ebd5d4db226a7c7149e Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 21 Feb 2014 18:01:06 +0100 Subject: Don't assume forge for FTB instances. Fix FTB related stuff. --- logic/OneSixInstance.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'logic/OneSixInstance.cpp') diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 8b4de641..f7e56591 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -36,6 +36,10 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings, d->m_settings->registerSetting("ShouldUpdate", false); d->version.reset(new OneSixVersion(this, this)); d->vanillaVersion.reset(new OneSixVersion(this, this)); +} + +void OneSixInstance::init() +{ if (QDir(instanceRoot()).exists("version.json")) { reloadVersion(); @@ -316,11 +320,12 @@ bool OneSixInstance::reloadVersion(QWidget *widgetParent) { I_D(OneSixInstance); - bool ret = d->version->reload(widgetParent); + bool ret = d->version->reload(widgetParent, false, externalPatches()); if (ret) { - ret = d->vanillaVersion->reload(widgetParent, true); + ret = d->vanillaVersion->reload(widgetParent, true, externalPatches()); } + emit versionReloaded(); return ret; } @@ -381,6 +386,11 @@ QDir OneSixInstance::versionsPath() const return QDir::current().absoluteFilePath("versions"); } +QStringList OneSixInstance::externalPatches() const +{ + return QStringList(); +} + QString OneSixInstance::loaderModsDir() const { return PathCombine(minecraftRoot(), "mods"); -- cgit v1.2.3