mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-07-06 05:16:59 +03:00
Don't assume forge for FTB instances. Fix FTB related stuff.
This commit is contained in:
parent
43881b9cdb
commit
f54705e1c5
11 changed files with 206 additions and 140 deletions
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue