diff options
Diffstat (limited to 'api/logic/InstanceCreationTask.cpp')
| -rw-r--r-- | api/logic/InstanceCreationTask.cpp | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/api/logic/InstanceCreationTask.cpp b/api/logic/InstanceCreationTask.cpp index e7b0de7c..8a68815a 100644 --- a/api/logic/InstanceCreationTask.cpp +++ b/api/logic/InstanceCreationTask.cpp @@ -4,13 +4,14 @@ #include "FileSystem.h" //FIXME: remove this -#include "minecraft/onesix/OneSixInstance.h" +#include "minecraft/MinecraftInstance.h" +#include "minecraft/ComponentList.h" -InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInstanceProvider* target, BaseVersionPtr version, +InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, const QString & stagingPath, BaseVersionPtr version, const QString& instName, const QString& instIcon, const QString& instGroup) { m_globalSettings = settings; - m_target = target; + m_stagingPath = stagingPath; m_instName = instName; m_instIcon = instIcon; m_instGroup = instGroup; @@ -20,27 +21,19 @@ InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInsta void InstanceCreationTask::executeTask() { setStatus(tr("Creating instance from version %1").arg(m_version->name())); - /* - auto minecraftVersion = std::dynamic_pointer_cast<MinecraftVersion>(m_version); - if(!minecraftVersion) { - emitFailed(tr("The supplied version is not a Minecraft version.")); - return ; + auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg")); + instanceSettings->suspendSave(); + instanceSettings->registerSetting("InstanceType", "Legacy"); + instanceSettings->set("InstanceType", "OneSix"); + MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath); + auto components = inst.getComponentList(); + components->buildingFromScratch(); + components->setComponentVersion("net.minecraft", m_version->descriptor(), true); + inst.setName(m_instName); + inst.setIconKey(m_instIcon); + inst.init(); + instanceSettings->resumeSave(); } - */ - - QString stagingPath = m_target->getStagedInstancePath(); - QDir rootDir(stagingPath); - - auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(stagingPath, "instance.cfg")); - instanceSettings->registerSetting("InstanceType", "Legacy"); - - instanceSettings->set("InstanceType", "OneSix"); - InstancePtr inst(new OneSixInstance(m_globalSettings, instanceSettings, stagingPath)); - inst->setIntendedVersionId(m_version->descriptor()); - inst->setName(m_instName); - inst->setIconKey(m_instIcon); - inst->init(); - m_target->commitStagedInstance(stagingPath, stagingPath, m_instName, m_instGroup); emitSucceeded(); } |