From ec62d8e97334d3b5a30cea00858e7035468f3609 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 9 Aug 2022 01:58:22 -0300
Subject: refactor: move general code from mod model to its own model

This aims to continue decoupling other types of resources (e.g. resource
packs, shader packs, etc) from mods, so that we don't have to
continuously watch our backs for changes to one of them affecting the
others.

To do so, this creates a more general list model for resources, based on
the mods one, that allows you to extend it with functionality for other
resources.

I had to do some template and preprocessor stuff to get around the
QObject limitation of not allowing templated classes, so that's sadge :c

On the other hand, I tried cleaning up most general-purpose code in the
mod model, and added some documentation, because it looks nice :D

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/instance/ExternalResourcesPage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'launcher/ui/pages/instance')

diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 39fbe3e2..da7c4af0 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -32,12 +32,12 @@ class SortProxy : public QSortFilterProxyModel {
         
         const auto& mod = model->at(source_row);
 
-        if (filterRegularExpression().match(mod.name()).hasMatch())
+        if (filterRegularExpression().match(mod->name()).hasMatch())
             return true;
-        if (filterRegularExpression().match(mod.description()).hasMatch())
+        if (filterRegularExpression().match(mod->description()).hasMatch())
             return true;
         
-        for (auto& author : mod.authors()) {
+        for (auto& author : mod->authors()) {
             if (filterRegularExpression().match(author).hasMatch()) {
                 return true;
             }
@@ -292,6 +292,6 @@ void ExternalResourcesPage::current(const QModelIndex& current, const QModelInde
 
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
-    Mod& m = m_model->operator[](row);
+    Mod& m = *m_model->operator[](row);
     ui->frame->updateWithMod(m);
 }
-- 
cgit 


From 97a74d5c1f00a11d331a41b16690f7202fe102a3 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Wed, 10 Aug 2022 14:48:34 -0300
Subject: refactor: adapt rest of the codebase to the new resource model

In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/CMakeLists.txt                            |   7 +-
 launcher/InstancePageProvider.h                    |   6 +-
 launcher/minecraft/MinecraftInstance.cpp           |  13 +-
 launcher/minecraft/MinecraftInstance.h             |  16 +-
 launcher/minecraft/mod/Mod.h                       |   3 +-
 launcher/minecraft/mod/ModFolderModel.cpp          |   2 +-
 launcher/minecraft/mod/Resource.h                  |   2 +
 launcher/minecraft/mod/ResourceFolderModel.h       |   3 +
 launcher/minecraft/mod/ResourcePack.h              |  13 ++
 launcher/minecraft/mod/ResourcePackFolderModel.cpp |   3 +-
 launcher/minecraft/mod/ResourcePackFolderModel.h   |   4 +
 launcher/minecraft/mod/ShaderPackFolderModel.h     |  10 ++
 launcher/minecraft/mod/TexturePackFolderModel.cpp  |  22 +--
 launcher/minecraft/mod/TexturePackFolderModel.h    |   6 +-
 .../ui/pages/instance/ExternalResourcesPage.cpp    | 142 ++---------------
 launcher/ui/pages/instance/ExternalResourcesPage.h |  17 +-
 .../ui/pages/instance/ExternalResourcesPage.ui     |   6 +-
 launcher/ui/pages/instance/ModFolderPage.cpp       |  42 ++++-
 launcher/ui/pages/instance/ModFolderPage.h         |  11 ++
 launcher/ui/pages/instance/ResourcePackPage.h      |   6 +-
 launcher/ui/pages/instance/ShaderPackPage.h        |   6 +-
 launcher/ui/pages/instance/TexturePackPage.h       |   6 +-
 launcher/ui/pages/instance/VersionPage.cpp         |   6 +-
 launcher/ui/pages/instance/VersionPage.ui          |   6 +-
 launcher/ui/widgets/InfoFrame.cpp                  | 172 +++++++++++++++++++++
 launcher/ui/widgets/InfoFrame.h                    |  54 +++++++
 launcher/ui/widgets/InfoFrame.ui                   |  92 +++++++++++
 launcher/ui/widgets/MCModInfoFrame.cpp             | 168 --------------------
 launcher/ui/widgets/MCModInfoFrame.h               |  52 -------
 launcher/ui/widgets/MCModInfoFrame.ui              |  92 -----------
 30 files changed, 480 insertions(+), 508 deletions(-)
 create mode 100644 launcher/minecraft/mod/ResourcePack.h
 create mode 100644 launcher/minecraft/mod/ShaderPackFolderModel.h
 create mode 100644 launcher/ui/widgets/InfoFrame.cpp
 create mode 100644 launcher/ui/widgets/InfoFrame.h
 create mode 100644 launcher/ui/widgets/InfoFrame.ui
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.cpp
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.h
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.ui

(limited to 'launcher/ui/pages/instance')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index d1e0befd..badd0eaa 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -326,6 +326,7 @@ set(MINECRAFT_SOURCES
     minecraft/mod/ResourcePackFolderModel.cpp
     minecraft/mod/TexturePackFolderModel.h
     minecraft/mod/TexturePackFolderModel.cpp
+    minecraft/mod/ShaderPackFolderModel.h
     minecraft/mod/tasks/BasicFolderLoadTask.h
     minecraft/mod/tasks/ModFolderLoadTask.h
     minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -884,8 +885,8 @@ SET(LAUNCHER_SOURCES
     ui/widgets/LineSeparator.h
     ui/widgets/LogView.cpp
     ui/widgets/LogView.h
-    ui/widgets/MCModInfoFrame.cpp
-    ui/widgets/MCModInfoFrame.h
+    ui/widgets/InfoFrame.cpp
+    ui/widgets/InfoFrame.h
     ui/widgets/ModFilterWidget.cpp
     ui/widgets/ModFilterWidget.h
     ui/widgets/ModListView.cpp
@@ -947,7 +948,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/modplatform/technic/TechnicPage.ui
     ui/widgets/InstanceCardWidget.ui
     ui/widgets/CustomCommands.ui
-    ui/widgets/MCModInfoFrame.ui
+    ui/widgets/InfoFrame.ui
     ui/widgets/ModFilterWidget.ui
     ui/dialogs/CopyInstanceDialog.ui
     ui/dialogs/ProfileSetupDialog.ui
diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h
index 78fb7016..bf29377d 100644
--- a/launcher/InstancePageProvider.h
+++ b/launcher/InstancePageProvider.h
@@ -37,9 +37,9 @@ public:
         modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
         values.append(modsPage);
         values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList()));
-        values.append(new ResourcePackPage(onesix.get()));
-        values.append(new TexturePackPage(onesix.get()));
-        values.append(new ShaderPackPage(onesix.get()));
+        values.append(new ResourcePackPage(onesix.get(), onesix->resourcePackList()));
+        values.append(new TexturePackPage(onesix.get(), onesix->texturePackList()));
+        values.append(new ShaderPackPage(onesix.get(), onesix->shaderPackList()));
         values.append(new NotesPage(onesix.get()));
         values.append(new WorldListPage(onesix.get(), onesix->worldList()));
         values.append(new ServersPage(onesix));
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index b42aeda3..94b4776e 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -76,6 +76,7 @@
 
 #include "mod/ModFolderModel.h"
 #include "mod/ResourcePackFolderModel.h"
+#include "mod/ShaderPackFolderModel.h"
 #include "mod/TexturePackFolderModel.h"
 
 #include "WorldList.h"
@@ -1092,18 +1093,18 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList() const
     return m_core_mod_list;
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::resourcePackList() const
+std::shared_ptr<ResourcePackFolderModel> MinecraftInstance::resourcePackList() const
 {
     if (!m_resource_pack_list)
     {
         m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir()));
-        m_resource_pack_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
+        m_resource_pack_list->enableInteraction(!isRunning());
+        connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ResourcePackFolderModel::disableInteraction);
     }
     return m_resource_pack_list;
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
+std::shared_ptr<TexturePackFolderModel> MinecraftInstance::texturePackList() const
 {
     if (!m_texture_pack_list)
     {
@@ -1114,11 +1115,11 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
     return m_texture_pack_list;
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::shaderPackList() const
+std::shared_ptr<ShaderPackFolderModel> MinecraftInstance::shaderPackList() const
 {
     if (!m_shader_pack_list)
     {
-        m_shader_pack_list.reset(new ResourcePackFolderModel(shaderPacksDir()));
+        m_shader_pack_list.reset(new ShaderPackFolderModel(shaderPacksDir()));
         m_shader_pack_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_shader_pack_list.get(), &ModFolderModel::disableInteraction);
     }
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 7a75f452..d62ac655 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -7,6 +7,10 @@
 #include "minecraft/launch/MinecraftServerTarget.h"
 
 class ModFolderModel;
+class ResourceFolderModel;
+class ResourcePackFolderModel;
+class ShaderPackFolderModel;
+class TexturePackFolderModel;
 class WorldList;
 class GameOptions;
 class LaunchStep;
@@ -72,9 +76,9 @@ public:
     //////  Mod Lists  //////
     std::shared_ptr<ModFolderModel> loaderModList() const;
     std::shared_ptr<ModFolderModel> coreModList() const;
-    std::shared_ptr<ModFolderModel> resourcePackList() const;
-    std::shared_ptr<ModFolderModel> texturePackList() const;
-    std::shared_ptr<ModFolderModel> shaderPackList() const;
+    std::shared_ptr<ResourcePackFolderModel> resourcePackList() const;
+    std::shared_ptr<TexturePackFolderModel> texturePackList() const;
+    std::shared_ptr<ShaderPackFolderModel> shaderPackList() const;
     std::shared_ptr<WorldList> worldList() const;
     std::shared_ptr<GameOptions> gameOptionsModel() const;
 
@@ -125,9 +129,9 @@ protected: // data
     std::shared_ptr<PackProfile> m_components;
     mutable std::shared_ptr<ModFolderModel> m_loader_mod_list;
     mutable std::shared_ptr<ModFolderModel> m_core_mod_list;
-    mutable std::shared_ptr<ModFolderModel> m_resource_pack_list;
-    mutable std::shared_ptr<ModFolderModel> m_shader_pack_list;
-    mutable std::shared_ptr<ModFolderModel> m_texture_pack_list;
+    mutable std::shared_ptr<ResourcePackFolderModel> m_resource_pack_list;
+    mutable std::shared_ptr<ShaderPackFolderModel> m_shader_pack_list;
+    mutable std::shared_ptr<TexturePackFolderModel> m_texture_pack_list;
     mutable std::shared_ptr<WorldList> m_world_list;
     mutable std::shared_ptr<GameOptions> m_game_options;
 };
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 25ac88c9..0835e3b1 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -50,7 +50,8 @@ public:
 
     Mod() = default;
     Mod(const QFileInfo &file);
-    explicit Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata);
+    Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata);
+    Mod(QString file_path) : Mod(QFileInfo(file_path)) {}
 
     auto enabled()         const -> bool { return m_enabled; }
 
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 9b8c58bc..c316e710 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -49,7 +49,7 @@
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 #include "minecraft/mod/tasks/ModFolderLoadTask.h"
 
