Derpstances. Everything renamed. Launching does not yet work.

28 files changed, 862 insertions, 314 deletions

diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index a861e9b2..79640c84 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -27,7 +27,7 @@
 class QDialog;
 class Task;
 class MinecraftProcess;
-class OneSixUpdate;
+class DerpUpdate;
 class InstanceList;
 class BaseInstancePrivate;
 
diff --git a/logic/OneSixFTBInstance.cpp b/logic/DerpFTBInstance.cpp
index e50a5b53..f9aeeca0 100644
--- a/logic/OneSixFTBInstance.cpp
+++ b/logic/DerpFTBInstance.cpp
@@ -1,17 +1,17 @@
-#include "OneSixFTBInstance.h"
+#include "DerpFTBInstance.h"
 
-#include "OneSixVersion.h"
-#include "OneSixLibrary.h"
+#include "DerpVersion.h"
+#include "DerpLibrary.h"
 #include "tasks/SequentialTask.h"
 #include "ForgeInstaller.h"
 #include "lists/ForgeVersionList.h"
 #include "MultiMC.h"
 
-class OneSixFTBInstanceForge : public Task
+class DerpFTBInstanceForge : public Task
 {
 	Q_OBJECT
 public:
-	explicit OneSixFTBInstanceForge(const QString &version, OneSixFTBInstance *inst, QObject *parent = 0) :
+	explicit DerpFTBInstanceForge(const QString &version, DerpFTBInstance *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, &OneSixFTBInstanceForge::installForge);
+			connect(fjob, &NetJob::succeeded, this, &DerpFTBInstanceForge::installForge);
 			connect(fjob, &NetJob::progress, [this](qint64 c, qint64 total){ setProgress(100 * c / total); });
 			fjob->start();
 		}
@@ -60,8 +60,6 @@ slots:
 			emitFailed(tr("Couldn't load the version config"));
 			return;
 		}
-		instance->revertCustomVersion();
-		instance->customizeVersion();
 		auto version = instance->getFullVersion();
 		if (!forge.apply(version))
 		{
@@ -72,41 +70,41 @@ slots:
 	}
 
 private:
-	OneSixFTBInstance *instance;
+	DerpFTBInstance *instance;
 	QString version;
 	ForgeVersionPtr forgeVersion;
 	MetaEntryPtr entry;
 	NetJob *fjob;
 };
 
-OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	OneSixInstance(rootDir, settings, parent)
+DerpFTBInstance::DerpFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
+	DerpInstance(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 OneSixLibrary(match.captured()));
+		m_forge.reset(new DerpLibrary(match.captured()));
 		m_forge->finalize();
 	}
 }
 
-QString OneSixFTBInstance::id() const
+QString DerpFTBInstance::id() const
 {
 	return "FTB/" + BaseInstance::id();
 }
 
-QString OneSixFTBInstance::getStatusbarDescription()
+QString DerpFTBInstance::getStatusbarDescription()
 {
-	return "OneSix FTB: " + intendedVersionId();
+	return "Derp FTB: " + intendedVersionId();
 }
-bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
+bool DerpFTBInstance::menuActionEnabled(QString action_name) const
 {
 	return false;
 }
 
-std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare)
+std::shared_ptr<Task> DerpFTBInstance::doUpdate(bool only_prepare)
 {
 	std::shared_ptr<SequentialTask> task;
 	task.reset(new SequentialTask(this));
@@ -114,12 +112,12 @@ std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare)
 	{
 		task->addTask(std::shared_ptr<Task>(MMC->forgelist()->getLoadTask()));
 	}
