1 files changed, 0 insertions, 416 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
deleted file mode 100644
index 3cfc1c76..00000000
--- a/logic/OneSixInstance.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MultiMC.h"
-#include "OneSixInstance.h"
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
-#include "MinecraftProcess.h"
-#include "OneSixVersion.h"
-#include "JavaChecker.h"
-#include "logic/icons/IconList.h"
-
-#include <setting.h>
-#include <pathutils.h>
-#include <cmdutils.h>
-#include <JlCompress.h>
-#include "gui/dialogs/OneSixModEditDialog.h"
-#include "logger/QsLog.h"
-#include "logic/assets/AssetsUtils.h"
-#include <QIcon>
-
-OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_obj,
-							   QObject *parent)
-	: BaseInstance(new OneSixInstancePrivate(), rootDir, setting_obj, parent)
-{
-	I_D(OneSixInstance);
-	d->m_settings->registerSetting("IntendedVersion", "");
-	d->m_settings->registerSetting("ShouldUpdate", false);
-	reloadFullVersion();
-}
-
-std::shared_ptr<Task> OneSixInstance::doUpdate(bool only_prepare)
-{
-	return std::shared_ptr<Task>(new OneSixUpdate(this, only_prepare));
-}
-
-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;
-}
-
-QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
-{
-	QDir assetsDir = QDir("assets/");
-	QDir indexDir = QDir(PathCombine(assetsDir.path(), "indexes"));
-	QDir objectDir = QDir(PathCombine(assetsDir.path(), "objects"));
-	QDir virtualDir = QDir(PathCombine(assetsDir.path(), "virtual"));
-
-	QString indexPath = PathCombine(indexDir.path(), version->assets + ".json");
-	QFile indexFile(indexPath);
-	QDir virtualRoot(PathCombine(virtualDir.path(), version->assets));
-
-	if (!indexFile.exists())
-	{
-		QLOG_ERROR() << "No assets index file" << indexPath << "; can't reconstruct assets";
-		return virtualRoot;
-	}
-
-	QLOG_DEBUG() << "reconstructAssets" << assetsDir.path() << indexDir.path()
-				 << objectDir.path() << virtualDir.path() << virtualRoot.path();
-
-	AssetsIndex index;
-	bool loadAssetsIndex = AssetsUtils::loadAssetsIndexJson(indexPath, &index);
-
-	if (loadAssetsIndex && index.isVirtual)
-	{
-		QLOG_INFO() << "Reconstructing virtual assets folder at" << virtualRoot.path();
-
-		for (QString map : index.objects.keys())
-		{
-			AssetObject asset_object = index.objects.value(map);
-			QString target_path = PathCombine(virtualRoot.path(), map);
-			QFile target(target_path);
-
-			QString tlk = asset_object.hash.left(2);
-
-			QString original_path =
-				PathCombine(PathCombine(objectDir.path(), tlk), asset_object.hash);
-			QFile original(original_path);
-			if(!original.exists())
-				continue;
-			if (!target.exists())
-			{
-				QFileInfo info(target_path);
-				QDir target_dir = info.dir();
-				// QLOG_DEBUG() << target_dir;
-				if (!target_dir.exists())
-					QDir("").mkpath(target_dir.path());
-
-				bool couldCopy = original.copy(target_path);
-				QLOG_DEBUG() << " Copying" << original_path << "to" << target_path
-								<< QString::number(couldCopy); // << original.errorString();
-			}
-		}
-
-		// TODO: Write last used time to virtualRoot/.lastused
-	}
-
-	return virtualRoot;
-}
-
-QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
-{
-	I_D(OneSixInstance);
-	auto version = d->version;
-	QString args_pattern = version->minecraftArguments;
-
-	QMap<QString, QString> token_mapping;
-	// yggdrasil!
-	token_mapping["auth_username"] = account->username();
-	token_mapping["auth_session"] = account->sessionId();
-	token_mapping["auth_access_token"] = account->accessToken();
-	token_mapping["auth_player_name"] = account->currentProfile()->name;
-	token_mapping["auth_uuid"] = account->currentProfile()->id;
-
-	// this is for offline?:
-	/*
-	map["auth_player_name"] = "Player";
-	map["auth_player_name"] = "00000000-0000-0000-0000-000000000000";
-	*/
-
-	// these do nothing and are stupid.
-	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"] = reconstructAssets(d->version).absolutePath();
-
-	auto user = account->user();
-	QJsonObject userAttrs;
-	for (auto key : user.properties.keys())
-	{
-		auto array = QJsonArray::fromStringList(user.properties.values(key));
-		userAttrs.insert(key, array);
-	}
-	QJsonDocument value(userAttrs);
-
-	token_mapping["user_properties"] = value.toJson(QJsonDocument::Compact);
-	token_mapping["user_type"] = account->currentProfile()->legacy ? "legacy" : "mojang";
-	// 1.7.3+ assets tokens
-	token_mapping["assets_root"] = absAssetsDir;
-	token_mapping["assets_index_name"] = version->assets;
-
-	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(MojangAccountPtr account)
-{
-	I_D(OneSixInstance);
-
-	QIcon icon = MMC->icons()->getIcon(iconKey());
-	auto pixmap = icon.pixmap(128, 128);
-	pixmap.save(PathCombine(minecraftRoot(), "icon.png"), "PNG");
-
-	auto version = d->version;
-	if (!version)
-		return nullptr;
-	QString launchScript;
-	{
-		auto libs = version->getActiveNormalLibs();
-		for (auto lib : libs)
-		{
-			QFileInfo fi(QString("libraries/") + lib->storagePath());
-			launchScript += "cp " + fi.absoluteFilePath() + "\n";
-		}
-		QString targetstr = "versions/" + version->id + "/" + version->id + ".jar";
-		QFileInfo fi(targetstr);
-		launchScript += "cp " + fi.absoluteFilePath() + "\n";
-	}
-	launchScript += "mainClass " + version->mainClass + "\n";
-
-	for (auto param : processMinecraftArgs(account))
-	{
-		launchScript += "param " + param + "\n";
-	}
-
-	// Set the width and height for 1.6 instances
-	bool maximize = settings().get("LaunchMaximized").toBool();
-	if (maximize)
-	{
-		// this is probably a BAD idea
-		// launchScript += "param --fullscreen\n";
-	}
-	else
-	{
-		launchScript +=
-			"param --width\nparam " + settings().get("MinecraftWinWidth").toString() + "\n";
-		launchScript +=
-			"param --height\nparam " + settings().get("MinecraftWinHeight").toString() + "\n";
-	}
-	QDir natives_dir(PathCombine(instanceRoot(), "natives/"));
-	launchScript += "windowTitle " + windowTitle() + "\n";
-	launchScript += "natives " + natives_dir.absolutePath() + "\n";
-	launchScript += "launch onesix\n";
-
-	// create the process and set its parameters
-	MinecraftProcess *proc = new MinecraftProcess(this);
-	proc->setWorkdir(minecraftRoot());
-	proc->setLaunchScript(launchScript);
-	// proc->setNativeFolder(natives_dir.absolutePath());
-	return proc;
-}
-
-void OneSixInstance::cleanupAfterRun()
-{
-	QString target_dir = PathCombine(instanceRoot(), "natives/");
-	QDir dir(target_dir);
-	dir.removeRecursively();
-}
-
-std::shared_ptr<ModList> OneSixInstance::loaderModList()
-{
-	I_D(OneSixInstance);
-	if (!d->loader_mod_list)
-	{
-		d->loader_mod_list.reset(new ModList(loaderModsDir()));
-	}
-	d->loader_mod_list->update();
-	return d->loader_mod_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::resourcePackList()
-{
-	I_D(OneSixInstance);
-	if (!d->resource_pack_list)
-	{
-		d->resource_pack_list.reset(new ModList(resourcePacksDir()));
-	}
-	d->resource_pack_list->update();
-	return d->resource_pack_list;
-}
-
-QDialog *OneSixInstance::createModEditDialog(QWidget *parent)
-{
-	return new OneSixModEditDialog(this, parent);
-}
-
-bool OneSixInstance::setIntendedVersionId(QString version)
-{
-	settings().set("IntendedVersion", version);
-	setShouldUpdate(true);
-	auto pathCustom = PathCombine(instanceRoot(), "custom.json");
-	auto pathOrig = PathCombine(instanceRoot(), "version.json");
-	QFile::remove(pathCustom);
-	QFile::remove(pathOrig);
-	reloadFullVersion();
-	return true;
-}
-
-QString OneSixInstance::intendedVersionId() const
-{
-	return settings().get("IntendedVersion").toString();
-}
-
-void OneSixInstance::setShouldUpdate(bool val)
-{
-	settings().set("ShouldUpdate", val);
-}
-
-bool OneSixInstance::shouldUpdate() const
-{
-	QVariant var = settings().get("ShouldUpdate");
-	if (!var.isValid() || var.toBool() == false)
-	{
-		return intendedVersionId() != currentVersionId();
-	}
-	return true;
-}
-
-bool OneSixInstance::versionIsCustom()
-{
-	QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
-	QFile versionfile(verpath_custom);
-	return versionfile.exists();
-}
-
-QString OneSixInstance::currentVersionId() const
-{
-	return intendedVersionId();
-}
-
-bool OneSixInstance::customizeVersion()
-{
-	if (!versionIsCustom())
-	{
-		auto pathCustom = PathCombine(instanceRoot(), "custom.json");
-		auto pathOrig = PathCombine(instanceRoot(), "version.json");
-		QFile::copy(pathOrig, pathCustom);
-		return reloadFullVersion();
-	}
-	else
-		return true;
-}
-
-bool OneSixInstance::revertCustomVersion()
-{
-	if (versionIsCustom())
-	{
-		auto path = PathCombine(instanceRoot(), "custom.json");
-		QFile::remove(path);
-		return reloadFullVersion();
-	}
-	else
-		return true;
-}
-
-bool OneSixInstance::reloadFullVersion()
-{
-	I_D(OneSixInstance);
-
-	QString verpath = PathCombine(instanceRoot(), "version.json");
-	{
-		QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
-		QFile versionfile(verpath_custom);
-		if (versionfile.exists())
-			verpath = verpath_custom;
-	}
-
-	auto version = OneSixVersion::fromFile(verpath);
-	if (version)
-	{
-		d->version = version;
-		return true;
-	}
-	else
-	{
-		d->version.reset();
-		return false;
-	}
-}
-
-std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion()
-{
-	I_D(OneSixInstance);
-	return d->version;
-}
-
-QString OneSixInstance::defaultBaseJar() const
-{
-	return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
-}
-
-QString OneSixInstance::defaultCustomBaseJar() const
-{
-	return PathCombine(instanceRoot(), "custom.jar");
-}
-
-bool OneSixInstance::menuActionEnabled(QString action_name) const
-{
-	if (action_name == "actionChangeInstLWJGLVersion")
-		return false;
-	return true;
-}
-
-QString OneSixInstance::getStatusbarDescription()
-{
-	QString descr = "One Six : " + intendedVersionId();
-	if (versionIsCustom())
-	{
-		descr + " (custom)";
-	}
-	return descr;
-}
-
-QString OneSixInstance::loaderModsDir() const
-{
-	return PathCombine(minecraftRoot(), "mods");
-}
-
-QString OneSixInstance::resourcePacksDir() const
-{
-	return PathCombine(minecraftRoot(), "resourcepacks");
-}
-
-QString OneSixInstance::instanceConfigFolder() const
-{
-	return PathCombine(minecraftRoot(), "config");
-}