1 files changed, 22 insertions, 57 deletions

diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index 95fd855b..c0a392e0 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -13,28 +13,26 @@
  * limitations under the License.
  */
 
-#include "InstanceFactory.h"
-
 #include <QDir>
 #include <QFileInfo>
-
-#include "BaseInstance.h"
-#include "LegacyInstance.h"
-#include "LegacyFTBInstance.h"
-#include "OneSixInstance.h"
-#include "OneSixFTBInstance.h"
-#include "NostalgiaInstance.h"
-#include "OneSixInstance.h"
-#include "BaseVersion.h"
-#include "MinecraftVersion.h"
-
-#include "inifile.h"
+#include <inifile.h>
 #include <inisettingsobject.h>
 #include <setting.h>
 
-#include "pathutils.h"
+#include <pathutils.h>
 #include "logger/QsLog.h"
 
+#include "logic/InstanceFactory.h"
+
+#include "logic/BaseInstance.h"
+#include "logic/LegacyInstance.h"
+#include "logic/LegacyFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/OneSixFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/BaseVersion.h"
+#include "logic/minecraft/MinecraftVersion.h"
+
 InstanceFactory InstanceFactory::loader;
 
 InstanceFactory::InstanceFactory() : QObject(NULL)
@@ -51,7 +49,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(InstancePtr &inst,
 	QString inst_type = m_settings->get("InstanceType").toString();
 
 	// FIXME: replace with a map lookup, where instance classes register their types
-	if (inst_type == "OneSix")
+	if (inst_type == "OneSix" || inst_type == "Nostalgia")
 	{
 		inst.reset(new OneSixInstance(instDir, m_settings, this));
 	}
@@ -59,10 +57,6 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(InstancePtr &inst,
 	{
 		inst.reset(new LegacyInstance(instDir, m_settings, this));
 	}
-	else if (inst_type == "Nostalgia")
-	{
-		inst.reset(new NostalgiaInstance(instDir, m_settings, this));
-	}
 	else if (inst_type == "LegacyFTB")
 	{
 		inst.reset(new LegacyFTBInstance(instDir, m_settings, this));
@@ -98,55 +92,26 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(InstancePtr &in
 
 	if (type == NormalInst)
 	{
-		switch (mcVer->type)
-		{
-		case MinecraftVersion::Legacy:
-			// TODO new instance type
-			m_settings->set("InstanceType", "Legacy");
-			inst.reset(new LegacyInstance(instDir, m_settings, this));
-			inst->setIntendedVersionId(version->descriptor());
-			inst->setShouldUseCustomBaseJar(false);
-			break;
-		case MinecraftVersion::OneSix:
-			m_settings->set("InstanceType", "OneSix");
-			inst.reset(new OneSixInstance(instDir, m_settings, this));
-			inst->setIntendedVersionId(version->descriptor());
-			inst->setShouldUseCustomBaseJar(false);
-			break;
-		case MinecraftVersion::Nostalgia:
-			m_settings->set("InstanceType", "Nostalgia");
-			inst.reset(new NostalgiaInstance(instDir, m_settings, this));
-			inst->setIntendedVersionId(version->descriptor());
-			inst->setShouldUseCustomBaseJar(false);
-			break;
-		default:
-		{
-			delete m_settings;
-			return InstanceFactory::NoSuchVersion;
-		}
-		}
+		m_settings->set("InstanceType", "OneSix");
+		inst.reset(new OneSixInstance(instDir, m_settings, this));
+		inst->setIntendedVersionId(version->descriptor());
+		inst->setShouldUseCustomBaseJar(false);
 	}
 	else if (type == FTBInstance)
 	{
-		switch (mcVer->type)
+		if(mcVer->usesLegacyLauncher())
 		{
-		case MinecraftVersion::Legacy:
 			m_settings->set("InstanceType", "LegacyFTB");
 			inst.reset(new LegacyFTBInstance(instDir, m_settings, this));
 			inst->setIntendedVersionId(version->descriptor());
 			inst->setShouldUseCustomBaseJar(false);
-			break;
-		case MinecraftVersion::OneSix:
+		}
+		else
+		{
 			m_settings->set("InstanceType", "OneSixFTB");
 			inst.reset(new OneSixFTBInstance(instDir, m_settings, this));
 			inst->setIntendedVersionId(version->descriptor());
 			inst->setShouldUseCustomBaseJar(false);
-			break;
-		default:
-		{
-			delete m_settings;
-			return InstanceFactory::NoSuchVersion;
-		}
 		}
 	}
 	else