From f7931c2ee202025740caf424fa00ffb76743a1d2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 22 Apr 2023 00:47:51 +0300
Subject: Better version handling

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/modplatform/ModModel.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'launcher/ui/pages/modplatform/ModModel.cpp')

diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index 3ffe6cb0..b69d2cf9 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -6,12 +6,24 @@
 
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.h"
 
 #include <QMessageBox>
 
 namespace ResourceDownload {
 
-ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceModel(api), m_base_instance(base_inst) {}
+ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceModel(api), m_base_instance(base_inst)
+{
+    auto folder = static_cast<MinecraftInstance const&>(m_base_instance).loaderModList();
+    for (auto mod : folder->allMods()) {
+        auto meta = mod->metadata();
+        ModPlatform::IndexedPack pack{ meta->project_id, meta->provider, meta->name, meta->slug };
+        pack.loadedFileId = meta->file_id;
+        qWarning() << pack.loadedFileId;
+        addPack(pack);
+    }
+}
 
 /******** Make data requests ********/
 
@@ -24,7 +36,7 @@ ResourceAPI::SearchArgs ModModel::createSearchArguments()
 
     std::optional<std::list<Version>> versions{};
 
-    { // Version filter
+    {  // Version filter
         if (!m_filter->versions.empty())
             versions = m_filter->versions;
     }
-- 
cgit 


From 75116364c6daea5affb029038d2a7d20bc601beb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 22 Apr 2023 00:55:11 +0300
Subject: Small Cleanup

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/ModIndex.h                 | 1 -
 launcher/ui/pages/modplatform/ModModel.cpp      | 1 -
 launcher/ui/pages/modplatform/ResourceModel.cpp | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'launcher/ui/pages/modplatform/ModModel.cpp')

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index de0af78c..b736aaf4 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <qvariant.h>
 #include <QList>
 #include <QMetaType>
 #include <QString>
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index b69d2cf9..251200f7 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -20,7 +20,6 @@ ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceMo
         auto meta = mod->metadata();
         ModPlatform::IndexedPack pack{ meta->project_id, meta->provider, meta->name, meta->slug };
         pack.loadedFileId = meta->file_id;
-        qWarning() << pack.loadedFileId;
         addPack(pack);
     }
 }
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index c7c34a7c..0e74395f 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "ResourceModel.h"
-#include <qlist.h>
 
 #include <QCryptographicHash>
 #include <QIcon>
+#include <QList>
 #include <QMessageBox>
 #include <QPixmapCache>
 #include <QUrl>
-- 
cgit