Merge pull request #3438 from jamierocks/technic-zip-fix

GH-3437 Extract Technic single zip packs to correct place

9 files changed, 2 insertions, 18 deletions

diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp
index 833ac0a2..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"
@@ -21,6 +20,7 @@
 #include "TechnicPackProcessor.h"
 
 #include <QtConcurrent>
+#include <FileSystem.h>
 
 Technic::SingleZipPackInstallTask::SingleZipPackInstallTask(const QUrl &sourceUrl, const QString &minecraftVersion)
 {
@@ -48,7 +48,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
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 <FileSystem.h>
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 <InstanceTask.h>
@@ -22,7 +21,6 @@
 
 #include <QUrl>
 
-
 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 <FileSystem.h>
@@ -27,7 +26,6 @@
 
 #include <memory>
 
-
 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 <QString>
 #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 <QList>
 #include <QString>
 
-
 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 <QIcon>
 
-
 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"