-	task->addTask(OneSixInstance::doUpdate(only_prepare));
-	task->addTask(std::shared_ptr<Task>(new OneSixFTBInstanceForge(m_forge->version(), this, this)));
+	task->addTask(DerpInstance::doUpdate(only_prepare));
+	task->addTask(std::shared_ptr<Task>(new DerpFTBInstanceForge(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(OneSixInstance::doUpdate(only_prepare));
+	task->addTask(DerpInstance::doUpdate(only_prepare));
 	return task;
 }
 
-#include "OneSixFTBInstance.moc"
+#include "DerpFTBInstance.moc"
diff --git a/logic/OneSixFTBInstance.h b/logic/DerpFTBInstance.h
index dc028819..c16998bf 100644
--- a/logic/OneSixFTBInstance.h
+++ b/logic/DerpFTBInstance.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "OneSixInstance.h"
+#include "DerpInstance.h"
 
-class OneSixLibrary;
+class DerpLibrary;
 
-class OneSixFTBInstance : public OneSixInstance
+class DerpFTBInstance : public DerpInstance
 {
 	Q_OBJECT
 public:
-	explicit OneSixFTBInstance(const QString &rootDir, SettingsObject *settings,
+	explicit DerpFTBInstance(const QString &rootDir, SettingsObject *settings,
 							QObject *parent = 0);
 	virtual QString getStatusbarDescription();
 	virtual bool menuActionEnabled(QString action_name) const;
@@ -18,5 +18,5 @@ public:
 	virtual QString id() const;
 
 private:
-	std::shared_ptr<OneSixLibrary> m_forge;
+	std::shared_ptr<DerpLibrary> m_forge;
 };
diff --git a/logic/OneSixInstance.cpp b/logic/DerpInstance.cpp
index 3cfc1c76..31ed7c95 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/DerpInstance.cpp
@@ -13,37 +13,35 @@
  * limitations under the License.
  */
 
+#include "DerpInstance.h"
+
+#include <QIcon>
+
+#include "DerpInstance_p.h"
+#include "DerpUpdate.h"
+#include "DerpVersion.h"
+#include "pathutils.h"
+#include "logger/QsLog.h"
+#include "assets/AssetsUtils.h"
 #include "MultiMC.h"
-#include "OneSixInstance.h"
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
+#include "icons/IconList.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>
+#include "gui/dialogs/DerpModEditDialog.h"
 
-OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_obj,
-							   QObject *parent)
-	: BaseInstance(new OneSixInstancePrivate(), rootDir, setting_obj, parent)
+DerpInstance::DerpInstance(const QString &rootDir, SettingsObject *settings, QObject *parent)
+	: BaseInstance(new DerpInstancePrivate(), rootDir, settings, parent)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	d->m_settings->registerSetting("IntendedVersion", "");
 	d->m_settings->registerSetting("ShouldUpdate", false);
+	d->version.reset(new DerpVersion(this, this));
 	reloadFullVersion();
 }
 
-std::shared_ptr<Task> OneSixInstance::doUpdate(bool only_prepare)
+
+std::shared_ptr<Task> DerpInstance::doUpdate(bool only_prepare)
 {
-	return std::shared_ptr<Task>(new OneSixUpdate(this, only_prepare));
+	return std::shared_ptr<Task>(new DerpUpdate(this, only_prepare));
 }
 
 QString replaceTokensIn(QString text, QMap<QString, QString> with)
@@ -70,7 +68,7 @@ QString replaceTokensIn(QString text, QMap<QString, QString> with)
 	return result;
 }
 
-QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
+QDir DerpInstance::reconstructAssets(std::shared_ptr<DerpVersion> version)
 {
 	QDir assetsDir = QDir("assets/");
 	QDir indexDir = QDir(PathCombine(assetsDir.path(), "indexes"));
@@ -130,9 +128,9 @@ QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
 	return virtualRoot;
 }
 
-QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
+QStringList DerpInstance::processMinecraftArgs(MojangAccountPtr account)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	auto version = d->version;
 	QString args_pattern = version->minecraftArguments;
 
@@ -182,9 +180,9 @@ QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
 	return parts;
 }
 
-MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
+MinecraftProcess *DerpInstance::prepareForLaunch(MojangAccountPtr account)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 
 	QIcon icon = MMC->icons()->getIcon(iconKey());
 	auto pixmap = icon.pixmap(128, 128);
@@ -229,7 +227,9 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
 	QDir natives_dir(PathCombine(instanceRoot(), "natives/"));
 	launchScript += "windowTitle " + windowTitle() + "\n";
 	launchScript += "natives " + natives_dir.absolutePath() + "\n";
-	launchScript += "launch onesix\n";
+	launchScript += "launch onesix";
+
+	qDebug() << launchScript;
 
 	// create the process and set its parameters
 	MinecraftProcess *proc = new MinecraftProcess(this);
@@ -239,16 +239,16 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
 	return proc;
 }
 
-void OneSixInstance::cleanupAfterRun()
+void DerpInstance::cleanupAfterRun()
 {
 	QString target_dir = PathCombine(instanceRoot(), "natives/");
 	QDir dir(target_dir);
 	dir.removeRecursively();
 }
 
