From 77caaca50dab7ba8e455d641ac6b448052bc6799 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 19 May 2022 08:09:18 +0200
Subject: fix: only consider enabled mod loaders

---
 launcher/minecraft/PackProfile.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index d53f41e1..87d11c4c 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -36,6 +36,13 @@
 #include "ComponentUpdateTask.h"
 
 #include "Application.h"
+#include "modplatform/ModAPI.h"
+
+static const QMap<QString, ModAPI::ModLoaderType> modloaderMapping{
+    {"net.minecraftforge", ModAPI::Forge},
+    {"net.fabricmc.fabric-loader", ModAPI::Fabric},
+    {"org.quiltmc.quilt-loader", ModAPI::Quilt}
+};
 
 PackProfile::PackProfile(MinecraftInstance * instance)
     : QAbstractListModel()
@@ -973,17 +980,15 @@ void PackProfile::disableInteraction(bool disable)
 
 ModAPI::ModLoaderType PackProfile::getModLoader()
 {
-    if (!getComponentVersion("net.minecraftforge").isEmpty())
-    {
-        return ModAPI::Forge;
-    }
-    else if (!getComponentVersion("net.fabricmc.fabric-loader").isEmpty())
-    {
-        return ModAPI::Fabric;
-    }
-    else if (!getComponentVersion("org.quiltmc.quilt-loader").isEmpty())
+    QMapIterator<QString, ModAPI::ModLoaderType> i(modloaderMapping);
+
+    while (i.hasNext())
     {
-        return ModAPI::Quilt;
+        i.next();
+        Component* c = getComponent(i.key());
+        if (c != nullptr && c->isEnabled()) {
+            return i.value();
+        }
     }
     return ModAPI::Unspecified;
 }
-- 
cgit 


From 943090db98dbbe969afed8a4fb59f4bbb43449cc Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 19 May 2022 08:40:28 +0200
Subject: refactor: allow tracking multiple mod loaders

---
 launcher/minecraft/PackProfile.cpp | 8 +++++---
 launcher/minecraft/PackProfile.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 87d11c4c..125048f0 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -978,8 +978,10 @@ void PackProfile::disableInteraction(bool disable)
     }
 }
 
-ModAPI::ModLoaderType PackProfile::getModLoader()
+ModAPI::ModLoaderTypes PackProfile::getModLoaders()
 {
+    ModAPI::ModLoaderTypes result = ModAPI::Unspecified;
+
     QMapIterator<QString, ModAPI::ModLoaderType> i(modloaderMapping);
 
     while (i.hasNext())
@@ -987,8 +989,8 @@ ModAPI::ModLoaderType PackProfile::getModLoader()
         i.next();
         Component* c = getComponent(i.key());
         if (c != nullptr && c->isEnabled()) {
-            return i.value();
+            result |= i.value();
         }
     }
-    return ModAPI::Unspecified;
+    return result;
 }
diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index ab4cd5c8..918e7f7a 100644
--- a/launcher/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -118,7 +118,7 @@ public:
     // todo(merged): is this the best approach
     void appendComponent(ComponentPtr component);
 
-    ModAPI::ModLoaderType getModLoader();
+    ModAPI::ModLoaderTypes getModLoaders();
 
 private:
     void scheduleSave();
-- 
cgit