Detect java bitness on launch, use appropriate libraries
Fixes problems with latest snapshot
This commit is contained in:
parent
82225a21e1
commit
088b039cf7
10 changed files with 163 additions and 103 deletions
|
@ -44,10 +44,12 @@ LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings,
|
|||
settings->registerSetting(new Setting("IntendedJarVersion", ""));
|
||||
}
|
||||
|
||||
Task *LegacyInstance::doUpdate()
|
||||
Task *LegacyInstance::doUpdate(bool prepare_for_launch)
|
||||
{
|
||||
// make sure the jar mods list is initialized by asking for it.
|
||||
auto list = jarModList();
|
||||
return new LegacyUpdate(this, this);
|
||||
// create an update task
|
||||
return new LegacyUpdate(this, prepare_for_launch , this);
|
||||
}
|
||||
|
||||
MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account)
|
||||
|
@ -245,12 +247,6 @@ QString LegacyInstance::currentVersionId() const
|
|||
return d->m_settings->get("JarVersion").toString();
|
||||
}
|
||||
|
||||
void LegacyInstance::setCurrentVersionId(QString val)
|
||||
{
|
||||
I_D(LegacyInstance);
|
||||
d->m_settings->set("JarVersion", val);
|
||||
}
|
||||
|
||||
QString LegacyInstance::lwjglVersion() const
|
||||
{
|
||||
I_D(LegacyInstance);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue