diff options
Diffstat (limited to 'logic/InstanceFactory.cpp')
-rw-r--r-- | logic/InstanceFactory.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp index 857d3a09..2f1748cc 100644 --- a/logic/InstanceFactory.cpp +++ b/logic/InstanceFactory.cpp @@ -31,9 +31,6 @@ #include "logic/OneSixInstance.h" #include "logic/BaseVersion.h" #include "logic/minecraft/MinecraftVersion.h" -#include "logic/ftb/LegacyFTBInstance.h" -#include "logic/ftb/OneSixFTBInstance.h" -#include "logic/ftb/FTBVersion.h" InstanceFactory InstanceFactory::loader; @@ -59,14 +56,6 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(InstancePtr &inst, { inst.reset(new LegacyInstance(instDir, m_settings)); } - else if (inst_type == "LegacyFTB") - { - inst.reset(new LegacyFTBInstance(instDir, m_settings)); - } - else if (inst_type == "OneSixFTB") - { - inst.reset(new OneSixFTBInstance(instDir, m_settings)); - } else { return InstanceFactory::UnknownLoadError; @@ -106,25 +95,6 @@ InstanceFactory::createInstance(InstancePtr &inst, BaseVersionPtr version, const inst->init(); return InstanceFactory::NoCreateError; } - auto ftbVersion = std::dynamic_pointer_cast<FTBVersion>(version); - if(ftbVersion) - { - auto mcversion = ftbVersion->getMinecraftVersion(); - if (mcversion->usesLegacyLauncher()) - { - m_settings->set("InstanceType", "LegacyFTB"); - inst.reset(new LegacyFTBInstance(instDir, m_settings)); - inst->setIntendedVersionId(mcversion->descriptor()); - } - else - { - m_settings->set("InstanceType", "OneSixFTB"); - inst.reset(new OneSixFTBInstance(instDir, m_settings)); - inst->setIntendedVersionId(mcversion->descriptor()); - inst->init(); - } - return InstanceFactory::NoCreateError; - } delete m_settings; return InstanceFactory::NoSuchVersion; } @@ -146,11 +116,6 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(InstancePtr &newI settings_obj.registerSetting("InstanceType", "Legacy"); QString inst_type = settings_obj.get("InstanceType").toString(); - if (inst_type == "OneSixFTB") - settings_obj.set("InstanceType", "OneSix"); - if (inst_type == "LegacyFTB") - settings_obj.set("InstanceType", "Legacy"); - oldInstance->copy(instDir); auto error = loadInstance(newInstance, instDir); |