refactor: add instance creation abstraction and move vanilla

This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)

Signed-off-by: flow <flowlnlnln@gmail.com>

1 files changed, 10 insertions, 32 deletions

diff --git a/launcher/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp
index e01bf306..c8c91997 100644
--- a/launcher/InstanceCreationTask.cpp
+++ b/launcher/InstanceCreationTask.cpp
@@ -1,40 +1,18 @@
 #include "InstanceCreationTask.h"
-#include "settings/INISettingsObject.h"
-#include "FileSystem.h"
 
-//FIXME: remove this
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft/PackProfile.h"
+#include <QDebug>
 
-InstanceCreationTask::InstanceCreationTask(BaseVersionPtr version)
-{
-    m_version = version;
-    m_usingLoader = false;
-}
-
-InstanceCreationTask::InstanceCreationTask(BaseVersionPtr version, QString loader, BaseVersionPtr loaderVersion)
-{
-    m_version = version;
-    m_usingLoader = true;
-    m_loader = loader;
-    m_loaderVersion = loaderVersion;
-}
+InstanceCreationTask::InstanceCreationTask() {}
 
 void InstanceCreationTask::executeTask()
 {
-    setStatus(tr("Creating instance from version %1").arg(m_version->name()));
-    {
-        auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
-        instanceSettings->suspendSave();
-        MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath);
-        auto components = inst.getPackProfile();
-        components->buildingFromScratch();
-        components->setComponentVersion("net.minecraft", m_version->descriptor(), true);
-        if(m_usingLoader)
-            components->setComponentVersion(m_loader, m_loaderVersion->descriptor());
-        inst.setName(m_instName);
-        inst.setIconKey(m_instIcon);
-        instanceSettings->resumeSave();
+    if (updateInstance() || createInstance()) {
+        emitSucceeded();
+        return;
     }
-    emitSucceeded();
+
+    qWarning() << "Instance creation failed!";
+    if (!m_error_message.isEmpty())
+        qWarning() << "Reason: " << m_error_message;
+    emitFailed(tr("Error while creating new instance."));
 }