-std::shared_ptr<ModList> OneSixInstance::loaderModList()
+std::shared_ptr<ModList> DerpInstance::loaderModList()
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	if (!d->loader_mod_list)
 	{
 		d->loader_mod_list.reset(new ModList(loaderModsDir()));
@@ -257,9 +257,9 @@ std::shared_ptr<ModList> OneSixInstance::loaderModList()
 	return d->loader_mod_list;
 }
 
-std::shared_ptr<ModList> OneSixInstance::resourcePackList()
+std::shared_ptr<ModList> DerpInstance::resourcePackList()
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	if (!d->resource_pack_list)
 	{
 		d->resource_pack_list.reset(new ModList(resourcePacksDir()));
@@ -268,34 +268,32 @@ std::shared_ptr<ModList> OneSixInstance::resourcePackList()
 	return d->resource_pack_list;
 }
 
-QDialog *OneSixInstance::createModEditDialog(QWidget *parent)
+QDialog *DerpInstance::createModEditDialog(QWidget *parent)
 {
-	return new OneSixModEditDialog(this, parent);
+	return new DerpModEditDialog(this, parent);
 }
 
-bool OneSixInstance::setIntendedVersionId(QString version)
+bool DerpInstance::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
+QString DerpInstance::intendedVersionId() const
 {
 	return settings().get("IntendedVersion").toString();
 }
 
-void OneSixInstance::setShouldUpdate(bool val)
+void DerpInstance::setShouldUpdate(bool val)
 {
 	settings().set("ShouldUpdate", val);
 }
 
-bool OneSixInstance::shouldUpdate() const
+bool DerpInstance::shouldUpdate() const
 {
 	QVariant var = settings().get("ShouldUpdate");
 	if (!var.isValid() || var.toBool() == false)
@@ -305,94 +303,53 @@ bool OneSixInstance::shouldUpdate() const
 	return true;
 }
 
-bool OneSixInstance::versionIsCustom()
+bool DerpInstance::versionIsCustom()
 {
-	QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
-	QFile versionfile(verpath_custom);
-	return versionfile.exists();
+	QDir patches(PathCombine(instanceRoot(), "patches/"));
+	return QFile::exists(PathCombine(instanceRoot(), "custom.json"))
+			|| (patches.exists() && patches.count() >= 0);
 }
 
-QString OneSixInstance::currentVersionId() const
+QString DerpInstance::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()
+bool DerpInstance::reloadFullVersion(QWidget *widgetParent)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 
-	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;
-	}
+	bool ret = d->version->reload(widgetParent);
+	emit versionReloaded();
+	return ret;
 }
 
-std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion()
+std::shared_ptr<DerpVersion> DerpInstance::getFullVersion()
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	return d->version;
 }
 
-QString OneSixInstance::defaultBaseJar() const
+QString DerpInstance::defaultBaseJar() const
 {
 	return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
 }
 
-QString OneSixInstance::defaultCustomBaseJar() const
+QString DerpInstance::defaultCustomBaseJar() const
 {
 	return PathCombine(instanceRoot(), "custom.jar");
 }
 
-bool OneSixInstance::menuActionEnabled(QString action_name) const
+bool DerpInstance::menuActionEnabled(QString action_name) const
 {
 	if (action_name == "actionChangeInstLWJGLVersion")
 		return false;
 	return true;
 }
 
