From 2980322c3b34b252ead838daee7a844853feccf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 12 Mar 2017 19:45:28 +0100
Subject: NOISSUE Remove Minecraft version list and versions.

---
 api/logic/minecraft/ftb/FTBInstanceProvider.cpp | 14 ++---------
 api/logic/minecraft/ftb/FTBPlugin.cpp           |  2 --
 api/logic/minecraft/ftb/FTBProfileStrategy.cpp  |  1 -
 api/logic/minecraft/ftb/FTBVersion.h            | 32 -------------------------
 4 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 api/logic/minecraft/ftb/FTBVersion.h

(limited to 'api/logic/minecraft/ftb')

diff --git a/api/logic/minecraft/ftb/FTBInstanceProvider.cpp b/api/logic/minecraft/ftb/FTBInstanceProvider.cpp
index 1321ea1b..fe23a84e 100644
--- a/api/logic/minecraft/ftb/FTBInstanceProvider.cpp
+++ b/api/logic/minecraft/ftb/FTBInstanceProvider.cpp
@@ -9,7 +9,6 @@
 #include <FileSystem.h>
 
 #include "Env.h"
-#include "minecraft/MinecraftVersion.h"
 
 #include "LegacyFTBInstance.h"
 #include "OneSixFTBInstance.h"
@@ -246,17 +245,8 @@ InstancePtr FTBInstanceProvider::createInstance(const FTBRecord & record) const
 	m_settings->registerSetting("InstanceType", "Legacy");
 
 	// all legacy versions are built in. therefore we can do this even if we don't have ALL the versions Mojang has on their servers.
-	auto mcVersion = std::dynamic_pointer_cast<MinecraftVersion>(ENV.getVersion("net.minecraft", record.mcVersion));
-	if (mcVersion && mcVersion->usesLegacyLauncher())
-	{
-		m_settings->set("InstanceType", "LegacyFTB");
-		inst.reset(new LegacyFTBInstance(m_globalSettings, m_settings, record.instanceDir));
-	}
-	else
-	{
-		m_settings->set("InstanceType", "OneSixFTB");
-		inst.reset(new OneSixFTBInstance(m_globalSettings, m_settings, record.instanceDir));
-	}
+	m_settings->set("InstanceType", "OneSixFTB");
+	inst.reset(new OneSixFTBInstance(m_globalSettings, m_settings, record.instanceDir));
 
 	// initialize
 	{
diff --git a/api/logic/minecraft/ftb/FTBPlugin.cpp b/api/logic/minecraft/ftb/FTBPlugin.cpp
index d14eea63..541879a1 100644
--- a/api/logic/minecraft/ftb/FTBPlugin.cpp
+++ b/api/logic/minecraft/ftb/FTBPlugin.cpp
@@ -1,11 +1,9 @@
 #include "FTBPlugin.h"
 #include <Env.h>
-#include "FTBVersion.h"
 #include "LegacyFTBInstance.h"
 #include "OneSixFTBInstance.h"
 #include <BaseInstance.h>
 #include <InstanceList.h>
-#include <minecraft/MinecraftVersionList.h>
 #include <settings/INISettingsObject.h>
 #include <FileSystem.h>
 
diff --git a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
index e4e6a6ae..92a1555a 100644
--- a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
+++ b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
@@ -2,7 +2,6 @@
 #include "OneSixFTBInstance.h"
 
 #include "minecraft/VersionBuildError.h"
-#include "minecraft/MinecraftVersionList.h"
 #include <FileSystem.h>
 
 #include <QDir>
diff --git a/api/logic/minecraft/ftb/FTBVersion.h b/api/logic/minecraft/ftb/FTBVersion.h
deleted file mode 100644
index 805319b4..00000000
--- a/api/logic/minecraft/ftb/FTBVersion.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-#include <minecraft/MinecraftVersion.h>
-
-class FTBVersion : public BaseVersion
-{
-public:
-	FTBVersion(MinecraftVersionPtr parent) : m_version(parent){};
-
-public:
-	virtual QString descriptor() override
-	{
-		return m_version->descriptor();
-	}
-
-	virtual QString name() override
-	{
-		return m_version->name();
-	}
-
-	virtual QString typeString() const override
-	{
-		return m_version->typeString();
-	}
-
-	MinecraftVersionPtr getMinecraftVersion()
-	{
-		return m_version;
-	}
-
-private:
-	MinecraftVersionPtr m_version;
-};
-- 
cgit v1.2.3