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

30 files changed, 321 insertions, 767 deletions

diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index 74a8e909..92aa0c92 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -17,9 +17,9 @@
 
 #include <QFile>
 
-#include "DerpVersion.h"
-#include "DerpLibrary.h"
-#include "DerpInstance.h"
+#include "OneSixVersion.h"
+#include "OneSixLibrary.h"
+#include "OneSixInstance.h"
 
 #include "cmdutils.h"
 
@@ -28,12 +28,12 @@ BaseInstaller::BaseInstaller()
 
 }
 
-bool BaseInstaller::isApplied(DerpInstance *on)
+bool BaseInstaller::isApplied(OneSixInstance *on)
 {
 	return QFile::exists(filename(on->instanceRoot()));
 }
 
-bool BaseInstaller::add(DerpInstance *to)
+bool BaseInstaller::add(OneSixInstance *to)
 {
 	if (!patchesDir(to->instanceRoot()).exists())
 	{
@@ -51,7 +51,7 @@ bool BaseInstaller::add(DerpInstance *to)
 	return true;
 }
 
-bool BaseInstaller::remove(DerpInstance *from)
+bool BaseInstaller::remove(OneSixInstance *from)
 {
 	return QFile::remove(filename(from->instanceRoot()));
 }
diff --git a/logic/BaseInstaller.h b/logic/BaseInstaller.h
index 08f78bfc..df7eab89 100644
--- a/logic/BaseInstaller.h
+++ b/logic/BaseInstaller.h
@@ -17,7 +17,7 @@
 
 #include <memory>
 
-class DerpInstance;
+class OneSixInstance;
 class QDir;
 class QString;
 
@@ -26,11 +26,11 @@ class BaseInstaller
 public:
 	BaseInstaller();
 
-	virtual bool canApply(DerpInstance *instance) const { return true; }
-	bool isApplied(DerpInstance *on);
+	virtual bool canApply(OneSixInstance *instance) const { return true; }
+	bool isApplied(OneSixInstance *on);
 
-	virtual bool add(DerpInstance *to);
-	virtual bool remove(DerpInstance *from);
+	virtual bool add(OneSixInstance *to);
+	virtual bool remove(OneSixInstance *from);
 
 protected:
 	virtual QString id() const = 0;
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index 79640c84..a861e9b2 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -27,7 +27,7 @@
 class QDialog;
 class Task;
 class MinecraftProcess;
-class DerpUpdate;
+class OneSixUpdate;
 class InstanceList;
 class BaseInstancePrivate;
 
diff --git a/logic/DerpVersion.cpp b/logic/DerpVersion.cpp
deleted file mode 100644
index f4a8dd97..00000000
--- a/logic/DerpVersion.cpp
+++ /dev/null
@@ -1,194 +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 "DerpVersion.h"
-
-#include <QDebug>
-
-#include "DerpVersionBuilder.h"
-
-DerpVersion::DerpVersion(DerpInstance *instance, QObject *parent)
-	: QAbstractListModel(parent), m_instance(instance)
-{
-	clear();
-}
-
-bool DerpVersion::reload(QWidget *widgetParent)
-{
-	return DerpVersionBuilder::build(this, m_instance, widgetParent);
-}
-
-void DerpVersion::clear()
-{
-	id.clear();
-	time.clear();
-	releaseTime.clear();
-	type.clear();
-	assets.clear();
-	processArguments.clear();
-	minecraftArguments.clear();
-	minimumLauncherVersion = 0xDEADBEAF;
-	mainClass.clear();
-	libraries.clear();
-}
-
-void DerpVersion::dump() const
-{
-	qDebug().nospace() << "DerpVersion("
-				  << "\n\tid=" << id
-				  << "\n\ttime=" << time
-				  << "\n\treleaseTime=" << releaseTime
-				  << "\n\ttype=" << type
-				  << "\n\tassets=" << assets
-				  << "\n\tprocessArguments=" << processArguments
-				  << "\n\tminecraftArguments=" << minecraftArguments
-				  << "\n\tminimumLauncherVersion=" << minimumLauncherVersion
-				  << "\n\tmainClass=" << mainClass
-				  << "\n\tlibraries=";
-	for (auto lib : libraries)
-	{
-		qDebug().nospace() << "\n\t\t" << lib.get();
-	}
-	qDebug().nospace() << "\n)";
-}
-
-QList<std::shared_ptr<DerpLibrary> > DerpVersion::getActiveNormalLibs()
-{
-	QList<std::shared_ptr<DerpLibrary> > output;
-	for (auto lib : libraries)
-	{
-		if (lib->isActive() && !lib->isNative())
-		{
-			output.append(lib);
-		}
-	}
-	return output;
-}
-
-QList<std::shared_ptr<DerpLibrary> > DerpVersion::getActiveNativeLibs()
-{
-	QList<std::shared_ptr<DerpLibrary> > output;
-	for (auto lib : libraries)
-	{
-		if (lib->isActive() && lib->isNative())
-		{
-			output.append(lib);
-		}
-	}
-	return output;
-}
-
-std::shared_ptr<DerpVersion> DerpVersion::fromJson(const QJsonObject &obj)
-{
-	std::shared_ptr<DerpVersion> version(new DerpVersion(0));
-	if (DerpVersionBuilder::read(version.get(), obj))
-	{
-		return version;
-	}
-	return 0;
-}
-
-QVariant DerpVersion::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	int row = index.row();
-	int column = index.column();
-
-	if (row < 0 || row >= libraries.size())
-		return QVariant();
-
-	if (role == Qt::DisplayRole)
-	{
-		switch (column)
-		{
-		case 0:
-			return libraries[row]->name();
-		case 1:
-			return libraries[row]->type();
-		case 2:
-			return libraries[row]->version();
-		default:
-			return QVariant();
-		}
-	}
-	return QVariant();
-}
-
-Qt::ItemFlags DerpVersion::flags(const QModelIndex &index) const
-{
-	if (!index.isValid())
-		return Qt::NoItemFlags;
-	int row = index.row();
-	if (libraries[row]->isActive())
-	{
-		return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren;
-	}
-	else
-	{
-		return Qt::ItemNeverHasChildren;
-	}
-	// return QAbstractListModel::flags(index);
-}
-
-QVariant DerpVersion::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
-		return QVariant();
-	switch (section)
-	{
-	case 0:
-		return QString("Name");
-	case 1:
-		return QString("Type");
-	case 2:
-		return QString("Version");
-	default:
-		return QString();
-	}
-}
-
-int DerpVersion::rowCount(const QModelIndex &parent) const
-{
-	return libraries.size();
-}
-
-int DerpVersion::columnCount(const QModelIndex &parent) const
-{
-	return 3;
-}
-
-QDebug operator<<(QDebug &dbg, const DerpVersion *version)
-{
-	version->dump();
-	return dbg.maybeSpace();
-}
-QDebug operator<<(QDebug &dbg, const DerpLibrary *library)
-{
-	dbg.nospace() << "DerpLibrary("
-				  << "\n\t\t\trawName=" << library->rawName()
-				  << "\n\t\t\tname=" << library->name()
-				  << "\n\t\t\tversion=" << library->version()
-				  << "\n\t\t\ttype=" << library->type()
-				  << "\n\t\t\tisActive=" << library->isActive()
-				  << "\n\t\t\tisNative=" << library->isNative()
-				  << "\n\t\t\tdownloadUrl=" << library->downloadUrl()
-				  << "\n\t\t\tstoragePath=" << library->storagePath()
-				  << "\n\t\t\tabsolutePath=" << library->absoluteUrl()
-				  << "\n\t\t\thint=" << library->hint();
-	dbg.nospace() << "\n\t\t)";
-	return dbg.maybeSpace();
-}
diff --git a/logic/DerpVersion.h b/logic/DerpVersion.h
deleted file mode 100644
index 4481d146..00000000
--- a/logic/DerpVersion.h
+++ /dev/null
@@ -1,115 +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.
- */
-
-#pragma once
-
-#include <QAbstractListModel>
-
-#include <QString>
-#include <QList>
-#include <memory>
-
-#include "DerpLibrary.h"
-
-class DerpInstance;
-
-class DerpVersion : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	explicit DerpVersion(DerpInstance *instance, QObject *parent = 0);
-
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-	virtual QVariant headerData(int section, Qt::Orientation orientation,
-								int role = Qt::DisplayRole) const;
-	virtual int columnCount(const QModelIndex &parent) const;
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-
-	bool reload(QWidget *widgetParent);
-	void clear();
-
-	void dump() const;
-
-public:
-	QList<std::shared_ptr<DerpLibrary>> getActiveNormalLibs();
-	QList<std::shared_ptr<DerpLibrary>> getActiveNativeLibs();
-
-	static std::shared_ptr<DerpVersion> fromJson(const QJsonObject &obj);
-
-	// data members
-public:
-	/// the ID - determines which jar to use! ACTUALLY IMPORTANT!
-	QString id;
-	/// Last updated time - as a string
-	QString time;
-	/// Release time - as a string
-	QString releaseTime;
-	/// Release type - "release" or "snapshot"
-	QString type;
-	/// Assets type - "legacy" or a version ID
-	QString assets;
-	/**
-	 * DEPRECATED: Old versions of the new vanilla launcher used this
-	 * ex: "username_session_version"
-	 */
-	QString processArguments;
-	/**
-	 * arguments that should be used for launching minecraft
-	 *
-	 * ex: "--username ${auth_player_name} --session ${auth_session}
-	 *      --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets}"
-	 */
-	QString minecraftArguments;
-	/**
-	 * the minimum launcher version required by this version ... current is 4 (at point of
-	 * writing)
-	 */
-	int minimumLauncherVersion = 0xDEADBEEF;
-	/**
-	 * The main class to load first
-	 */
-	QString mainClass;
-
-	/// the list of libs - both active and inactive, native and java
-	QList<std::shared_ptr<DerpLibrary>> libraries;
-
-	/*
-	FIXME: add support for those rules here? Looks like a pile of quick hacks to me though.
-
-	"rules": [
-		{
-		"action": "allow"
-		},
-		{
-		"action": "disallow",
-		"os": {
-			"name": "osx",
-			"version": "^10\\.5\\.\\d$"
-		}
-		}
-	],
-	"incompatibilityReason": "There is a bug in LWJGL which makes it incompatible with OSX
-	10.5.8. Please go to New Profile and use 1.5.2 for now. Sorry!"
-	}
-	*/
-	// QList<Rule> rules;
-
-private:
-	DerpInstance *m_instance;
-};
-
-QDebug operator<<(QDebug &dbg, const DerpVersion *version);
-QDebug operator<<(QDebug &dbg, const DerpLibrary *library);
diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp
index 35663ddd..863c3dfd 100644
--- a/logic/ForgeInstaller.cpp
+++ b/logic/ForgeInstaller.cpp
@@ -14,15 +14,15 @@
  */
 
 #include "ForgeInstaller.h"
