Small cleanup

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

12 files changed, 7 insertions, 60 deletions

diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index 19c20e65..3ffe6cb0 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -24,7 +24,7 @@ ResourceAPI::SearchArgs ModModel::createSearchArguments()
 
     std::optional<std::list<Version>> versions{};
 
-    {  // Version filter
+    { // Version filter
         if (!m_filter->versions.empty())
             versions = m_filter->versions;
     }
@@ -49,20 +49,6 @@ ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& en
     return { pack, versions, profile->getModLoaders() };
 }
 
-ResourceAPI::DependencySearchArgs ModModel::createDependecyArguments(const ModPlatform::Dependency& dep)
-{
-    auto profile = static_cast<MinecraftInstance const&>(m_base_instance).getPackProfile();
-
-    Q_ASSERT(profile);
-    Q_ASSERT(m_filter);
-
-    std::optional<std::list<Version>> versions{};
-    if (!m_filter->versions.empty())
-        versions = m_filter->versions;
-
-    return { dep, versions->front(), profile->getModLoaders().value() };
-};
-
 ResourceAPI::ProjectInfoArgs ModModel::createInfoArguments(QModelIndex& entry)
 {
     auto& pack = m_packs[entry.row()];
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index 59b27dda..f7563171 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -32,7 +32,7 @@ class ModModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
+    virtual ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) = 0;
 
     void setFilter(std::shared_ptr<ModFilterWidget::Filter> filter) { m_filter = filter; }
 
@@ -40,7 +40,6 @@ class ModModel : public ResourceModel {
     ResourceAPI::SearchArgs createSearchArguments() override;
     ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
     ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override;
-    ResourceAPI::DependencySearchArgs createDependecyArguments(const ModPlatform::Dependency&) override;
 
    protected:
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 97b9efa9..b1e936f8 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -324,11 +324,6 @@ void ResourceModel::loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArra
 {
     NEED_FOR_CALLBACK_ASSERT("loadIndexedPackVersions");
 }
-ModPlatform::IndexedVersion ResourceModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr)
-{
-    NEED_FOR_CALLBACK_ASSERT("loadDependencyVersions");
-    return {};
-}
 
 /* Default callbacks */
 
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
index 3ea567af..c0844589 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.h
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -70,9 +70,6 @@ class ResourceModel : public QAbstractListModel {
     virtual ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) = 0;
     virtual ResourceAPI::ProjectInfoCallbacks createInfoCallbacks(QModelIndex&) { return {}; }
 
-    virtual ResourceAPI::DependencySearchArgs createDependecyArguments(const ModPlatform::Dependency&) { return {}; };
-    virtual ResourceAPI::DependencySearchCallbacks createDependecyCallbacks() { return {}; }
-
     /** Requests the API for more entries. */
     virtual void search();
 
@@ -109,7 +106,6 @@ class ResourceModel : public QAbstractListModel {
     virtual void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&);
     virtual void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&);
     virtual void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&);
-    virtual ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr);
 
    protected:
     /* Basic search parameters */
diff --git a/launcher/ui/pages/modplatform/ResourcePackModel.h b/launcher/ui/pages/modplatform/ResourcePackModel.h
index 8ff4d8a2..e2b4a195 100644
--- a/launcher/ui/pages/modplatform/ResourcePackModel.h
+++ b/launcher/ui/pages/modplatform/ResourcePackModel.h
@@ -28,7 +28,6 @@ class ResourcePackResourceModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
 
    public slots:
     ResourceAPI::SearchArgs createSearchArguments() override;
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 1baa24ee..bbd465bc 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -43,6 +43,9 @@
 #include <QKeyEvent>
 
 #include "Markdown.h"
+#include "ResourceDownloadTask.h"
+
+#include "minecraft/MinecraftInstance.h"
 
 #include "ui/dialogs/ResourceDownloadDialog.h"
 #include "ui/pages/modplatform/ResourceModel.h"
diff --git a/launcher/ui/pages/modplatform/ResourcePage.h b/launcher/ui/pages/modplatform/ResourcePage.h
index a8299728..1896d53e 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.h
+++ b/launcher/ui/pages/modplatform/ResourcePage.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <QDir>
 #include <QTimer>
 #include <QWidget>
 
 #include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
 
 #include "ui/pages/BasePage.h"
 #include "ui/widgets/ProgressWidget.h"
@@ -77,7 +77,7 @@ class ResourcePage : public QWidget, public BasePage {
 
    protected slots:
     virtual void triggerSearch() {}
-
+   
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onVersionSelectionChanged(QString data);
     void onResourceSelected();
diff --git a/launcher/ui/pages/modplatform/ShaderPackModel.h b/launcher/ui/pages/modplatform/ShaderPackModel.h
index 17a07aa4..f3c695e9 100644
--- a/launcher/ui/pages/modplatform/ShaderPackModel.h
+++ b/launcher/ui/pages/modplatform/ShaderPackModel.h
@@ -28,7 +28,6 @@ class ShaderPackResourceModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
 
    public slots:
     ResourceAPI::SearchArgs createSearchArguments() override;
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
index 08bf22fe..b233a845 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
@@ -57,11 +57,6 @@ void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto FlameResourcePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return FlameMod::loadDependencyVersions(m, arr);
-};
-
 auto FlameResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -98,11 +93,6 @@ void FlameTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m,
     m.versions = filtered_versions;
 }
 
-auto FlameTexturePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return FlameMod::loadDependencyVersions(m, arr);
-};
-
 ResourceAPI::SearchArgs FlameTexturePackModel::createSearchArguments()
 {
     auto args = TexturePackResourceModel::createSearchArguments();
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
index 7871d9aa..f3ef918a 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
@@ -43,7 +43,6 @@ class FlameResourcePackModel : public ResourcePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -62,7 +61,6 @@ class FlameTexturePackModel : public TexturePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     ResourceAPI::SearchArgs createSearchArguments() override;
     ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
index 53be2d2c..e9f09387 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
@@ -69,11 +69,6 @@ void ModrinthResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthResourcePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
@@ -96,11 +91,6 @@ void ModrinthTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack&
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthTexturePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthTexturePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
@@ -123,11 +113,6 @@ void ModrinthShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack&
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthShaderPackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthShaderPackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
index 0045fe86..6cd19c41 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
@@ -59,7 +59,6 @@ class ModrinthResourcePackModel : public ResourcePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -78,7 +77,6 @@ class ModrinthTexturePackModel : public TexturePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -97,7 +95,6 @@ class ModrinthShaderPackModel : public ShaderPackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };