Merge pull request #1728 from Trial97/filters

feat: add more filters to the mod download dialog

launcher/CMakeLists.txt

@@ -1034,6 +1034,8 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/skins/SkinManageDialog.h
 
     # GUI - widgets
+    ui/widgets/CheckComboBox.cpp
+    ui/widgets/CheckComboBox.h
     ui/widgets/Common.cpp
     ui/widgets/Common.h
     ui/widgets/CustomCommands.cpp

launcher/minecraft/mod/MetadataHandler.h

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,4 +53,6 @@ class Metadata {
     static auto get(QDir& index_dir, QString mod_slug) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_slug); }
 
     static auto get(QDir& index_dir, QVariant& mod_id) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_id); }
+
+    static auto modSideToString(ModSide side) -> QString { return Packwiz::V1::sideToString(side); }
 };

launcher/minecraft/mod/Mod.cpp

@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@
 #include "minecraft/mod/ModDetails.h"
 #include "minecraft/mod/Resource.h"
 #include "minecraft/mod/tasks/LocalModParseTask.h"
+#include "modplatform/ModIndex.h"
 
 static ModPlatform::ProviderCapabilities ProviderCaps;
 
@@ -103,6 +105,32 @@ int Mod::compare(const Resource& other, SortType type) const
         case SortType::PROVIDER: {
             return QString::compare(provider().value_or("Unknown"), cast_other->provider().value_or("Unknown"), Qt::CaseInsensitive);
         }
+        case SortType::SIDE: {
+            if (side() > cast_other->side())
+                return 1;
+            else if (side() < cast_other->side())
+                return -1;
+            break;
+        }
+        case SortType::LOADERS: {
+            if (loaders() > cast_other->loaders())
+                return 1;
+            else if (loaders() < cast_other->loaders())
+                return -1;
+            break;
+        }
+        case SortType::MC_VERSIONS: {
+            auto thisVersion = mcVersions().join(",");
+            auto otherVersion = cast_other->mcVersions().join(",");
+            return QString::compare(thisVersion, otherVersion, Qt::CaseInsensitive);
+        }
+        case SortType::RELEASE_TYPE: {
+            if (releaseType() > cast_other->releaseType())
+                return 1;
+            else if (releaseType() < cast_other->releaseType())
+                return -1;
+            break;
+        }
     }
     return 0;
 }
@@ -226,6 +254,34 @@ auto Mod::provider() const -> std::optional<QString>
     return {};
 }
 
+auto Mod::side() const -> Metadata::ModSide
+{
+    if (metadata())
+        return metadata()->side;
+    return Metadata::ModSide::UniversalSide;
+}
+
+auto Mod::releaseType() const -> ModPlatform::IndexedVersionType
+{
+    if (metadata())
+        return metadata()->releaseType;
+    return ModPlatform::IndexedVersionType::VersionType::Unknown;
+}
+
+auto Mod::loaders() const -> ModPlatform::ModLoaderTypes
+{
+    if (metadata())
+        return metadata()->loaders;
+    return {};
+}
+
+auto Mod::mcVersions() const -> QStringList
+{
+    if (metadata())
+        return metadata()->mcVersions;
+    return {};
+}
+
 auto Mod::licenses() const -> const QList<ModLicense>&
 {
     return details().licenses;

launcher/minecraft/mod/Mod.h

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@
 
 #include "ModDetails.h"
 #include "Resource.h"
+#include "modplatform/ModIndex.h"
 
 class Mod : public Resource {
     Q_OBJECT
@@ -70,6 +72,10 @@ class Mod : public Resource {
     auto licenses() const -> const QList<ModLicense>&;
     auto issueTracker() const -> QString;
     auto metaurl() const -> QString;
+    auto side() const -> Metadata::ModSide;
+    auto loaders() const -> ModPlatform::ModLoaderTypes;
+    auto mcVersions() const -> QStringList;
+    auto releaseType() const -> ModPlatform::IndexedVersionType;
 
     /** Get the intneral path to the mod's icon file*/
     QString iconPath() const { return m_local_details.icon_file; }

launcher/minecraft/mod/ModFolderModel.cpp

@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,12 +48,11 @@
 #include <QThreadPool>
 #include <QUrl>
 #include <QUuid>
-#include <algorithm>
 
 #include "Application.h"
 
 #include "Json.h"
-#include "StringUtils.h"
+#include "minecraft/mod/MetadataHandler.h"
 #include "minecraft/mod/Resource.h"
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 #include "minecraft/mod/tasks/LocalModUpdateTask.h"
@@ -64,14 +64,18 @@
 ModFolderModel::ModFolderModel(const QString& dir, BaseInstance* instance, bool is_indexed, bool create_dir)
     : ResourceFolderModel(QDir(dir), instance, nullptr, create_dir), m_is_indexed(is_indexed)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Version", "Last Modified", "Provider", "Size" });
-    m_column_names_translated =
-        QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Version"), tr("Last Modified"), tr("Provider"), tr("Size") });
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Version", "Last Modified", "Provider", "Size", "Side", "Loaders",
+                                   "Miecraft Versions", "Release Type" });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Version"), tr("Last Modified"), tr("Provider"),
+                                              tr("Size"), tr("Side"), tr("Loaders"), tr("Miecraft Versions"), tr("Release Type") });
     m_column_sort_keys = { SortType::ENABLED, SortType::NAME,        SortType::NAME,        SortType::VERSION,
-                           SortType::DATE,    SortType::PROVIDER, SortType::SIZE };
+                           SortType::DATE,    SortType::PROVIDER,    SortType::SIZE,        SortType::SIDE,
+                           SortType::LOADERS, SortType::MC_VERSIONS, SortType::RELEASE_TYPE };
     m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch,     QHeaderView::Interactive,
+                              QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive,
                               QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive };
-    m_columnsHideable = { false, true, false, true, true, true, true };
+    m_columnsHideable = { false, true, false, true, true, true, true, true, true, true, true };
+    m_columnsHiddenByDefault = { false, false, false, false, false, false, false, true, true, true, true };
 }
 
 QVariant ModFolderModel::data(const QModelIndex& index, int role) const
@@ -109,6 +113,26 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
 
                     return provider.value();
                 }
+                case SideColumn: {
+                    return Metadata::modSideToString(at(row)->side());
+                }
+                case LoadersColumn: {
+                    QStringList loaders;
+                    auto modLoaders = at(row)->loaders();
+                    for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Cauldron, ModPlatform::LiteLoader,
+                                         ModPlatform::Fabric, ModPlatform::Quilt }) {
+                        if (modLoaders & loader) {
+                            loaders << getModLoaderAsString(loader);
+                        }
+                    }
+                    return loaders.join(", ");
+                }
+                case McVersionsColumn: {
+                    return at(row)->mcVersions().join(", ");
+                }
+                case ReleaseTypeColumn: {
+                    return at(row)->releaseType().toString();
+                }
                 case SizeColumn:
                     return m_resources[row]->sizeStr();
                 default:
@@ -165,6 +189,10 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio
                 case DateColumn:
                 case ProviderColumn:
                 case ImageColumn:
+                case SideColumn:
+                case LoadersColumn:
+                case McVersionsColumn:
+                case ReleaseTypeColumn:
                 case SizeColumn:
                     return columnNames().at(section);
                 default:
@@ -183,6 +211,14 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio
                     return tr("The date and time this mod was last changed (or added).");
                 case ProviderColumn:
                     return tr("Where the mod was downloaded from.");
+                case SideColumn:
+                    return tr("On what environment the mod is running.");
+                case LoadersColumn:
+                    return tr("The mod loader.");
+                case McVersionsColumn:
+                    return tr("The supported minecraft versions.");
+                case ReleaseTypeColumn:
+                    return tr("The release type.");
                 case SizeColumn:
                     return tr("The size of the mod.");
                 default:

launcher/minecraft/mod/ModFolderModel.h

@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -61,7 +62,20 @@ class QFileSystemWatcher;
 class ModFolderModel : public ResourceFolderModel {
     Q_OBJECT
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, VersionColumn, DateColumn, ProviderColumn, SizeColumn, NUM_COLUMNS };
+    enum Columns {
+        ActiveColumn = 0,
+        ImageColumn,
+        NameColumn,
+        VersionColumn,
+        DateColumn,
+        ProviderColumn,
+        SizeColumn,
+        SideColumn,
+        LoadersColumn,
+        McVersionsColumn,
+        ReleaseTypeColumn,
+        NUM_COLUMNS
+    };
     enum ModStatusAction { Disable, Enable, Toggle };
     ModFolderModel(const QString& dir, BaseInstance* instance, bool is_indexed = false, bool create_dir = true);
 

launcher/minecraft/mod/Resource.h

@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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 <QDateTime>
@@ -15,7 +50,7 @@ enum class ResourceType {
     LITEMOD,     //!< The resource is a litemod
 };
 
