mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

6
api/logic/InstanceImportTask.cpp
View file

@ -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('.'))