From a70d1f1a9184a9f0506c439be1009e5ba3c77b5b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 21 Feb 2022 22:30:44 +0100 Subject: refactor: drop LegacyInstance --- launcher/InstanceList.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'launcher/InstanceList.cpp') diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index ad18740b..5637983b 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -32,7 +32,6 @@ #include "BaseInstance.h" #include "InstanceTask.h" #include "settings/INISettingsObject.h" -#include "minecraft/legacy/LegacyInstance.h" #include "NullInstance.h" #include "minecraft/MinecraftInstance.h" #include "FileSystem.h" @@ -553,10 +552,6 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id) { inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); } - else if (inst_type == "Legacy") - { - inst.reset(new LegacyInstance(m_globalSettings, instanceSettings, instanceRoot)); - } else { inst.reset(new NullInstance(m_globalSettings, instanceSettings, instanceRoot)); -- cgit From 624ab25cd490833fa43743137918f7014c9fe376 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 21 Feb 2022 22:47:19 +0100 Subject: refactor: set default InstanceType to OneSix --- launcher/InstanceList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'launcher/InstanceList.cpp') diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index 5637983b..04b86f6b 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -544,7 +544,7 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id) auto instanceSettings = std::make_shared(FS::PathCombine(instanceRoot, "instance.cfg")); InstancePtr inst; - instanceSettings->registerSetting("InstanceType", "Legacy"); + instanceSettings->registerSetting("InstanceType", "Legacy"); // intentionally Legacy. We don't support it. QString inst_type = instanceSettings->get("InstanceType").toString(); -- cgit