-#include "DerpVersion.h"
-#include "DerpLibrary.h"
+#include "OneSixVersion.h"
+#include "OneSixLibrary.h"
 #include "net/HttpMetaCache.h"
 #include <quazip.h>
 #include <quazipfile.h>
 #include <pathutils.h>
 #include <QStringList>
 #include "MultiMC.h"
-#include "DerpInstance.h"
+#include "OneSixInstance.h"
 
 #include <QJsonDocument>
 #include <QJsonArray>
@@ -31,7 +31,7 @@
 
 ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 {
-	std::shared_ptr<DerpVersion> newVersion;
+	std::shared_ptr<OneSixVersion> newVersion;
 	m_universal_url = universal_url;
 
 	QuaZip zip(filename);
@@ -64,7 +64,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 
 	// read the forge version info
 	{
-		newVersion = DerpVersion::fromJson(versionInfoVal.toObject());
+		newVersion = OneSixVersion::fromJson(versionInfoVal.toObject());
 		if (!newVersion)
 			return;
 	}
@@ -74,7 +74,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 	internalPath = installObj.value("filePath").toString();
 
 	// where do we put the library? decode the mojang path
-	DerpLibrary lib(libraryName);
+	OneSixLibrary lib(libraryName);
 	lib.finalize();
 
 	auto cacheentry = MMC->metacache()->resolveEntry("libraries", lib.storagePath());
@@ -109,7 +109,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 	realVersionId = m_forge_version->id = installObj.value("minecraft").toString();
 }
 
