fix: correctly handle disabled mods with metadata

im stupid

1 files changed, 24 insertions, 5 deletions

diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 62d856f6..bde32b3e 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -53,12 +53,31 @@ void ModFolderLoadTask::run()
     m_mods_dir.refresh();
     for (auto entry : m_mods_dir.entryInfoList()) {
         Mod mod(entry);
-        if(m_result->mods.contains(mod.internal_id())){
-            m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+
+        if (mod.enabled()) {
+            if (m_result->mods.contains(mod.internal_id())) {
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+            }
+            else {
+                m_result->mods[mod.internal_id()] = mod;
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+            }
         }
-        else {
-            m_result->mods[mod.internal_id()] = mod;
-            m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+        else { 
+            QString chopped_id = mod.internal_id().chopped(9);
+            if (m_result->mods.contains(chopped_id)) {
+                m_result->mods[mod.internal_id()] = mod;
+
+                auto metadata = m_result->mods[chopped_id].metadata();
+                mod.setMetadata(new Metadata::ModStruct(*metadata));
+
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+                m_result->mods.remove(chopped_id);
+            }
+            else {
+                m_result->mods[mod.internal_id()] = mod;
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+            }
         }
     }