summaryrefslogtreecommitdiffstats
path: root/api/logic/InstanceCreationTask.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-07-24 09:01:37 +0200
committerPetr Mrázek <peterix@gmail.com>2017-09-09 19:19:05 +0200
commit13628e7a8260b9407b0d44069f5bc1ecab585f35 (patch)
tree162a0d8b597154c1a00c649d44b3bf8fd1e10d2b /api/logic/InstanceCreationTask.cpp
parentb29382c748353856053f07b4756fa98f854244e1 (diff)
downloadMultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar
MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.gz
MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.lz
MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.xz
MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.zip
NOISSUE merging of strategy into profile, onesix into minecraft
Diffstat (limited to 'api/logic/InstanceCreationTask.cpp')
-rw-r--r--api/logic/InstanceCreationTask.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/api/logic/InstanceCreationTask.cpp b/api/logic/InstanceCreationTask.cpp
index a7ea1e66..21892f82 100644
--- a/api/logic/InstanceCreationTask.cpp
+++ b/api/logic/InstanceCreationTask.cpp
@@ -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();