Begin the transformation!

Nuke all the things.

11 files changed, 420 insertions, 1117 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 5ba05b2a..95f2ac4c 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -1032,7 +1032,7 @@ void MainWindow::on_actionViewSelectedInstFolder_triggered()
 	}
 }
 
-void MainWindow::on_actionEditInstMods_triggered()
+void MainWindow::on_actionEditInstance_triggered()
 {
 	if (m_selectedInstance)
 	{
@@ -1339,99 +1339,12 @@ void MainWindow::startTask(Task *task)
 	task->start();
 }
 
-// Create A Desktop Shortcut
-void MainWindow::on_actionMakeDesktopShortcut_triggered()
-{
-	QString name("Test");
-	name = QInputDialog::getText(this, tr("MultiMC Shortcut"), tr("Enter a Shortcut Name."),
-								 QLineEdit::Normal, name);
-
-	Util::createShortCut(Util::getDesktopDir(), QApplication::instance()->applicationFilePath(),
-						 QStringList() << "-dl" << QDir::currentPath() << "test", name,
-						 "application-x-octet-stream");
-
-	CustomMessageBox::selectable(
-		this, tr("Not useful"),
-		tr("A Dummy Shortcut was created. it will not do anything productive"),
-		QMessageBox::Warning)->show();
-}
-
 // BrowserDialog
 void MainWindow::openWebPage(QUrl url)
 {
 	QDesktopServices::openUrl(url);
 }
 
-void MainWindow::on_actionChangeInstMCVersion_triggered()
-{
-	if (view->selectionModel()->selectedIndexes().count() < 1)
-		return;
-
-	VersionSelectDialog vselect(m_selectedInstance->versionList().get(),
-								tr("Change Minecraft version"), this);
-	vselect.setFuzzyFilter(1, "*OneSix*");
-	if (!vselect.exec() || !vselect.selectedVersion())
-		return;
-
-	if (!MMC->accounts()->anyAccountIsValid())
-	{
-		CustomMessageBox::selectable(
-			this, tr("Error"),
-			tr("MultiMC cannot download Minecraft or update instances unless you have at least "
-			   "one account added.\nPlease add your Mojang or Minecraft account."),
-			QMessageBox::Warning)->show();
-		return;
-	}
-
-	if (m_selectedInstance->versionIsCustom())
-	{
-		auto result = CustomMessageBox::selectable(
-			this, tr("Are you sure?"),
-			tr("This will remove any library/version customization you did previously. "
-			   "This includes things like Forge install and similar."),
-			QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Abort,
-			QMessageBox::Abort)->exec();
-
-		if (result != QMessageBox::Ok)
-			return;
-	}
-	m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor());
-
-	auto updateTask = m_selectedInstance->doUpdate();
-	if (!updateTask)
-	{
-		return;
-	}
-	ProgressDialog tDialog(this);
-	connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
-	tDialog.exec(updateTask.get());
-}
-
-void MainWindow::on_actionChangeInstLWJGLVersion_triggered()
-{
-	if (!m_selectedInstance)
-		return;
-
-	LWJGLSelectDialog lselect(this);
-	lselect.exec();
-	if (lselect.result() == QDialog::Accepted)
-	{
-        auto ptr = std::dynamic_pointer_cast<LegacyInstance>(m_selectedInstance);
-        if(ptr)
-            ptr->setLWJGLVersion(lselect.selectedVersion());
-	}
-}
-
-void MainWindow::on_actionInstanceSettings_triggered()
-{
-	if (view->selectionModel()->selectedIndexes().count() < 1)
-		return;
-
-	InstanceSettings settings(&m_selectedInstance->settings(), this);
-	settings.setWindowTitle(tr("Instance settings"));
-	settings.exec();
-}
-
 void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     if(!current.isValid())
