summaryrefslogtreecommitdiffstats
path: root/logic/InstanceFactory.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-01-24 18:12:02 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-01-24 18:12:02 +0100
commit7d5787025aa5cebf6778f71e79f248f10b8541c9 (patch)
treebb80eb6a4e313b19da00a9ad8d0e1248aaa50212 /logic/InstanceFactory.cpp
parent156bc8f27656c115bf1b023cd4ebc5f629df3887 (diff)
downloadMultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar
MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.gz
MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.lz
MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.xz
MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.zip
Change naming from Derp -> OneSix until the new instance type supports legacy
Diffstat (limited to 'logic/InstanceFactory.cpp')
-rw-r--r--logic/InstanceFactory.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index c50ec4e4..730bcd69 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -21,10 +21,10 @@
#include "BaseInstance.h"
#include "LegacyInstance.h"
#include "LegacyFTBInstance.h"
-#include "DerpInstance.h"
-#include "DerpFTBInstance.h"
+#include "OneSixInstance.h"
+#include "OneSixFTBInstance.h"
#include "NostalgiaInstance.h"
-#include "DerpInstance.h"
+#include "OneSixInstance.h"
#include "BaseVersion.h"
#include "MinecraftVersion.h"
@@ -51,9 +51,9 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
QString inst_type = m_settings->get("InstanceType").toString();
// FIXME: replace with a map lookup, where instance classes register their types
- if (inst_type == "Derp" || inst_type == "OneSix")
+ if (inst_type == "OneSix" || inst_type == "OneSix")
{
- inst = new DerpInstance(instDir, m_settings, this);
+ inst = new OneSixInstance(instDir, m_settings, this);
}
else if (inst_type == "Legacy")
{
@@ -67,9 +67,9 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
{
inst = new LegacyFTBInstance(instDir, m_settings, this);
}
- else if (inst_type == "OneSixFTB" || inst_type == "DerpFTB")
+ else if (inst_type == "OneSixFTB" || inst_type == "OneSixFTB")
{
- inst = new DerpFTBInstance(instDir, m_settings, this);
+ inst = new OneSixFTBInstance(instDir, m_settings, this);
}
else
{
@@ -102,15 +102,15 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
switch (mcVer->type)
{
case MinecraftVersion::Legacy:
- // TODO derp
+ // TODO OneSix
m_settings->set("InstanceType", "Legacy");
inst = new LegacyInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false);
break;
- case MinecraftVersion::Derp:
- m_settings->set("InstanceType", "Derp");
- inst = new DerpInstance(instDir, m_settings, this);
+ case MinecraftVersion::OneSix:
+ m_settings->set("InstanceType", "OneSix");
+ inst = new OneSixInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false);
break;
@@ -137,9 +137,9 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false);
break;
- case MinecraftVersion::Derp:
- m_settings->set("InstanceType", "DerpFTB");
- inst = new DerpFTBInstance(instDir, m_settings, this);
+ case MinecraftVersion::OneSix:
+ m_settings->set("InstanceType", "OneSixFTB");
+ inst = new OneSixFTBInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false);
break;
@@ -176,8 +176,8 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&ne
m_settings->registerSetting("InstanceType", "Legacy");
QString inst_type = m_settings->get("InstanceType").toString();
- if(inst_type == "OneSixFTB" || inst_type == "DerpFTB")
- m_settings->set("InstanceType", "Derp");
+ if(inst_type == "OneSixFTB" || inst_type == "OneSixFTB")
+ m_settings->set("InstanceType", "OneSix");
if(inst_type == "LegacyFTB")
m_settings->set("InstanceType", "Legacy");