-enum class SortType { NAME, DATE, VERSION, ENABLED, PACK_FORMAT, PROVIDER, SIZE };
+enum class SortType { NAME, DATE, VERSION, ENABLED, PACK_FORMAT, PROVIDER, SIZE, SIDE, LOADERS, MC_VERSIONS, RELEASE_TYPE };
 
 enum class EnableAction { ENABLE, DISABLE, TOGGLE };
 

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -539,6 +539,10 @@ void ResourceFolderModel::saveColumns(QTreeView* tree)
 
 void ResourceFolderModel::loadColumns(QTreeView* tree)
 {
+    for (auto i = 0; i < m_columnsHiddenByDefault.size(); ++i) {
+        tree->setColumnHidden(i, m_columnsHiddenByDefault[i]);
+    }
+
     auto const setting_name = QString("UI/%1_Page/Columns").arg(id());
     auto setting = (m_instance->settings()->contains(setting_name)) ? m_instance->settings()->getSetting(setting_name)
                                                                     : m_instance->settings()->registerSetting(setting_name);

launcher/minecraft/mod/ResourceFolderModel.h

@@ -201,6 +201,7 @@ class ResourceFolderModel : public QAbstractListModel {
     QList<QHeaderView::ResizeMode> m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive,
                                                              QHeaderView::Interactive };
     QList<bool> m_columnsHideable = { false, false, true, true };
+    QList<bool> m_columnsHiddenByDefault = { false, false, false, false };
 
     QDir m_dir;
     BaseInstance* m_instance;

launcher/minecraft/mod/ResourcePackFolderModel.cpp

@@ -42,7 +42,6 @@
 #include <QStyle>
 
 #include "Application.h"
-#include "StringUtils.h"
 #include "Version.h"
 
 #include "minecraft/mod/Resource.h"
@@ -57,6 +56,7 @@ ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, BaseInstanc
     m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch,
                               QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive };
     m_columnsHideable = { false, true, false, true, true, true };
+    m_columnsHiddenByDefault = { false, false, false, false, false, false };
 }
 
 QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const

launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp

@@ -23,6 +23,7 @@
 #include <memory>
 #include "Json.h"
 #include "QObjectPtr.h"
+#include "minecraft/PackProfile.h"
 #include "minecraft/mod/MetadataHandler.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
@@ -44,6 +45,14 @@ static ModPlatform::ModLoaderTypes mcLoaders(BaseInstance* inst)
     return static_cast<MinecraftInstance*>(inst)->getPackProfile()->getSupportedModLoaders().value();
 }
 
+static bool checkDependencies(std::shared_ptr<GetModDependenciesTask::PackDependency> sel,
+                              Version mcVersion,
+                              ModPlatform::ModLoaderTypes loaders)
+{
+    return (sel->pack->versions.isEmpty() || sel->version.mcVersion.contains(mcVersion.toString())) &&
+           (!loaders || !sel->version.loaders || sel->version.loaders & loaders);
+}
+
 GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
                                                BaseInstance* instance,
                                                ModFolderModel* folder,
@@ -68,6 +77,7 @@ GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
 void GetModDependenciesTask::prepare()
 {
     for (auto sel : m_selected) {
+        if (checkDependencies(sel, m_version, m_loaderType))
             for (auto dep : getDependenciesForVersion(sel->version, sel->pack->provider)) {
                 addTask(prepareDependencyTask(dep, sel->pack->provider, 20));
             }

launcher/modplatform/ModIndex.cpp

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -94,10 +95,9 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
 {
     QCryptographicHash::Algorithm algo = QCryptographicHash::Sha1;
     switch (p) {
-        case ResourceProvider::MODRINTH: {
+        case ResourceProvider::MODRINTH:
             algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Sha512;
             break;
-        }
         case ResourceProvider::FLAME:
             algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Md5;
             break;
@@ -117,7 +117,7 @@ QString getMetaURL(ResourceProvider provider, QVariant projectID)
            projectID.toString();
 }
 
-auto getModLoaderString(ModLoaderType type) -> const QString
+auto getModLoaderAsString(ModLoaderType type) -> const QString
 {
     switch (type) {
         case NeoForge:
@@ -138,4 +138,21 @@ auto getModLoaderString(ModLoaderType type) -> const QString
     return "";
 }
 
+auto getModLoaderFromString(QString type) -> ModLoaderType
+{
+    if (type == "neoforge")
+        return NeoForge;
+    if (type == "forge")
+        return Forge;
+    if (type == "cauldron")
+        return Cauldron;
+    if (type == "liteloader")
+        return LiteLoader;
+    if (type == "fabric")
+        return Fabric;
+    if (type == "quilt")
+        return Quilt;
+    return {};
+}
+
 }  // namespace ModPlatform

launcher/modplatform/ModIndex.h

@@ -109,6 +109,7 @@ struct IndexedVersion {
     bool is_preferred = true;
     QString changelog;
     QList<Dependency> dependencies;
+    QString side;  // this is for flame API
 
     // For internal use, not provided by APIs
     bool is_currently_selected = false;
@@ -183,7 +184,8 @@ inline auto getOverrideDeps() -> QList<OverrideDep>
 
 QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
-auto getModLoaderString(ModLoaderType type) -> const QString;
+auto getModLoaderAsString(ModLoaderType type) -> const QString;
+auto getModLoaderFromString(QString type) -> ModLoaderType;
 
 constexpr bool hasSingleModLoaderSelected(ModLoaderTypes l) noexcept
 {
@@ -191,6 +193,11 @@ constexpr bool hasSingleModLoaderSelected(ModLoaderTypes l) noexcept
     return x && !(x & (x - 1));
 }
 
+struct Category {
+    QString name;
+    QString id;
+};
+
 }  // namespace ModPlatform
 
 Q_DECLARE_METATYPE(ModPlatform::IndexedPack)

launcher/modplatform/ResourceAPI.h

@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -73,6 +74,8 @@ class ResourceAPI {
         std::optional<SortingMethod> sorting;
         std::optional<ModPlatform::ModLoaderTypes> loaders;
         std::optional<std::list<Version> > versions;
+        std::optional<QString> side;
+        std::optional<QStringList> categoryIds;
     };
     struct SearchCallbacks {
         std::function<void(QJsonDocument&)> on_succeed;

launcher/modplatform/flame/FlameAPI.cpp

@@ -3,10 +3,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "FlameAPI.h"
+#include <memory>
 #include "FlameModIndex.h"
 
 #include "Application.h"
 #include "Json.h"
+#include "modplatform/ModIndex.h"
 #include "net/ApiDownload.h"
 #include "net/ApiUpload.h"
 #include "net/NetJob.h"
@@ -220,3 +222,42 @@ QList<ResourceAPI::SortingMethod> FlameAPI::getSortingMethods() const
              { 7, "Category", QObject::tr("Sort by Category") },
              { 8, "GameVersion", QObject::tr("Sort by Game Version") } };
 }
+
+Task::Ptr FlameAPI::getModCategories(std::shared_ptr<QByteArray> response)
+{
+    auto netJob = makeShared<NetJob>(QString("Flame::GetCategories"), APPLICATION->network());
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl("https://api.curseforge.com/v1/categories?gameId=432&classId=6"), response));
+    QObject::connect(netJob.get(), &Task::failed, [](QString msg) { qDebug() << "Flame failed to get categories:" << msg; });
+    return netJob;
+}
+
+QList<ModPlatform::Category> FlameAPI::loadModCategories(std::shared_ptr<QByteArray> response)
+{
+    QList<ModPlatform::Category> categories;
+    QJsonParseError parse_error{};
+    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+    if (parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from categories at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
+        qWarning() << *response;
+        return categories;
+    }
+
+    try {
+        auto obj = Json::requireObject(doc);
+        auto arr = Json::requireArray(obj, "data");
+
+        for (auto val : arr) {
+            auto cat = Json::requireObject(val);
+            auto id = Json::requireInteger(cat, "id");
+            auto name = Json::requireString(cat, "name");
+            categories.push_back({ name, QString::number(id) });
+        }
+
+    } catch (Json::JsonException& e) {
+        qCritical() << "Failed to parse response from a version request.";
+        qCritical() << e.what();
+        qDebug() << doc;
+    }
+    return categories;
+};

launcher/modplatform/flame/FlameAPI.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <QList>
 #include <algorithm>
 #include <memory>
 #include "modplatform/ModIndex.h"
@@ -22,6 +23,9 @@ class FlameAPI : public NetworkResourceAPI {
     Task::Ptr getFiles(const QStringList& fileIds, std::shared_ptr<QByteArray> response) const;
     Task::Ptr getFile(const QString& addonId, const QString& fileId, std::shared_ptr<QByteArray> response) const;
 
+    static Task::Ptr getModCategories(std::shared_ptr<QByteArray> response);
+    static QList<ModPlatform::Category> loadModCategories(std::shared_ptr<QByteArray> response);
+
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
     static inline auto validateModLoaders(ModPlatform::ModLoaderTypes loaders) -> bool
@@ -96,6 +100,9 @@ class FlameAPI : public NetworkResourceAPI {
         get_arguments.append("sortOrder=desc");
         if (args.loaders.has_value())
             get_arguments.append(QString("modLoaderTypes=%1").arg(getModLoaderFilters(args.loaders.value())));
+        if (args.categoryIds.has_value() && !args.categoryIds->empty())
+            get_arguments.append(QString("categoryIds=[%1]").arg(args.categoryIds->join(",")));
+
         get_arguments.append(gameVersionStr);
 
         return "https://api.curseforge.com/v1/mods/search?gameId=432&" + get_arguments.join('&');

launcher/modplatform/flame/FlameModIndex.cpp

@@ -80,10 +80,6 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                                        const BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
-    QString mcVersion = profile->getComponentVersion("net.minecraft");
-    auto loaders = profile->getSupportedModLoaders();
-
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
 
@@ -91,8 +87,7 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         if (!file.addonId.isValid())
             file.addonId = pack.addonId;
 
-        if (file.fileId.isValid() &&
-            (!loaders.has_value() || !file.loaders || loaders.value() & file.loaders))  // Heuristic to check if the returned value is valid
+        if (file.fileId.isValid())  // Heuristic to check if the returned value is valid
             unsortedVersions.append(file);
     }
 
@@ -118,19 +113,25 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
 
         if (str.contains('.'))
             file.mcVersion.append(str);
-        auto loader = str.toLower();
-        if (loader == "neoforge")
+
+        if (auto loader = str.toLower(); loader == "neoforge")
             file.loaders |= ModPlatform::NeoForge;
-        if (loader == "forge")
+        else if (loader == "forge")
             file.loaders |= ModPlatform::Forge;
-        if (loader == "cauldron")
+        else if (loader == "cauldron")
             file.loaders |= ModPlatform::Cauldron;
-        if (loader == "liteloader")
+        else if (loader == "liteloader")
             file.loaders |= ModPlatform::LiteLoader;
-        if (loader == "fabric")
+        else if (loader == "fabric")
             file.loaders |= ModPlatform::Fabric;
-        if (loader == "quilt")
+        else if (loader == "quilt")
             file.loaders |= ModPlatform::Quilt;
+        else if (loader == "server" || loader == "client") {
+            if (file.side.isEmpty())
+                file.side = loader;
+            else if (file.side != loader)
+                file.side = "both";
+        }
     }
 
     file.addonId = Json::requireInteger(obj, "modId");