-ModFolderModel::ModFolderModel(const QString &dir, bool is_indexed) : ResourceFolderModel(dir), m_is_indexed(is_indexed)
+ModFolderModel::ModFolderModel(const QString &dir, bool is_indexed) : ResourceFolderModel(QDir(dir)), m_is_indexed(is_indexed)
 {
     FS::ensureFolderPathExists(m_dir.absolutePath());
     m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::VERSION, SortType::DATE };
diff --git a/launcher/minecraft/mod/Resource.h b/launcher/minecraft/mod/Resource.h
index 68663ab0..bec7490f 100644
--- a/launcher/minecraft/mod/Resource.h
+++ b/launcher/minecraft/mod/Resource.h
@@ -34,6 +34,8 @@ class Resource : public QObject {
 
     Resource(QObject* parent = nullptr);
     Resource(QFileInfo file_info);
+    Resource(QString file_path) : Resource(QFileInfo(file_path)) {}
+
     ~Resource() override = default;
 
     void setFile(QFileInfo file_info);
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h
index 2ccf14f0..986d9885 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.h
+++ b/launcher/minecraft/mod/ResourceFolderModel.h
@@ -261,6 +261,9 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
 
         std::sort(removed_rows.begin(), removed_rows.end());
 
+        for (int i = 0; i < removed_rows.size(); i++)
+            removed_rows[i] -= i;
+
         for (auto& removed_index : removed_rows) {
             beginRemoveRows(QModelIndex(), removed_index, removed_index);
 
diff --git a/launcher/minecraft/mod/ResourcePack.h b/launcher/minecraft/mod/ResourcePack.h
new file mode 100644
index 00000000..c2cc8690
--- /dev/null
+++ b/launcher/minecraft/mod/ResourcePack.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "Resource.h"
+
+class ResourcePack : public Resource {
+    Q_OBJECT
+    public:
+    using Ptr = shared_qobject_ptr<Resource>;
+
+    ResourcePack(QObject* parent = nullptr) : Resource(parent) {}
+    ResourcePack(QFileInfo file_info) : Resource(file_info) {}
+
+};
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index 64a04469..e92be894 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -35,5 +35,4 @@
 
 #include "ResourcePackFolderModel.h"
 
-ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ResourceFolderModel(dir) {
-}
+ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ResourceFolderModel(QDir(dir)) {}
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.h b/launcher/minecraft/mod/ResourcePackFolderModel.h
index d2a5bf18..1fe82867 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.h
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.h
@@ -2,9 +2,13 @@
 
 #include "ResourceFolderModel.h"
 
+#include "ResourcePack.h"
+
 class ResourcePackFolderModel : public ResourceFolderModel
 {
     Q_OBJECT
 public:
     explicit ResourcePackFolderModel(const QString &dir);
+
+    RESOURCE_HELPERS(ResourcePack)
 };
diff --git a/launcher/minecraft/mod/ShaderPackFolderModel.h b/launcher/minecraft/mod/ShaderPackFolderModel.h
new file mode 100644
index 00000000..a3aa958f
--- /dev/null
+++ b/launcher/minecraft/mod/ShaderPackFolderModel.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "ResourceFolderModel.h"
+
+class ShaderPackFolderModel : public ResourceFolderModel {
+    Q_OBJECT
+
+   public:
+    explicit ShaderPackFolderModel(const QString& dir) : ResourceFolderModel(QDir(dir)) {}
+};
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index e3a22219..2c7c945b 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -35,24 +35,4 @@
 
 #include "TexturePackFolderModel.h"
 
-TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir) {
-}
-
-QVariant TexturePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
-    if (role == Qt::ToolTipRole) {
-        switch (section) {
-            case ActiveColumn:
-                return tr("Is the texture pack enabled?");
-            case NameColumn:
-                return tr("The name of the texture pack.");
-            case VersionColumn:
-                return tr("The version of the texture pack.");
-            case DateColumn:
-                return tr("The date and time this texture pack was last changed (or added).");
-            default:
-                return QVariant();
-        }
-    }
-
-    return ModFolderModel::headerData(section, orientation, role);
-}
+TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ResourceFolderModel(QDir(dir)) {}
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.h b/launcher/minecraft/mod/TexturePackFolderModel.h
index a59d5119..69e98661 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.h
+++ b/launcher/minecraft/mod/TexturePackFolderModel.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include "ModFolderModel.h"
+#include "ResourceFolderModel.h"
 
-class TexturePackFolderModel : public ModFolderModel
+class TexturePackFolderModel : public ResourceFolderModel
 {
     Q_OBJECT
 
 public:
     explicit TexturePackFolderModel(const QString &dir);
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 };
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index da7c4af0..0a3687e5 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -3,100 +3,13 @@
 
 #include "DesktopServices.h"
 #include "Version.h"
-#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/mod/ResourceFolderModel.h"
 #include "ui/GuiUtil.h"
 
 #include <QKeyEvent>
 #include <QMenu>
 
