diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-07-24 09:01:37 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-09-09 19:19:05 +0200 |
| commit | 13628e7a8260b9407b0d44069f5bc1ecab585f35 (patch) | |
| tree | 162a0d8b597154c1a00c649d44b3bf8fd1e10d2b /api/logic/InstanceImportTask.cpp | |
| parent | b29382c748353856053f07b4756fa98f854244e1 (diff) | |
| download | MultiMC-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/InstanceImportTask.cpp')
| -rw-r--r-- | api/logic/InstanceImportTask.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp index 2bbdd897..7963a335 100644 --- a/api/logic/InstanceImportTask.cpp +++ b/api/logic/InstanceImportTask.cpp @@ -1,5 +1,3 @@ -#include "minecraft/onesix/OneSixInstance.h" - #include "InstanceImportTask.h" #include "BaseInstance.h" #include "BaseInstanceProvider.h" @@ -12,6 +10,8 @@ #include <QtConcurrentRun> // FIXME: this does not belong here, it's Minecraft/Flame specific +#include "minecraft/MinecraftInstance.h" +#include "minecraft/MinecraftProfile.h" #include "minecraft/flame/FileResolvingTask.h" #include "minecraft/flame/PackManifest.h" #include "Json.h" @@ -225,7 +225,7 @@ void InstanceImportTask::processFlame() auto instanceSettings = std::make_shared<INISettingsObject>(configPath); instanceSettings->registerSetting("InstanceType", "Legacy"); instanceSettings->set("InstanceType", "OneSix"); - OneSixInstance instance(m_globalSettings, instanceSettings, m_stagingPath); + MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); auto mcVersion = pack.minecraft.version; // Hack to correct some 'special sauce'... if(mcVersion.endsWith('.')) |