-QString OneSixInstance::getStatusbarDescription()
+QString DerpInstance::getStatusbarDescription()
 {
-	QString descr = "One Six : " + intendedVersionId();
+	QString descr = "Derp : " + intendedVersionId();
 	if (versionIsCustom())
 	{
 		descr + " (custom)";
@@ -400,17 +357,17 @@ QString OneSixInstance::getStatusbarDescription()
 	return descr;
 }
 
-QString OneSixInstance::loaderModsDir() const
+QString DerpInstance::loaderModsDir() const
 {
 	return PathCombine(minecraftRoot(), "mods");
 }
 
-QString OneSixInstance::resourcePacksDir() const
+QString DerpInstance::resourcePacksDir() const
 {
 	return PathCombine(minecraftRoot(), "resourcepacks");
 }
 
-QString OneSixInstance::instanceConfigFolder() const
+QString DerpInstance::instanceConfigFolder() const
 {
 	return PathCombine(minecraftRoot(), "config");
 }
diff --git a/logic/OneSixInstance.h b/logic/DerpInstance.h
index f869e345..37d3df52 100644
--- a/logic/OneSixInstance.h
+++ b/logic/DerpInstance.h
@@ -15,21 +15,17 @@
 
 #pragma once
 
-#include <QStringList>
-#include <QDir>
-
 #include "BaseInstance.h"
 
-class OneSixVersion;
-class Task;
-class ModList;
+#include "DerpVersion.h"
+#include "ModList.h"
 
-class OneSixInstance : public BaseInstance
+class DerpInstance : public BaseInstance
 {
 	Q_OBJECT
 public:
-	explicit OneSixInstance(const QString &rootDir, SettingsObject *settings,
-							QObject *parent = 0);
+	explicit DerpInstance(const QString &rootDir, SettingsObject *settings,
+						  QObject *parent = 0);
 
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> loaderModList();
@@ -55,14 +51,10 @@ public:
 
 	virtual QDialog *createModEditDialog(QWidget *parent) override;
 
-	/// reload the full version json file. return true on success!
-	bool reloadFullVersion();
+	/// reload the full version json files. return true on success!
+	bool reloadFullVersion(QWidget *widgetParent = 0);
 	/// get the current full version info
-	std::shared_ptr<OneSixVersion> getFullVersion();
-	/// revert the current custom version back to base
-	bool revertCustomVersion();
-	/// customize the current base version
-	bool customizeVersion();
+	std::shared_ptr<DerpVersion> getFullVersion();
 	/// is the current version original, or custom?
 	virtual bool versionIsCustom() override;
 
@@ -72,7 +64,10 @@ public:
 	virtual bool menuActionEnabled(QString action_name) const override;
 	virtual QString getStatusbarDescription() override;
 
+signals:
+	void versionReloaded();
+
 private:
 	QStringList processMinecraftArgs(MojangAccountPtr account);
-	QDir reconstructAssets(std::shared_ptr<OneSixVersion> version);
+	QDir reconstructAssets(std::shared_ptr<DerpVersion> version);
 };
diff --git a/logic/OneSixInstance_p.h b/logic/DerpInstance_p.h
index 6b7ea431..41f7b62d 100644
--- a/logic/OneSixInstance_p.h
+++ b/logic/DerpInstance_p.h
@@ -15,16 +15,13 @@
 
 #pragma once
 
-#include <memory>
+#include "BaseInstance_p.h"
+#include "DerpVersion.h"
+#include "ModList.h"
 
-#include "logic/BaseInstance_p.h"
-#include "logic/OneSixVersion.h"
-#include "logic/OneSixLibrary.h"
-#include "logic/ModList.h"
-
-struct OneSixInstancePrivate : public BaseInstancePrivate
+struct DerpInstancePrivate : public BaseInstancePrivate
 {
-	std::shared_ptr<OneSixVersion> version;
+	std::shared_ptr<DerpVersion> version;
 	std::shared_ptr<ModList> loader_mod_list;
 	std::shared_ptr<ModList> resource_pack_list;
-};
\ No newline at end of file
+};
diff --git a/logic/OneSixLibrary.cpp b/logic/DerpLibrary.cpp
index 7b80d5e7..ba4d516b 100644
--- a/logic/OneSixLibrary.cpp
+++ b/logic/DerpLibrary.cpp
@@ -15,15 +15,15 @@
 
 #include <QJsonArray>
 
-#include "OneSixLibrary.h"
-#include "OneSixRule.h"
+#include "DerpLibrary.h"
+#include "DerpRule.h"
 #include "OpSys.h"
 #include "logic/net/URLConstants.h"
 #include <pathutils.h>
 #include <JlCompress.h>
 #include "logger/QsLog.h"
 
-void OneSixLibrary::finalize()
+void DerpLibrary::finalize()
 {
 	QStringList parts = m_name.split(':');
 	QString relative = parts[0];
@@ -76,67 +76,67 @@ void OneSixLibrary::finalize()
 	}
 }
 
-void OneSixLibrary::setName(QString name)
+void DerpLibrary::setName(const QString &name)
 {
 	m_name = name;
 }
-void OneSixLibrary::setBaseUrl(QString base_url)
+void DerpLibrary::setBaseUrl(const QString &base_url)
 {
 	m_base_url = base_url;
 }
-void OneSixLibrary::setIsNative()
+void DerpLibrary::setIsNative()
 {
 	m_is_native = true;
 }
