0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change naming from Derp -> OneSix until the new instance type supports legacy

Browse Source
This commit is contained in:
Jan Dalheimer
2014-01-24 18:12:02 +01:00
parent 156bc8f276
commit 7d5787025a
35 changed files with 375 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
logic/InstanceFactory.cpp
View File

@ -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");