-namespace {
-// FIXME: wasteful
-void RemoveThePrefix(QString& string)
-{
-    QRegularExpression regex(QStringLiteral("^(?:the|teh) +"), QRegularExpression::CaseInsensitiveOption);
-    string.remove(regex);
-    string = string.trimmed();
-}
-}  // namespace
-
-class SortProxy : public QSortFilterProxyModel {
-   public:
-    explicit SortProxy(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
-
-   protected:
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override
-    {
-        ModFolderModel* model = qobject_cast<ModFolderModel*>(sourceModel());
-        if (!model)
-            return false;
-        
-        const auto& mod = model->at(source_row);
-
-        if (filterRegularExpression().match(mod->name()).hasMatch())
-            return true;
-        if (filterRegularExpression().match(mod->description()).hasMatch())
-            return true;
-        
-        for (auto& author : mod->authors()) {
-            if (filterRegularExpression().match(author).hasMatch()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override
-    {
-        ModFolderModel* model = qobject_cast<ModFolderModel*>(sourceModel());
-        if (!model || !source_left.isValid() || !source_right.isValid() || source_left.column() != source_right.column()) {
-            return QSortFilterProxyModel::lessThan(source_left, source_right);
-        }
-
-        // we are now guaranteed to have two valid indexes in the same column... we love the provided invariants unconditionally and
-        // proceed.
-
-        auto column = (ModFolderModel::Columns) source_left.column();
-        bool invert = false;
-        switch (column) {
-            // GH-2550 - sort by enabled/disabled
-            case ModFolderModel::ActiveColumn: {
-                auto dataL = source_left.data(Qt::CheckStateRole).toBool();
-                auto dataR = source_right.data(Qt::CheckStateRole).toBool();
-                if (dataL != dataR)
-                    return dataL > dataR;
-                
-                // fallthrough
-                invert = sortOrder() == Qt::DescendingOrder;
-            }
-            // GH-2722 - sort mod names in a way that discards "The" prefixes
-            case ModFolderModel::NameColumn: {
-                auto dataL = model->data(model->index(source_left.row(), ModFolderModel::NameColumn)).toString();
-                RemoveThePrefix(dataL);
-                auto dataR = model->data(model->index(source_right.row(), ModFolderModel::NameColumn)).toString();
-                RemoveThePrefix(dataR);
-
-                auto less = dataL.compare(dataR, sortCaseSensitivity());
-                if (less != 0)
-                    return invert ? (less > 0) : (less < 0);
-                
-                // fallthrough
-                invert = sortOrder() == Qt::DescendingOrder;
-            }
-            // GH-2762 - sort versions by parsing them as versions
-            case ModFolderModel::VersionColumn: {
-                auto dataL = Version(model->data(model->index(source_left.row(), ModFolderModel::VersionColumn)).toString());
-                auto dataR = Version(model->data(model->index(source_right.row(), ModFolderModel::VersionColumn)).toString());
-                return invert ? (dataL > dataR) : (dataL < dataR);
-            }
-            default: {
-                return QSortFilterProxyModel::lessThan(source_left, source_right);
-            }
-        }
-    }
-};
-
-ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared_ptr<ModFolderModel> model, QWidget* parent)
+ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared_ptr<ResourceFolderModel> model, QWidget* parent)
     : QMainWindow(parent), m_instance(instance), ui(new Ui::ExternalResourcesPage), m_model(model)
 {
     ui->setupUi(this);
@@ -105,7 +18,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
 
     ui->actionsToolbar->insertSpacer(ui->actionViewConfigs);
 
-    m_filterModel = new SortProxy(this);
+    m_filterModel = model->createFilterProxyModel(this);
     m_filterModel->setDynamicSortFilter(true);
     m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
@@ -127,7 +40,6 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
     connect(ui->actionViewFolder, &QAction::triggered, this, &ExternalResourcesPage::viewFolder);
 
     connect(ui->treeView, &ModListView::customContextMenuRequested, this, &ExternalResourcesPage::ShowContextMenu);
-    connect(ui->treeView, &ModListView::activated, this, &ExternalResourcesPage::itemActivated);
 
     auto selection_model = ui->treeView->selectionModel();
     connect(selection_model, &QItemSelectionModel::currentChanged, this, &ExternalResourcesPage::current);
@@ -137,19 +49,9 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
 
 ExternalResourcesPage::~ExternalResourcesPage()
 {
-    m_model->stopWatching();
     delete ui;
 }
 
-void ExternalResourcesPage::itemActivated(const QModelIndex&)
-{
-    if (!m_controlsEnabled)
-        return;
-    
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Toggle);
-}
-
 QMenu* ExternalResourcesPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
@@ -241,7 +143,7 @@ void ExternalResourcesPage::addItem()
 
     if (!list.isEmpty()) {
         for (auto filename : list) {
-            m_model->installMod(filename);
+            m_model->installResource(filename);
         }
     }
 }
@@ -252,25 +154,7 @@ void ExternalResourcesPage::removeItem()
         return;
     
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->deleteMods(selection.indexes());
-}
-
-void ExternalResourcesPage::enableItem()
-{
-    if (!m_controlsEnabled)
-        return;
-    
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Enable);
-}
-
-void ExternalResourcesPage::disableItem()
-{
-    if (!m_controlsEnabled)
-        return;
-    
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Disable);
+    m_model->deleteResources(selection.indexes());
 }
 
 void ExternalResourcesPage::viewConfigs()
@@ -283,15 +167,23 @@ void ExternalResourcesPage::viewFolder()
     DesktopServices::openDirectory(m_model->dir().absolutePath(), true);
 }
 
-void ExternalResourcesPage::current(const QModelIndex& current, const QModelIndex& previous)
+bool ExternalResourcesPage::current(const QModelIndex& current, const QModelIndex& previous)
 {
     if (!current.isValid()) {
         ui->frame->clear();
-        return;
+        return false;
     }
 
+    return onSelectionChanged(current, previous);
+}
+
+bool ExternalResourcesPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+{
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
-    Mod& m = *m_model->operator[](row);
-    ui->frame->updateWithMod(m);
+    Resource const& resource = m_model->at(row);
+    ui->frame->updateWithResource(resource);
+
+    return true;
 }
+
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index ff294678..280f1542 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -7,7 +7,7 @@
 #include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
 
-class ModFolderModel;
+class ResourceFolderModel;
 
 namespace Ui {
 class ExternalResourcesPage;
@@ -19,8 +19,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     Q_OBJECT
 
    public:
-    // FIXME: Switch to different model (or change the name of this one)
-    explicit ExternalResourcesPage(BaseInstance* instance, std::shared_ptr<ModFolderModel> model, QWidget* parent = nullptr);
+    explicit ExternalResourcesPage(BaseInstance* instance, std::shared_ptr<ResourceFolderModel> model, QWidget* parent = nullptr);
     virtual ~ExternalResourcesPage();
 
     virtual QString displayName() const override = 0;
@@ -41,18 +40,20 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     QMenu* createPopupMenu() override;
 
    public slots:
-    void current(const QModelIndex& current, const QModelIndex& previous);
+    bool current(const QModelIndex& current, const QModelIndex& previous);
+
+    virtual bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
 
    protected slots:
-    void itemActivated(const QModelIndex& index);
+    virtual void itemActivated(const QModelIndex& index) {};
     void filterTextChanged(const QString& newContents);
     virtual void runningStateChanged(bool running);
 
     virtual void addItem();
     virtual void removeItem();
 
-    virtual void enableItem();
-    virtual void disableItem();
+    virtual void enableItem() {};
+    virtual void disableItem() {};
 
     virtual void viewFolder();
     virtual void viewConfigs();
@@ -63,7 +64,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     BaseInstance* m_instance = nullptr;
 
     Ui::ExternalResourcesPage* ui = nullptr;
-    std::shared_ptr<ModFolderModel> m_model;
+    std::shared_ptr<ResourceFolderModel> m_model;
     QSortFilterProxyModel* m_filterModel = nullptr;
 
     QString m_fileSelectionFilter;
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.ui b/launcher/ui/pages/instance/ExternalResourcesPage.ui
index a13666b2..76f8ec18 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.ui
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.ui
@@ -43,7 +43,7 @@
      </layout>
     </item>
     <item row="2" column="1" colspan="3">
-     <widget class="MCModInfoFrame" name="frame">
+     <widget class="InfoFrame" name="frame">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
         <horstretch>0</horstretch>
@@ -166,9 +166,9 @@
    <header>ui/widgets/ModListView.h</header>
   </customwidget>
   <customwidget>
-   <class>MCModInfoFrame</class>
+   <class>InfoFrame</class>
    <extends>QFrame</extends>
-   <header>ui/widgets/MCModInfoFrame.h</header>
+   <header>ui/widgets/InfoFrame.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 45678db1..63897fb0 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -65,7 +65,7 @@
 #include "ui/dialogs/ProgressDialog.h"
 
 ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent)