launcher/modplatform/modrinth/ModrinthAPI.cpp

@@ -120,3 +120,41 @@ QList<ResourceAPI::SortingMethod> ModrinthAPI::getSortingMethods() const
              { 4, "newest", QObject::tr("Sort by Newest") },
              { 5, "updated", QObject::tr("Sort by Last Updated") } };
 }
+
+Task::Ptr ModrinthAPI::getModCategories(std::shared_ptr<QByteArray> response)
+{
+    auto netJob = makeShared<NetJob>(QString("Modrinth::GetCategories"), APPLICATION->network());
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(BuildConfig.MODRINTH_PROD_URL + "/tag/category"), response));
+    QObject::connect(netJob.get(), &Task::failed, [](QString msg) { qDebug() << "Modrinth failed to get categories:" << msg; });
+    return netJob;
+}
+
+QList<ModPlatform::Category> ModrinthAPI::loadModCategories(std::shared_ptr<QByteArray> response)
+{
+    QList<ModPlatform::Category> categories;
+    QJsonParseError parse_error{};
+    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+    if (parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from categories at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
+        qWarning() << *response;
+        return categories;
+    }
+
+    try {
+        auto arr = Json::requireArray(doc);
+
+        for (auto val : arr) {
+            auto cat = Json::requireObject(val);
+            auto name = Json::requireString(cat, "name");
+            if (Json::ensureString(cat, "project_type", "") == "mod")
+                categories.push_back({ name, name });
+        }
+
+    } catch (Json::JsonException& e) {
+        qCritical() << "Failed to parse response from a version request.";
+        qCritical() << e.what();
+        qDebug() << doc;
+    }
+    return categories;
+};

launcher/modplatform/modrinth/ModrinthAPI.h

@@ -30,6 +30,9 @@ class ModrinthAPI : public NetworkResourceAPI {
 
     Task::Ptr getProjects(QStringList addonIds, std::shared_ptr<QByteArray> response) const override;
 
+    static Task::Ptr getModCategories(std::shared_ptr<QByteArray> response);
+    static QList<ModPlatform::Category> loadModCategories(std::shared_ptr<QByteArray> response);
+
    public:
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
@@ -41,7 +44,7 @@ class ModrinthAPI : public NetworkResourceAPI {
         for (auto loader :
              { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Fabric, ModPlatform::Quilt, ModPlatform::LiteLoader }) {
             if (types & loader) {
-                l << getModLoaderString(loader);
+                l << getModLoaderAsString(loader);
             }
         }
         return l;
@@ -56,6 +59,27 @@ class ModrinthAPI : public NetworkResourceAPI {
         return l.join(',');
     }
 
+    static auto getCategoriesFilters(QStringList categories) -> const QString
+    {
+        QStringList l;
+        for (auto cat : categories) {
+            l << QString("\"categories:%1\"").arg(cat);
+        }
+        return l.join(',');
+    }
+
+    static auto getSideFilters(QString side) -> const QString
+    {
+        if (side.isEmpty() || side == "both") {
+            return {};
+        }
+        if (side == "client")
+            return QString("\"client_side:required\",\"client_side:optional\"");
+        if (side == "server")
+            return QString("\"server_side:required\",\"server_side:optional\"");
+        return {};
+    }
+
    private:
     [[nodiscard]] static QString resourceTypeParameter(ModPlatform::ResourceType type)
     {
@@ -73,6 +97,7 @@ class ModrinthAPI : public NetworkResourceAPI {
 
         return "";
     }
+
     [[nodiscard]] QString createFacets(SearchArgs const& args) const
     {
         QStringList facets_list;
@@ -81,6 +106,14 @@ class ModrinthAPI : public NetworkResourceAPI {
             facets_list.append(QString("[%1]").arg(getModLoaderFilters(args.loaders.value())));
         if (args.versions.has_value())
             facets_list.append(QString("[%1]").arg(getGameVersionsArray(args.versions.value())));
+        if (args.side.has_value()) {
+            auto side = getSideFilters(args.side.value());
+            if (!side.isEmpty())
+                facets_list.append(QString("[%1]").arg(side));
+        }
+        if (args.categoryIds.has_value() && !args.categoryIds->empty())
+            facets_list.append(QString("[%1]").arg(getCategoriesFilters(args.categoryIds.value())));
+
         facets_list.append(QString("[\"project_type:%1\"]").arg(resourceTypeParameter(args.type)));
 
         return QString("[%1]").arg(facets_list.join(','));

launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp

@@ -112,7 +112,7 @@ void ModrinthCheckUpdate::executeTask()
                                           ModPlatform::ModLoaderType::Fabric, ModPlatform::ModLoaderType::Quilt };
                     for (auto flag : flags) {
                         if (m_loaders.value().testFlag(flag)) {
-                            loader_filter = ModPlatform::getModLoaderString(flag);
+                            loader_filter = ModPlatform::getModLoaderAsString(flag);
                             break;
                         }
                     }

launcher/modplatform/modrinth/ModrinthPackIndex.cpp

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -115,16 +116,11 @@ void Modrinth::loadExtraPackData(ModPlatform::IndexedPack& pack, QJsonObject& ob
 void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr, const BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
-    QString mcVersion = profile->getComponentVersion("net.minecraft");
-    auto loaders = profile->getSupportedModLoaders();
-
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
         auto file = loadIndexedPackVersion(obj);
 
-        if (file.fileId.isValid() &&
-            (!loaders.has_value() || !file.loaders || loaders.value() & file.loaders))  // Heuristic to check if the returned value is valid
+        if (file.fileId.isValid())  // Heuristic to check if the returned value is valid
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
@@ -155,15 +151,15 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
     for (auto loader : loaders) {
         if (loader == "neoforge")
             file.loaders |= ModPlatform::NeoForge;
-        if (loader == "forge")
+        else if (loader == "forge")
             file.loaders |= ModPlatform::Forge;
-        if (loader == "cauldron")
+        else if (loader == "cauldron")
             file.loaders |= ModPlatform::Cauldron;
-        if (loader == "liteloader")
+        else if (loader == "liteloader")
             file.loaders |= ModPlatform::LiteLoader;
-        if (loader == "fabric")
+        else if (loader == "fabric")
             file.loaders |= ModPlatform::Fabric;
-        if (loader == "quilt")
+        else if (loader == "quilt")
             file.loaders |= ModPlatform::Quilt;
     }
     file.version = Json::requireString(obj, "name");

launcher/modplatform/packwiz/Packwiz.cpp

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -113,7 +114,11 @@ auto V1::createModFormat([[maybe_unused]] QDir& index_dir, ModPlatform::IndexedP
     mod.provider = mod_pack.provider;
     mod.file_id = mod_version.fileId;
     mod.project_id = mod_pack.addonId;
-    mod.side = stringToSide(mod_pack.side);
+    mod.side = stringToSide(mod_version.side.isEmpty() ? mod_pack.side : mod_version.side);
+    mod.loaders = mod_version.loaders;
+    mod.mcVersions = mod_version.mcVersion;
+    mod.mcVersions.sort();
+    mod.releaseType = mod_version.version_type;
 
     return mod;
 }
@@ -181,6 +186,18 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
             break;
     }
 
+    toml::array loaders;
+    for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Cauldron, ModPlatform::LiteLoader, ModPlatform::Fabric,
+                         ModPlatform::Quilt }) {
+        if (mod.loaders & loader) {
+            loaders.push_back(getModLoaderAsString(loader).toStdString());
+        }
+    }
+    toml::array mcVersions;
+    for (auto version : mod.mcVersions) {
+        mcVersions.push_back(version.toStdString());
+    }
+
     if (!index_file.open(QIODevice::ReadWrite)) {
         qCritical() << QString("Could not open file %1!").arg(normalized_fname);
         return;
@@ -192,6 +209,9 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
         auto tbl = toml::table{ { "name", mod.name.toStdString() },
                                 { "filename", mod.filename.toStdString() },
                                 { "side", sideToString(mod.side).toStdString() },
+                                { "loaders", loaders },
+                                { "mcVersions", mcVersions },
+                                { "releaseType", mod.releaseType.toString().toStdString() },
                                 { "download",
                                   toml::table{
                                       { "mode", mod.mode.toStdString() },
@@ -276,6 +296,25 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod
         mod.name = stringEntry(table, "name");
         mod.filename = stringEntry(table, "filename");
         mod.side = stringToSide(stringEntry(table, "side"));
+        mod.releaseType = ModPlatform::IndexedVersionType(stringEntry(table, "releaseType"));
+        if (auto loaders = table["loaders"]; loaders && loaders.is_array()) {
+            for (auto&& loader : *loaders.as_array()) {
+                if (loader.is_string()) {
+                    mod.loaders |= ModPlatform::getModLoaderFromString(QString::fromStdString(loader.as_string()->value_or("")));
+                }
+            }
+        }
+        if (auto versions = table["mcVersions"]; versions && versions.is_array()) {
+            for (auto&& version : *versions.as_array()) {
+                if (version.is_string()) {
+                    auto ver = QString::fromStdString(version.as_string()->value_or(""));
+                    if (!ver.isEmpty()) {
+                        mod.mcVersions << ver;
+                    }
+                }
+            }
+            mod.mcVersions.sort();
+        }
     }
 
     {  // [download] info

launcher/modplatform/packwiz/Packwiz.h

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -41,6 +42,9 @@ class V1 {
         QString name{};
         QString filename{};
         Side side{ Side::UniversalSide };
+        ModPlatform::ModLoaderTypes loaders;
+        QStringList mcVersions;
+        ModPlatform::IndexedVersionType releaseType;
 
         // [download]
         QString mode{};

launcher/ui/dialogs/ResourceDownloadDialog.cpp

@@ -27,6 +27,7 @@
 #include "Application.h"
 #include "ResourceDownloadTask.h"
 
+#include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourcePackFolderModel.h"
 #include "minecraft/mod/ShaderPackFolderModel.h"

launcher/ui/pages/modplatform/ModModel.cpp

@@ -25,15 +25,21 @@ ResourceAPI::SearchArgs ModModel::createSearchArguments()
     Q_ASSERT(m_filter);
 
     std::optional<std::list<Version>> versions{};
+    std::optional<QStringList> categories{};
+    auto loaders = profile->getSupportedModLoaders();
 
-    {  // Version filter
+    // Version filter
     if (!m_filter->versions.empty())
         versions = m_filter->versions;
-    }
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
+    if (!m_filter->categoryIds.empty())
+        categories = m_filter->categoryIds;
+    auto side = m_filter->side;
 
     auto sort = getCurrentSortingMethodByIndex();
 
-    return { ModPlatform::ResourceType::MOD, m_next_search_offset, m_search_term, sort, profile->getSupportedModLoaders(), versions };
+    return { ModPlatform::ResourceType::MOD, m_next_search_offset, m_search_term, sort, loaders, versions, side, categories };
 }
 
 ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& entry)
@@ -45,10 +51,13 @@ ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& en
     Q_ASSERT(m_filter);
 
     std::optional<std::list<Version>> versions{};
+    auto loaders = profile->getSupportedModLoaders();
     if (!m_filter->versions.empty())
         versions = m_filter->versions;
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
 
-    return { pack, versions, profile->getSupportedModLoaders() };
+    return { pack, versions, loaders };
 }
 
 ResourceAPI::ProjectInfoArgs ModModel::createInfoArguments(QModelIndex& entry)
@@ -79,4 +88,43 @@ bool ModModel::isPackInstalled(ModPlatform::IndexedPack::Ptr pack) const
     });
 }
 
+bool checkSide(QString filter, QString value)
+{
+    return filter.isEmpty() || value.isEmpty() || filter == "both" || value == "both" || filter == value;
+}
+
+bool checkMcVersions(std::list<Version> filter, QStringList value)
+{
+    bool valid = false;
+    for (auto mcVersion : filter) {
+        if (value.contains(mcVersion.toString())) {
+            valid = true;
+            break;
+        }
+    }
+    return filter.empty() || valid;
+}
+
+bool ModModel::checkFilters(ModPlatform::IndexedPack::Ptr pack)
+{
+    if (!m_filter)
+        return true;
+    return !(m_filter->hideInstalled && isPackInstalled(pack)) && checkSide(m_filter->side, pack->side);
+}
+
+bool ModModel::checkVersionFilters(const ModPlatform::IndexedVersion& v)
+{
+    if (!m_filter)
+        return true;
+    auto loaders = static_cast<MinecraftInstance&>(m_base_instance).getPackProfile()->getSupportedModLoaders();
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
+    return (!optedOut(v) &&                                                         // is opted out(aka curseforge download link)
+            (!loaders.has_value() || !v.loaders || loaders.value() & v.loaders) &&  // loaders
+            checkSide(m_filter->side, v.side) &&                                    // side
+            (m_filter->releases.empty() ||                                          // releases
+             std::find(m_filter->releases.cbegin(), m_filter->releases.cend(), v.version_type) != m_filter->releases.cend()) &&
+            checkMcVersions(m_filter->versions, v.mcVersion));  // mcVersions
+}
+
 }  // namespace ResourceDownload

