Do the url trick on initial modpack download too

2 files changed, 10 insertions, 1 deletions

diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index ac24c647..6d48a3bf 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -65,7 +65,15 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
         // pick the latest version supported
         file.mcVersion = versionArray[0].toString();
         file.version = Json::requireString(version, "displayName");
-        file.downloadUrl = Json::requireString(version, "downloadUrl");
+        file.fileName = Json::requireString(version, "fileName");
+        file.downloadUrl = Json::ensureString(version, "downloadUrl");
+        if(file.downloadUrl.isEmpty()){
+            //FIXME : HACK, MAY NOT WORK FOR LONG
+            file.downloadUrl = QString("https://media.forgecdn.net/files/%1/%2/%3")
+                    .arg(QString::number(QString::number(file.fileId).leftRef(4).toInt())
+                            ,QString::number(QString::number(file.fileId).rightRef(3).toInt())
+                            ,QUrl::toPercentEncoding(file.fileName));
+        }
         unsortedVersions.append(file);
     }
 
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index 7ffa29c3..a8bb15be 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -18,6 +18,7 @@ struct IndexedVersion {
     QString version;
     QString mcVersion;
     QString downloadUrl;
+    QString fileName;
 };
 
 struct IndexedPack