-    : ExternalResourcesPage(inst, mods, parent)
+    : ExternalResourcesPage(inst, mods, parent), m_model(mods)
 {
     // This is structured like that so that these changes
     // do not affect the Resource pack and Shader pack tabs
@@ -110,6 +110,8 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
 
         ModFolderPage::runningStateChanged(m_instance && m_instance->isRunning());
     }
+
+    connect(ui->treeView, &ModListView::activated, this, &ModFolderPage::itemActivated);
 }
 
 void ModFolderPage::runningStateChanged(bool running)
@@ -124,6 +126,44 @@ bool ModFolderPage::shouldDisplay() const
     return true;
 }
 
+void ModFolderPage::itemActivated(const QModelIndex&)
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setModStatus(selection.indexes(), ModFolderModel::Toggle);
+}
+
+void ModFolderPage::enableItem()
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setModStatus(selection.indexes(), ModFolderModel::Enable);
+}
+
+void ModFolderPage::disableItem()
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setModStatus(selection.indexes(), ModFolderModel::Disable);
+}
+
+bool ModFolderPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+{
+    auto sourceCurrent = m_filterModel->mapToSource(current);
+    int row = sourceCurrent.row();
+    Mod const* m = m_model->at(row);
+    if (m)
+        ui->frame->updateWithMod(*m);
+
+    return true;
+}
+
 void ModFolderPage::installMods()
 {
     if (!m_controlsEnabled)
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 7e305951..5da353f0 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -55,9 +55,20 @@ class ModFolderPage : public ExternalResourcesPage {
     virtual bool shouldDisplay() const override;
     void runningStateChanged(bool running) override;
 
+   public slots:
+    bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
+
+    void itemActivated(const QModelIndex& index) override;
+
+    void enableItem() override;
+    void disableItem() override;
+
    private slots:
     void installMods();
     void updateMods();
+
+   protected:
+    std::shared_ptr<ModFolderModel> m_model;
 };
 
 class CoreModFolderPage : public ModFolderPage {
diff --git a/launcher/ui/pages/instance/ResourcePackPage.h b/launcher/ui/pages/instance/ResourcePackPage.h
index a6c9fdd3..2eefc3d3 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.h
+++ b/launcher/ui/pages/instance/ResourcePackPage.h
@@ -38,12 +38,14 @@
 #include "ExternalResourcesPage.h"
 #include "ui_ExternalResourcesPage.h"
 
+#include "minecraft/mod/ResourcePackFolderModel.h"
+
 class ResourcePackPage : public ExternalResourcesPage
 {
     Q_OBJECT
 public:
-    explicit ResourcePackPage(MinecraftInstance *instance, QWidget *parent = 0)
-        : ExternalResourcesPage(instance, instance->resourcePackList(), parent)
+    explicit ResourcePackPage(MinecraftInstance *instance, std::shared_ptr<ResourcePackFolderModel> model, QWidget *parent = 0)
+        : ExternalResourcesPage(instance, model, parent)
     {
         ui->actionViewConfigs->setVisible(false);
     }
diff --git a/launcher/ui/pages/instance/ShaderPackPage.h b/launcher/ui/pages/instance/ShaderPackPage.h
index 2cc056c8..7f7ff8c1 100644
--- a/launcher/ui/pages/instance/ShaderPackPage.h
+++ b/launcher/ui/pages/instance/ShaderPackPage.h
@@ -38,12 +38,14 @@
 #include "ExternalResourcesPage.h"
 #include "ui_ExternalResourcesPage.h"
 
+#include "minecraft/mod/ShaderPackFolderModel.h"
+
 class ShaderPackPage : public ExternalResourcesPage
 {
     Q_OBJECT
 public:
-    explicit ShaderPackPage(MinecraftInstance *instance, QWidget *parent = 0)
-        : ExternalResourcesPage(instance, instance->shaderPackList(), parent)
+    explicit ShaderPackPage(MinecraftInstance *instance, std::shared_ptr<ShaderPackFolderModel> model, QWidget *parent = 0)
+        : ExternalResourcesPage(instance, model, parent)
     {
         ui->actionViewConfigs->setVisible(false);
     }
diff --git a/launcher/ui/pages/instance/TexturePackPage.h b/launcher/ui/pages/instance/TexturePackPage.h
index f550a5bc..fa219eda 100644
--- a/launcher/ui/pages/instance/TexturePackPage.h
+++ b/launcher/ui/pages/instance/TexturePackPage.h
@@ -38,12 +38,14 @@
 #include "ExternalResourcesPage.h"
 #include "ui_ExternalResourcesPage.h"
 
+#include "minecraft/mod/TexturePackFolderModel.h"
+
 class TexturePackPage : public ExternalResourcesPage
 {
     Q_OBJECT
 public:
-    explicit TexturePackPage(MinecraftInstance *instance, QWidget *parent = 0)
-        : ExternalResourcesPage(instance, instance->texturePackList(), parent)
+    explicit TexturePackPage(MinecraftInstance *instance, std::shared_ptr<TexturePackFolderModel> model, QWidget *parent = 0)
+        : ExternalResourcesPage(instance, model, parent)
     {
         ui->actionViewConfigs->setVisible(false);
     }
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index 468ff35c..a021c633 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -196,10 +196,10 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
     switch(severity)
     {
         case ProblemSeverity::Warning:
-            ui->frame->setModText(tr("%1 possibly has issues.").arg(patch->getName()));
+            ui->frame->setName(tr("%1 possibly has issues.").arg(patch->getName()));
             break;
         case ProblemSeverity::Error:
-            ui->frame->setModText(tr("%1 has issues!").arg(patch->getName()));
+            ui->frame->setName(tr("%1 has issues!").arg(patch->getName()));
             break;
         default:
         case ProblemSeverity::None:
@@ -222,7 +222,7 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
         problemOut += problem.m_description;
         problemOut += "\n";
     }
-    ui->frame->setModDescription(problemOut);
+    ui->frame->setDescription(problemOut);
 }
 
 void VersionPage::updateRunningStatus(bool running)
diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui
index 489f7218..fcba5598 100644
--- a/launcher/ui/pages/instance/VersionPage.ui
+++ b/launcher/ui/pages/instance/VersionPage.ui
@@ -64,7 +64,7 @@
        </layout>
       </item>
       <item>
-       <widget class="MCModInfoFrame" name="frame">
+       <widget class="InfoFrame" name="frame">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
           <horstretch>0</horstretch>
@@ -278,9 +278,9 @@
    <header>ui/widgets/ModListView.h</header>
   </customwidget>
   <customwidget>
-   <class>MCModInfoFrame</class>
+   <class>InfoFrame</class>
    <extends>QFrame</extends>
-   <header>ui/widgets/MCModInfoFrame.h</header>
+   <header>ui/widgets/InfoFrame.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
new file mode 100644
index 00000000..821e61a7
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -0,0 +1,172 @@
+/* Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <QMessageBox>
+
+#include "InfoFrame.h"
+#include "ui_InfoFrame.h"
+
+#include "ui/dialogs/CustomMessageBox.h"
+
+InfoFrame::InfoFrame(QWidget *parent) :
+    QFrame(parent),
+    ui(new Ui::InfoFrame)
+{
+    ui->setupUi(this);
+    ui->descriptionLabel->setHidden(true);
+    ui->nameLabel->setHidden(true);
+    updateHiddenState();
+}
+
+InfoFrame::~InfoFrame()
+{
+    delete ui;
+}
+
+void InfoFrame::updateWithMod(Mod const& m)
+{
+    if (m.type() == ResourceType::FOLDER)
+    {
+        clear();
+        return;
+    }
+
+    QString text = "";
+    QString name = "";
+    if (m.name().isEmpty())
+        name = m.internal_id();
+    else
+        name = m.name();
+
+    if (m.homeurl().isEmpty())
+        text = name;
+    else
+        text = "<a href=\"" + m.homeurl() + "\">" + name + "</a>";
+    if (!m.authors().isEmpty())
+        text += " by " + m.authors().join(", ");
+
+    setName(text);
+
+    if (m.description().isEmpty())
+    {
+        setDescription(QString());
+    }
+    else
+    {
+        setDescription(m.description());
+    }
+}
+
+void InfoFrame::updateWithResource(const Resource& resource)
+{
+    setName(resource.name());
+}
+
+void InfoFrame::clear()
+{
+    setName();
+    setDescription();
+}
+
+void InfoFrame::updateHiddenState()
+{
+    if(ui->descriptionLabel->isHidden() && ui->nameLabel->isHidden())
+    {
+        setHidden(true);
+    }
+    else
+    {
+        setHidden(false);
+    }
+}
+
+void InfoFrame::setName(QString text)
+{
+    if(text.isEmpty())
+    {
+        ui->nameLabel->setHidden(true);
+    }
+    else
+    {
+        ui->nameLabel->setText(text);
+        ui->nameLabel->setHidden(false);
+    }
+    updateHiddenState();
+}
+
+void InfoFrame::setDescription(QString text)
+{
+    if(text.isEmpty())
+    {
+        ui->descriptionLabel->setHidden(true);
+        updateHiddenState();
+        return;
+    }
+    else
+    {
+        ui->descriptionLabel->setHidden(false);
+        updateHiddenState();
+    }
+    ui->descriptionLabel->setToolTip("");
+    QString intermediatetext = text.trimmed();
+    bool prev(false);
+    QChar rem('\n');
+    QString finaltext;
+    finaltext.reserve(intermediatetext.size());
+    foreach(const QChar& c, intermediatetext)
+    {
+        if(c == rem && prev){
+            continue;
+        }
+        prev = c == rem;
+        finaltext += c;
+    }
+    QString labeltext;
+    labeltext.reserve(300);
+    if(finaltext.length() > 290)
+    {
+        ui->descriptionLabel->setOpenExternalLinks(false);
+        ui->descriptionLabel->setTextFormat(Qt::TextFormat::RichText);
+        m_description = text;
+        // This allows injecting HTML here.
+        labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
+        QObject::connect(ui->descriptionLabel, &QLabel::linkActivated, this, &InfoFrame::descriptionEllipsisHandler);
+    }
+    else
+    {
+        ui->descriptionLabel->setTextFormat(Qt::TextFormat::PlainText);
+        labeltext.append(finaltext);
+    }
+    ui->descriptionLabel->setText(labeltext);
+}
+
+void InfoFrame::descriptionEllipsisHandler(QString link)
+{
+    if(!m_current_box)
+    {
+        m_current_box = CustomMessageBox::selectable(this, "", m_description);
+        connect(m_current_box, &QMessageBox::finished, this, &InfoFrame::boxClosed);
+        m_current_box->show();
+    }
+    else
+    {
+        m_current_box->setText(m_description);
+    }
+}
+
+void InfoFrame::boxClosed(int result)
+{
+    m_current_box = nullptr;
+}
diff --git a/launcher/ui/widgets/InfoFrame.h b/launcher/ui/widgets/InfoFrame.h
new file mode 100644
index 00000000..d69dc232
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.h
@@ -0,0 +1,54 @@
+/* Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QFrame>
+
+#include "minecraft/mod/Mod.h"
+#include "minecraft/mod/ResourcePack.h"
+
+namespace Ui
+{
+class InfoFrame;
+}
+
+class InfoFrame : public QFrame {
+    Q_OBJECT
+
+   public:
+    InfoFrame(QWidget* parent = nullptr);
+    ~InfoFrame() override;
+
+    void setName(QString text = {});
+    void setDescription(QString text = {});
+
+    void clear();
+
+    void updateWithMod(Mod const& m);
+    void updateWithResource(Resource const& resource);
+
+   public slots:
+    void descriptionEllipsisHandler(QString link);
+    void boxClosed(int result);
+
+   private:
+    void updateHiddenState();
+
+   private:
+    Ui::InfoFrame* ui;
+    QString m_description;
+    class QMessageBox* m_current_box = nullptr;
+};
diff --git a/launcher/ui/widgets/InfoFrame.ui b/launcher/ui/widgets/InfoFrame.ui
new file mode 100644
index 00000000..0d3772d7
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InfoFrame</class>
+ <widget class="QFrame" name="InfoFrame">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>527</width>
+    <height>113</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>120</height>
+   </size>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="nameLabel">
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="descriptionLabel">
+     <property name="toolTip">
+      <string notr="true"/>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/widgets/MCModInfoFrame.cpp b/launcher/ui/widgets/MCModInfoFrame.cpp
deleted file mode 100644
index 22475abc..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QMessageBox>
-#include <QtGui>
-
-#include "MCModInfoFrame.h"
-#include "ui_MCModInfoFrame.h"
-
-#include "ui/dialogs/CustomMessageBox.h"
-
-void MCModInfoFrame::updateWithMod(Mod &m)
-{
-    if (m.type() == ResourceType::FOLDER)
-    {
-        clear();
-        return;
-    }
-
-    QString text = "";
-    QString name = "";
-    if (m.name().isEmpty())
-        name = m.internal_id();
-    else
-        name = m.name();
-
-    if (m.homeurl().isEmpty())
-        text = name;
-    else
-        text = "<a href=\"" + m.homeurl() + "\">" + name + "</a>";
-    if (!m.authors().isEmpty())
-        text += " by " + m.authors().join(", ");
-
-    setModText(text);
-
-    if (m.description().isEmpty())
-    {
-        setModDescription(QString());
-    }
-    else
-    {
-        setModDescription(m.description());
-    }
-}
-
-void MCModInfoFrame::clear()
-{
-    setModText(QString());
-    setModDescription(QString());
-}
-
-MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
-    QFrame(parent),
-    ui(new Ui::MCModInfoFrame)
-{
-    ui->setupUi(this);
-    ui->label_ModDescription->setHidden(true);
-    ui->label_ModText->setHidden(true);
-    updateHiddenState();
-}
-
-MCModInfoFrame::~MCModInfoFrame()
-{
-    delete ui;
-}
-
-void MCModInfoFrame::updateHiddenState()
-{
-    if(ui->label_ModDescription->isHidden() && ui->label_ModText->isHidden())
-    {
-        setHidden(true);
-    }
-    else
-    {
-        setHidden(false);
-    }
-}
-
-void MCModInfoFrame::setModText(QString text)
-{
-    if(text.isEmpty())
-    {
-        ui->label_ModText->setHidden(true);
-    }
-    else
-    {
-        ui->label_ModText->setText(text);
-        ui->label_ModText->setHidden(false);
-    }
-    updateHiddenState();
-}
-
-void MCModInfoFrame::setModDescription(QString text)
-{
-    if(text.isEmpty())
-    {
-        ui->label_ModDescription->setHidden(true);
-        updateHiddenState();
-        return;
-    }
-    else
-    {
-        ui->label_ModDescription->setHidden(false);
-        updateHiddenState();
-    }
-    ui->label_ModDescription->setToolTip("");
-    QString intermediatetext = text.trimmed();
-    bool prev(false);
-    QChar rem('\n');
-    QString finaltext;
-    finaltext.reserve(intermediatetext.size());
-    foreach(const QChar& c, intermediatetext)
-    {
-        if(c == rem && prev){
-            continue;
-        }
-        prev = c == rem;
-        finaltext += c;
-    }
-    QString labeltext;
-    labeltext.reserve(300);
-    if(finaltext.length() > 290)
-    {
-        ui->label_ModDescription->setOpenExternalLinks(false);
-        ui->label_ModDescription->setTextFormat(Qt::TextFormat::RichText);
-        desc = text;
-        // This allows injecting HTML here.
-        labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
-        QObject::connect(ui->label_ModDescription, &QLabel::linkActivated, this, &MCModInfoFrame::modDescEllipsisHandler);
-    }
-    else
-    {
-        ui->label_ModDescription->setTextFormat(Qt::TextFormat::PlainText);
-        labeltext.append(finaltext);
-    }
-    ui->label_ModDescription->setText(labeltext);
-}
-
-void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
-{
-    if(!currentBox)
-    {
-        currentBox = CustomMessageBox::selectable(this, QString(), desc);
-        connect(currentBox, &QMessageBox::finished, this, &MCModInfoFrame::boxClosed);
-        currentBox->show();
-    }
-    else
-    {
-        currentBox->setText(desc);
-    }
-}
-
-void MCModInfoFrame::boxClosed(int result)
-{
-    currentBox = nullptr;
-}
diff --git a/launcher/ui/widgets/MCModInfoFrame.h b/launcher/ui/widgets/MCModInfoFrame.h
deleted file mode 100644
index 0b7ef537..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QFrame>
-#include "minecraft/mod/Mod.h"
-
-namespace Ui
-{
-class MCModInfoFrame;
-}
-
-class MCModInfoFrame : public QFrame
-{
-    Q_OBJECT
-
-public:
-    explicit MCModInfoFrame(QWidget *parent = 0);
-    ~MCModInfoFrame();
-
-    void setModText(QString text);
-    void setModDescription(QString text);
-
-    void updateWithMod(Mod &m);
-    void clear();
-
-public slots:
-    void modDescEllipsisHandler(const QString& link );
-    void boxClosed(int result);
-
-private:
-    void updateHiddenState();
-
-private:
-    Ui::MCModInfoFrame *ui;
-    QString desc;
-    class QMessageBox * currentBox = nullptr;
-};
-
diff --git a/launcher/ui/widgets/MCModInfoFrame.ui b/launcher/ui/widgets/MCModInfoFrame.ui
deleted file mode 100644
index 5ef33379..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.ui
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MCModInfoFrame</class>
- <widget class="QFrame" name="MCModInfoFrame">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>527</width>
-    <height>113</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>120</height>
-   </size>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label_ModText">
-     <property name="text">
-      <string notr="true"/>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_ModDescription">
-     <property name="toolTip">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string notr="true"/>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-- 
cgit 


From e2ab2aea32b6d48ee0c9f90442ed53c47e2e7d96 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 13 Aug 2022 11:58:39 -0300
Subject: change: add enable/disable to resources

TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/minecraft/mod/Mod.cpp                     | 35 ----------
 launcher/minecraft/mod/Mod.h                       |  6 --
 launcher/minecraft/mod/ModFolderModel.cpp          | 76 ----------------------
 launcher/minecraft/mod/ModFolderModel.h            |  7 --
 launcher/minecraft/mod/Resource.cpp                | 57 +++++++++++++++-
 launcher/minecraft/mod/Resource.h                  | 16 +++++
 launcher/minecraft/mod/ResourceFolderModel.cpp     | 64 +++++++++++++++++-
 launcher/minecraft/mod/ResourceFolderModel.h       | 14 ++--
 .../minecraft/mod/ResourceFolderModel_test.cpp     | 56 ++++++++++++++++
 .../ui/pages/instance/ExternalResourcesPage.cpp    | 28 ++++++++
 launcher/ui/pages/instance/ExternalResourcesPage.h |  6 +-
 launcher/ui/pages/instance/ModFolderPage.cpp       | 29 ---------
 launcher/ui/pages/instance/ModFolderPage.h         |  5 --
 13 files changed, 231 insertions(+), 168 deletions(-)

(limited to 'launcher/ui/pages/instance')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 5e186471..39023f69 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -56,37 +56,6 @@ Mod::Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata)
     m_local_details.metadata = std::make_shared<Metadata::ModStruct>(std::move(metadata));
 }
 
-auto Mod::enable(bool value) -> bool
-{
-    if (m_type == ResourceType::UNKNOWN || m_type == ResourceType::FOLDER)
-        return false;
-
-    if (m_enabled == value)
-        return false;
-
-    QString path = m_file_info.absoluteFilePath();
-    QFile file(path);
-    if (value) {
-        if (!path.endsWith(".disabled"))
-            return false;
-        path.chop(9);
-
-        if (!file.rename(path))
-            return false;
-    } else {
-        path += ".disabled";
-
-        if (!file.rename(path))
-            return false;
-    }
-
-    if (status() == ModStatus::NoMetadata)
-        setFile(QFileInfo(path));
-
-    m_enabled = value;
-    return true;
-}
-
 void Mod::setStatus(ModStatus status)
 {
     m_local_details.status = status;
@@ -108,10 +77,6 @@ std::pair<int, bool> Mod::compare(const Resource& other, SortType type) const
     switch (type) {
         default:
         case SortType::ENABLED:
-            if (enabled() && !cast_other->enabled())
-                return { 1, type == SortType::ENABLED };
-            if (!enabled() && cast_other->enabled())
-                return { -1, type == SortType::ENABLED };
         case SortType::NAME:
         case SortType::DATE: {
             auto res = Resource::compare(other, type);
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index b9b57058..f336bec4 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -54,8 +54,6 @@ public:
     Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata);
     Mod(QString file_path) : Mod(QFileInfo(file_path)) {}
 
-    auto enabled()         const -> bool { return m_enabled; }
-
     auto details()     const -> const ModDetails&;
     auto name()        const -> QString override;
     auto version()     const -> QString;
@@ -71,8 +69,6 @@ public:
     void setMetadata(std::shared_ptr<Metadata::ModStruct>&& metadata);
     void setMetadata(const Metadata::ModStruct& metadata) { setMetadata(std::make_shared<Metadata::ModStruct>(metadata)); }
 
-    auto enable(bool value) -> bool;
-
     [[nodiscard]] auto compare(Resource const& other, SortType type) const -> std::pair<int, bool> override;
     [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
@@ -83,6 +79,4 @@ public:
 
 protected:
     ModDetails m_local_details;
-
-    bool m_enabled = true;
 };
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 15c713b8..4e264a74 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -104,20 +104,6 @@ QVariant ModFolderModel::data(const QModelIndex &index, int role) const
     }
 }
 
-bool ModFolderModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (index.row() < 0 || index.row() >= rowCount(index) || !index.isValid())
-    {
-        return false;
-    }
-
-    if (role == Qt::CheckStateRole)
-    {
-        return setModStatus(index.row(), Toggle);
-    }
-    return false;
-}
-
 QVariant ModFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     switch (role)
@@ -305,65 +291,3 @@ void ModFolderModel::onParseSucceeded(int ticket, QString mod_id)
 
     emit dataChanged(index(row), index(row, columnCount(QModelIndex()) - 1));
 }
-
-
-bool ModFolderModel::setModStatus(const QModelIndexList& indexes, ModStatusAction enable)
-{
-    if(!m_can_interact) {
-        return false;
-    }
-
-    if(indexes.isEmpty())
-        return true;
-
-    for (auto index: indexes)
-    {
-        if(index.column() != 0) {
-            continue;
-        }
-        setModStatus(index.row(), enable);
-    }
-    return true;
-}
-
-bool ModFolderModel::setModStatus(int row, ModFolderModel::ModStatusAction action)
-{
-    if(row < 0 || row >= m_resources.size()) {
-        return false;
-    }
-
-    auto mod = at(row);
-    bool desiredStatus;
-    switch(action) {
-        case Enable:
-            desiredStatus = true;
-            break;
-        case Disable:
-            desiredStatus = false;
-            break;
-        case Toggle:
-        default:
-            desiredStatus = !mod->enabled();
-            break;
-    }
-
-    if(desiredStatus == mod->enabled()) {
-        return true;
-    }
-
-    // preserve the row, but change its ID
-    auto oldId = mod->internal_id();
-    if(!mod->enable(!mod->enabled())) {
-        return false;
-    }
-    auto newId = mod->internal_id();
-    if(m_resources_index.contains(newId)) {
-        // NOTE: this could handle a corner case, where we are overwriting a file, because the same 'mod' exists both enabled and disabled
-        // But is it necessary?
-    }
-    m_resources_index.remove(oldId);
-    m_resources_index[newId] = row;
-    emit dataChanged(index(row, 0), index(row, columnCount(QModelIndex()) - 1));
-    return true;
-}
-
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 7fe830c2..c33195ed 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -77,7 +77,6 @@ public:
     ModFolderModel(const QString &dir, bool is_indexed = false);
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
 
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
     int columnCount(const QModelIndex &parent) const override;
@@ -91,9 +90,6 @@ public:
     /// Deletes all the selected mods
     bool deleteMods(const QModelIndexList &indexes);
 
-    /// Enable or disable listed mods
-    bool setModStatus(const QModelIndexList &indexes, ModStatusAction action);
-
     bool isValid();
 
     bool startWatching() override;
@@ -111,9 +107,6 @@ slots:
     void onUpdateSucceeded() override;
     void onParseSucceeded(int ticket, QString resource_id) override;
 
-private:
-    bool setModStatus(int index, ModStatusAction action);
-
 protected:
     bool m_is_indexed;
     bool m_first_folder_load = true;
diff --git a/launcher/minecraft/mod/Resource.cpp b/launcher/minecraft/mod/Resource.cpp
index c58df3d8..0fbcfd7c 100644
--- a/launcher/minecraft/mod/Resource.cpp
+++ b/launcher/minecraft/mod/Resource.cpp
@@ -29,8 +29,10 @@ void Resource::parseFile()
         m_type = ResourceType::FOLDER;
         m_name = file_name;
     } else if (m_file_info.isFile()) {
-        if (file_name.endsWith(".disabled"))
+        if (file_name.endsWith(".disabled")) {
             file_name.chop(9);
+            m_enabled = false;
+        }
 
         if (file_name.endsWith(".zip") || file_name.endsWith(".jar")) {
             m_type = ResourceType::ZIPFILE;
@@ -59,6 +61,11 @@ std::pair<int, bool> Resource::compare(const Resource& other, SortType type) con
 {
     switch (type) {
         default:
+        case SortType::ENABLED:
+            if (enabled() && !other.enabled())
+                return { 1, type == SortType::ENABLED };
+            if (!enabled() && other.enabled())
+                return { -1, type == SortType::ENABLED };
         case SortType::NAME: {
             QString this_name{ name() };
             QString other_name{ other.name() };
@@ -85,6 +92,54 @@ bool Resource::applyFilter(QRegularExpression filter) const
     return filter.match(name()).hasMatch();
 }
 
+bool Resource::enable(EnableAction action)
+{
+    if (m_type == ResourceType::UNKNOWN || m_type == ResourceType::FOLDER)
+        return false;
+
+
+    QString path = m_file_info.absoluteFilePath();
+    QFile file(path);
+
+    bool enable = true;
+    switch (action) {
+        case EnableAction::ENABLE:
+            enable = true;
+            break;
+        case EnableAction::DISABLE:
+            enable = false;
+            break;
+        case EnableAction::TOGGLE:
+        default:
+            enable = !enabled();
+            break;
+    }
+
+    if (m_enabled == enable)
+        return false;
+
+    if (enable) {
+        // m_enabled is false, but there's no '.disabled' suffix.
+        // TODO: Report error?
+        if (!path.endsWith(".disabled"))
+            return false;
+        path.chop(9);
+
+        if (!file.rename(path))
+            return false;
+    } else {
+        path += ".disabled";
+
+        if (!file.rename(path))
+            return false;
+    }
+
+    setFile(QFileInfo(path));
+
+    m_enabled = enable;
+    return true;
+}
+
 bool Resource::destroy()
 {
     m_type = ResourceType::UNKNOWN;
diff --git a/launcher/minecraft/mod/Resource.h b/launcher/minecraft/mod/Resource.h
index e76bc49e..cee1f172 100644
--- a/launcher/minecraft/mod/Resource.h
+++ b/launcher/minecraft/mod/Resource.h
@@ -22,6 +22,12 @@ enum class SortType {
     ENABLED,
 };
 
+enum class EnableAction {
+    ENABLE,
+    DISABLE,
+    TOGGLE
+};
+
 /** General class for managed resources. It mirrors a file in disk, with some more info
  *  for display and house-keeping purposes.
  *
@@ -47,6 +53,7 @@ class Resource : public QObject {
     [[nodiscard]] auto dateTimeChanged() const -> QDateTime { return m_changed_date_time; }
     [[nodiscard]] auto internal_id() const -> QString { return m_internal_id; }
     [[nodiscard]] auto type() const -> ResourceType { return m_type; }
+    [[nodiscard]] bool enabled() const { return m_enabled; }
 
     [[nodiscard]] virtual auto name() const -> QString { return m_name; }
     [[nodiscard]] virtual bool valid() const { return m_type != ResourceType::UNKNOWN; }
@@ -65,6 +72,12 @@ class Resource : public QObject {
      */
     [[nodiscard]] virtual bool applyFilter(QRegularExpression filter) const;
 
+    /** Changes the enabled property, according to 'action'.
+     *
+     *  Returns whether a change was applied to the Resource's properties.
+     */
+    bool enable(EnableAction action);
+
     [[nodiscard]] auto shouldResolve() const -> bool { return !m_is_resolving && !m_is_resolved; }
     [[nodiscard]] auto isResolving() const -> bool { return m_is_resolving; }
     [[nodiscard]] auto resolutionTicket() const -> int { return m_resolution_ticket; }
@@ -92,6 +105,9 @@ class Resource : public QObject {
     /* The type of file we're dealing with. */
     ResourceType m_type = ResourceType::UNKNOWN;
 
+    /* Whether the resource is enabled (e.g. shows up in the game) or not. */
+    bool m_enabled = true;
+
     /* Used to keep trach of pending / concluded actions on the resource. */
     bool m_is_resolving = false;
     bool m_is_resolved = false;
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index b7213c47..31d88eb6 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -172,6 +172,44 @@ bool ResourceFolderModel::deleteResources(const QModelIndexList& indexes)
     return true;
 }
 
+bool ResourceFolderModel::setResourceEnabled(const QModelIndexList &indexes, EnableAction action)
+{
+    if (!m_can_interact)
+        return false;
+
+    if (indexes.isEmpty())
+        return true;
+
+    bool succeeded = true;
+    for (auto const& idx : indexes) {
+        if (!validateIndex(idx) || idx.column() != 0)
+            continue;
+
+        int row = idx.row();
+
+        auto& resource = m_resources[row];
+
+        // Preserve the row, but change its ID
+        auto old_id = resource->internal_id();
+        if (!resource->enable(action)) {
+            succeeded = false;
+            continue;
+        }
+
+        auto new_id = resource->internal_id();
+        if (m_resources_index.contains(new_id)) {
+            // FIXME: https://github.com/PolyMC/PolyMC/issues/550
+        }
+
+        m_resources_index.remove(old_id);
+        m_resources_index[new_id] = row;
+
+        emit dataChanged(index(row, 0), index(row, columnCount(QModelIndex()) - 1));
+    }
+
+    return succeeded;
+}
+
 static QMutex s_update_task_mutex;
 bool ResourceFolderModel::update()
 {
@@ -271,7 +309,6 @@ Task* ResourceFolderModel::createUpdateTask()
     return new BasicFolderLoadTask(m_dir);
 }
 
-
 bool ResourceFolderModel::hasPendingParseTasks() const
 {
     return !m_active_parse_tasks.isEmpty();
@@ -370,11 +407,30 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
             }
         case Qt::ToolTipRole:
             return m_resources[row]->internal_id();
+        case Qt::CheckStateRole:
+            switch (column) {
+                case ACTIVE_COLUMN:
+                    return m_resources[row]->enabled() ? Qt::Checked : Qt::Unchecked;
+                default:
+                    return {};
+            }
         default:
             return {};
     }
 }
 
+bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+    int row = index.row();
+    if (row < 0 || row >= rowCount(index) || !index.isValid())
+        return false;
+
+    if (role == Qt::CheckStateRole)
+        return setResourceEnabled({ index }, EnableAction::TOGGLE);
+
+    return false;
+}
+
 QVariant ResourceFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     switch (role) {
@@ -389,9 +445,14 @@ QVariant ResourceFolderModel::headerData(int section, Qt::Orientation orientatio
             }
         case Qt::ToolTipRole: {
             switch (section) {
+                case ACTIVE_COLUMN:
+                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
+                    return tr("Is the resource enabled?");
                 case NAME_COLUMN:
+                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The name of the resource.");
                 case DATE_COLUMN:
+                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The date and time this resource was last changed (or added).");
                 default:
                     return {};
@@ -459,4 +520,3 @@ void ResourceFolderModel::enableInteraction(bool enabled)
         return (compare_result.first < 0);
     return (compare_result.first > 0);
 }
-
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h
index b3a474ba..e27b5db6 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.h
+++ b/launcher/minecraft/mod/ResourceFolderModel.h
@@ -55,9 +55,14 @@ class ResourceFolderModel : public QAbstractListModel {
      *  Returns whether the removal was successful.
      */
     virtual bool uninstallResource(QString file_name);
-
     virtual bool deleteResources(const QModelIndexList&);
 
+    /** Applies the given 'action' to the resources in 'indexes'.
+     *
+     *  Returns whether the action was successfully applied to all resources.
+     */
+    virtual bool setResourceEnabled(const QModelIndexList& indexes, EnableAction action);
+
     /** Creates a new update task and start it. Returns false if no update was done, like when an update is already underway. */
     virtual bool update();
 
@@ -66,6 +71,7 @@ class ResourceFolderModel : public QAbstractListModel {
 
     [[nodiscard]] size_t size() const { return m_resources.size(); };
     [[nodiscard]] bool empty() const { return size() == 0; }
+    [[nodiscard]] Resource& at(int index) { return *m_resources.at(index); }
     [[nodiscard]] Resource const& at(int index) const { return *m_resources.at(index); }
     [[nodiscard]] QList<Resource::Ptr> const& all() const { return m_resources; }
 
@@ -81,7 +87,7 @@ class ResourceFolderModel : public QAbstractListModel {
     /* Qt behavior */
 
     /* Basic columns */
-    enum Columns { NAME_COLUMN = 0, DATE_COLUMN, NUM_COLUMNS };
+    enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, NUM_COLUMNS };
 
     [[nodiscard]] int rowCount(const QModelIndex& = {}) const override { return size(); }
     [[nodiscard]] int columnCount(const QModelIndex& = {}) const override { return NUM_COLUMNS; };
@@ -96,7 +102,7 @@ class ResourceFolderModel : public QAbstractListModel {
     [[nodiscard]] bool validateIndex(const QModelIndex& index) const;
 
     [[nodiscard]] QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override { return false; };
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
     [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
@@ -174,7 +180,7 @@ class ResourceFolderModel : public QAbstractListModel {
    protected:
     // Represents the relationship between a column's index (represented by the list index), and it's sorting key.
     // As such, the order in with they appear is very important!
-    QList<SortType> m_column_sort_keys = { SortType::NAME, SortType::DATE };
+    QList<SortType> m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::DATE };
 
     bool m_can_interact = true;
 
diff --git a/launcher/minecraft/mod/ResourceFolderModel_test.cpp b/launcher/minecraft/mod/ResourceFolderModel_test.cpp
index 5e29e6aa..fe98552e 100644
--- a/launcher/minecraft/mod/ResourceFolderModel_test.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel_test.cpp
@@ -212,6 +212,62 @@ slots:
             QCoreApplication::processEvents();
         }
     }
+
+    void test_enable_disable()
+    {
+        QString folder_resource = QFINDTESTDATA("testdata/test_folder");
+        QString file_mod = QFINDTESTDATA("testdata/supercoolmod.jar");
+
+        QTemporaryDir tmp;
+        ResourceFolderModel model(tmp.path());
+
+        QCOMPARE(model.size(), 0);
+
+        {
+            EXEC_UPDATE_TASK(model.installResource(folder_resource), QVERIFY)
+        }
+        {
+            EXEC_UPDATE_TASK(model.installResource(file_mod), QVERIFY)
+        }
+
+        for (auto res : model.all())
+            qDebug() << res->name();
+
+        QCOMPARE(model.size(), 2);
+
+        auto& res_1 = model.at(0).type() != ResourceType::FOLDER ? model.at(0) : model.at(1);
+        auto& res_2 = model.at(0).type() == ResourceType::FOLDER ? model.at(0) : model.at(1);
+        auto id_1 = res_1.internal_id();
+        auto id_2 = res_2.internal_id();
+        bool initial_enabled_res_2 =  res_2.enabled();
+        bool initial_enabled_res_1 =  res_1.enabled();
+
+        QVERIFY(res_1.type() != ResourceType::FOLDER && res_1.type() != ResourceType::UNKNOWN);
+        qDebug() << "res_1 is of the correct type.";
+        QVERIFY(res_1.enabled());
+        qDebug() << "res_1 is initially enabled.";
+
+        QVERIFY(res_1.enable(EnableAction::TOGGLE));
+
+        QVERIFY(res_1.enabled() == !initial_enabled_res_1);
+        qDebug() << "res_1 got successfully toggled.";
+
+        QVERIFY(res_1.enable(EnableAction::TOGGLE));
+        qDebug() << "res_1 got successfully toggled again.";
+
+        QVERIFY(res_1.enabled() == initial_enabled_res_1);
+        QVERIFY(res_1.internal_id() == id_1);
+        qDebug() << "res_1 got back to its initial state.";
+
+        QVERIFY(!res_2.enable(initial_enabled_res_2 ? EnableAction::ENABLE : EnableAction::DISABLE));
+        QVERIFY(res_2.enabled() == initial_enabled_res_2);
+        QVERIFY(res_2.internal_id() == id_2);
+
+        while (model.hasPendingParseTasks()) {
+            QTest::qSleep(20);
+            QCoreApplication::processEvents();
+        }
+    }
 };
 
 QTEST_GUILESS_MAIN(ResourceFolderModelTest)
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 0a3687e5..f31e8325 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -40,6 +40,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
     connect(ui->actionViewFolder, &QAction::triggered, this, &ExternalResourcesPage::viewFolder);
 
     connect(ui->treeView, &ModListView::customContextMenuRequested, this, &ExternalResourcesPage::ShowContextMenu);
+    connect(ui->treeView, &ModListView::activated, this, &ExternalResourcesPage::itemActivated);
 
     auto selection_model = ui->treeView->selectionModel();
     connect(selection_model, &QItemSelectionModel::currentChanged, this, &ExternalResourcesPage::current);
@@ -81,6 +82,15 @@ void ExternalResourcesPage::retranslate()
     ui->retranslateUi(this);
 }
 
+void ExternalResourcesPage::itemActivated(const QModelIndex&)
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setResourceEnabled(selection.indexes(), EnableAction::TOGGLE);
+}
+
 void ExternalResourcesPage::filterTextChanged(const QString& newContents)
 {
     m_viewFilter = newContents;
@@ -157,6 +167,24 @@ void ExternalResourcesPage::removeItem()
     m_model->deleteResources(selection.indexes());
 }
 
+void ExternalResourcesPage::enableItem()
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setResourceEnabled(selection.indexes(), EnableAction::ENABLE);
+}
+
+void ExternalResourcesPage::disableItem()
+{
+    if (!m_controlsEnabled)
+        return;
+
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+    m_model->setResourceEnabled(selection.indexes(), EnableAction::DISABLE);
+}
+
 void ExternalResourcesPage::viewConfigs()
 {
     DesktopServices::openDirectory(m_instance->instanceConfigFolder(), true);
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 280f1542..8e352cef 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -45,15 +45,15 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     virtual bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
 
    protected slots:
-    virtual void itemActivated(const QModelIndex& index) {};
+    void itemActivated(const QModelIndex& index);
     void filterTextChanged(const QString& newContents);
     virtual void runningStateChanged(bool running);
 
     virtual void addItem();
     virtual void removeItem();
 
-    virtual void enableItem() {};
-    virtual void disableItem() {};
+    virtual void enableItem();
+    virtual void disableItem();
 
     virtual void viewFolder();
     virtual void viewConfigs();
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 63897fb0..75b40e77 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -110,8 +110,6 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
 
         ModFolderPage::runningStateChanged(m_instance && m_instance->isRunning());
     }
-
-    connect(ui->treeView, &ModListView::activated, this, &ModFolderPage::itemActivated);
 }
 
 void ModFolderPage::runningStateChanged(bool running)
@@ -126,33 +124,6 @@ bool ModFolderPage::shouldDisplay() const
     return true;
 }
 
-void ModFolderPage::itemActivated(const QModelIndex&)
-{
-    if (!m_controlsEnabled)
-        return;
-
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Toggle);
-}
-
-void ModFolderPage::enableItem()
-{
-    if (!m_controlsEnabled)
-        return;
-
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Enable);
-}
-
-void ModFolderPage::disableItem()
-{
-    if (!m_controlsEnabled)
-        return;
-
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
-    m_model->setModStatus(selection.indexes(), ModFolderModel::Disable);
-}
-
 bool ModFolderPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     auto sourceCurrent = m_filterModel->mapToSource(current);
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 5da353f0..7fc9d9a1 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -58,11 +58,6 @@ class ModFolderPage : public ExternalResourcesPage {
    public slots:
     bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
 
-    void itemActivated(const QModelIndex& index) override;
-
-    void enableItem() override;
-    void disableItem() override;
-
    private slots:
     void installMods();
     void updateMods();
-- 
cgit