From fd1a8f039ad28263e8e8dd1fc6848f9809084283 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Fri, 13 Nov 2020 16:33:52 +0000 Subject: [PATCH 1/2] GH-3437 Extract Technic single zip packs to correct place --- api/logic/modplatform/technic/SingleZipPackInstallTask.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp index 833ac0a2..ca0de008 100644 --- a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp +++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp @@ -21,6 +21,7 @@ #include "TechnicPackProcessor.h" #include +#include Technic::SingleZipPackInstallTask::SingleZipPackInstallTask(const QUrl &sourceUrl, const QString &minecraftVersion) { @@ -48,7 +49,7 @@ void Technic::SingleZipPackInstallTask::executeTask() void Technic::SingleZipPackInstallTask::downloadSucceeded() { setStatus(tr("Extracting modpack")); - QDir extractDir(m_stagingPath); + QDir extractDir(FS::PathCombine(m_stagingPath, ".minecraft")); qDebug() << "Attempting to create instance from" << m_archivePath; // open the zip and find relevant files in it From edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Tue, 13 Oct 2020 21:15:00 +0100 Subject: [PATCH 2/2] NOISSUE Cleanup Technic support --- api/logic/modplatform/technic/SingleZipPackInstallTask.cpp | 1 - api/logic/modplatform/technic/SingleZipPackInstallTask.h | 6 ------ api/logic/modplatform/technic/SolderPackInstallTask.cpp | 1 - api/logic/modplatform/technic/SolderPackInstallTask.h | 2 -- api/logic/modplatform/technic/TechnicPackProcessor.cpp | 2 -- api/logic/modplatform/technic/TechnicPackProcessor.h | 2 -- application/pages/modplatform/technic/TechnicData.h | 1 - application/pages/modplatform/technic/TechnicModel.cpp | 1 - application/pages/modplatform/technic/TechnicPage.cpp | 1 - 9 files changed, 17 deletions(-) diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp index ca0de008..7901db04 100644 --- a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp +++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "SingleZipPackInstallTask.h" #include "Env.h" diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.h b/api/logic/modplatform/technic/SingleZipPackInstallTask.h index 929476bb..99534130 100644 --- a/api/logic/modplatform/technic/SingleZipPackInstallTask.h +++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.h @@ -13,12 +13,8 @@ * limitations under the License. */ - #pragma once -#ifndef TECHNIC_SINGLEZIPPACKINSTALLTASK_H -#define TECHNIC_SINGLEZIPPACKINSTALLTASK_H - #include "InstanceTask.h" #include "net/NetJob.h" #include "multimc_logic_export.h" @@ -60,5 +56,3 @@ private: }; } // namespace Technic - -#endif // TECHNIC_SINGLEZIPPACKINSTALLTASK_H diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.cpp b/api/logic/modplatform/technic/SolderPackInstallTask.cpp index abdc0c0c..54ae6dff 100644 --- a/api/logic/modplatform/technic/SolderPackInstallTask.cpp +++ b/api/logic/modplatform/technic/SolderPackInstallTask.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "SolderPackInstallTask.h" #include diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.h b/api/logic/modplatform/technic/SolderPackInstallTask.h index d3a1d0fd..c3e3f6d9 100644 --- a/api/logic/modplatform/technic/SolderPackInstallTask.h +++ b/api/logic/modplatform/technic/SolderPackInstallTask.h @@ -13,7 +13,6 @@ * limitations under the License. */ - #pragma once #include @@ -22,7 +21,6 @@ #include - namespace Technic { class MULTIMC_LOGIC_EXPORT SolderPackInstallTask : public InstanceTask diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/api/logic/modplatform/technic/TechnicPackProcessor.cpp index f986a529..4a8191eb 100644 --- a/api/logic/modplatform/technic/TechnicPackProcessor.cpp +++ b/api/logic/modplatform/technic/TechnicPackProcessor.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "TechnicPackProcessor.h" #include @@ -27,7 +26,6 @@ #include - void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const QString &instName, const QString &instIcon, const QString &stagingPath, const QString &minecraftVersion, const bool isSolder) { QString minecraftPath = FS::PathCombine(stagingPath, ".minecraft"); diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.h b/api/logic/modplatform/technic/TechnicPackProcessor.h index 49d046a5..f0edb17a 100644 --- a/api/logic/modplatform/technic/TechnicPackProcessor.h +++ b/api/logic/modplatform/technic/TechnicPackProcessor.h @@ -13,13 +13,11 @@ * limitations under the License. */ - #pragma once #include #include "settings/SettingsObject.h" - namespace Technic { // not exporting it, only used in SingleZipPackInstallTask, InstanceImportTask and SolderPackInstallTask diff --git a/application/pages/modplatform/technic/TechnicData.h b/application/pages/modplatform/technic/TechnicData.h index 5c746619..e23cb7f6 100644 --- a/application/pages/modplatform/technic/TechnicData.h +++ b/application/pages/modplatform/technic/TechnicData.h @@ -18,7 +18,6 @@ #include #include - namespace Technic { struct Modpack { QString slug; diff --git a/application/pages/modplatform/technic/TechnicModel.cpp b/application/pages/modplatform/technic/TechnicModel.cpp index bdc411c3..e1294554 100644 --- a/application/pages/modplatform/technic/TechnicModel.cpp +++ b/application/pages/modplatform/technic/TechnicModel.cpp @@ -20,7 +20,6 @@ #include - Technic::ListModel::ListModel(QObject *parent) : QAbstractListModel(parent) { } diff --git a/application/pages/modplatform/technic/TechnicPage.cpp b/application/pages/modplatform/technic/TechnicPage.cpp index 75efd3ed..584e9c27 100644 --- a/application/pages/modplatform/technic/TechnicPage.cpp +++ b/application/pages/modplatform/technic/TechnicPage.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "TechnicPage.h" #include "ui_TechnicPage.h"