diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 404044d8..e40f188e 100644 --- a/api/logic/CMakeLists.txt +++ b/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}) diff --git a/api/logic/FolderInstanceProvider.cpp b/api/logic/FolderInstanceProvider.cpp index a6d3bdc8..52e23254 100644 --- a/api/logic/FolderInstanceProvider.cpp +++ b/api/logic/FolderInstanceProvider.cpp @@ -428,7 +428,7 @@ Task * FolderInstanceProvider::creationTask(BaseVersionPtr version, const QStrin return new FolderInstanceStaging(this, task, stagingPath, instName, instGroup); } -#include +#include Task * FolderInstanceProvider::ftbCreationTask(FtbPackDownloader *downloader, const QString& instName, const QString& instGroup, const QString& instIcon) { auto stagingPath = getStagedInstancePath(); diff --git a/api/logic/FolderInstanceProvider.h b/api/logic/FolderInstanceProvider.h index 5117affc..2641a46b 100644 --- a/api/logic/FolderInstanceProvider.h +++ b/api/logic/FolderInstanceProvider.h @@ -2,7 +2,7 @@ #include "BaseInstanceProvider.h" #include -#include +#include class QFileSystemWatcher; diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp index 2b481300..7fae97b8 100644 --- a/api/logic/InstanceImportTask.cpp +++ b/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, diff --git a/api/logic/minecraft/flame/FileResolvingTask.cpp b/api/logic/modplatform/flame/FileResolvingTask.cpp similarity index 100% rename from api/logic/minecraft/flame/FileResolvingTask.cpp rename to api/logic/modplatform/flame/FileResolvingTask.cpp diff --git a/api/logic/minecraft/flame/FileResolvingTask.h b/api/logic/modplatform/flame/FileResolvingTask.h similarity index 100% rename from api/logic/minecraft/flame/FileResolvingTask.h rename to api/logic/modplatform/flame/FileResolvingTask.h diff --git a/api/logic/minecraft/flame/PackManifest.cpp b/api/logic/modplatform/flame/PackManifest.cpp similarity index 100% rename from api/logic/minecraft/flame/PackManifest.cpp rename to api/logic/modplatform/flame/PackManifest.cpp diff --git a/api/logic/minecraft/flame/PackManifest.h b/api/logic/modplatform/flame/PackManifest.h similarity index 100% rename from api/logic/minecraft/flame/PackManifest.h rename to api/logic/modplatform/flame/PackManifest.h diff --git a/api/logic/modplatform/FtbPackDownloader.cpp b/api/logic/modplatform/ftb/FtbPackDownloader.cpp similarity index 100% rename from api/logic/modplatform/FtbPackDownloader.cpp rename to api/logic/modplatform/ftb/FtbPackDownloader.cpp diff --git a/api/logic/modplatform/FtbPackDownloader.h b/api/logic/modplatform/ftb/FtbPackDownloader.h similarity index 100% rename from api/logic/modplatform/FtbPackDownloader.h rename to api/logic/modplatform/ftb/FtbPackDownloader.h diff --git a/api/logic/modplatform/FtbPackFetchTask.cpp b/api/logic/modplatform/ftb/FtbPackFetchTask.cpp similarity index 100% rename from api/logic/modplatform/FtbPackFetchTask.cpp rename to api/logic/modplatform/ftb/FtbPackFetchTask.cpp diff --git a/api/logic/modplatform/FtbPackFetchTask.h b/api/logic/modplatform/ftb/FtbPackFetchTask.h similarity index 100% rename from api/logic/modplatform/FtbPackFetchTask.h rename to api/logic/modplatform/ftb/FtbPackFetchTask.h diff --git a/api/logic/modplatform/FtbPackInstallTask.cpp b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/FtbPackInstallTask.cpp rename to api/logic/modplatform/ftb/FtbPackInstallTask.cpp diff --git a/api/logic/modplatform/FtbPackInstallTask.h b/api/logic/modplatform/ftb/FtbPackInstallTask.h similarity index 96% rename from api/logic/modplatform/FtbPackInstallTask.h rename to api/logic/modplatform/ftb/FtbPackInstallTask.h index cf477ae2..7d6e5276 100644 --- a/api/logic/modplatform/FtbPackInstallTask.h +++ b/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" diff --git a/api/logic/modplatform/PackHelpers.h b/api/logic/modplatform/ftb/PackHelpers.h similarity index 100% rename from api/logic/modplatform/PackHelpers.h rename to api/logic/modplatform/ftb/PackHelpers.h diff --git a/application/FtbListModel.h b/application/FtbListModel.h index e41e9b62..41fc3ccd 100644 --- a/application/FtbListModel.h +++ b/application/FtbListModel.h @@ -2,7 +2,7 @@ #include #include -#include +#include class FtbFilterModel : public QSortFilterProxyModel { diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index e690e1b7..542d1da6 100644 --- a/application/MainWindow.cpp +++ b/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()) diff --git a/application/MainWindow.h b/application/MainWindow.h index 25dc36ed..e9897606 100644 --- a/application/MainWindow.h +++ b/application/MainWindow.h @@ -25,7 +25,7 @@ #include "minecraft/auth/MojangAccount.h" #include "net/NetJob.h" #include "updater/GoUpdate.h" -#include +#include class LaunchController; class NewsChecker; diff --git a/application/dialogs/ChooseFtbPackDialog.h b/application/dialogs/ChooseFtbPackDialog.h index 0b021138..f9f3dd08 100644 --- a/application/dialogs/ChooseFtbPackDialog.h +++ b/application/dialogs/ChooseFtbPackDialog.h @@ -2,9 +2,8 @@ #include #include -#include +#include #include "ui_ChooseFtbPackDialog.h" -#include #include "FtbListModel.h" namespace Ui { diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index 9b0f7f53..f1fe26f4 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -18,8 +18,8 @@ #include #include "BaseVersion.h" -#include "modplatform/FtbPackDownloader.h" -#include "modplatform/PackHelpers.h" +#include "modplatform/ftb/FtbPackDownloader.h" +#include "modplatform/ftb/PackHelpers.h" namespace Ui {