@@ -1446,12 +1359,8 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
 	{
 		ui->instanceToolBar->setEnabled(m_selectedInstance->canLaunch());
 		renameButton->setText(m_selectedInstance->name());
-		ui->actionChangeInstLWJGLVersion->setEnabled(
-			m_selectedInstance->menuActionEnabled("actionChangeInstLWJGLVersion"));
-		ui->actionEditInstMods->setEnabled(
-			m_selectedInstance->menuActionEnabled("actionEditInstMods"));
-		ui->actionChangeInstMCVersion->setEnabled(
-			m_selectedInstance->menuActionEnabled("actionChangeInstMCVersion"));
+		ui->actionEditInstance->setEnabled(
+			m_selectedInstance->menuActionEnabled("actionEditInstance"));
 		m_statusLeft->setText(m_selectedInstance->getStatusbarDescription());
 		updateInstanceToolIcon(m_selectedInstance->iconKey());
 
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 69cf11b0..0cd2e84b 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -103,11 +103,7 @@ slots:
 
 	void on_actionRenameInstance_triggered();
 
-	void on_actionMakeDesktopShortcut_triggered();
-
-	void on_actionChangeInstMCVersion_triggered();
-
-	void on_actionEditInstMods_triggered();
+	void on_actionEditInstance_triggered();
 
 	void on_actionEditInstNotes_triggered();
 
@@ -135,12 +131,8 @@ slots:
 	void taskStart();
 	void taskEnd();
 
-	void on_actionChangeInstLWJGLVersion_triggered();
-
 	void instanceEnded();
 
-	void on_actionInstanceSettings_triggered();
-
 	// called when an icon is changed in the icon model.
 	void iconUpdated(QString);
 
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 1d7fbec9..8ee196fd 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -74,7 +74,7 @@
    <addaction name="actionReportBug"/>
    <addaction name="actionAbout"/>
    <addaction name="separator"/>
-   <addaction name="actionPatreon"/>   
+   <addaction name="actionPatreon"/>
    <addaction name="actionCAT"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
@@ -115,10 +115,7 @@
    <addaction name="separator"/>
    <addaction name="actionScreenshots"/>
    <addaction name="separator"/>
-   <addaction name="actionInstanceSettings"/>
-   <addaction name="actionChangeInstMCVersion"/>
-   <addaction name="actionChangeInstLWJGLVersion"/>
-   <addaction name="actionEditInstMods"/>
+   <addaction name="actionEditInstance"/>
    <addaction name="actionViewSelectedInstFolder"/>
    <addaction name="actionConfig_Folder"/>
    <addaction name="separator"/>
@@ -284,7 +281,7 @@
    <property name="statusTip">
     <string>Open the MultiMC Patreon page.</string>
    </property>
-  </action>  
+  </action>
   <action name="actionMoreNews">
    <property name="icon">
     <iconset theme="news">
@@ -388,82 +385,18 @@
     <string>Edit the notes for the selected instance.</string>
    </property>
   </action>
-  <action name="actionInstanceSettings">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Settings</string>
-   </property>
-   <property name="toolTip">
-    <string>Change settings for the selected instance.</string>
-   </property>
-   <property name="statusTip">
-    <string>Change settings for the selected instance.</string>
-   </property>
-  </action>
-  <action name="actionMakeDesktopShortcut">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Make Shortcut</string>
-   </property>
-   <property name="toolTip">
-    <string>Make a shortcut on the desktop for the selected instance.</string>
-   </property>
-   <property name="statusTip">
-    <string>Make a shortcut on the desktop for the selected instance.</string>
-   </property>
-  </action>
-  <action name="actionManageInstSaves">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Manage Saves</string>
-   </property>
-   <property name="toolTip">
-    <string>Manage saves for the selected instance.</string>
-   </property>
-   <property name="statusTip">
-    <string>Manage saves for the selected instance.</string>
-   </property>
-  </action>
-  <action name="actionEditInstMods">
+  <action name="actionEditInstance">
    <property name="text">
     <string>Edit Mods</string>
    </property>
-   <property name="toolTip">
-    <string>Edit the mods for the selected instance.</string>
-   </property>
-   <property name="statusTip">
-    <string>Edit the mods for the selected instance.</string>
-   </property>
-  </action>
-  <action name="actionChangeInstMCVersion">
-   <property name="text">
-    <string>Change Version</string>
-   </property>
-   <property name="toolTip">
-    <string>Change the selected instance's Minecraft version.</string>
-   </property>
-   <property name="statusTip">
-    <string>Change the selected instance's Minecraft version.</string>
-   </property>
-  </action>
-  <action name="actionChangeInstLWJGLVersion">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Change LWJGL</string>
+   <property name="iconText">
+    <string>Edit Instance</string>
    </property>
    <property name="toolTip">
-    <string>Change the version of LWJGL for the selected instance to use.</string>
+    <string>Change the instance settings, mods and versions.</string>
    </property>
    <property name="statusTip">
-    <string>Change the version of LWJGL for the selected instance to use.</string>
+    <string>Change the instance settings, mods and versions.</string>
    </property>
   </action>
   <action name="actionViewSelectedInstFolder">
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/InstanceEditDialog.cpp
index a3598eb9..fe2d1b03 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/InstanceEditDialog.cpp
@@ -23,27 +23,74 @@
 #include <QKeyEvent>
 #include <QDesktopServices>
 
-#include "OneSixModEditDialog.h"
-#include "ModEditDialogCommon.h"
-#include "ui_OneSixModEditDialog.h"
+#include "InstanceEditDialog.h"
+#include "ui_InstanceEditDialog.h"
 
 #include "gui/Platform.h"
 #include "gui/dialogs/CustomMessageBox.h"
 #include "gui/dialogs/VersionSelectDialog.h"
 
 #include "gui/dialogs/ProgressDialog.h"
+#include "InstanceSettings.h"
 
 #include "logic/ModList.h"
 #include "logic/VersionFinal.h"
 #include "logic/EnabledItemFilter.h"
-#include "logic/lists/ForgeVersionList.h"
-#include "logic/lists/LiteLoaderVersionList.h"
-#include "logic/ForgeInstaller.h"
-#include "logic/LiteLoaderInstaller.h"
+#include "logic/forge/ForgeVersionList.h"
+#include "logic/forge/ForgeInstaller.h"
+#include "logic/liteloader/LiteLoaderVersionList.h"
+#include "logic/liteloader/LiteLoaderInstaller.h"
 #include "logic/OneSixVersionBuilder.h"
+#include "logic/auth/MojangAccountList.h"
 
-OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
-	: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
+#include <QAbstractItemModel>
+#include <logic/Mod.h>
+
+#include "CustomMessageBox.h"
+#include <QDesktopServices>
+#include <QMessageBox>
+#include <QString>
+#include <QUrl>
+
+bool lastfirst(QModelIndexList &list, int &first, int &last)
+{
+	if (!list.size())
+		return false;
+	first = last = list[0].row();
+	for (auto item : list)
+	{
+		int row = item.row();
+		if (row < first)
+			first = row;
+		if (row > last)
+			last = row;
+	}
+	return true;
+}
+
+void showWebsiteForMod(QWidget *parentDlg, Mod &m)
+{
+	QString url = m.homeurl();
+	if (url.size())
+	{
+		// catch the cases where the protocol is missing
+		if (!url.startsWith("http"))
+		{
+			url = "http://" + url;
+		}
+		QDesktopServices::openUrl(url);
+	}
+	else
+	{
+		CustomMessageBox::selectable(
+			parentDlg, QObject::tr("How sad!"),
+			QObject::tr("The mod author didn't provide a website link for this mod."),
+			QMessageBox::Warning);
+	}
+}
+
+InstanceEditDialog::InstanceEditDialog(OneSixInstance *inst, QWidget *parent)
+	: QDialog(parent), ui(new Ui::InstanceEditDialog), m_inst(inst)
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
@@ -58,7 +105,7 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		ui->libraryTreeView->setModel(main_model);
 		ui->libraryTreeView->installEventFilter(this);
 		connect(ui->libraryTreeView->selectionModel(), &QItemSelectionModel::currentChanged,
-				this, &OneSixModEditDialog::versionCurrent);
+				this, &InstanceEditDialog::versionCurrent);
 		updateVersionControls();
 	}
 	else
@@ -76,6 +123,17 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
 				SLOT(loaderCurrent(QModelIndex, QModelIndex)));
 	}
