refactor: remove unused mod info and organize some stuff

2 files changed, 11 insertions, 33 deletions

diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index a7bec5ae..3354732b 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -35,7 +35,6 @@ std::shared_ptr<ModDetails> ReadMCModInfo(QByteArray contents)
             details->name = name;
         }
         details->version = firstObj.value("version").toString();
-        details->updateurl = firstObj.value("updateUrl").toString();
         auto homeurl = firstObj.value("url").toString().trimmed();
         if(!homeurl.isEmpty())
         {
@@ -57,7 +56,6 @@ std::shared_ptr<ModDetails> ReadMCModInfo(QByteArray contents)
         {
             details->authors.append(author.toString());
         }
-        details->credits = firstObj.value("credits").toString();
         return details;
     };
     QJsonParseError jsonError;
@@ -168,27 +166,9 @@ std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents)
     }
     if(!authors.isEmpty())
     {
-        // author information is stored as a string now, not a list
         details->authors.append(authors);
     }
-    // is credits even used anywhere? including this for completion/parity with old data version
-    toml_datum_t creditsDatum = toml_string_in(tomlData, "credits");
-    QString credits = "";
-    if(creditsDatum.ok)
-    {
-        authors = creditsDatum.u.s;
-        free(creditsDatum.u.s);
-    }
-    else
-    {
-        creditsDatum = toml_string_in(tomlModsTable0, "credits");
-        if(creditsDatum.ok)
-        {
-            credits = creditsDatum.u.s;
-            free(creditsDatum.u.s);
-        }
-    }
-    details->credits = credits;
+
     toml_datum_t homeurlDatum = toml_string_in(tomlData, "displayURL");
     QString homeurl = "";
     if(homeurlDatum.ok)
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index fd4d6008..bf7b28d6 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -3,32 +3,30 @@
 
 #include "modplatform/packwiz/Packwiz.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) :
-    m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
-{
-}
+ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) 
+    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
+{}
 
 void ModFolderLoadTask::run()
 {
     // Read metadata first
     m_index_dir.refresh();
-    for(auto entry : m_index_dir.entryList()){
+    for (auto entry : m_index_dir.entryList()) {
         // QDir::Filter::NoDotAndDotDot seems to exclude all files for some reason...
-        if(entry == "." || entry == "..")
+        if (entry == "." || entry == "..")
             continue;
 
-        entry.chop(5); // Remove .toml at the end
+        entry.chop(5);  // Remove .toml at the end
         Mod mod(m_mods_dir, Packwiz::getIndexForMod(m_index_dir, entry));
-        m_result->mods[mod.mmc_id()] = mod;
+        m_result->mods[mod.internal_id()] = mod;
     }
 
     // Read JAR files that don't have metadata
     m_mods_dir.refresh();
-    for (auto entry : m_mods_dir.entryInfoList())
-    {
+    for (auto entry : m_mods_dir.entryInfoList()) {
         Mod mod(entry);
-        if(!m_result->mods.contains(mod.mmc_id()))
-            m_result->mods[mod.mmc_id()] = mod;
+        if (!m_result->mods.contains(mod.internal_id()))
+            m_result->mods[mod.internal_id()] = mod;
     }
 
     emit succeeded();