Merge pull request #3819 from jamierocks/atl-optional-mods

NOISSUE Support ATLauncher optional mods

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) {

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.

api/logic/modplatform/atlauncher/ATLPackManifest.cpp

@@ -143,8 +143,24 @@ 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.hidden = Json::ensureBoolean(obj, QString("hidden"), false);
+    p.library = Json::ensureBoolean(obj, QString("library"), false);
+    p.group = Json::ensureString(obj, QString("group"), "");
+    if(obj.contains("depends")) {
+        auto dependsArr = Json::requireArray(obj, "depends");
+        for (const auto depends : dependsArr) {
+            p.depends.append(Json::requireString(depends));
+        }
+    }
+
     p.client = Json::ensureBoolean(obj, QString("client"), false);
+
+    // computed
+    p.effectively_hidden = p.hidden || p.library;
 }
 
 void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)

api/logic/modplatform/atlauncher/ATLPackManifest.h

@@ -86,8 +86,19 @@ struct VersionMod
     QString decompType_raw;
     QString decompFile;
 
+    QString description;
     bool optional;
+    bool recommended;
+    bool selected;
+    bool hidden;
+    bool library;
+    QString group;
+    QVector<QString> depends;
+
     bool client;
+
+    // computed
+    bool effectively_hidden;
 };
 
 struct PackVersion

application/CMakeLists.txt

@@ -129,6 +129,8 @@ SET(MULTIMC_SOURCES
     pages/modplatform/atlauncher/AtlFilterModel.h
     pages/modplatform/atlauncher/AtlListModel.cpp
     pages/modplatform/atlauncher/AtlListModel.h
+    pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+    pages/modplatform/atlauncher/AtlOptionalModDialog.h
     pages/modplatform/atlauncher/AtlPage.cpp
     pages/modplatform/atlauncher/AtlPage.h
 
@@ -278,6 +280,9 @@ SET(MULTIMC_UIS
     pages/modplatform/technic/TechnicPage.ui
     pages/modplatform/ImportPage.ui
 
+    # Platform Dialogs
+    pages/modplatform/atlauncher/AtlOptionalModDialog.ui
+
     # Dialogs
     dialogs/CopyInstanceDialog.ui
     dialogs/NewComponentDialog.ui

application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp

@@ -0,0 +1,207 @@
+#include "AtlOptionalModDialog.h"
+#include "ui_AtlOptionalModDialog.h"
+
+AtlOptionalModListModel::AtlOptionalModListModel(QWidget *parent, QVector<ATLauncher::VersionMod> mods)
+    : QAbstractListModel(parent), m_mods(mods) {
+
+    // fill mod index
+    for (int i = 0; i < m_mods.size(); i++) {
+        auto mod = m_mods.at(i);
+        m_index[mod.name] = i;
+    }
+    // set initial state
+    for (int i = 0; i < m_mods.size(); i++) {
+        auto mod = m_mods.at(i);
+        m_selection[mod.name] = false;
+        setMod(mod, i, mod.selected, false);
+    }
+}
+
+QVector<QString> AtlOptionalModListModel::getResult() {
+    QVector<QString> result;
+
+    for (const auto& mod : m_mods) {
+        if (m_selection[mod.name]) {
+            result.push_back(mod.name);
+        }
+    }
+
+    return result;
+}
+
+int AtlOptionalModListModel::rowCount(const QModelIndex &parent) const {
+    return m_mods.size();
+}
+
+int AtlOptionalModListModel::columnCount(const QModelIndex &parent) const {
+    // Enabled, Name, Description
+    return 3;
+}
+
+QVariant AtlOptionalModListModel::data(const QModelIndex &index, int role) const {
+    auto row = index.row();
+    auto mod = m_mods.at(row);
+
+    if (role == Qt::DisplayRole) {
+        if (index.column() == NameColumn) {
+            return mod.name;
+        }
+        if (index.column() == DescriptionColumn) {
+            return mod.description;
+        }
+    }
+    else if (role == Qt::ToolTipRole) {
+        if (index.column() == DescriptionColumn) {
+            return mod.description;
+        }
+    }
+    else if (role == Qt::CheckStateRole) {
+        if (index.column() == EnabledColumn) {
+            return m_selection[mod.name] ? Qt::Checked : Qt::Unchecked;
+        }
+    }
+
+    return QVariant();
+}
+
+bool AtlOptionalModListModel::setData(const QModelIndex &index, const QVariant &value, int role) {
+    if (role == Qt::CheckStateRole) {
+        auto row = index.row();
+        auto mod = m_mods.at(row);
+
+        toggleMod(mod, row);
+        return true;
+    }
+
+    return false;
+}
+
+QVariant AtlOptionalModListModel::headerData(int section, Qt::Orientation orientation, int role) const {
+    if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
+        switch (section) {
+            case EnabledColumn:
+                return QString();
+            case NameColumn:
+                return QString("Name");
+            case DescriptionColumn:
+                return QString("Description");
+        }
+    }
+
+    return QVariant();
+}
+
+Qt::ItemFlags AtlOptionalModListModel::flags(const QModelIndex &index) const {
+    auto flags = QAbstractListModel::flags(index);
+    if (index.isValid() && index.column() == EnabledColumn) {
+        flags |= Qt::ItemIsUserCheckable;
+    }
+    return flags;
+}
+
+void AtlOptionalModListModel::selectRecommended() {
+    for (const auto& mod : m_mods) {
+        m_selection[mod.name] = mod.recommended;
+    }
+
+    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn),
+                     AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
+}
+
+void AtlOptionalModListModel::clearAll() {
+    for (const auto& mod : m_mods) {
+        m_selection[mod.name] = false;
+    }
+
+    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn),
+                     AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
+}
+
+void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index) {
+    setMod(mod, index, !m_selection[mod.name]);
+}
+
+void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit) {
+    if (m_selection[mod.name] == enable) return;
+
+    m_selection[mod.name] = enable;
+
+    // disable other mods in the group, if applicable
+    if (enable && !mod.group.isEmpty()) {
+        for (int i = 0; i < m_mods.size(); i++) {
+            if (index == i) continue;
+            auto other = m_mods.at(i);
+
+            if (mod.group == other.group) {
+                setMod(other, i, false, shouldEmit);
+            }
+        }
+    }
+
+    for (const auto& dependencyName : mod.depends) {
+        auto dependencyIndex = m_index[dependencyName];
+        auto dependencyMod = m_mods.at(dependencyIndex);
+
+        // enable/disable dependencies
+        if (enable) {
+            setMod(dependencyMod, dependencyIndex, true, shouldEmit);
+        }
+
+        // if the dependency is 'effectively hidden', then track which mods
+        // depend on it - so we can efficiently disable it when no more dependents
+        // depend on it.
+        auto dependants = m_dependants[dependencyName];
+
+        if (enable) {
+            dependants.append(mod.name);
+        }
+        else {
+            dependants.removeAll(mod.name);
+
+            // if there are no longer any dependents, let's disable the mod
+            if (dependencyMod.effectively_hidden && dependants.isEmpty()) {
+                setMod(dependencyMod, dependencyIndex, false, shouldEmit);
+            }
+        }
+    }
+
+    // disable mods that depend on this one, if disabling
+    if (!enable) {
+        auto dependants = m_dependants[mod.name];
+        for (const auto& dependencyName : dependants) {
+            auto dependencyIndex = m_index[dependencyName];
+            auto dependencyMod = m_mods.at(dependencyIndex);
+
+            setMod(dependencyMod, dependencyIndex, false, shouldEmit);
+        }
+    }
+
+    if (shouldEmit) {
+        emit dataChanged(AtlOptionalModListModel::index(index, EnabledColumn),
+                         AtlOptionalModListModel::index(index, EnabledColumn));
+    }
+}
+
+
+AtlOptionalModDialog::AtlOptionalModDialog(QWidget *parent, QVector<ATLauncher::VersionMod> mods)
+    : QDialog(parent), ui(new Ui::AtlOptionalModDialog) {
+    ui->setupUi(this);
+
+    listModel = new AtlOptionalModListModel(this, mods);
+    ui->treeView->setModel(listModel);
+
+    ui->treeView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    ui->treeView->header()->setSectionResizeMode(
+            AtlOptionalModListModel::NameColumn, QHeaderView::ResizeToContents);
+    ui->treeView->header()->setSectionResizeMode(
+            AtlOptionalModListModel::DescriptionColumn, QHeaderView::Stretch);
+
+    connect(ui->selectRecommendedButton, &QPushButton::pressed,
+            listModel, &AtlOptionalModListModel::selectRecommended);
+    connect(ui->clearAllButton, &QPushButton::pressed,
+            listModel, &AtlOptionalModListModel::clearAll);
+}
+
+AtlOptionalModDialog::~AtlOptionalModDialog() {
+    delete ui;
+}