launcher/ui/pages/modplatform/ModModel.h

@@ -45,6 +45,9 @@ class ModModel : public ResourceModel {
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;
     virtual bool isPackInstalled(ModPlatform::IndexedPack::Ptr) const override;
 
+    virtual bool checkFilters(ModPlatform::IndexedPack::Ptr) override;
+    virtual bool checkVersionFilters(const ModPlatform::IndexedVersion&) override;
+
    protected:
     BaseInstance& m_base_instance;
 

launcher/ui/pages/modplatform/ModPage.cpp

@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,7 +58,6 @@ namespace ResourceDownload {
 
 ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);
     connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ModPage::onResourceSelected);
 }
@@ -67,17 +67,18 @@ void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
     if (m_filter_widget)
         disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr);
 
+    auto old = m_ui->splitter->replaceWidget(0, widget.get());
+    // because we replaced the widget we also need to delete it
+    if (old) {
+        delete old;
+    }
+
     m_filter_widget.swap(widget);
 
-    m_ui->gridLayout_3->addWidget(m_filter_widget.get(), 0, 0, 1, m_ui->gridLayout_3->columnCount());
-
-    m_filter_widget->setInstance(&static_cast<MinecraftInstance&>(m_base_instance));
     m_filter = m_filter_widget->getFilter();
 
-    connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this,
-            [&] { m_ui->searchButton->setStyleSheet("text-decoration: underline"); });
-    connect(m_filter_widget.get(), &ModFilterWidget::filterUnchanged, this,
-            [&] { m_ui->searchButton->setStyleSheet("text-decoration: none"); });
+    connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this, &ModPage::triggerSearch);
+    prepareProviderCategories();
 }
 
 /******** Callbacks to events in the UI (set up in the derived classes) ********/
@@ -89,6 +90,7 @@ void ModPage::filterMods()
 
 void ModPage::triggerSearch()
 {
+    auto changed = m_filter_widget->changed();
     m_filter = m_filter_widget->getFilter();
     m_ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
     m_ui->packView->clearSelection();
@@ -96,7 +98,7 @@ void ModPage::triggerSearch()
     m_ui->versionSelectionBox->clear();
     updateSelectionButton();
 
-    static_cast<ModModel*>(m_model)->searchWithTerm(getSearchTerm(), m_ui->sortByBox->currentData().toUInt(), m_filter_widget->changed());
+    static_cast<ModModel*>(m_model)->searchWithTerm(getSearchTerm(), m_ui->sortByBox->currentData().toUInt(), changed);
     m_fetch_progress.watch(m_model->activeSearchJob().get());
 }
 
@@ -111,40 +113,6 @@ QMap<QString, QString> ModPage::urlHandlers() const
 
 /******** Make changes to the UI ********/
 
-void ModPage::updateVersionList()
-{
-    m_ui->versionSelectionBox->clear();
-    auto packProfile = (dynamic_cast<MinecraftInstance&>(m_base_instance)).getPackProfile();
-
-    QString mcVersion = packProfile->getComponentVersion("net.minecraft");
-
-    auto current_pack = getCurrentPack();
-    if (!current_pack)
-        return;
-    for (int i = 0; i < current_pack->versions.size(); i++) {
-        auto version = current_pack->versions[i];
-        bool valid = false;
-        for (auto& mcVer : m_filter->versions) {
-            if (validateVersion(version, mcVer.toString(), packProfile->getSupportedModLoaders())) {
-                valid = true;
-                break;
-            }
-        }
-
-        // Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
-        if ((valid || m_filter->versions.empty()) && !optedOut(version)) {
-            auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
-            m_ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(i));
-        }
-    }
-    if (m_ui->versionSelectionBox->count() == 0) {
-        m_ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
-        m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
-    }
-
-    updateSelectionButton();
-}
-
 void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack,
                                 ModPlatform::IndexedVersion& version,
                                 const std::shared_ptr<ResourceFolderModel> base_model)

launcher/ui/pages/modplatform/ModPage.h

@@ -31,8 +31,7 @@ class ModPage : public ResourcePage {
         auto page = new T(dialog, instance);
         auto model = static_cast<ModModel*>(page->getModel());
 
-        auto filter_widget =
-            ModFilterWidget::create(static_cast<MinecraftInstance&>(instance).getPackProfile()->getComponentVersion("net.minecraft"), page);
+        auto filter_widget = page->createFilterWidget();
         page->setFilterWidget(filter_widget);
         model->setFilter(page->getFilter());
 
@@ -51,20 +50,17 @@ class ModPage : public ResourcePage {
 
     void addResourceToPage(ModPlatform::IndexedPack::Ptr, ModPlatform::IndexedVersion&, std::shared_ptr<ResourceFolderModel>) override;
 
-    virtual auto validateVersion(ModPlatform::IndexedVersion& ver,
-                                 QString mineVer,
-                                 std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const -> bool = 0;
+    virtual unique_qobject_ptr<ModFilterWidget> createFilterWidget() = 0;
 
     [[nodiscard]] bool supportsFiltering() const override { return true; };
     auto getFilter() const -> const std::shared_ptr<ModFilterWidget::Filter> { return m_filter; }
     void setFilterWidget(unique_qobject_ptr<ModFilterWidget>&);
 
-   public slots:
-    void updateVersionList() override;
-
    protected:
     ModPage(ModDownloadDialog* dialog, BaseInstance& instance);
 
+    virtual void prepareProviderCategories(){};
+
    protected slots:
     virtual void filterMods();
     void triggerSearch() override;

launcher/ui/pages/modplatform/ResourceModel.cpp

@@ -410,12 +410,17 @@ void ResourceModel::searchRequestSucceeded(QJsonDocument& doc)
         m_search_state = SearchState::CanFetchMore;
     }
 
+    QList<ModPlatform::IndexedPack::Ptr> filteredNewList;
+    for (auto p : newList)
+        if (checkFilters(p))
+            filteredNewList << p;
+
     // When you have a Qt build with assertions turned on, proceeding here will abort the application
-    if (newList.size() == 0)
+    if (filteredNewList.size() == 0)
         return;
 
-    beginInsertRows(QModelIndex(), m_packs.size(), m_packs.size() + newList.size() - 1);
-    m_packs.append(newList);
+    beginInsertRows(QModelIndex(), m_packs.size(), m_packs.size() + filteredNewList.size() - 1);
+    m_packs.append(filteredNewList);
     endInsertRows();
 }
 
@@ -558,4 +563,8 @@ void ResourceModel::removePack(const QString& rem)
         ver.is_currently_selected = false;
 }
 
