CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE merging of strategy into profile, onesix into minecraft

Browse Source
This commit is contained in:
Petr Mrázek
2017-07-24 09:01:37 +02:00
parent b29382c748
commit 13628e7a82
42 changed files with 1203 additions and 1666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/InstanceCreationTask.cpp
View File

@ -4,7 +4,7 @@
#include "FileSystem.h"
//FIXME: remove this
#include "minecraft/onesix/OneSixInstance.h"
#include "minecraft/MinecraftInstance.h"
InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, const QString & stagingPath, BaseVersionPtr version,
const QString& instName, const QString& instIcon, const QString& instGroup)
@ -25,11 +25,11 @@ void InstanceCreationTask::executeTask()
instanceSettings->suspendSave();
instanceSettings->registerSetting("InstanceType", "Legacy");
instanceSettings->set("InstanceType", "OneSix");
OneSixInstance inst(m_globalSettings, instanceSettings, m_stagingPath);
inst.setIntendedVersionId(m_version->descriptor());
inst.setName(m_instName);
inst.setIconKey(m_instIcon);
inst.init();
auto inst = new MinecraftInstance(m_globalSettings, instanceSettings, m_stagingPath);
inst->setComponentVersion("net.minecraft", m_version->descriptor());
inst->setName(m_instName);
inst->setIconKey(m_instIcon);
inst->init();
instanceSettings->resumeSave();
}
emitSucceeded();