NOISSUE move modpack platform related files to 'modplatform' subfolders

api/logic/CMakeLists.txt

@@ -277,12 +277,6 @@ set(MINECRAFT_SOURCES
 	minecraft/WorldList.h
 	minecraft/WorldList.cpp
 
-	# Flame
-	minecraft/flame/PackManifest.h
-	minecraft/flame/PackManifest.cpp
-	minecraft/flame/FileResolvingTask.h
-	minecraft/flame/FileResolvingTask.cpp
-
 	# Assets
 	minecraft/AssetsUtils.h
 	minecraft/AssetsUtils.cpp
@@ -418,18 +412,25 @@ set(META_SOURCES
 	meta/Index.h
 )
 
-set(MODPLATFORM_SOURCES
-    # Modplatform sources
-    modplatform/FtbPackDownloader.h
-    modplatform/FtbPackDownloader.cpp
+set(FTB_SOURCES
+	# Modplatform sources
+	modplatform/ftb/FtbPackDownloader.h
+	modplatform/ftb/FtbPackDownloader.cpp
 
-    modplatform/FtbPackFetchTask.h
-    modplatform/FtbPackFetchTask.cpp
-    modplatform/FtbPackInstallTask.h
-    modplatform/FtbPackInstallTask.cpp
+	modplatform/ftb/FtbPackFetchTask.h
+	modplatform/ftb/FtbPackFetchTask.cpp
+	modplatform/ftb/FtbPackInstallTask.h
+	modplatform/ftb/FtbPackInstallTask.cpp
 
-    modplatform/PackHelpers.h
+	modplatform/ftb/PackHelpers.h
+)
 
+set(FLAME_SOURCES
+	# Flame
+	modplatform/flame/PackManifest.h
+	modplatform/flame/PackManifest.cpp
+	modplatform/flame/FileResolvingTask.h
+	modplatform/flame/FileResolvingTask.cpp
 )
 
 add_unit_test(Index
@@ -460,7 +461,8 @@ set(LOGIC_SOURCES
 	${TOOLS_SOURCES}
 	${META_SOURCES}
 	${ICONS_SOURCES}
-	${MODPLATFORM_SOURCES}
+	${FTB_SOURCES}
+	${FLAME_SOURCES}
 )
 
 add_library(MultiMC_logic SHARED ${LOGIC_SOURCES})

api/logic/FolderInstanceProvider.cpp

@@ -428,7 +428,7 @@ Task * FolderInstanceProvider::creationTask(BaseVersionPtr version, const QStrin
 	return new FolderInstanceStaging(this, task, stagingPath, instName, instGroup);
 }
 
-#include <modplatform/FtbPackInstallTask.h>
+#include <modplatform/ftb/FtbPackInstallTask.h>
 Task * FolderInstanceProvider::ftbCreationTask(FtbPackDownloader *downloader, const QString& instName, const QString& instGroup, const QString& instIcon)
 {
 	auto stagingPath = getStagedInstancePath();

api/logic/FolderInstanceProvider.h

@@ -2,7 +2,7 @@
 
 #include "BaseInstanceProvider.h"
 #include <QMap>
-#include <modplatform/FtbPackDownloader.h>
+#include <modplatform/ftb/FtbPackDownloader.h>
 
 class QFileSystemWatcher;
 

api/logic/InstanceImportTask.cpp

@@ -12,8 +12,8 @@
 // FIXME: this does not belong here, it's Minecraft/Flame specific
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/ComponentList.h"
-#include "minecraft/flame/FileResolvingTask.h"
-#include "minecraft/flame/PackManifest.h"
+#include "modplatform/flame/FileResolvingTask.h"
+#include "modplatform/flame/PackManifest.h"
 #include "Json.h"
 
 InstanceImportTask::InstanceImportTask(SettingsObjectPtr settings, const QUrl sourceUrl, const QString & stagingPath,

api/logic/modplatform/ftb/FtbPackInstallTask.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "tasks/Task.h"
-#include "modplatform/FtbPackDownloader.h"
+#include "modplatform/ftb/FtbPackDownloader.h"
 #include "BaseInstanceProvider.h"
 #include "net/NetJob.h"
 #include "quazip.h"

application/FtbListModel.h

@@ -2,7 +2,7 @@
 
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
-#include <modplatform/PackHelpers.h>
+#include <modplatform/ftb/PackHelpers.h>
 
 class FtbFilterModel : public QSortFilterProxyModel
 {

application/MainWindow.cpp

@@ -1368,7 +1368,8 @@ void MainWindow::addInstance(QString url)
 
 	const QUrl modpackUrl = newInstDlg.modpackUrl();
 
-	if(newInstDlg.isFtbModpackRequested()) {
+	if(newInstDlg.isFtbModpackRequested())
+	{
 		instanceFromFtbPack(newInstDlg.getFtbPackDownloader(), newInstDlg.instName(), newInstDlg.instGroup(), newInstDlg.iconKey());
 	}
 	else if (modpackUrl.isValid())

application/MainWindow.h

@@ -25,7 +25,7 @@
 #include "minecraft/auth/MojangAccount.h"
 #include "net/NetJob.h"
 #include "updater/GoUpdate.h"
-#include <modplatform/FtbPackDownloader.h>
+#include <modplatform/ftb/FtbPackDownloader.h>
 
 class LaunchController;
 class NewsChecker;

application/dialogs/ChooseFtbPackDialog.h

@@ -2,9 +2,8 @@
 
 #include <QDialog>
 #include <net/NetJob.h>
-#include <modplatform/PackHelpers.h>
+#include <modplatform/ftb/PackHelpers.h>
 #include "ui_ChooseFtbPackDialog.h"
-#include <modplatform/PackHelpers.h>
 #include "FtbListModel.h"
 
 namespace Ui {

application/dialogs/NewInstanceDialog.h

@@ -18,8 +18,8 @@
 #include <QDialog>
 
 #include "BaseVersion.h"
-#include "modplatform/FtbPackDownloader.h"
-#include "modplatform/PackHelpers.h"
+#include "modplatform/ftb/FtbPackDownloader.h"
+#include "modplatform/ftb/PackHelpers.h"
 
 namespace Ui
 {