+	// Core mods
+	{
+		ensureFolderPathExists(m_inst->coreModsDir());
+		m_coremods = m_inst->coreModList();
+		ui->coreModsTreeView->setModel(m_coremods.get());
+		ui->coreModsTreeView->installEventFilter(this);
+		m_coremods->startWatching();
+		auto smodel = ui->coreModsTreeView->selectionModel();
+		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+				SLOT(coreCurrent(QModelIndex, QModelIndex)));
+	}
 	// resource packs
 	{
 		ensureFolderPathExists(m_inst->resourcePacksDir());
@@ -86,23 +144,24 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 	}
 
 	connect(m_inst, &OneSixInstance::versionReloaded, this,
-			&OneSixModEditDialog::updateVersionControls);
+			&InstanceEditDialog::updateVersionControls);
 }
 
-OneSixModEditDialog::~OneSixModEditDialog()
+InstanceEditDialog::~InstanceEditDialog()
 {
 	m_mods->stopWatching();
 	m_resourcepacks->stopWatching();
+	m_coremods->stopWatching();
 	delete ui;
 }
 
-void OneSixModEditDialog::updateVersionControls()
+void InstanceEditDialog::updateVersionControls()
 {
 	ui->forgeBtn->setEnabled(true);
 	ui->liteloaderBtn->setEnabled(true);
 }
 
-void OneSixModEditDialog::disableVersionControls()
+void InstanceEditDialog::disableVersionControls()
 {
 	ui->forgeBtn->setEnabled(false);
 	ui->liteloaderBtn->setEnabled(false);
@@ -110,7 +169,7 @@ void OneSixModEditDialog::disableVersionControls()
 	ui->removeLibraryBtn->setEnabled(false);
 }
 
-bool OneSixModEditDialog::reloadInstanceVersion()
+bool InstanceEditDialog::reloadInstanceVersion()
 {
 	try
 	{
@@ -131,12 +190,19 @@ bool OneSixModEditDialog::reloadInstanceVersion()
 	}
 }
 
-void OneSixModEditDialog::on_reloadLibrariesBtn_clicked()
+void InstanceEditDialog::on_settingsBtn_clicked()
+{
+	InstanceSettings settings(&m_inst->settings(), this);
+	settings.setWindowTitle(tr("Instance settings"));
+	settings.exec();
+}
+
+void InstanceEditDialog::on_reloadLibrariesBtn_clicked()
 {
 	reloadInstanceVersion();
 }
 
