From 74311a54cf2f423a160ce0999bd5ad7e5c62f243 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Fri, 28 May 2021 15:03:14 +0100
Subject: NOISSUE Support ATLauncher optional mods

---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp   | 21 ++++++++++++++++++---
 .../modplatform/atlauncher/ATLPackInstallTask.h     |  5 +++++
 .../modplatform/atlauncher/ATLPackManifest.cpp      |  3 +++
 api/logic/modplatform/atlauncher/ATLPackManifest.h  |  3 +++
 4 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'api/logic/modplatform')

diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
index 89c4dfd3..89829c05 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -457,16 +457,31 @@ void PackInstallTask::extractConfigs()
 void PackInstallTask::downloadMods()
 {
     qDebug() << "PackInstallTask::installMods: " << QThread::currentThreadId();
+
+    QVector<ATLauncher::VersionMod> optionalMods;
+    for (const auto& mod : m_version.mods) {
+        if (mod.optional) {
+            optionalMods.push_back(mod);
+        }
+    }
+
+    // Select optional mods, if pack contains any
+    QVector<QString> selectedMods;
+    if (!optionalMods.isEmpty()) {
+        setStatus(tr("Selecting optional mods..."));
+        selectedMods = m_support->chooseOptionalMods(optionalMods);
+    }
+
     setStatus(tr("Downloading mods..."));
 
     jarmods.clear();
     jobPtr.reset(new NetJob(tr("Mod download")));
     for(const auto& mod : m_version.mods) {
         // skip non-client mods
-        if (!mod.client) continue;
+        if(!mod.client) continue;
 
-        // skip optional mods for now
-        if(mod.optional) continue;
+        // skip optional mods that were not selected
+        if(mod.optional && !selectedMods.contains(mod.name)) continue;
 
         QString url;
         switch(mod.download) {
diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h b/api/logic/modplatform/atlauncher/ATLPackInstallTask.h
index 3647e471..8233c376 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/api/logic/modplatform/atlauncher/ATLPackInstallTask.h
@@ -18,6 +18,11 @@ namespace ATLauncher {
 class MULTIMC_LOGIC_EXPORT UserInteractionSupport {
 
 public:
+    /**
+     * Requests a user interaction to select which optional mods should be installed.
+     */
+    virtual QVector<QString> chooseOptionalMods(QVector<ATLauncher::VersionMod> mods) = 0;
+
     /**
      * Requests a user interaction to select a component version from a given version list
      * and constrained to a given Minecraft version.
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
index 57cc52b6..149cb9c1 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
@@ -143,7 +143,10 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
         p.decompFile = Json::requireString(obj, "decompFile");
     }
 
+    p.description = Json::ensureString(obj, QString("description"), "");
     p.optional = Json::ensureBoolean(obj, QString("optional"), false);
+    p.recommended = Json::ensureBoolean(obj, QString("recommended"), false);
+    p.selected = Json::ensureBoolean(obj, QString("selected"), false);
     p.client = Json::ensureBoolean(obj, QString("client"), false);
 }
 
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.h b/api/logic/modplatform/atlauncher/ATLPackManifest.h
index 937106a5..48e1d344 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.h
+++ b/api/logic/modplatform/atlauncher/ATLPackManifest.h
@@ -86,7 +86,10 @@ struct VersionMod
     QString decompType_raw;
     QString decompFile;
 
+    QString description;
     bool optional;
+    bool recommended;
+    bool selected;
     bool client;
 };
 
-- 
cgit