Move all the things (YES. Move them.)

Also, implemented some basic modlist logic, to be wired up.

1 files changed, 0 insertions, 211 deletions

diff --git a/backend/OneSixInstance.cpp b/backend/OneSixInstance.cpp
deleted file mode 100644
index 46866b0e..00000000
--- a/backend/OneSixInstance.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-#include "OneSixInstance.h"
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
-#include "MinecraftProcess.h"
-#include "VersionFactory.h"
-
-#include <setting.h>
-#include <pathutils.h>
-#include <cmdutils.h>
-#include <JlCompress.h>
-
-OneSixInstance::OneSixInstance ( const QString& rootDir, SettingsObject* setting_obj, QObject* parent )
-: BaseInstance ( new OneSixInstancePrivate(), rootDir, setting_obj, parent )
-{
-	I_D(OneSixInstance);
-	d->m_settings->registerSetting(new Setting("IntendedVersion", ""));
-	d->m_settings->registerSetting(new Setting("ShouldUpdate", false));
-	reloadFullVersion();
-}
-
-BaseUpdate* OneSixInstance::doUpdate()
-{
-	return new OneSixUpdate(this);
-}
-
-QString replaceTokensIn(QString text, QMap<QString, QString> with)
-{
-	QString result;
-	QRegExp token_regexp("\\$\\{(.+)\\}");
-	token_regexp.setMinimal(true);
-	QStringList list;
-	int tail = 0;
-	int head = 0;
-	while ((head = token_regexp.indexIn(text, head)) != -1)
-	{
-		result.append(text.mid(tail, head-tail));
-		QString key = token_regexp.cap(1);
-		auto iter = with.find(key);
-		if(iter != with.end())
-		{
-			result.append(*iter);
-		}
-		head += token_regexp.matchedLength();
-		tail = head;
-	}
-	result.append(text.mid(tail));
-	return result;
-}
-
-QStringList OneSixInstance::processMinecraftArgs( QString user, QString session )
-{
-	I_D(OneSixInstance);
-	auto version = d->version;
-	QString args_pattern = version->minecraftArguments;
-	
-	QMap<QString, QString> token_mapping;
-	token_mapping["auth_username"] = user;
-	token_mapping["auth_session"] = session;
-	//FIXME: user and player name are DIFFERENT!
-	token_mapping["auth_player_name"] = user;
-	//FIXME: WTF is this. I just plugged in a random UUID here.
-	token_mapping["auth_uuid"] = "7d4bacf0-fd62-11e2-b778-0800200c9a66"; // obviously fake.
-	
-	// this is for offline:
-	/*
-	map["auth_player_name"] = "Player";
-	map["auth_player_name"] = "00000000-0000-0000-0000-000000000000";
-	*/
-	
-	token_mapping["profile_name"] = name();
-	token_mapping["version_name"] = version->id;
-
-	QString absRootDir = QDir(minecraftRoot()).absolutePath();
-	token_mapping["game_directory"] = absRootDir;
-	QString absAssetsDir = QDir("assets/").absolutePath();
-	token_mapping["game_assets"] = absAssetsDir;
-	
-	QStringList parts = args_pattern.split(' ',QString::SkipEmptyParts);
-	for (int i = 0; i < parts.length(); i++)
-	{
-		parts[i] = replaceTokensIn(parts[i], token_mapping);
-	}
-	return parts;
-}
-
-MinecraftProcess* OneSixInstance::prepareForLaunch ( QString user, QString session )
-{
-	I_D(OneSixInstance);
-	cleanupAfterRun();
-	auto version = d->version;
-	if(!version)
-		return nullptr;
-	auto libs_to_extract = version->getActiveNativeLibs();
-	QString natives_dir_raw = PathCombine(instanceRoot(), "natives/");
-	bool success = ensurePathExists(natives_dir_raw);
-	if(!success)
-	{
-		// FIXME: handle errors
-		return nullptr;
-	}
-	
-	for(auto lib: libs_to_extract)
-	{
-		QString path = "libraries/" + lib->storagePath();
-		qDebug() << "Will extract " << path.toLocal8Bit();
-		if(JlCompress::extractWithExceptions(path, natives_dir_raw, lib->extract_excludes).isEmpty())
-		{
-			return nullptr;
-		}
-	}
-
-	QStringList args;
-	args.append(Util::Commandline::splitArgs(settings().get("JvmArgs").toString()));
-	args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt());
-	args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt());
-	QDir natives_dir(natives_dir_raw);
-	args << QString("-Djava.library.path=%1").arg( natives_dir.absolutePath() );
-	QString classPath;
-	{
-		auto libs = version->getActiveNormalLibs();
-		for (auto lib: libs)
-		{
-			QFileInfo fi(QString("libraries/") + lib->storagePath());
-			classPath.append(fi.absoluteFilePath());
-			//FIXME: make separator tweakable
-			classPath.append(':');
-		}
-		QString targetstr = "versions/" + version->id + "/" + version->id + ".jar";
-		QFileInfo fi(targetstr);
-		classPath.append(fi.absoluteFilePath());
-	}
-	if(classPath.size())
-	{
-		args << "-cp";
-		args << classPath;
-	}
-	args << version->mainClass;
-	args.append(processMinecraftArgs(user, session));
-	
-	// create the process and set its parameters
-	MinecraftProcess * proc = new MinecraftProcess(this);
-	proc->setMinecraftArguments(args);
-	proc->setMinecraftWorkdir(minecraftRoot());
-	return proc;
-}
-
-void OneSixInstance::cleanupAfterRun()
-{
-	QString target_dir = PathCombine(instanceRoot(), "natives/");
-	QDir dir(target_dir);
-	dir.removeRecursively();
-}
-
-bool OneSixInstance::setIntendedVersionId ( QString version )
-{
-	settings().set("IntendedVersion", version);
-	setShouldUpdate(true);
-	return true;
-}
-
-QString OneSixInstance::intendedVersionId() const
-{
-	return settings().get("IntendedVersion").toString();
-}
-
-void OneSixInstance::setShouldUpdate ( bool val )
-{
-	settings().set ( "ShouldUpdate", val );
-}
-
-bool OneSixInstance::shouldUpdate() const
-{
-	I_D(OneSixInstance);
-	QVariant var = settings().get ( "ShouldUpdate" );
-	if ( !var.isValid() || var.toBool() == false )
-	{
-		return intendedVersionId() != currentVersionId();
-	}
-	return true;
-}
-
-QString OneSixInstance::currentVersionId() const
-{
-	return intendedVersionId();
-}
-
-bool OneSixInstance::reloadFullVersion()
-{
-	I_D(OneSixInstance);
-	
-	QString verpath = PathCombine(instanceRoot(), "version.json");
-	QFile versionfile(verpath);
-	if(versionfile.exists() && versionfile.open(QIODevice::ReadOnly))
-	{
-		FullVersionFactory fvf;
-		auto version = fvf.parse(versionfile.readAll());
-		versionfile.close();
-		if(version)
-		{
-			d->version = version;
-			return true;
-		}
-	};
-	return false;
-}
-
-QSharedPointer< FullVersion > OneSixInstance::getFullVersion()
-{
-	I_D(OneSixInstance);
-	return d->version;
-}