-void OneSixModEditDialog::on_removeLibraryBtn_clicked()
+void InstanceEditDialog::on_removeLibraryBtn_clicked()
 {
 	if (ui->libraryTreeView->currentIndex().isValid())
 	{
@@ -148,7 +214,7 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked()
+void InstanceEditDialog::on_resetLibraryOrderBtn_clicked()
 {
 	try
 	{
@@ -160,7 +226,7 @@ void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_moveLibraryUpBtn_clicked()
+void InstanceEditDialog::on_moveLibraryUpBtn_clicked()
 {
 	if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
 	{
@@ -178,7 +244,7 @@ void OneSixModEditDialog::on_moveLibraryUpBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_moveLibraryDownBtn_clicked()
+void InstanceEditDialog::on_moveLibraryDownBtn_clicked()
 {
 	if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
 	{
@@ -196,7 +262,106 @@ void OneSixModEditDialog::on_moveLibraryDownBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_forgeBtn_clicked()
+// FIXME: use this for legacy forge... or abstract away.
+/*
+void LegacyModEditDialog::on_addForgeBtn_clicked()
+{
+	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
+	vselect.setFilter(1, m_inst->intendedVersionId());
+	if (vselect.exec() && vselect.selectedVersion())
+	{
+		ForgeVersionPtr forge =
+			std::dynamic_pointer_cast<ForgeVersion>(vselect.selectedVersion());
+		if (!forge)
+			return;
+		auto entry = MMC->metacache()->resolveEntry("minecraftforge", forge->filename);
+		if (entry->stale)
+		{
+			NetJob *fjob = new NetJob("Forge download");
+			fjob->addNetAction(CacheDownload::make(forge->universal_url, entry));
+			ProgressDialog dlg(this);
+			dlg.exec(fjob);
+			if (dlg.result() == QDialog::Accepted)
+			{
+				m_jarmods->stopWatching();
+				m_jarmods->installMod(QFileInfo(entry->getFullPath()));
+				m_jarmods->startWatching();
+			}
+			else
+			{
+				// failed to download forge :/
+			}
+		}
+		else
+		{
+			m_jarmods->stopWatching();
+			m_jarmods->installMod(QFileInfo(entry->getFullPath()));
+			m_jarmods->startWatching();
+		}
+	}
+}*/
+
+void InstanceEditDialog::on_changeMCVersionBtn_clicked()
+{
+	VersionSelectDialog vselect(m_inst->versionList().get(), tr("Change Minecraft version"), this);
+	if (!vselect.exec() || !vselect.selectedVersion())
+		return;
+
+	if (!MMC->accounts()->anyAccountIsValid())
+	{
+		CustomMessageBox::selectable(
+			this, tr("Error"),
+			tr("MultiMC cannot download Minecraft or update instances unless you have at least "
+			   "one account added.\nPlease add your Mojang or Minecraft account."),
+			QMessageBox::Warning)->show();
+		return;
+	}
+
+	if (m_inst->versionIsCustom())
+	{
+		auto result = CustomMessageBox::selectable(
+			this, tr("Are you sure?"),
+			tr("This will remove any library/version customization you did previously. "
+			   "This includes things like Forge install and similar."),
+			QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Abort,
+			QMessageBox::Abort)->exec();
+
+		if (result != QMessageBox::Ok)
+			return;
+		m_version->revertToVanilla();
+		reloadInstanceVersion();
+	}
+	m_inst->setIntendedVersionId(vselect.selectedVersion()->descriptor());
+
+	auto updateTask = m_inst->doUpdate();
+	if (!updateTask)
+	{
+		return;
+	}
+	ProgressDialog tDialog(this);
+	connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
+	tDialog.exec(updateTask.get());
+}
+
+/*
+void MainWindow::on_actionChangeInstLWJGLVersion_triggered()
+{
+	if (!m_selectedInstance)
+		return;
+
+	LWJGLSelectDialog lselect(this);
+	lselect.exec();
+	if (lselect.result() == QDialog::Accepted)
+	{
+        auto ptr = std::dynamic_pointer_cast<LegacyInstance>(m_selectedInstance);
+        if(ptr)
+            ptr->setLWJGLVersion(lselect.selectedVersion());
+	}
+}
+*/
+
+
+void InstanceEditDialog::on_forgeBtn_clicked()
 {
 	// FIXME: use actual model, not reloading. Move logic to model.
 	if (m_version->hasFtbPack())
@@ -210,7 +375,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 		m_version->removeFtbPack();
 		reloadInstanceVersion();
 	}
-	if (m_version->isCustom())
+	if (m_version->usesLegacyCustomJson())
 	{
 		if (QMessageBox::question(this, tr("Revert?"),
 								  tr("This action will remove your custom.json. Continue?")) !=
@@ -218,7 +383,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 		{
 			return;
 		}
-		m_version->revertToBase();
+		m_version->revertToVanilla();
 		reloadInstanceVersion();
 	}
 	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
@@ -232,7 +397,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_liteloaderBtn_clicked()
+void InstanceEditDialog::on_liteloaderBtn_clicked()
 {
 	if (m_version->hasFtbPack())
 	{
@@ -245,7 +410,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 		m_version->removeFtbPack();
 		reloadInstanceVersion();
 	}
-	if (m_version->isCustom())
+	if (m_version->usesLegacyCustomJson())
 	{
 		if (QMessageBox::question(this, tr("Revert?"),
 								  tr("This action will remove your custom.json. Continue?")) !=
@@ -253,7 +418,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 		{
 			return;
 		}
-		m_version->revertToBase();
+		m_version->revertToVanilla();
 		reloadInstanceVersion();
 	}
 	VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"),
@@ -268,7 +433,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 	}
 }
 
-bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
+bool InstanceEditDialog::loaderListFilter(QKeyEvent *keyEvent)
 {
 	switch (keyEvent->key())
 	{
@@ -284,7 +449,23 @@ bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
 	return QDialog::eventFilter(ui->loaderModTreeView, keyEvent);
 }
 
-bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
+bool InstanceEditDialog::coreListFilter(QKeyEvent *keyEvent)
+{
+	switch (keyEvent->key())
+	{
+	case Qt::Key_Delete:
+		on_rmCoreBtn_clicked();
+		return true;
+	case Qt::Key_Plus:
+		on_addCoreBtn_clicked();
+		return true;
+	default:
+		break;
+	}
+	return QDialog::eventFilter(ui->coreModsTreeView, keyEvent);
+}
+
+bool InstanceEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
 {
 	switch (keyEvent->key())
 	{
@@ -300,7 +481,7 @@ bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
 	return QDialog::eventFilter(ui->resPackTreeView, keyEvent);
 }
 
-bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
+bool InstanceEditDialog::eventFilter(QObject *obj, QEvent *ev)
 {
 	if (ev->type() != QEvent::KeyPress)
 	{
@@ -309,20 +490,22 @@ bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
 	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(ev);
 	if (obj == ui->loaderModTreeView)
 		return loaderListFilter(keyEvent);
+	if (obj == ui->coreModsTreeView)
+		return coreListFilter(keyEvent);
 	if (obj == ui->resPackTreeView)
 		return resourcePackListFilter(keyEvent);
 	return QDialog::eventFilter(obj, ev);
 }
 
-void OneSixModEditDialog::on_buttonBox_rejected()
+void InstanceEditDialog::on_buttonBox_rejected()
 {
 	close();
 }
 
-void OneSixModEditDialog::on_addModBtn_clicked()
+void InstanceEditDialog::on_addModBtn_clicked()
 {
 	QStringList fileNames = QFileDialog::getOpenFileNames(
-		this, QApplication::translate("LegacyModEditDialog", "Select Loader Mods"));
+		this, QApplication::translate("InstanceEditDialog", "Select Loader Mods"));
 	for (auto filename : fileNames)
 	{
 		m_mods->stopWatching();
@@ -330,7 +513,7 @@ void OneSixModEditDialog::on_addModBtn_clicked()
 		m_mods->startWatching();
 	}
 }
-void OneSixModEditDialog::on_rmModBtn_clicked()
+void InstanceEditDialog::on_rmModBtn_clicked()
 {
 	int first, last;
 	auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
@@ -341,15 +524,44 @@ void OneSixModEditDialog::on_rmModBtn_clicked()
 	m_mods->deleteMods(first, last);
 	m_mods->startWatching();
 }
-void OneSixModEditDialog::on_viewModBtn_clicked()
+void InstanceEditDialog::on_viewModBtn_clicked()
 {
 	openDirInDefaultProgram(m_inst->loaderModsDir(), true);
 }
 
-void OneSixModEditDialog::on_addResPackBtn_clicked()
+void InstanceEditDialog::on_addCoreBtn_clicked()
+{
+	//: Title of core mod selection dialog
+	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select Core Mods"));
+	for (auto filename : fileNames)
+	{
+		m_coremods->stopWatching();
+		m_coremods->installMod(QFileInfo(filename));
+		m_coremods->startWatching();
+	}
+}
+
+void InstanceEditDialog::on_rmCoreBtn_clicked()
+{
+	int first, last;
+	auto list = ui->coreModsTreeView->selectionModel()->selectedRows();
+
+	if (!lastfirst(list, first, last))
+		return;
+	m_coremods->stopWatching();
+	m_coremods->deleteMods(first, last);
+	m_coremods->startWatching();
+}
+
+void InstanceEditDialog::on_viewCoreBtn_clicked()
+{
+	openDirInDefaultProgram(m_inst->coreModsDir(), true);
+}
+
+void InstanceEditDialog::on_addResPackBtn_clicked()
 {
 	QStringList fileNames = QFileDialog::getOpenFileNames(
-		this, QApplication::translate("LegacyModEditDialog", "Select Resource Packs"));
+		this, QApplication::translate("InstanceEditDialog", "Select Resource Packs"));
 	for (auto filename : fileNames)
 	{
 		m_resourcepacks->stopWatching();
@@ -357,7 +569,7 @@ void OneSixModEditDialog::on_addResPackBtn_clicked()
 		m_resourcepacks->startWatching();
 	}
 }
-void OneSixModEditDialog::on_rmResPackBtn_clicked()
+void InstanceEditDialog::on_rmResPackBtn_clicked()
 {
 	int first, last;
 	auto list = ui->resPackTreeView->selectionModel()->selectedRows();
@@ -368,12 +580,12 @@ void OneSixModEditDialog::on_rmResPackBtn_clicked()
 	m_resourcepacks->deleteMods(first, last);
 	m_resourcepacks->startWatching();
 }
-void OneSixModEditDialog::on_viewResPackBtn_clicked()
+void InstanceEditDialog::on_viewResPackBtn_clicked()
 {
 	openDirInDefaultProgram(m_inst->resourcePacksDir(), true);
 }
 
-void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
+void InstanceEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
 {
 	if (!current.isValid())
 	{
@@ -385,7 +597,7 @@ void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previou
 	ui->frame->updateWithMod(m);
 }
 
-void OneSixModEditDialog::versionCurrent(const QModelIndex &current,
+void InstanceEditDialog::versionCurrent(const QModelIndex &current,
 										 const QModelIndex &previous)
 {
 	if (!current.isValid())
@@ -397,3 +609,15 @@ void OneSixModEditDialog::versionCurrent(const QModelIndex &current,
 		ui->removeLibraryBtn->setEnabled(m_version->canRemove(current.row()));
 	}
 }
+
+void InstanceEditDialog::coreCurrent(QModelIndex current, QModelIndex previous)
+{
+	if (!current.isValid())
+	{
+		ui->coreMIFrame->clear();
+		return;
+	}
+	int row = current.row();
+	Mod &m = m_coremods->operator[](row);
+	ui->coreMIFrame->updateWithMod(m);
+}
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/InstanceEditDialog.h
index e106c6fe..ea2c6496 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/InstanceEditDialog.h
@@ -17,59 +17,81 @@
 #include <QDialog>
 
 #include <logic/OneSixInstance.h>
+#include <logic/net/NetJob.h>
 
 class EnabledItemFilter;
 namespace Ui
 {
-class OneSixModEditDialog;
+class InstanceEditDialog;
 }
 
-class OneSixModEditDialog : public QDialog
+class InstanceEditDialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	explicit OneSixModEditDialog(OneSixInstance *inst, QWidget *parent = 0);
-	virtual ~OneSixModEditDialog();
+	explicit InstanceEditDialog(OneSixInstance *inst, QWidget *parent = 0);
+	virtual ~InstanceEditDialog();
 
 private
 slots:
+
+	// version tab
+	void on_forgeBtn_clicked();
+	void on_liteloaderBtn_clicked();
+	void on_reloadLibrariesBtn_clicked();
+	void on_removeLibraryBtn_clicked();
+	void on_resetLibraryOrderBtn_clicked();
+	void on_settingsBtn_clicked();
+	void on_moveLibraryUpBtn_clicked();
+	void on_moveLibraryDownBtn_clicked();
+
+	// loader mod tab
 	void on_addModBtn_clicked();
 	void on_rmModBtn_clicked();
 	void on_viewModBtn_clicked();
 
+	// core mod tab
+	void on_addCoreBtn_clicked();
+	void on_rmCoreBtn_clicked();
+	void on_viewCoreBtn_clicked();
+
+	// resource pack tab
 	void on_addResPackBtn_clicked();
 	void on_rmResPackBtn_clicked();
 	void on_viewResPackBtn_clicked();
+
+	
 	// Questionable: SettingsDialog doesn't need this for some reason?
 	void on_buttonBox_rejected();
-	void on_forgeBtn_clicked();
-	void on_liteloaderBtn_clicked();
-	void on_reloadLibrariesBtn_clicked();
-	void on_removeLibraryBtn_clicked();
-	void on_resetLibraryOrderBtn_clicked();
-	void on_moveLibraryUpBtn_clicked();
-	void on_moveLibraryDownBtn_clicked();
+	
 	void updateVersionControls();
 	void disableVersionControls();
-
+	void on_changeMCVersionBtn_clicked();
+	
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
+	bool jarListFilter(QKeyEvent *ev);
 	bool loaderListFilter(QKeyEvent *ev);
+	bool coreListFilter(QKeyEvent *ev);
 	bool resourcePackListFilter(QKeyEvent *ev);
 	/// FIXME: this shouldn't be necessary!
 	bool reloadInstanceVersion();
 
 private:
-	Ui::OneSixModEditDialog *ui;
+	Ui::InstanceEditDialog *ui;
 	std::shared_ptr<VersionFinal> m_version;
 	std::shared_ptr<ModList> m_mods;
+	std::shared_ptr<ModList> m_coremods;
+	std::shared_ptr<ModList> m_jarmods;
 	std::shared_ptr<ModList> m_resourcepacks;
 	EnabledItemFilter *main_model;
 	OneSixInstance *m_inst;
+	NetJobPtr forgeJob;
 
 public
 slots:
 	void loaderCurrent(QModelIndex current, QModelIndex previous);
 	void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
+	void coreCurrent(QModelIndex current, QModelIndex previous);
 };
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/InstanceEditDialog.ui
index 2c9f70bb..0ad79833 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/InstanceEditDialog.ui
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OneSixModEditDialog</class>
- <widget class="QDialog" name="OneSixModEditDialog">
+ <class>InstanceEditDialog</class>
+ <widget class="QDialog" name="InstanceEditDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>555</width>
-    <height>463</height>
+    <width>593</width>
+    <height>568</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Manage Mods</string>
+   <string>Edit Instance</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="enabled">
@@ -53,6 +63,13 @@
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_4">
          <item>
+          <widget class="QPushButton" name="changeMCVersionBtn">
+           <property name="text">
+            <string>Change version</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="QPushButton" name="forgeBtn">
            <property name="toolTip">
             <string>Replace any current custom version with Minecraft Forge</string>
@@ -70,6 +87,13 @@
           </widget>
          </item>
          <item>
+          <widget class="QPushButton" name="jarmodBtn">
+           <property name="text">
+            <string>Add jar mod</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="Line" name="line">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -128,6 +152,20 @@
           </widget>
          </item>
          <item>
+          <widget class="Line" name="line_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="settingsBtn">
+           <property name="text">
+            <string>Settings</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <spacer name="verticalSpacer_7">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
@@ -144,6 +182,72 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="coreTab">
+      <attribute name="title">
+       <string>Core Mods</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="ModListView" name="coreModsTreeView">
+           <property name="dragDropMode">
+            <enum>QAbstractItemView::DropOnly</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="coreModsButtonBox">
+           <item>
+            <widget class="QPushButton" name="addCoreBtn">
+             <property name="text">
+              <string>&amp;Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="rmCoreBtn">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="coreModsButtonSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="viewCoreBtn">
+             <property name="text">
+              <string>&amp;View Folder</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="MCModInfoFrame" name="coreMIFrame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="modTab">
       <attribute name="title">
        <string>Loader Mods</string>
@@ -280,16 +384,6 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/gui/dialogs/LegacyModEditDialog.cpp b/gui/dialogs/LegacyModEditDialog.cpp
deleted file mode 100644
index e5039c02..00000000
--- a/gui/dialogs/LegacyModEditDialog.cpp
+++ /dev/null
@@ -1,393 +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 "LegacyModEditDialog.h"
-#include "ModEditDialogCommon.h"
-#include "VersionSelectDialog.h"
-#include "ProgressDialog.h"
-#include "ui_LegacyModEditDialog.h"
-#include "logic/ModList.h"
-#include "logic/lists/ForgeVersionList.h"
-#include "gui/Platform.h"
-
-#include <pathutils.h>
-#include <QFileDialog>
-//#include <QMessageBox>
-#include <QDebug>
-#include <QEvent>
-#include <QKeyEvent>
-
-LegacyModEditDialog::LegacyModEditDialog(LegacyInstance *inst, QWidget *parent)
-	: QDialog(parent), ui(new Ui::LegacyModEditDialog), m_inst(inst)
-{
-	MultiMCPlatform::fixWM_CLASS(this);
-	ui->setupUi(this);
-
-	// Jar mods
-	{
-		ensureFolderPathExists(m_inst->jarModsDir());
-		m_jarmods = m_inst->jarModList();
-		ui->jarModsTreeView->setModel(m_jarmods.get());
-#ifndef Q_OS_LINUX
-		// FIXME: internal DnD causes segfaults later
-		ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop);
-		// FIXME: DnD is glitched with contiguous (we move only first item in selection)
-		ui->jarModsTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
-#endif
-		ui->jarModsTreeView->installEventFilter(this);
-		m_jarmods->startWatching();
-		auto smodel = ui->jarModsTreeView->selectionModel();
-		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-				SLOT(jarCurrent(QModelIndex, QModelIndex)));
-	}
-	// Core mods
-	{
-		ensureFolderPathExists(m_inst->coreModsDir());
-		m_coremods = m_inst->coreModList();
-		ui->coreModsTreeView->setModel(m_coremods.get());
-		ui->coreModsTreeView->installEventFilter(this);
-		m_coremods->startWatching();
-		auto smodel = ui->coreModsTreeView->selectionModel();
-		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-				SLOT(coreCurrent(QModelIndex, QModelIndex)));
-	}
-	// Loader mods
-	{
-		ensureFolderPathExists(m_inst->loaderModsDir());
-		m_mods = m_inst->loaderModList();
-		ui->loaderModTreeView->setModel(m_mods.get());
-		ui->loaderModTreeView->installEventFilter(this);
-		m_mods->startWatching();
-		auto smodel = ui->loaderModTreeView->selectionModel();
-		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-				SLOT(loaderCurrent(QModelIndex, QModelIndex)));
-	}
-	// texture packs
-	{
-		ensureFolderPathExists(m_inst->texturePacksDir());
-		m_texturepacks = m_inst->texturePackList();
-		ui->texPackTreeView->setModel(m_texturepacks.get());
-		ui->texPackTreeView->installEventFilter(this);
-		m_texturepacks->startWatching();
-	}
-}
-
-LegacyModEditDialog::~LegacyModEditDialog()
-{
-	m_mods->stopWatching();
-	m_coremods->stopWatching();
-	m_jarmods->stopWatching();
-	m_texturepacks->stopWatching();
-	delete ui;
-}
-
-bool LegacyModEditDialog::coreListFilter(QKeyEvent *keyEvent)
-{
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		on_rmCoreBtn_clicked();
-		return true;
-	case Qt::Key_Plus:
-		on_addCoreBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QDialog::eventFilter(ui->coreModsTreeView, keyEvent);
-}
-
-bool LegacyModEditDialog::jarListFilter(QKeyEvent *keyEvent)
-{
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Up:
-	{
-		if (keyEvent->modifiers() & Qt::ControlModifier)
-		{
-			on_moveJarUpBtn_clicked();
-			return true;
-		}
-		break;
-	}
-	case Qt::Key_Down:
-	{
-		if (keyEvent->modifiers() & Qt::ControlModifier)
-		{
-			on_moveJarDownBtn_clicked();
-			return true;
-		}
-		break;
-	}
-	case Qt::Key_Delete:
-		on_rmJarBtn_clicked();
-		return true;
-	case Qt::Key_Plus:
-		on_addJarBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QDialog::eventFilter(ui->jarModsTreeView, keyEvent);
-}
-
-bool LegacyModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
-{
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		on_rmModBtn_clicked();
-		return true;
-	case Qt::Key_Plus:
-		on_addModBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QDialog::eventFilter(ui->loaderModTreeView, keyEvent);
-}
-
-bool LegacyModEditDialog::texturePackListFilter(QKeyEvent *keyEvent)
-{
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		on_rmTexPackBtn_clicked();
-		return true;
-	case Qt::Key_Plus:
-		on_addTexPackBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QDialog::eventFilter(ui->texPackTreeView, keyEvent);
-}
-
-bool LegacyModEditDialog::eventFilter(QObject *obj, QEvent *ev)
-{
-	if (ev->type() != QEvent::KeyPress)
-	{
-		return QDialog::eventFilter(obj, ev);
-	}
-	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(ev);
-	if (obj == ui->jarModsTreeView)
-		return jarListFilter(keyEvent);
-	if (obj == ui->coreModsTreeView)
-		return coreListFilter(keyEvent);
-	if (obj == ui->loaderModTreeView)
-		return loaderListFilter(keyEvent);
-	if (obj == ui->texPackTreeView)
-		return texturePackListFilter(keyEvent);
-	return QDialog::eventFilter(obj, ev);
-}
-
-void LegacyModEditDialog::on_addCoreBtn_clicked()
-{
-	//: Title of core mod selection dialog
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select Core Mods"));
-	for (auto filename : fileNames)
-	{
-		m_coremods->stopWatching();
-		m_coremods->installMod(QFileInfo(filename));
-		m_coremods->startWatching();
-	}
-}
-void LegacyModEditDialog::on_addForgeBtn_clicked()
-{
-	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
-	vselect.setExactFilter(1, m_inst->intendedVersionId());
-	if (vselect.exec() && vselect.selectedVersion())
-	{
-		ForgeVersionPtr forge =
-			std::dynamic_pointer_cast<ForgeVersion>(vselect.selectedVersion());
-		if (!forge)
-			return;
-		auto entry = MMC->metacache()->resolveEntry("minecraftforge", forge->filename);
-		if (entry->stale)
-		{
-			NetJob *fjob = new NetJob("Forge download");
-			fjob->addNetAction(CacheDownload::make(forge->universal_url, entry));
-			ProgressDialog dlg(this);
-			dlg.exec(fjob);
-			if (dlg.result() == QDialog::Accepted)
-			{
-				m_jarmods->stopWatching();
-				m_jarmods->installMod(QFileInfo(entry->getFullPath()));
-				m_jarmods->startWatching();
-			}
-			else
-			{
-				// failed to download forge :/
-			}
-		}
-		else
-		{
-			m_jarmods->stopWatching();
-			m_jarmods->installMod(QFileInfo(entry->getFullPath()));
-			m_jarmods->startWatching();
-		}
-	}
-}
-void LegacyModEditDialog::on_addJarBtn_clicked()
-{
-	//: Title of jar mod selection dialog
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select Jar Mods"));
-	for (auto filename : fileNames)
-	{
-		m_jarmods->stopWatching();
-		m_jarmods->installMod(QFileInfo(filename));
-		m_jarmods->startWatching();
-	}
-}
-void LegacyModEditDialog::on_addModBtn_clicked()
-{
-	//: Title of regular mod selection dialog
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select Loader Mods"));
-	for (auto filename : fileNames)
-	{
-		m_mods->stopWatching();
-		m_mods->installMod(QFileInfo(filename));
-		m_mods->startWatching();
-	}
-}
-void LegacyModEditDialog::on_addTexPackBtn_clicked()
-{
-	//: Title of texture pack selection dialog
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select Texture Packs"));
-	for (auto filename : fileNames)
-	{
-		m_texturepacks->stopWatching();
-		m_texturepacks->installMod(QFileInfo(filename));
-		m_texturepacks->startWatching();
-	}
-}
-
-void LegacyModEditDialog::on_moveJarDownBtn_clicked()
-{
-	int first, last;
-	auto list = ui->jarModsTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-
-	m_jarmods->moveModsDown(first, last);
-}
-void LegacyModEditDialog::on_moveJarUpBtn_clicked()
-{
-	int first, last;
-	auto list = ui->jarModsTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_jarmods->moveModsUp(first, last);
-}
-void LegacyModEditDialog::on_rmCoreBtn_clicked()
-{
-	int first, last;
-	auto list = ui->coreModsTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_coremods->stopWatching();
-	m_coremods->deleteMods(first, last);
-	m_coremods->startWatching();
-}
-void LegacyModEditDialog::on_rmJarBtn_clicked()
-{
-	int first, last;
-	auto list = ui->jarModsTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_jarmods->stopWatching();
-	m_jarmods->deleteMods(first, last);
-	m_jarmods->startWatching();
-}
-void LegacyModEditDialog::on_rmModBtn_clicked()
-{
-	int first, last;
-	auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_mods->stopWatching();
-	m_mods->deleteMods(first, last);
-	m_mods->startWatching();
-}
-void LegacyModEditDialog::on_rmTexPackBtn_clicked()
-{
-	int first, last;
-	auto list = ui->texPackTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_texturepacks->stopWatching();
-	m_texturepacks->deleteMods(first, last);
-	m_texturepacks->startWatching();
-}
-void LegacyModEditDialog::on_viewCoreBtn_clicked()
-{
-	openDirInDefaultProgram(m_inst->coreModsDir(), true);
-}
-void LegacyModEditDialog::on_viewModBtn_clicked()
-{
-	openDirInDefaultProgram(m_inst->loaderModsDir(), true);
-}
-void LegacyModEditDialog::on_viewTexPackBtn_clicked()
-{
-	openDirInDefaultProgram(m_inst->texturePacksDir(), true);
-}
-
-void LegacyModEditDialog::on_buttonBox_rejected()
-{
-	close();
-}
-
-void LegacyModEditDialog::jarCurrent(QModelIndex current, QModelIndex previous)
-{
-	if (!current.isValid())
-	{
-		ui->jarMIFrame->clear();
-		return;
-	}
-	int row = current.row();
-	Mod &m = m_jarmods->operator[](row);
-	ui->jarMIFrame->updateWithMod(m);
-}
-
-void LegacyModEditDialog::coreCurrent(QModelIndex current, QModelIndex previous)
-{
-	if (!current.isValid())
-	{
-		ui->coreMIFrame->clear();
-		return;
-	}
-	int row = current.row();
-	Mod &m = m_coremods->operator[](row);
-	ui->coreMIFrame->updateWithMod(m);
-}
-
-void LegacyModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
-{
-	if (!current.isValid())
-	{
-		ui->loaderMIFrame->clear();
-		return;
-	}
-	int row = current.row();
-	Mod &m = m_mods->operator[](row);
-	ui->loaderMIFrame->updateWithMod(m);
-}
diff --git a/gui/dialogs/LegacyModEditDialog.h b/gui/dialogs/LegacyModEditDialog.h
deleted file mode 100644
index d5582aef..00000000
--- a/gui/dialogs/LegacyModEditDialog.h
+++ /dev/null
@@ -1,78 +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 <QDialog>
-#include "logic/LegacyInstance.h"
-#include <logic/net/NetJob.h>
-
-namespace Ui
-{
-class LegacyModEditDialog;
-}
-
-class LegacyModEditDialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit LegacyModEditDialog(LegacyInstance *inst, QWidget *parent = 0);
-	~LegacyModEditDialog();
-
-private
-slots:
-
-	void on_addJarBtn_clicked();
-	void on_rmJarBtn_clicked();
-	void on_addForgeBtn_clicked();
-	void on_moveJarUpBtn_clicked();
-	void on_moveJarDownBtn_clicked();
-
-	void on_addCoreBtn_clicked();
-	void on_rmCoreBtn_clicked();
-	void on_viewCoreBtn_clicked();
-
-	void on_addModBtn_clicked();
-	void on_rmModBtn_clicked();
-	void on_viewModBtn_clicked();
-
-	void on_addTexPackBtn_clicked();
-	void on_rmTexPackBtn_clicked();
-	void on_viewTexPackBtn_clicked();
-
-	// Questionable: SettingsDialog doesn't need this for some reason?
-	void on_buttonBox_rejected();
-
-	void jarCurrent(QModelIndex current, QModelIndex previous);
-	void coreCurrent(QModelIndex current, QModelIndex previous);
-	void loaderCurrent(QModelIndex current, QModelIndex previous);
-
-protected:
-	bool eventFilter(QObject *obj, QEvent *ev);
-	bool jarListFilter(QKeyEvent *ev);
-	bool coreListFilter(QKeyEvent *ev);
-	bool loaderListFilter(QKeyEvent *ev);
-	bool texturePackListFilter(QKeyEvent *ev);
-
-private:
-	Ui::LegacyModEditDialog *ui;
-	std::shared_ptr<ModList> m_mods;
-	std::shared_ptr<ModList> m_coremods;
-	std::shared_ptr<ModList> m_jarmods;
-	std::shared_ptr<ModList> m_texturepacks;
-	LegacyInstance *m_inst;
-	NetJobPtr forgeJob;
-};
diff --git a/gui/dialogs/LegacyModEditDialog.ui b/gui/dialogs/LegacyModEditDialog.ui
deleted file mode 100644
index 0662c712..00000000
--- a/gui/dialogs/LegacyModEditDialog.ui
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LegacyModEditDialog</class>
- <widget class="QDialog" name="LegacyModEditDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>540</width>
-    <height>420</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Edit Mods</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="jarTab">
-      <attribute name="title">
-       <string>Jar Mods</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="ModListView" name="jarModsTreeView">
-           <property name="verticalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOn</enum>
-           </property>
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="jarModsButtonBox">
-           <item>
-            <widget class="QPushButton" name="addJarBtn">
-             <property name="text">
-              <string>&amp;Add</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="rmJarBtn">
-             <property name="text">
-              <string>&amp;Remove</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="addForgeBtn">
-             <property name="text">
-              <string>MCForge</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="jarModsButtonSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="moveJarUpBtn">
-             <property name="text">
-              <string>Move &amp;Up</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="moveJarDownBtn">
-             <property name="text">
-              <string>Move &amp;Down</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="MCModInfoFrame" name="jarMIFrame">
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="coreTab">
-      <attribute name="title">
-       <string>Core Mods</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="ModListView" name="coreModsTreeView">
-           <property name="dragDropMode">
-            <enum>QAbstractItemView::DropOnly</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="coreModsButtonBox">
-           <item>
-            <widget class="QPushButton" name="addCoreBtn">
-             <property name="text">
-              <string>&amp;Add</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="rmCoreBtn">
-             <property name="text">
-              <string>&amp;Remove</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="coreModsButtonSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="viewCoreBtn">
-             <property name="text">
-              <string>&amp;View Folder</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="MCModInfoFrame" name="coreMIFrame">
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="modTab">
-      <attribute name="title">
-       <string>Loader Mods</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="ModListView" name="loaderModTreeView">
-           <property name="acceptDrops">
-            <bool>true</bool>
-           </property>
-           <property name="dragDropMode">
-            <enum>QAbstractItemView::DropOnly</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="mlModsButtonBox">
-           <item>
-            <widget class="QPushButton" name="addModBtn">
-             <property name="text">
-              <string>&amp;Add</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="rmModBtn">
-             <property name="text">
-              <string>&amp;Remove</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="mlModsButtonSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="viewModBtn">
-             <property name="text">
-              <string>&amp;View Folder</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="MCModInfoFrame" name="loaderMIFrame">
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="texPackTab">
-      <property name="acceptDrops">
-       <bool>false</bool>
-      </property>
-      <attribute name="title">
-       <string>Texture Packs</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="ModListView" name="texPackTreeView">
-         <property name="acceptDrops">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="texturePacksButtonBox">
-         <item>
-          <widget class="QPushButton" name="addTexPackBtn">
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="rmTexPackBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="texturePacksButtonSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="viewTexPackBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ModListView</class>
-   <extends>QTreeView</extends>
-   <header>gui/widgets/ModListView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>MCModInfoFrame</class>
-   <extends>QFrame</extends>
-   <header>gui/widgets/MCModInfoFrame.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/dialogs/ModEditDialogCommon.cpp b/gui/dialogs/ModEditDialogCommon.cpp
deleted file mode 100644
index eee42e5e..00000000
--- a/gui/dialogs/ModEditDialogCommon.cpp
+++ /dev/null
@@ -1,57 +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 "ModEditDialogCommon.h"
-#include "CustomMessageBox.h"
-#include <QDesktopServices>
-#include <QMessageBox>
-#include <QString>
-#include <QUrl>
-bool lastfirst(QModelIndexList &list, int &first, int &last)
-{
-	if (!list.size())
-		return false;
-	first = last = list[0].row();
-	for (auto item : list)
-	{
-		int row = item.row();
-		if (row < first)
-			first = row;
-		if (row > last)
-			last = row;
-	}
-	return true;
-}
-
-void showWebsiteForMod(QWidget *parentDlg, Mod &m)
-{
-	QString url = m.homeurl();
-	if (url.size())
-	{
-		// catch the cases where the protocol is missing
-		if (!url.startsWith("http"))
-		{
-			url = "http://" + url;
-		}
-		QDesktopServices::openUrl(url);
-	}
-	else
-	{
-		CustomMessageBox::selectable(
-			parentDlg, QObject::tr("How sad!"),
-			QObject::tr("The mod author didn't provide a website link for this mod."),
-			QMessageBox::Warning);
-	}
-}
diff --git a/gui/dialogs/ModEditDialogCommon.h b/gui/dialogs/ModEditDialogCommon.h
deleted file mode 100644
index a226d5a9..00000000
--- a/gui/dialogs/ModEditDialogCommon.h
+++ /dev/null
@@ -1,22 +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 <QAbstractItemModel>
-#include <logic/Mod.h>
-
-bool lastfirst(QModelIndexList &list, int &first, int &last);
-
-void showWebsiteForMod(QWidget *parentDlg, Mod &m);
\ No newline at end of file