NOISSUE remove FTB integration

4 files changed, 1 insertions, 124 deletions

diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index 4eec3927..6a01795d 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -36,7 +36,6 @@
 #include "dialogs/CustomMessageBox.h"
 #include "InstanceList.h"
 #include "FolderInstanceProvider.h"
-#include "minecraft/ftb/FTBInstanceProvider.h"
 
 #include <minecraft/auth/MojangAccountList.h>
 #include "icons/IconList.h"
@@ -58,8 +57,6 @@
 
 #include "translations/TranslationsModel.h"
 
-#include "minecraft/ftb/FTBPlugin.h"
-
 #include <Commandline.h>
 #include <FileSystem.h>
 #include <DesktopServices.h>
@@ -427,8 +424,6 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
 		m_settings->registerSetting("ConsoleMaxLines", 100000);
 		m_settings->registerSetting("ConsoleOverflowStop", true);
 
-		FTBPlugin::initialize(m_settings);
-
 		// Folders
 		m_settings->registerSetting("InstanceDir", "instances");
 		m_settings->registerSetting({"CentralModsDir", "ModsDir"}, "mods");
@@ -600,7 +595,6 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
 		m_instanceFolder = new FolderInstanceProvider(m_settings, instDir);
 		connect(InstDirSetting.get(), &Setting::SettingChanged, m_instanceFolder, &FolderInstanceProvider::on_InstFolderChanged);
 		m_instances->addInstanceProvider(m_instanceFolder);
-		m_instances->addInstanceProvider(new FTBInstanceProvider(m_settings));
 		qDebug() << "Loading Instances...";
 		m_instances->loadList(true);
 		qDebug() << "<> Instances loaded.";
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 4073f6b7..29075778 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -21,7 +21,6 @@
 #include <QDir>
 #include <QTextCharFormat>
 
-#include <ColumnResizer.h>
 #include "updater/UpdateChecker.h"
 
 #include "settings/SettingsObject.h"
@@ -49,10 +48,6 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP
 	ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
 	ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
 
-	auto resizer = new ColumnResizer(this);
-	resizer->addWidgetsFromLayout(ui->groupBox->layout(), 1);
-	resizer->addWidgetsFromLayout(ui->foldersBox->layout(), 1);
-
 	defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat());
 
 	m_languageModel = MMC->translations();
@@ -97,31 +92,6 @@ bool MultiMCPage::apply()
 	return true;
 }
 
-void MultiMCPage::on_ftbLauncherBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("FTB Launcher Folder"),
-														ui->ftbLauncherBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbLauncherBox->setText(cooked_dir);
-	}
-}
-void MultiMCPage::on_ftbBrowseBtn_clicked()
-{
-	QString raw_dir =
-		QFileDialog::getExistingDirectory(this, tr("FTB Folder"), ui->ftbBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbBox->setText(cooked_dir);
-	}
-}
-
 void MultiMCPage::on_instDirBrowseBtn_clicked()
 {
     QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"),
@@ -346,11 +316,6 @@ void MultiMCPage::applySettings()
 	s->set("ConsoleMaxLines", ui->lineLimitSpinBox->value());
 	s->set("ConsoleOverflowStop", ui->checkStopLogging->checkState() != Qt::Unchecked);
 
-	// FTB
-	s->set("TrackFTBInstances", ui->trackFtbBox->isChecked());
-	s->set("FTBLauncherLocal", FS::NormalizePath(ui->ftbLauncherBox->text()));
-	s->set("FTBRoot", FS::NormalizePath(ui->ftbBox->text()));
-
 	// Folders
 	// TODO: Offer to move instances to new instance folder.
 	s->set("InstanceDir", ui->instDirTextBox->text());
@@ -457,11 +422,6 @@ void MultiMCPage::loadSettings()
 	ui->lineLimitSpinBox->setValue(s->get("ConsoleMaxLines").toInt());
 	ui->checkStopLogging->setChecked(s->get("ConsoleOverflowStop").toBool());
 
-	// FTB
-	ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool());
-	ui->ftbLauncherBox->setText(s->get("FTBLauncherLocal").toString());
-	ui->ftbBox->setText(s->get("FTBRoot").toString());
-
 	// Folders
 	ui->instDirTextBox->setText(s->get("InstanceDir").toString());
 	ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
diff --git a/application/pages/global/MultiMCPage.h b/application/pages/global/MultiMCPage.h
index 98eb353d..d18d70d6 100644
--- a/application/pages/global/MultiMCPage.h
+++ b/application/pages/global/MultiMCPage.h
@@ -64,9 +64,6 @@ private:
 
 private
 slots:
-	void on_ftbLauncherBrowseBtn_clicked();
-	void on_ftbBrowseBtn_clicked();
-
 	void on_instDirBrowseBtn_clicked();
 	void on_modsDirBrowseBtn_clicked();
 	void on_lwjglDirBrowseBtn_clicked();
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index 0b966876..cf434631 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>467</width>
-    <height>614</height>
+    <height>629</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -89,75 +89,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string notr="true">FTB</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="2" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>&amp;Launcher:</string>
-            </property>
-            <property name="buddy">
-             <cstring>ftbLauncherBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="ftbLauncherBox">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="ftbBox"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Files:</string>
-            </property>
-            <property name="buddy">
-             <cstring>ftbBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QToolButton" name="ftbBrowseBtn">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="ftbLauncherBrowseBtn">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::TabFocus</enum>
-            </property>
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="3">
-           <widget class="QCheckBox" name="trackFtbBox">
-            <property name="text">
-             <string>Track FTB instances</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
         <widget class="QGroupBox" name="foldersBox">
          <property name="title">
           <string>Folders</string>
@@ -645,11 +576,6 @@
   <tabstop>tabWidget</tabstop>
   <tabstop>autoUpdateCheckBox</tabstop>
   <tabstop>updateChannelComboBox</tabstop>
-  <tabstop>trackFtbBox</tabstop>
-  <tabstop>ftbLauncherBox</tabstop>
-  <tabstop>ftbLauncherBrowseBtn</tabstop>
-  <tabstop>ftbBox</tabstop>
-  <tabstop>ftbBrowseBtn</tabstop>
   <tabstop>instDirTextBox</tabstop>
   <tabstop>instDirBrowseBtn</tabstop>
   <tabstop>modsDirTextBox</tabstop>