+bool ResourceModel::checkVersionFilters(const ModPlatform::IndexedVersion& v)
+{
+    return (!optedOut(v));
+}
 }  // namespace ResourceDownload

launcher/ui/pages/modplatform/ResourceModel.h

@@ -11,6 +11,7 @@
 #include "QObjectPtr.h"
 
 #include "ResourceDownloadTask.h"
+#include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
 
 #include "tasks/ConcurrentTask.h"
@@ -55,6 +56,16 @@ class ResourceModel : public QAbstractListModel {
 
     [[nodiscard]] auto getSortingMethods() const { return m_api->getSortingMethods(); }
 
+    /** Whether the version is opted out or not. Currently only makes sense in CF. */
+    virtual bool optedOut(const ModPlatform::IndexedVersion& ver) const
+    {
+        Q_UNUSED(ver);
+        return false;
+    };
+
+    virtual bool checkFilters(ModPlatform::IndexedPack::Ptr) { return true; }
+    virtual bool checkVersionFilters(const ModPlatform::IndexedVersion&);
+
    public slots:
     void fetchMore(const QModelIndex& parent) override;
     // NOTE: Can't use [[nodiscard]] here because of https://bugreports.qt.io/browse/QTBUG-58628 on Qt 5.12

launcher/ui/pages/modplatform/ResourcePackPage.cpp

@@ -15,7 +15,6 @@ namespace ResourceDownload {
 
 ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ResourcePackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ResourcePackResourcePage::onResourceSelected);
 }
 

launcher/ui/pages/modplatform/ResourcePage.cpp

@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -67,11 +68,13 @@ ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_in
 
     connect(&m_search_timer, &QTimer::timeout, this, &ResourcePage::triggerSearch);
 
+    // hide progress bar to prevent weird artifact
+    m_fetch_progress.hide();
     m_fetch_progress.hideIfInactive(true);
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    m_ui->gridLayout_3->addWidget(&m_fetch_progress, 0, 0, 1, m_ui->gridLayout_3->columnCount());
+    m_ui->verticalLayout->insertWidget(1, &m_fetch_progress);
 
     m_ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     m_ui->packView->installEventFilter(this);