-void OneSixLibrary::addNative(OpSys os, QString suffix)
+void DerpLibrary::addNative(OpSys os, const QString &suffix)
 {
 	m_is_native = true;
 	m_native_suffixes[os] = suffix;
 }
-void OneSixLibrary::setRules(QList<std::shared_ptr<Rule>> rules)
+void DerpLibrary::setRules(QList<std::shared_ptr<Rule>> rules)
 {
 	m_rules = rules;
 }
-bool OneSixLibrary::isActive()
+bool DerpLibrary::isActive() const
 {
 	return m_is_active;
 }
-bool OneSixLibrary::isNative()
+bool DerpLibrary::isNative() const
 {
 	return m_is_native;
 }
-QString OneSixLibrary::downloadUrl()
+QString DerpLibrary::downloadUrl() const
 {
 	if (m_absolute_url.size())
 		return m_absolute_url;
 	return m_download_url;
 }
-QString OneSixLibrary::storagePath()
+QString DerpLibrary::storagePath() const
 {
 	return m_storage_path;
 }
 
-void OneSixLibrary::setAbsoluteUrl(QString absolute_url)
+void DerpLibrary::setAbsoluteUrl(const QString &absolute_url)
 {
 	m_absolute_url = absolute_url;
 }
 
-QString OneSixLibrary::absoluteUrl()
+QString DerpLibrary::absoluteUrl() const
 {
 	return m_absolute_url;
 }
 
-void OneSixLibrary::setHint(QString hint)
+void DerpLibrary::setHint(const QString &hint)
 {
 	m_hint = hint;
 }
 
-QString OneSixLibrary::hint()
+QString DerpLibrary::hint() const
 {
 	return m_hint;
 }
 
-bool OneSixLibrary::filesExist()
+bool DerpLibrary::filesExist()
 {
 	QString storage = storagePath();
 	if (storage.contains("${arch}"))
@@ -167,7 +167,7 @@ bool OneSixLibrary::filesExist()
 	return true;
 }
 
-bool OneSixLibrary::extractTo(QString target_dir)
+bool DerpLibrary::extractTo(QString target_dir)
 {
 	QString storage = storagePath();
 	if (storage.contains("${arch}"))
@@ -220,7 +220,7 @@ bool OneSixLibrary::extractTo(QString target_dir)
 	return true;
 }
 
-QJsonObject OneSixLibrary::toJson()
+QJsonObject DerpLibrary::toJson()
 {
 	QJsonObject libRoot;
 	libRoot.insert("name", m_name);
diff --git a/logic/OneSixLibrary.h b/logic/DerpLibrary.h
index 227cdbef..d1cee843 100644
--- a/logic/OneSixLibrary.h
+++ b/logic/DerpLibrary.h
@@ -26,7 +26,7 @@
 
 class Rule;
 
-class OneSixLibrary
+class DerpLibrary
 {
 private:
 	// basic values used internally (so far)
@@ -63,7 +63,7 @@ public:
 
 public:
 	/// Constructor
-	OneSixLibrary(QString name)
+	DerpLibrary(const QString &name)
 	{
 		m_name = name;
 	}
@@ -84,48 +84,48 @@ public:
 	void finalize();
 
 	/// Set the library composite name
-	void setName(QString name);
+	void setName(const QString &name);
 	/// get a decent-looking name
-	QString name()
+	QString name() const
 	{
 		return m_decentname;
 	}
 	/// get a decent-looking version
-	QString version()
+	QString version() const
 	{
 		return m_decentversion;
 	}
 	/// what kind of library is it? (for display)
-	QString type()
+	QString type() const
 	{
 		return m_decenttype;
 	}
 	/// Set the url base for downloads
-	void setBaseUrl(QString base_url);
+	void setBaseUrl(const QString &base_url);
 
 	/// Call this to mark the library as 'native' (it's a zip archive with DLLs)
 	void setIsNative();
 	/// Attach a name suffix to the specified OS native
-	void addNative(OpSys os, QString suffix);
+	void addNative(OpSys os, const QString &suffix);
 	/// Set the load rules
 	void setRules(QList<std::shared_ptr<Rule>> rules);
 
 	/// Returns true if the library should be loaded (or extracted, in case of natives)
-	bool isActive();
+	bool isActive() const;
 	/// Returns true if the library is native
-	bool isNative();
+	bool isNative() const;
 	/// Get the URL to download the library from
-	QString downloadUrl();
+	QString downloadUrl() const;
 	/// Get the relative path where the library should be saved
-	QString storagePath();
+	QString storagePath() const;
 
 	/// set an absolute URL for the library. This is an MMC extension.
-	void setAbsoluteUrl(QString absolute_url);
-	QString absoluteUrl();
+	void setAbsoluteUrl(const QString &absolute_url);
+	QString absoluteUrl() const;
 
 	/// set a hint about how to treat the library. This is an MMC extension.
-	void setHint(QString hint);
-	QString hint();
+	void setHint(const QString &hint);
+	QString hint() const;
 
 	bool extractTo(QString target_dir);
 	bool filesExist();
diff --git a/logic/OneSixRule.cpp b/logic/DerpRule.cpp
index 392b1dd1..d4cf1ba3 100644
--- a/logic/OneSixRule.cpp
+++ b/logic/DerpRule.cpp
@@ -16,7 +16,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
-#include "OneSixRule.h"
+#include "DerpRule.h"
 
 QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules)
 {
@@ -86,4 +86,4 @@ RuleAction RuleAction_fromString(QString name)
 	if (name == "disallow")
 		return Disallow;
 	return Defer;
-}
\ No newline at end of file
+}
diff --git a/logic/OneSixRule.h b/logic/DerpRule.h
index 5a13cbd9..7895ea98 100644
--- a/logic/OneSixRule.h
+++ b/logic/DerpRule.h
@@ -17,7 +17,7 @@
 
 #include <QString>
 
