diff options
Diffstat (limited to 'launcher/modplatform/modpacksch/FTBPackInstallTask.h')
-rw-r--r-- | launcher/modplatform/modpacksch/FTBPackInstallTask.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.h b/launcher/modplatform/modpacksch/FTBPackInstallTask.h index ff59b695..a85f360a 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.h +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.h @@ -19,9 +19,13 @@ #include "FTBPackManifest.h" +#include "QObjectPtr.h" +#include "modplatform/flame/FileResolvingTask.h" #include "InstanceTask.h" #include "net/NetJob.h" +#include <QWidget> + namespace ModpacksCH { class PackInstallTask : public InstanceTask @@ -29,7 +33,7 @@ class PackInstallTask : public InstanceTask Q_OBJECT public: - explicit PackInstallTask(Modpack pack, QString version); + explicit PackInstallTask(Modpack pack, QString version, QWidget* parent = nullptr); virtual ~PackInstallTask(){} bool canAbort() const override { return true; } @@ -43,6 +47,7 @@ private slots: void onDownloadFailed(QString reason); private: + void resolveMods(); void downloadPack(); void install(); @@ -50,6 +55,9 @@ private: bool abortable = false; NetJob::Ptr jobPtr; + shared_qobject_ptr<Flame::FileResolvingTask> modIdResolver; + QMap<int, int> indexFileIdMap; + QByteArray response; Modpack m_pack; @@ -58,6 +66,8 @@ private: QMap<QString, QString> filesToCopy; + //FIXME: nuke + QWidget* m_parent; }; } |