@@ -93,8 +96,10 @@ void ResourcePage::retranslate()
 
 void ResourcePage::openedImpl()
 {
-    if (!supportsFiltering())
+    if (!supportsFiltering()) {
         m_ui->resourceFilterButton->setVisible(false);
+        m_ui->filterWidget->hide();
+    }
 
     //: String in the search bar of the mod downloading dialog
     m_ui->searchEdit->setPlaceholderText(tr("Search for %1...").arg(resourcesString()));
@@ -269,7 +274,7 @@ void ResourcePage::updateVersionList()
     if (current_pack)
         for (int i = 0; i < current_pack->versions.size(); i++) {
             auto& version = current_pack->versions[i];
-            if (optedOut(version))
+            if (!m_model->checkVersionFilters(version))
                 continue;
 
             auto release_type = current_pack->versions[i].version_type.isValid()

launcher/ui/pages/modplatform/ResourcePage.h

@@ -84,7 +84,7 @@ class ResourcePage : public QWidget, public BasePage {
     bool hasSelectedPacks() { return !(m_model->selectedPacks().isEmpty()); }
 
    protected slots:
-    virtual void triggerSearch() {}
+    virtual void triggerSearch() = 0;
 
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onVersionSelectionChanged(QString data);
@@ -96,13 +96,6 @@ class ResourcePage : public QWidget, public BasePage {
     virtual QMap<QString, QString> urlHandlers() const = 0;
     virtual void openUrl(const QUrl&);
 
-    /** Whether the version is opted out or not. Currently only makes sense in CF. */
-    virtual bool optedOut(ModPlatform::IndexedVersion& ver) const
-    {
-        Q_UNUSED(ver);
-        return false;
-    };
-
    public:
     BaseInstance& m_base_instance;
 

launcher/ui/pages/modplatform/ResourcePage.ui

@@ -10,20 +10,30 @@
     <height>685</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0" colspan="4">
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="1" column="2">
-      <widget class="ProjectDescriptionPage" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>false</bool>
-       </property>
-       <property name="openLinks">
-        <bool>false</bool>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="resourceFilterButton">
+       <property name="text">
+        <string>Filter options</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item>
+      <widget class="QLineEdit" name="searchEdit"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="filterWidget" native="true"/>
      <widget class="QListView" name="packView">
       <property name="horizontalScrollBarPolicy">
        <enum>Qt::ScrollBarAlwaysOff</enum>
@@ -38,20 +48,17 @@
        </size>
       </property>
      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="3">
-    <widget class="QPushButton" name="searchButton">
-     <property name="text">
-      <string>Search</string>
+     <widget class="ProjectDescriptionPage" name="packDescription">
+      <property name="openExternalLinks">
+       <bool>false</bool>
+      </property>
+      <property name="openLinks">
+       <bool>false</bool>
       </property>
      </widget>
+    </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLineEdit" name="searchEdit"/>
-   </item>
-   <item row="2" column="0" colspan="4">
+   <item>
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0">
      <item row="0" column="2">
       <widget class="QComboBox" name="versionSelectionBox"/>
@@ -74,20 +81,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1">
-    <widget class="QPushButton" name="resourceFilterButton">
-     <property name="text">
-      <string>Filter options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -98,8 +91,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>searchEdit</tabstop>
-  <tabstop>searchButton</tabstop>
   <tabstop>packView</tabstop>
   <tabstop>packDescription</tabstop>
   <tabstop>sortByBox</tabstop>

launcher/ui/pages/modplatform/ShaderPackPage.cpp

@@ -16,7 +16,6 @@ namespace ResourceDownload {
 
 ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ShaderPackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ShaderPackResourcePage::onResourceSelected);
 }
 

launcher/ui/pages/modplatform/TexturePackPage.h

@@ -41,7 +41,6 @@ class TexturePackResourcePage : public ResourcePackResourcePage {
    protected:
     TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance) : ResourcePackResourcePage(dialog, instance)
     {
-        connect(m_ui->searchButton, &QPushButton::clicked, this, &TexturePackResourcePage::triggerSearch);
         connect(m_ui->packView, &QListView::doubleClicked, this, &TexturePackResourcePage::onResourceSelected);
     }
 };

launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp

@@ -6,11 +6,17 @@
 
 #include "Json.h"
 
+#include "minecraft/PackProfile.h"
 #include "modplatform/flame/FlameAPI.h"
 #include "modplatform/flame/FlameModIndex.h"
 
 namespace ResourceDownload {
 
+static bool isOptedOut(const ModPlatform::IndexedVersion& ver)
+{
+    return ver.downloadUrl.isEmpty();
+}
+
 FlameModModel::FlameModModel(BaseInstance& base) : ModModel(base, new FlameAPI) {}
 
 void FlameModModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
@@ -34,6 +40,11 @@ auto FlameModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJs
     return FlameMod::loadDependencyVersions(m, arr, &m_base_instance);
 }
 
+bool FlameModModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -57,6 +68,11 @@ void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
+bool FlameResourcePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -116,6 +132,11 @@ ResourceAPI::VersionSearchArgs FlameTexturePackModel::createVersionsArguments(QM
     return args;
 }
 
+bool FlameTexturePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameTexturePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -139,6 +160,11 @@ void FlameShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m,
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
+bool FlameShaderPackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameShaderPackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");

launcher/ui/pages/modplatform/flame/FlameResourceModels.h

@@ -17,6 +17,8 @@ class FlameModModel : public ModModel {
     FlameModModel(BaseInstance&);
     ~FlameModModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -36,6 +38,8 @@ class FlameResourcePackModel : public ResourcePackResourceModel {
     FlameResourcePackModel(const BaseInstance&);
     ~FlameResourcePackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -54,6 +58,8 @@ class FlameTexturePackModel : public TexturePackResourceModel {
     FlameTexturePackModel(const BaseInstance&);
     ~FlameTexturePackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -75,6 +81,8 @@ class FlameShaderPackModel : public ShaderPackResourceModel {
     FlameShaderPackModel(const BaseInstance&);
     ~FlameShaderPackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }

launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp

@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +38,10 @@
  */
 
 #include "FlameResourcePages.h"
+#include <QList>
+#include <memory>
+#include "modplatform/ModIndex.h"
+#include "modplatform/flame/FlameAPI.h"
 #include "ui_ResourcePage.h"
 
 #include "FlameResourceModels.h"
@@ -44,11 +49,6 @@
 
 namespace ResourceDownload {
 
-static bool isOptedOut(ModPlatform::IndexedVersion const& ver)
-{
-    return ver.downloadUrl.isEmpty();
-}
-
 FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ModPage(dialog, instance)
 {
     m_model = new FlameModModel(instance);
@@ -66,19 +66,6 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance) :
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver,
-                                   QString mineVer,
-                                   std::optional<ModPlatform::ModLoaderTypes> loaders) const -> bool
-{
-    return ver.mcVersion.contains(mineVer) && !ver.downloadUrl.isEmpty() &&
-           (!loaders.has_value() || !ver.loaders || loaders.value() & ver.loaders);
-}
-
-bool FlameModPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameModPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -113,11 +100,6 @@ FlameResourcePackPage::FlameResourcePackPage(ResourcePackDownloadDialog* dialog,
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameResourcePackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameResourcePackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -152,11 +134,6 @@ FlameTexturePackPage::FlameTexturePackPage(TexturePackDownloadDialog* dialog, Ba
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameTexturePackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameTexturePackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -191,11 +168,6 @@ FlameShaderPackPage::FlameShaderPackPage(ShaderPackDownloadDialog* dialog, BaseI
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameShaderPackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameShaderPackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -232,4 +204,19 @@ auto FlameShaderPackPage::shouldDisplay() const -> bool
     return true;
 }
 
+unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget()
+{
+    return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_base_instance), false, this);
+}
+
+void FlameModPage::prepareProviderCategories()
+{
+    auto response = std::make_shared<QByteArray>();
+    auto task = FlameAPI::getModCategories(response);
+    QObject::connect(task.get(), &Task::succeeded, [this, response]() {
+        auto categories = FlameAPI::loadModCategories(response);
+        m_filter_widget->setCategories(categories);
+    });
+    task->start();
+};
 }  // namespace ResourceDownload

launcher/ui/pages/modplatform/flame/FlameResourcePages.h

@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -94,12 +95,11 @@ class FlameModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    bool validateVersion(ModPlatform::IndexedVersion& ver,
-                         QString mineVer,
-                         std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const override;
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
+    unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
+
+   protected:
+    virtual void prepareProviderCategories() override;
 };
 
 class FlameResourcePackPage : public ResourcePackResourcePage {
@@ -124,8 +124,6 @@ class FlameResourcePackPage : public ResourcePackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 
@@ -151,8 +149,6 @@ class FlameTexturePackPage : public TexturePackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 
@@ -178,8 +174,6 @@ class FlameShaderPackPage : public ShaderPackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 

launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp

@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -63,13 +64,6 @@ ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instan
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver,
-                                      QString mineVer,
-                                      std::optional<ModPlatform::ModLoaderTypes> loaders) const -> bool
-{
-    return ver.mcVersion.contains(mineVer) && (!loaders.has_value() || !ver.loaders || loaders.value() & ver.loaders);
-}
-
 ModrinthResourcePackPage::ModrinthResourcePackPage(ResourcePackDownloadDialog* dialog, BaseInstance& instance)
     : ResourcePackResourcePage(dialog, instance)
 {
@@ -144,4 +138,19 @@ auto ModrinthShaderPackPage::shouldDisplay() const -> bool
     return true;
 }
 
+unique_qobject_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget()
+{
+    return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_base_instance), true, this);
+}
+
+void ModrinthModPage::prepareProviderCategories()
+{
+    auto response = std::make_shared<QByteArray>();
+    auto task = ModrinthAPI::getModCategories(response);
+    QObject::connect(task.get(), &Task::succeeded, [this, response]() {
+        auto categories = ModrinthAPI::loadModCategories(response);
+        m_filter_widget->setCategories(categories);
+    });
+    task->start();
+};
 }  // namespace ResourceDownload

launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h

@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -93,8 +94,10 @@ class ModrinthModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const
-        -> bool override;
+    unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
+
+   protected:
+    virtual void prepareProviderCategories() override;
 };
 
 class ModrinthResourcePackPage : public ResourcePackResourcePage {

launcher/ui/widgets/CheckComboBox.cpp

@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "CheckComboBox.h"
+
+#include <QAbstractItemView>
+#include <QBoxLayout>
+#include <QEvent>
+#include <QIdentityProxyModel>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QListView>
+#include <QMouseEvent>
+#include <QStringList>
+#include <QStylePainter>
+
+class CheckComboModel : public QIdentityProxyModel {
+    Q_OBJECT
+
+   public:
+    explicit CheckComboModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+
+    virtual Qt::ItemFlags flags(const QModelIndex& index) const { return QIdentityProxyModel::flags(index) | Qt::ItemIsUserCheckable; }
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    {
+        if (role == Qt::CheckStateRole) {
+            auto txt = QIdentityProxyModel::data(index, Qt::DisplayRole).toString();
+            return checked.contains(txt) ? Qt::Checked : Qt::Unchecked;
+        }
+        if (role == Qt::DisplayRole)
+            return QIdentityProxyModel::data(index, Qt::DisplayRole);
+        return {};
+    }
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole)
+    {
+        if (role == Qt::CheckStateRole) {
+            auto txt = QIdentityProxyModel::data(index, Qt::DisplayRole).toString();
+            if (checked.contains(txt)) {
+                checked.removeOne(txt);
+            } else {
+                checked.push_back(txt);
+            }
+            emit dataChanged(index, index);
+            emit checkStateChanged();
+            return true;
+        }
+        return QIdentityProxyModel::setData(index, value, role);
+    }
+    QStringList getChecked() { return checked; }
+
+   signals:
+    void checkStateChanged();
+
+   private:
+    QStringList checked;
+};
+
+CheckComboBox::CheckComboBox(QWidget* parent) : QComboBox(parent), m_separator(", ")
+{
+    view()->installEventFilter(this);
+    view()->window()->installEventFilter(this);
+    view()->viewport()->installEventFilter(this);
+    this->installEventFilter(this);
+}
+
+void CheckComboBox::setSourceModel(QAbstractItemModel* new_model)
+{
+    auto proxy = new CheckComboModel(this);
+    proxy->setSourceModel(new_model);
+    model()->disconnect(this);
+    QComboBox::setModel(proxy);
+    connect(this, QOverload<int>::of(&QComboBox::activated), this, &CheckComboBox::toggleCheckState);
+    connect(proxy, &CheckComboModel::checkStateChanged, this, &CheckComboBox::emitCheckedItemsChanged);
+    connect(model(), &CheckComboModel::rowsInserted, this, &CheckComboBox::emitCheckedItemsChanged);
+    connect(model(), &CheckComboModel::rowsRemoved, this, &CheckComboBox::emitCheckedItemsChanged);
+}
+
+void CheckComboBox::hidePopup()
+{
+    if (!containerMousePress)
+        QComboBox::hidePopup();
+}
+
+void CheckComboBox::emitCheckedItemsChanged()
+{
+    emit checkedItemsChanged(checkedItems());
+}
+
+QString CheckComboBox::defaultText() const
+{
+    return m_default_text;
+}
+
+void CheckComboBox::setDefaultText(const QString& text)
+{
+    m_default_text = text;
+}
+
+QString CheckComboBox::separator() const
+{
+    return m_separator;
+}
+
+void CheckComboBox::setSeparator(const QString& separator)
+{
+    m_separator = separator;
+}
+
+bool CheckComboBox::eventFilter(QObject* receiver, QEvent* event)
+{
+    switch (event->type()) {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease: {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (receiver == this && (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down)) {
+                showPopup();
+                return true;
+            } else if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Escape) {
+                QComboBox::hidePopup();
+                return (keyEvent->key() != Qt::Key_Escape);
+            }
+            break;
+        }
+        case QEvent::MouseButtonPress: {
+            auto ev = static_cast<QMouseEvent*>(event);
+            containerMousePress = ev && view()->indexAt(ev->pos()).isValid();
+            break;
+        }
+        case QEvent::Wheel:
+            return receiver == this;
+        default:
+            break;
+    }
+    return false;
+}
+
+void CheckComboBox::toggleCheckState(int index)
+{
+    QVariant value = itemData(index, Qt::CheckStateRole);
+    if (value.isValid()) {
+        Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
+        setItemData(index, (state == Qt::Unchecked ? Qt::Checked : Qt::Unchecked), Qt::CheckStateRole);
+    }
+    emitCheckedItemsChanged();
+}
+
+Qt::CheckState CheckComboBox::itemCheckState(int index) const
+{
+    return static_cast<Qt::CheckState>(itemData(index, Qt::CheckStateRole).toInt());
+}
+
+void CheckComboBox::setItemCheckState(int index, Qt::CheckState state)
+{
+    setItemData(index, state, Qt::CheckStateRole);
+}
+
+QStringList CheckComboBox::checkedItems() const
+{
+    if (model())
+        return dynamic_cast<CheckComboModel*>(model())->getChecked();
+    return {};
+}
+
+void CheckComboBox::setCheckedItems(const QStringList& items)
+{
+    foreach (auto text, items) {
+        auto index = findText(text);
+        setItemCheckState(index, index != -1 ? Qt::Checked : Qt::Unchecked);
+    }
+}
+
+void CheckComboBox::paintEvent(QPaintEvent*)
+{
+    QStylePainter painter(this);
+    painter.setPen(palette().color(QPalette::Text));
+
+    // draw the combobox frame, focusrect and selected etc.
+    QStyleOptionComboBox opt;
+    initStyleOption(&opt);
+    QStringList items = checkedItems();
+    if (items.isEmpty())
+        opt.currentText = defaultText();
+    else
+        opt.currentText = items.join(separator());
+    painter.drawComplexControl(QStyle::CC_ComboBox, opt);
+
+    // draw the icon and text
+    painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
+}
+
+#include "CheckComboBox.moc"

launcher/ui/widgets/CheckComboBox.h