-#include "logic/OneSixLibrary.h"
+#include "logic/DerpLibrary.h"
 
 enum RuleAction
 {
@@ -33,7 +33,7 @@ class Rule
 {
 protected:
 	RuleAction m_result;
-	virtual bool applies(OneSixLibrary *parent) = 0;
+	virtual bool applies(DerpLibrary *parent) = 0;
 
 public:
 	Rule(RuleAction result) : m_result(result)
@@ -41,7 +41,7 @@ public:
 	}
 	virtual ~Rule() {};
 	virtual QJsonObject toJson() = 0;
-	RuleAction apply(OneSixLibrary *parent)
+	RuleAction apply(DerpLibrary *parent)
 	{
 		if (applies(parent))
 			return m_result;
@@ -60,7 +60,7 @@ private:
 	QString m_version_regexp;
 
 protected:
-	virtual bool applies(OneSixLibrary *)
+	virtual bool applies(DerpLibrary *)
 	{
 		return (m_system == currentSystem);
 	}
@@ -81,7 +81,7 @@ public:
 class ImplicitRule : public Rule
 {
 protected:
-	virtual bool applies(OneSixLibrary *)
+	virtual bool applies(DerpLibrary *)
 	{
 		return true;
 	}
diff --git a/logic/OneSixUpdate.cpp b/logic/DerpUpdate.cpp
index 0119ab07..e1600d28 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/DerpUpdate.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "MultiMC.h"
-#include "OneSixUpdate.h"
+#include "DerpUpdate.h"
 
 #include <QtNetwork>
 
@@ -25,9 +25,9 @@
 
 #include "BaseInstance.h"
 #include "lists/MinecraftVersionList.h"
-#include "OneSixVersion.h"
-#include "OneSixLibrary.h"
-#include "OneSixInstance.h"
+#include "DerpVersion.h"
+#include "DerpLibrary.h"
+#include "DerpInstance.h"
 #include "net/ForgeMirrors.h"
 #include "net/URLConstants.h"
 #include "assets/AssetsUtils.h"
@@ -35,12 +35,12 @@
 #include "pathutils.h"
 #include <JlCompress.h>
 
-OneSixUpdate::OneSixUpdate(BaseInstance *inst, bool only_prepare, QObject *parent)
+DerpUpdate::DerpUpdate(BaseInstance *inst, bool only_prepare, QObject *parent)
 	: Task(parent), m_inst(inst), m_only_prepare(only_prepare)
 {
 }
 
-void OneSixUpdate::executeTask()
+void DerpUpdate::executeTask()
 {
 	QString intendedVersion = m_inst->intendedVersionId();
 
@@ -77,7 +77,7 @@ void OneSixUpdate::executeTask()
 	}
 }
 
-void OneSixUpdate::versionFileStart()
+void DerpUpdate::versionFileStart()
 {
 	QLOG_IN