-bool ForgeInstaller::add(DerpInstance *to)
+bool ForgeInstaller::add(OneSixInstance *to)
 {
 	if (!BaseInstaller::add(to))
 	{
diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index 6490b5bf..eb8ecd79 100644
--- a/logic/ForgeInstaller.h
+++ b/logic/ForgeInstaller.h
@@ -20,20 +20,20 @@
 #include <QString>
 #include <memory>
 
-class DerpVersion;
+class OneSixVersion;
 
 class ForgeInstaller : public BaseInstaller
 {
 public:
 	ForgeInstaller(QString filename, QString universal_url);
 
-	bool add(DerpInstance *to) override;
+	bool add(OneSixInstance *to) override;
 
 	QString id() const override { return "net.minecraftforge"; }
 
 private:
 	// the version, read from the installer
-	std::shared_ptr<DerpVersion> m_forge_version;
+	std::shared_ptr<OneSixVersion> m_forge_version;
 	QString internalPath;
 	QString finalPath;
 	QString realVersionId;
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index c50ec4e4..730bcd69 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -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");
 
diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h
index 1ff17cbd..1e7d9eb6 100644
--- a/logic/LegacyInstance.h
+++ b/logic/LegacyInstance.h
@@ -68,7 +68,7 @@ public:
 	virtual QString intendedVersionId() const override;
 	virtual bool setIntendedVersionId(QString version) override;
 	// the `version' of Legacy instances is defined by the launcher code.
-	// in contrast with Derp, where `version' is described in a json file
+	// in contrast with OneSix, where `version' is described in a json file
 	virtual bool versionIsCustom() override
 	{
 		return false;
diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp
index 71c7011f..1ce9d3f4 100644
--- a/logic/LiteLoaderInstaller.cpp
+++ b/logic/LiteLoaderInstaller.cpp
@@ -20,9 +20,9 @@
 
 #include "logger/QsLog.h"
 
-#include "DerpVersion.h"
-#include "DerpLibrary.h"
-#include "DerpInstance.h"
+#include "OneSixVersion.h"
+#include "OneSixLibrary.h"
+#include "OneSixInstance.h"
 
 QMap<QString, QString> LiteLoaderInstaller::m_launcherWrapperVersionMapping;
 
@@ -38,12 +38,12 @@ LiteLoaderInstaller::LiteLoaderInstaller()
 	}
 }
 
-bool LiteLoaderInstaller::canApply(DerpInstance *instance) const
+bool LiteLoaderInstaller::canApply(OneSixInstance *instance) const
 {
 	return m_launcherWrapperVersionMapping.contains(instance->intendedVersionId());
 }
 
-bool LiteLoaderInstaller::add(DerpInstance *to)
+bool LiteLoaderInstaller::add(OneSixInstance *to)
 {
 	if (!BaseInstaller::add(to))
 	{
@@ -60,7 +60,7 @@ bool LiteLoaderInstaller::add(DerpInstance *to)
 
 	// launchwrapper
 	{
-		DerpLibrary launchwrapperLib("net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[to->intendedVersionId()]);
+		OneSixLibrary launchwrapperLib("net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[to->intendedVersionId()]);
 		launchwrapperLib.finalize();
 		QJsonObject lwLibObj = launchwrapperLib.toJson();
 		lwLibObj.insert("insert", QString("prepend"));
@@ -69,7 +69,7 @@ bool LiteLoaderInstaller::add(DerpInstance *to)
 
 	// liteloader
 	{
-		DerpLibrary liteloaderLib("com.mumfrey:liteloader:" + to->intendedVersionId());
+		OneSixLibrary liteloaderLib("com.mumfrey:liteloader:" + to->intendedVersionId());
 		liteloaderLib.setBaseUrl("http://dl.liteloader.com/versions/");
 		liteloaderLib.finalize();
 		QJsonObject llLibObj = liteloaderLib.toJson();
diff --git a/logic/LiteLoaderInstaller.h b/logic/LiteLoaderInstaller.h
index c128ee22..5e01b16c 100644
--- a/logic/LiteLoaderInstaller.h
+++ b/logic/LiteLoaderInstaller.h
@@ -25,8 +25,8 @@ class LiteLoaderInstaller : public BaseInstaller
 public:
 	LiteLoaderInstaller();
 
-	bool canApply(DerpInstance *instance) const override;
-	bool add(DerpInstance *to) override;
+	bool canApply(OneSixInstance *instance) const override;
+	bool add(OneSixInstance *to) override;
 
 private:
 	virtual QString id() const override { return "com.mumfrey.liteloader"; }
diff --git a/logic/MinecraftVersion.h b/logic/MinecraftVersion.h
index dd849ce9..504381a8 100644
--- a/logic/MinecraftVersion.h
+++ b/logic/MinecraftVersion.h
@@ -32,7 +32,7 @@ struct MinecraftVersion : public BaseVersion
 	/// This version's type. Used internally to identify what kind of version this is.
 	enum VersionType
 	{
-		Derp,
+		OneSix,
 		Legacy,
 		Nostalgia
 	} type;
@@ -66,8 +66,8 @@ struct MinecraftVersion : public BaseVersion
 		}
 		switch (type)
 		{
-		case Derp:
-			pre_final.append("Derp");
+		case OneSix:
+			pre_final.append("OneSix");
 			break;
 		case Legacy:
 			pre_final.append("Legacy");
diff --git a/logic/NostalgiaInstance.cpp b/logic/NostalgiaInstance.cpp
index f27954a7..2e23ee71 100644
--- a/logic/NostalgiaInstance.cpp
+++ b/logic/NostalgiaInstance.cpp
@@ -17,7 +17,7 @@
 
 NostalgiaInstance::NostalgiaInstance(const QString &rootDir, SettingsObject *settings,
 									 QObject *parent)
-	: DerpInstance(rootDir, settings, parent)
+	: OneSixInstance(rootDir, settings, parent)
 {
 }
 
diff --git a/logic/NostalgiaInstance.h b/logic/NostalgiaInstance.h
index 6a6b91a1..a26f7f0a 100644
--- a/logic/NostalgiaInstance.h
+++ b/logic/NostalgiaInstance.h
@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include "DerpInstance.h"
+#include "OneSixInstance.h"
 
-class NostalgiaInstance : public DerpInstance
+class NostalgiaInstance : public OneSixInstance
 {
 	Q_OBJECT
 public:
diff --git a/logic/DerpFTBInstance.cpp b/logic/OneSixFTBInstance.cpp
index 9b687461..71bc1470 100644
--- a/logic/DerpFTBInstance.cpp
+++ b/logic/OneSixFTBInstance.cpp
@@ -1,17 +1,17 @@
-#include "DerpFTBInstance.h"
+#include "OneSixFTBInstance.h"
 
-#include "DerpVersion.h"
-#include "DerpLibrary.h"
+#include "OneSixVersion.h"
+#include "OneSixLibrary.h"
 #include "tasks/SequentialTask.h"
 #include "ForgeInstaller.h"
 #include "lists/ForgeVersionList.h"
 #include "MultiMC.h"
 
-class DerpFTBInstanceForge : public Task
+class OneSixFTBInstanceForge : public Task
 {
 	Q_OBJECT
 public:
-	explicit DerpFTBInstanceForge(const QString &version, DerpFTBInstance *inst, QObject *parent = 0) :
+	explicit OneSixFTBInstanceForge(const QString &version, OneSixFTBInstance *inst, QObject *parent = 0) :
 		Task(parent), instance(inst), version("Forge " + version)
 	{
 	}
@@ -38,7 +38,7 @@ public:
 			fjob = new NetJob("Forge download");
 			fjob->addNetAction(CacheDownload::make(forgeVersion->installer_url, entry));
 			connect(fjob, &NetJob::failed, [this](){emitFailed(m_failReason);});
-			connect(fjob, &NetJob::succeeded, this, &DerpFTBInstanceForge::installForge);
+			connect(fjob, &NetJob::succeeded, this, &OneSixFTBInstanceForge::installForge);
 			connect(fjob, &NetJob::progress, [this](qint64 c, qint64 total){ setProgress(100 * c / total); });
 			fjob->start();
 		}
@@ -70,41 +70,41 @@ slots:
 	}
 
 private:
-	DerpFTBInstance *instance;
+	OneSixFTBInstance *instance;
 	QString version;
 	ForgeVersionPtr forgeVersion;
 	MetaEntryPtr entry;
 	NetJob *fjob;
 };
 
-DerpFTBInstance::DerpFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	DerpInstance(rootDir, settings, parent)
+OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
+	OneSixInstance(rootDir, settings, parent)
 {
 	QFile f(QDir(minecraftRoot()).absoluteFilePath("pack.json"));
 	if (f.open(QFile::ReadOnly))
 	{
 		QString data = QString::fromUtf8(f.readAll());
 		QRegularExpressionMatch match = QRegularExpression("net.minecraftforge:minecraftforge:[\\.\\d]*").match(data);
-		m_forge.reset(new DerpLibrary(match.captured()));
+		m_forge.reset(new OneSixLibrary(match.captured()));
 		m_forge->finalize();
 	}
 }
 
-QString DerpFTBInstance::id() const
+QString OneSixFTBInstance::id() const
 {
 	return "FTB/" + BaseInstance::id();
 }
 
-QString DerpFTBInstance::getStatusbarDescription()
+QString OneSixFTBInstance::getStatusbarDescription()
 {
-	return "Derp FTB: " + intendedVersionId();
+	return "OneSix FTB: " + intendedVersionId();
 }
-bool DerpFTBInstance::menuActionEnabled(QString action_name) const
+bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
 {
 	return false;
 }
 
-std::shared_ptr<Task> DerpFTBInstance::doUpdate(bool only_prepare)
+std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare)
 {
 	std::shared_ptr<SequentialTask> task;
 	task.reset(new SequentialTask(this));
@@ -112,12 +112,12 @@ std::shared_ptr<Task> DerpFTBInstance::doUpdate(bool only_prepare)
 	{
 		task->addTask(std::shared_ptr<Task>(MMC->forgelist()->getLoadTask()));
 	}
-	task->addTask(DerpInstance::doUpdate(only_prepare));
-	task->addTask(std::shared_ptr<Task>(new DerpFTBInstanceForge(m_forge->version(), this, this)));
+	task->addTask(OneSixInstance::doUpdate(only_prepare));
+	task->addTask(std::shared_ptr<Task>(new OneSixFTBInstanceForge(m_forge->version(), this, this)));
 	//FIXME: yes. this may appear dumb. but the previous step can change the list, so we do it all again.
 	//TODO: Add a graph task. Construct graphs of tasks so we may capture the logic properly.
-	task->addTask(DerpInstance::doUpdate(only_prepare));
+	task->addTask(OneSixInstance::doUpdate(only_prepare));
 	return task;
 }
 
-#include "DerpFTBInstance.moc"
+#include "OneSixFTBInstance.moc"
diff --git a/logic/DerpFTBInstance.h b/logic/OneSi