@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QComboBox>
+#include <QLineEdit>
+
+class CheckComboBox : public QComboBox {
+    Q_OBJECT
+
+   public:
+    explicit CheckComboBox(QWidget* parent = nullptr);
+    virtual ~CheckComboBox() = default;
+
+    void hidePopup() override;
+
+    QString defaultText() const;
+    void setDefaultText(const QString& text);
+
+    Qt::CheckState itemCheckState(int index) const;
+    void setItemCheckState(int index, Qt::CheckState state);
+
+    QString separator() const;
+    void setSeparator(const QString& separator);
+
+    QStringList checkedItems() const;
+
+    void setSourceModel(QAbstractItemModel* model);
+
+   public slots:
+    void setCheckedItems(const QStringList& items);
+
+   signals:
+    void checkedItemsChanged(const QStringList& items);
+
+   protected:
+    void paintEvent(QPaintEvent*) override;
+
+   private:
+    void emitCheckedItemsChanged();
+    bool eventFilter(QObject* receiver, QEvent* event) override;
+    void toggleCheckState(int index);
+
+   private:
+    QString m_default_text;
+    QString m_separator;
+    bool containerMousePress;
+};

launcher/ui/widgets/ModFilterWidget.cpp

@@ -1,13 +1,139 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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 "ModFilterWidget.h"
+#include <QCheckBox>
+#include <QComboBox>
+#include <QListWidget>
+#include <algorithm>
+#include <list>
+#include "BaseVersionList.h"
+#include "Version.h"
+#include "meta/Index.h"
+#include "modplatform/ModIndex.h"
+#include "ui/widgets/CheckComboBox.h"
 #include "ui_ModFilterWidget.h"
 
 #include "Application.h"
+#include "minecraft/PackProfile.h"
 
-unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_version, QWidget* parent)
+unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended, QWidget* parent)
 {
-    auto filter_widget = new ModFilterWidget(default_version, parent);
+    return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, parent));
+}
 