application/pages/modplatform/atlauncher/AtlOptionalModDialog.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include <QDialog>
+#include <QAbstractListModel>
+
+#include "modplatform/atlauncher/ATLPackIndex.h"
+
+namespace Ui {
+class AtlOptionalModDialog;
+}
+
+class AtlOptionalModListModel : public QAbstractListModel {
+    Q_OBJECT
+
+public:
+    enum Columns
+    {
+        EnabledColumn = 0,
+        NameColumn,
+        DescriptionColumn,
+    };
+
+    AtlOptionalModListModel(QWidget *parent, QVector<ATLauncher::VersionMod> mods);
+
+    QVector<QString> getResult();
+
+    int rowCount(const QModelIndex &parent) const override;
+    int columnCount(const QModelIndex &parent) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+
+public slots:
+    void selectRecommended();
+    void clearAll();
+
+private:
+    void toggleMod(ATLauncher::VersionMod mod, int index);
+    void setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit = true);
+
+private:
+    QVector<ATLauncher::VersionMod> m_mods;
+    QMap<QString, bool> m_selection;
+    QMap<QString, int> m_index;
+    QMap<QString, QVector<QString>> m_dependants;
+};
+
+class AtlOptionalModDialog : public QDialog {
+    Q_OBJECT
+
+public:
+    AtlOptionalModDialog(QWidget *parent, QVector<ATLauncher::VersionMod> mods);
+    ~AtlOptionalModDialog() override;
+
+    QVector<QString> getResult() {
+        return listModel->getResult();
+    }
+
+private:
+    Ui::AtlOptionalModDialog *ui;
+
+    AtlOptionalModListModel *listModel;
+};

application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AtlOptionalModDialog</class>
+ <widget class="QDialog" name="AtlOptionalModDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>550</width>
+    <height>310</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select Mods To Install</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="1" column="3">
+    <widget class="QPushButton" name="installButton">
+     <property name="text">
+      <string>Install</string>
+     </property>
+     <property name="default">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="selectRecommendedButton">
+     <property name="text">
+      <string>Select Recommended</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="shareCodeButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Use Share Code</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="clearAllButton">
+     <property name="text">
+      <string>Clear All</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="4">
+    <widget class="ModListView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ModListView</class>
+   <extends>QTreeView</extends>
+   <header>widgets/ModListView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

application/pages/modplatform/atlauncher/AtlPage.cpp

@@ -2,6 +2,7 @@
 #include "ui_AtlPage.h"
 
 #include "dialogs/NewInstanceDialog.h"
+#include "AtlOptionalModDialog.h"
 #include <modplatform/atlauncher/ATLPackInstallTask.h>
 #include <BuildConfig.h>
 #include <dialogs/VersionSelectDialog.h>
@@ -131,6 +132,12 @@ void AtlPage::onVersionSelectionChanged(QString data)
     suggestCurrent();
 }
 
+QVector<QString> AtlPage::chooseOptionalMods(QVector<ATLauncher::VersionMod> mods) {
+    AtlOptionalModDialog optionalModDialog(this, mods);
+    optionalModDialog.exec();
+    return optionalModDialog.getResult();
+}
+
 QString AtlPage::chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) {
     VersionSelectDialog vselect(vlist.get(), "Choose Version", MMC->activeWindow(), false);
     if (minecraftVersion != Q_NULLPTR) {

application/pages/modplatform/atlauncher/AtlPage.h

@@ -63,6 +63,7 @@ private:
     void suggestCurrent();
 
     QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) override;
+    QVector<QString> chooseOptionalMods(QVector<ATLauncher::VersionMod> mods) override;
 
 private slots:
     void triggerSearch();