-    if (!filter_widget->versionList()->isLoaded()) {
+class VersionBasicModel : public QIdentityProxyModel {
+    Q_OBJECT
+
+   public:
+    explicit VersionBasicModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (role == Qt::DisplayRole)
+            return QIdentityProxyModel::data(index, BaseVersionList::VersionIdRole);
+        return {};
+    }
+};
+
+ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWidget* parent)
+    : QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
+{
+    ui->setupUi(this);
+
+    m_versions_proxy = new VersionProxyModel(this);
+    m_versions_proxy->setFilter(BaseVersionList::TypeRole, new ExactFilter("release"));
+
+    auto proxy = new VersionBasicModel(this);
+    proxy->setSourceModel(m_versions_proxy);
+
+    if (extended) {
+        ui->versions->setSourceModel(proxy);
+        ui->versions->setSeparator(", ");
+        ui->version->hide();
+    } else {
+        ui->version->setModel(proxy);
+        ui->versions->hide();
+        ui->showAllVersions->hide();
+        ui->environmentGroup->hide();
+    }
+
+    ui->versions->setStyleSheet("combobox-popup: 0;");
+    ui->version->setStyleSheet("combobox-popup: 0;");
+    connect(ui->showAllVersions, &QCheckBox::stateChanged, this, &ModFilterWidget::onShowAllVersionsChanged);
+    connect(ui->versions, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ModFilterWidget::onVersionFilterChanged);
+    connect(ui->versions, &CheckComboBox::checkedItemsChanged, this, [this] { onVersionFilterChanged(0); });
+    connect(ui->version, &QComboBox::currentTextChanged, this, &ModFilterWidget::onVersionFilterTextChanged);
+
+    connect(ui->neoForge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+
+    connect(ui->neoForge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+
+    if (extended) {
+        connect(ui->clientSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
+        connect(ui->serverSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
+    }
+
+    connect(ui->hideInstalled, &QCheckBox::stateChanged, this, &ModFilterWidget::onHideInstalledFilterChanged);
+
+    setHidden(true);
+    loadVersionList();
+    prepareBasicFilter();
+}
+
+auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
+{
+    m_filter_changed = false;
+    return m_filter;
+}
+
+ModFilterWidget::~ModFilterWidget()
+{
+    delete ui;
+}
+
+void ModFilterWidget::loadVersionList()
+{
+    m_version_list = APPLICATION->metadataIndex()->get("net.minecraft");
+    if (!m_version_list->isLoaded()) {
         QEventLoop load_version_list_loop;
 
         QTimer time_limit_for_list_load;
@@ -16,10 +142,12 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
         time_limit_for_list_load.callOnTimeout(&load_version_list_loop, &QEventLoop::quit);
         time_limit_for_list_load.start(4000);
 
-        auto task = filter_widget->versionList()->getLoadTask();
+        auto task = m_version_list->getLoadTask();
 
-        connect(task.get(), &Task::failed,
-                [filter_widget] { filter_widget->disableVersionButton(VersionButtonID::Major, tr("failed to get version index")); });
+        connect(task.get(), &Task::failed, [this] {
+            ui->versions->setEnabled(false);
+            ui->showAllVersions->setEnabled(false);
+        });
         connect(task.get(), &Task::finished, &load_version_list_loop, &QEventLoop::quit);
 
         if (!task->isRunning())
@@ -29,128 +157,132 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
         if (time_limit_for_list_load.isActive())
             time_limit_for_list_load.stop();
     }
-
-    return unique_qobject_ptr<ModFilterWidget>(filter_widget);
+    m_versions_proxy->setSourceModel(m_version_list.get());
 }
 
-ModFilterWidget::ModFilterWidget(Version def, QWidget* parent) : QTabWidget(parent), m_filter(new Filter()), ui(new Ui::ModFilterWidget)
+void ModFilterWidget::prepareBasicFilter()
 {
-    ui->setupUi(this);
-
-    m_mcVersion_buttons.addButton(ui->strictVersionButton, VersionButtonID::Strict);
-    ui->strictVersionButton->click();
-    m_mcVersion_buttons.addButton(ui->majorVersionButton, VersionButtonID::Major);
-    m_mcVersion_buttons.addButton(ui->allVersionsButton, VersionButtonID::All);
-    // m_mcVersion_buttons.addButton(ui->betweenVersionsButton, VersionButtonID::Between);
-
-    connect(&m_mcVersion_buttons, SIGNAL(idClicked(int)), this, SLOT(onVersionFilterChanged(int)));
-
-    m_filter->versions.push_front(def);
-
-    m_version_list = APPLICATION->metadataIndex()->get("net.minecraft");
-    setHidden(true);
+    m_filter->hideInstalled = false;
+    m_filter->side = "";  // or "both"
+    auto loaders = m_instance->getPackProfile()->getSupportedModLoaders().value();
+    ui->neoForge->setChecked(loaders & ModPlatform::NeoForge);
+    ui->forge->setChecked(loaders & ModPlatform::Forge);
+    ui->fabric->setChecked(loaders & ModPlatform::Fabric);
+    ui->quilt->setChecked(loaders & ModPlatform::Quilt);
+    m_filter->loaders = loaders;
+    auto def = m_instance->getPackProfile()->getComponentVersion("net.minecraft");
+    m_filter->versions.emplace_front(def);
+    ui->versions->setCheckedItems({ def });
+    ui->version->setCurrentIndex(ui->version->findText(def));
 }
 
-void ModFilterWidget::setInstance(MinecraftInstance* instance)
+void ModFilterWidget::onShowAllVersionsChanged()
 {
-    m_instance = instance;
-
-    ui->strictVersionButton->setText(tr("Strict match (= %1)").arg(mcVersionStr()));
-
-    // we can't do this for snapshots sadly
-    if (mcVersionStr().contains('.')) {
-        auto mcVersionSplit = mcVersionStr().split(".");
-        ui->majorVersionButton->setText(tr("Major version match (= %1.%2.x)").arg(mcVersionSplit[0], mcVersionSplit[1]));
-    } else {
-        ui->majorVersionButton->setText(tr("Major version match (unsupported)"));
-        disableVersionButton(Major);
-    }
-    ui->allVersionsButton->setText(tr("Any version"));
-    // ui->betweenVersionsButton->setText(
-    //     tr("Between two versions"));
-}
-
-auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
-{
-    m_last_version_id = m_version_id;
-    emit filterUnchanged();
-    return m_filter;
-}
-
-void ModFilterWidget::disableVersionButton(VersionButtonID id, QString reason)
-{
-    QAbstractButton* btn = nullptr;
-
-    switch (id) {
-        case (VersionButtonID::Strict):
-            btn = ui->strictVersionButton;
-            break;
-        case (VersionButtonID::Major):
-            btn = ui->majorVersionButton;
-            break;
-        case (VersionButtonID::All):
-            btn = ui->allVersionsButton;
-            break;
-        case (VersionButtonID::Between):
-        default:
-            break;
-    }
-
-    if (btn) {
-        btn->setEnabled(false);
-        if (!reason.isEmpty())
-            btn->setText(btn->text() + QString(" (%1)").arg(reason));
-    }
-}
-
-void ModFilterWidget::onVersionFilterChanged(int id)
-{
-    // ui->lowerVersionComboBox->setEnabled(id == VersionButtonID::Between);
-    // ui->upperVersionComboBox->setEnabled(id == VersionButtonID::Between);
-
-    int index = 1;
-
-    auto cast_id = (VersionButtonID)id;
-    if (cast_id != m_version_id) {
-        m_version_id = cast_id;
-    } else {
-        return;
-    }
-
-    m_filter->versions.clear();
-
-    switch (cast_id) {
-        case (VersionButtonID::Strict):
-            m_filter->versions.push_front(mcVersion());
-            break;
-        case (VersionButtonID::Major): {
-            auto versionSplit = mcVersionStr().split(".");
-
-            auto major_version = QString("%1.%2").arg(versionSplit[0], versionSplit[1]);
-            QString version_str = major_version;
-
-            while (m_version_list->hasVersion(version_str)) {
-                m_filter->versions.emplace_back(version_str);
-                version_str = QString("%1.%2").arg(major_version, QString::number(index++));
-            }
-
-            break;
-        }
-        case (VersionButtonID::All):
-            // Empty list to avoid enumerating all versions :P
-            break;
-        case (VersionButtonID::Between):
-            // TODO
-            break;
-    }
-
-    if (changed())
-        emit filterChanged();
+    if (ui->showAllVersions->isChecked())
+        m_versions_proxy->clearFilters();
     else
-        emit filterUnchanged();
+        m_versions_proxy->setFilter(BaseVersionList::TypeRole, new ExactFilter("release"));
 }
 
-ModFilterWidget::~ModFilterWidget()
+void ModFilterWidget::onVersionFilterChanged(int)
 {
-    delete ui;
+    auto versions = ui->versions->checkedItems();
+    versions.sort();
+    std::list<Version> current_list;
+
+    for (const QString& version : versions)
+        current_list.emplace_back(version);
+
+    m_filter_changed = m_filter->versions.size() != current_list.size() ||
+                       !std::equal(m_filter->versions.begin(), m_filter->versions.end(), current_list.begin(), current_list.end());
+    m_filter->versions = current_list;
+    if (m_filter_changed)
+        emit filterChanged();
 }
+
+void ModFilterWidget::onLoadersFilterChanged()
+{
+    ModPlatform::ModLoaderTypes loaders;
+    if (ui->neoForge->isChecked())
+        loaders |= ModPlatform::NeoForge;
+    if (ui->forge->isChecked())
+        loaders |= ModPlatform::Forge;
+    if (ui->fabric->isChecked())
+        loaders |= ModPlatform::Fabric;
+    if (ui->quilt->isChecked())
+        loaders |= ModPlatform::Quilt;
+    m_filter_changed = loaders != m_filter->loaders;
+    m_filter->loaders = loaders;
+    if (m_filter_changed)
+        emit filterChanged();
+}
+
+void ModFilterWidget::onSideFilterChanged()
+{
+    QString side;
+
+    if (ui->clientSide->isChecked() != ui->serverSide->isChecked()) {
+        if (ui->clientSide->isChecked())
+            side = "client";
+        else
+            side = "server";
+    } else {
+        // both are checked or none are checked; in either case no filtering will happen
+        side = "";
+    }
+
+    m_filter_changed = side != m_filter->side;
+    m_filter->side = side;
+    if (m_filter_changed)
+        emit filterChanged();
+}
+
+void ModFilterWidget::onHideInstalledFilterChanged()
+{
+    auto hide = ui->hideInstalled->isChecked();
+    m_filter_changed = hide != m_filter->hideInstalled;
+    m_filter->hideInstalled = hide;
+    if (m_filter_changed)
+        emit filterChanged();
+}
+
+void ModFilterWidget::onVersionFilterTextChanged(const QString& version)
+{
+    m_filter->versions.clear();
+    m_filter->versions.emplace_back(version);
+    m_filter_changed = true;
+    emit filterChanged();
+}
+
+void ModFilterWidget::setCategories(const QList<ModPlatform::Category>& categories)
+{
+    m_categories = categories;
+
+    delete ui->categoryGroup->layout();
+    auto layout = new QVBoxLayout(ui->categoryGroup);
+
+    for (const auto& category : categories) {
+        auto name = category.name;
+        name.replace("-", " ");
+        name.replace("&", "&&");
+        auto checkbox = new QCheckBox(name);
+        auto font = checkbox->font();
+        font.setCapitalization(QFont::Capitalize);
+        checkbox->setFont(font);
+
+        layout->addWidget(checkbox);
+
+        const QString id = category.id;
+        connect(checkbox, &QCheckBox::toggled, this, [this, id](bool checked) {
+            if (checked)
+                m_filter->categoryIds.append(id);
+            else
+                m_filter->categoryIds.removeOne(id);
+
+            m_filter_changed = true;
+            emit filterChanged();
+        });
+    }
+}
+
+#include "ModFilterWidget.moc"

launcher/ui/widgets/ModFilterWidget.h

@@ -1,15 +1,52 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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 <QButtonGroup>
+#include <QList>
+#include <QListWidgetItem>
 #include <QTabWidget>
 
 #include "Version.h"
 
-#include "meta/Index.h"
+#include "VersionProxyModel.h"
 #include "meta/VersionList.h"
 
 #include "minecraft/MinecraftInstance.h"
-#include "minecraft/PackProfile.h"
+#include "modplatform/ModIndex.h"
 
 class MinecraftInstance;
 
@@ -20,59 +57,57 @@ class ModFilterWidget;
 class ModFilterWidget : public QTabWidget {
     Q_OBJECT
    public:
-    enum VersionButtonID { Strict = 0, Major = 1, All = 2, Between = 3 };
-
     struct Filter {
         std::list<Version> versions;
+        std::list<ModPlatform::IndexedVersionType> releases;
+        ModPlatform::ModLoaderTypes loaders;
+        QString side;
+        bool hideInstalled;
+        QStringList categoryIds;
 
-        bool operator==(const Filter& other) const { return versions == other.versions; }
+        bool operator==(const Filter& other) const
+        {
+            return hideInstalled == other.hideInstalled && side == other.side && loaders == other.loaders && versions == other.versions &&
+                   releases == other.releases && categoryIds == other.categoryIds;
+        }
         bool operator!=(const Filter& other) const { return !(*this == other); }
     };
 
-    std::shared_ptr<Filter> m_filter;
-
-   public:
-    static unique_qobject_ptr<ModFilterWidget> create(Version default_version, QWidget* parent = nullptr);
-    ~ModFilterWidget();
-
-    void setInstance(MinecraftInstance* instance);
-
-    /// By default all buttons are enabled
-    void disableVersionButton(VersionButtonID, QString reason = {});
+    static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended, QWidget* parent = nullptr);
+    virtual ~ModFilterWidget();
 
     auto getFilter() -> std::shared_ptr<Filter>;
-    auto changed() const -> bool { return m_last_version_id != m_version_id; }
+    auto changed() const -> bool { return m_filter_changed; }
 
-    Meta::VersionList::Ptr versionList() { return m_version_list; }
-
-   private:
-    ModFilterWidget(Version def, QWidget* parent = nullptr);
-
-    inline auto mcVersionStr() const -> QString
-    {
-        return m_instance ? m_instance->getPackProfile()->getComponentVersion("net.minecraft") : "";
-    }
-    inline auto mcVersion() const -> Version { return { mcVersionStr() }; }
-
-   private slots:
-    void onVersionFilterChanged(int id);
-
-   public:
    signals:
     void filterChanged();
-    void filterUnchanged();
+
+   public slots:
+    void setCategories(const QList<ModPlatform::Category>&);
+
+   private:
+    ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, QWidget* parent = nullptr);
+
+    void loadVersionList();
+    void prepareBasicFilter();
+
+   private slots:
+    void onVersionFilterChanged(int);
+    void onVersionFilterTextChanged(const QString& version);
+    void onLoadersFilterChanged();
+    void onSideFilterChanged();
+    void onHideInstalledFilterChanged();
+    void onShowAllVersionsChanged();
 
    private:
     Ui::ModFilterWidget* ui;
 
     MinecraftInstance* m_instance = nullptr;
-
-    /* Version stuff */
-    QButtonGroup m_mcVersion_buttons;
+    std::shared_ptr<Filter> m_filter;
+    bool m_filter_changed = false;
 
     Meta::VersionList::Ptr m_version_list;
+    VersionProxyModel* m_versions_proxy = nullptr;
 
-    /* Used to tell if the filter was changed since the last getFilter() call */
-    VersionButtonID m_last_version_id = VersionButtonID::Strict;
-    VersionButtonID m_version_id = VersionButtonID::Strict;
+    QList<ModPlatform::Category> m_categories;
 };

launcher/ui/widgets/ModFilterWidget.ui

@@ -1,54 +1,219 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ModFilterWidget</class>
- <widget class="QTabWidget" name="ModFilterWidget">
+ <widget class="QWidget" name="ModFilterWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>310</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <widget class="QWidget" name="VersionPage">
-   <attribute name="title">
-    <string>Minecraft versions</string>
-   </attribute>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <layout class="QFormLayout" name="formLayout">
-      <item row="2" column="0">
-       <widget class="QRadioButton" name="allVersionsButton">
-        <property name="text">
-         <string notr="true">allVersions</string>
+  <property name="minimumSize">
+   <size>
+    <width>275</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>310</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <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="QScrollArea" name="scrollArea">
+     <property name="minimumSize">
+      <size>
+       <width>275</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>308</width>
+        <height>598</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QGroupBox" name="categoryGroup">
+         <property name="title">
+          <string>Categories</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="strictVersionButton">
+       <item>
+        <widget class="QGroupBox" name="loaderGroup">
+         <property name="title">
+          <string>Loaders</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QCheckBox" name="neoForge">
             <property name="text">
-         <string notr="true">strictVersion</string>
+             <string>NeoForge</string>
             </property>
            </widget>
           </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="majorVersionButton">
+          <item>
+           <widget class="QCheckBox" name="forge">
             <property name="text">
-         <string notr="true">majorVersion</string>
+             <string>Forge</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="fabric">
+            <property name="text">
+             <string>Fabric</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="quilt">
+            <property name="text">
+             <string>Quilt</string>
             </property>
            </widget>
           </item>
          </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="minecraftVersionGroup">
+         <property name="title">
+          <string>Versions</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="showAllVersions">
+            <property name="text">
+             <string>Show all versions</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="CheckComboBox" name="versions"/>
+          </item>
+          <item>
+           <widget class="QComboBox" name="version"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="environmentGroup">
+         <property name="title">
+          <string>Environments</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="QCheckBox" name="clientSide">
+            <property name="text">
+             <string>Client</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="serverSide">
+            <property name="text">
+             <string>Server</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="hideInstalled">
+         <property name="text">
+          <string>Hide installed items</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>
      </widget>
     </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CheckComboBox</class>
+   <extends>QComboBox</extends>
+   <header>ui/widgets/CheckComboBox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>