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/modplatform/ModAPI.h               | 15 +++++++++----
 launcher/modplatform/flame/FlameAPI.h       | 17 +++++++++-----
 launcher/modplatform/modrinth/ModrinthAPI.h | 35 +++++++++++++----------------
 3 files changed, 37 insertions(+), 30 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModAPI.h b/launcher/modplatform/ModAPI.h
index 8e6cd45c..4230df0b 100644
--- a/launcher/modplatform/ModAPI.h
+++ b/launcher/modplatform/ModAPI.h
@@ -16,14 +16,21 @@ class ModAPI {
    public:
     virtual ~ModAPI() = default;
 
-    // https://docs.curseforge.com/?http#tocS_ModLoaderType
-    enum ModLoaderType { Unspecified = 0, Forge = 1, Cauldron = 2, LiteLoader = 3, Fabric = 4, Quilt = 5 };
+    enum ModLoaderType {
+        Unspecified = 0,
+        Forge = 1 << 0,
+        Cauldron = 1 << 1,
+        LiteLoader = 1 << 2,
+        Fabric = 1 << 3,
+        Quilt = 1 << 4
+    };
+    Q_DECLARE_FLAGS(ModLoaderTypes, ModLoaderType)
 
     struct SearchArgs {
         int offset;
         QString search;
         QString sorting;
-        ModLoaderType mod_loader;
+        ModLoaderTypes loaders;
         std::list<Version> versions;
     };
 
@@ -33,7 +40,7 @@ class ModAPI {
     struct VersionSearchArgs {
         QString addonId;
         std::list<Version> mcVersions;
-        ModLoaderType loader;
+        ModLoaderTypes loaders;
     };
 
     virtual void getVersions(CallerType* caller, VersionSearchArgs&& args) const = 0;
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 61628e60..8bb33d47 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -37,14 +37,14 @@ class FlameAPI : public NetworkModAPI {
             .arg(args.offset)
             .arg(args.search)
             .arg(getSortFieldInt(args.sorting))
-            .arg(getMappedModLoader(args.mod_loader))
+            .arg(getMappedModLoader(args.loaders))
             .arg(gameVersionStr);
     };
 
     inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
     {
         QString gameVersionQuery = args.mcVersions.size() == 1 ? QString("gameVersion=%1&").arg(args.mcVersions.front().toString()) : "";
-        QString modLoaderQuery = QString("modLoaderType=%1&").arg(getMappedModLoader(args.loader));
+        QString modLoaderQuery = QString("modLoaderType=%1&").arg(getMappedModLoader(args.loaders));
 
         return QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&%2%3")
             .arg(args.addonId)
@@ -53,11 +53,16 @@ class FlameAPI : public NetworkModAPI {
     };
 
    public:
-    static auto getMappedModLoader(const ModLoaderType type) -> const ModLoaderType
+    static auto getMappedModLoader(const ModLoaderTypes loaders) -> const int
     {
+        // https://docs.curseforge.com/?http#tocS_ModLoaderType
+        if (loaders & Forge)
+            return 1;
+        if (loaders & Fabric)
+            return 4;
         // TODO: remove this once Quilt drops official Fabric support
-        if (type == Quilt)  // NOTE: Most if not all Fabric mods should work *currently*
-            return Fabric;
-        return type;
+        if (loaders & Quilt)  // NOTE: Most if not all Fabric mods should work *currently*
+            return 4;  // Quilt would probably be 5
+        return 0;
     }
 };
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 6d642b5e..39f6c49a 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -28,30 +28,25 @@ class ModrinthAPI : public NetworkModAPI {
    public:
     inline auto getAuthorURL(const QString& name) const -> QString { return "https://modrinth.com/user/" + name; };
 
-    static auto getModLoaderStrings(ModLoaderType type) -> const QStringList
+    static auto getModLoaderStrings(const ModLoaderTypes types) -> const QStringList
     {
         QStringList l;
-        switch (type)
+        for (auto loader : {Forge, Fabric, Quilt})
         {
-            case Unspecified:
-                for (auto loader : {Forge, Fabric, Quilt})
-                {
-                    l << ModAPI::getModLoaderString(loader);
-                }
-                break;
-
-            case Quilt:
-                l << ModAPI::getModLoaderString(Fabric);
-            default:
-                l << ModAPI::getModLoaderString(type);
+            if (types & loader || types == Unspecified)
+            {
+                l << ModAPI::getModLoaderString(loader);
+            }
         }
+        if (types & Quilt && ~types & Fabric)  // Add Fabric if Quilt is in use, if Fabric isn't already there
+            l << ModAPI::getModLoaderString(Fabric);
         return l;
     }
 
-    static auto getModLoaderFilters(ModLoaderType type) -> const QString
+    static auto getModLoaderFilters(ModLoaderTypes types) -> const QString
     {
         QStringList l;
-        for (auto loader : getModLoaderStrings(type))
+        for (auto loader : getModLoaderStrings(types))
         {
             l << QString("\"categories:%1\"").arg(loader);
         }
@@ -61,7 +56,7 @@ class ModrinthAPI : public NetworkModAPI {
    private:
     inline auto getModSearchURL(SearchArgs& args) const -> QString override
     {
-        if (!validateModLoader(args.mod_loader)) {
+        if (!validateModLoaders(args.loaders)) {
             qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
             return "";
         }
@@ -76,7 +71,7 @@ class ModrinthAPI : public NetworkModAPI {
             .arg(args.offset)
             .arg(args.search)
             .arg(args.sorting)
-            .arg(getModLoaderFilters(args.mod_loader))
+            .arg(getModLoaderFilters(args.loaders))
             .arg(getGameVersionsArray(args.versions));
     };
 
@@ -88,7 +83,7 @@ class ModrinthAPI : public NetworkModAPI {
                        "loaders=[\"%3\"]")
             .arg(args.addonId)
             .arg(getGameVersionsString(args.mcVersions))
-            .arg(getModLoaderStrings(args.loader).join("\",\""));
+            .arg(getModLoaderStrings(args.loaders).join("\",\""));
     };
 
     auto getGameVersionsArray(std::list<Version> mcVersions) const -> QString
@@ -101,9 +96,9 @@ class ModrinthAPI : public NetworkModAPI {
         return s.isEmpty() ? QString() : QString("[%1],").arg(s);
     }
 
-    inline auto validateModLoader(ModLoaderType modLoader) const -> bool
+    inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool
     {
-        return modLoader == Unspecified || modLoader == Forge || modLoader == Fabric || modLoader == Quilt;
+        return loaders == Unspecified || loaders & (Forge | Fabric | Quilt);
     }
 
 };
-- 
cgit 


From 36045a8b0aa5c99e8520a39e6cc372ab9b549668 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 19 May 2022 12:35:44 +0200
Subject: chore: improve readability

Co-authored-by: flow <thiagodonato300@gmail.com>
---
 launcher/modplatform/modrinth/ModrinthAPI.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 39f6c49a..79bc5175 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -33,12 +33,12 @@ class ModrinthAPI : public NetworkModAPI {
         QStringList l;
         for (auto loader : {Forge, Fabric, Quilt})
         {
-            if (types & loader || types == Unspecified)
+            if ((types & loader) || types == Unspecified)
             {
                 l << ModAPI::getModLoaderString(loader);
             }
         }
-        if (types & Quilt && ~types & Fabric)  // Add Fabric if Quilt is in use, if Fabric isn't already there
+        if ((types & Quilt) && (~types & Fabric))  // Add Fabric if Quilt is in use, if Fabric isn't already there
             l << ModAPI::getModLoaderString(Fabric);
         return l;
     }
@@ -98,7 +98,7 @@ class ModrinthAPI : public NetworkModAPI {
 
     inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool
     {
-        return loaders == Unspecified || loaders & (Forge | Fabric | Quilt);
+        return (loaders == Unspecified) || (loaders & (Forge | Fabric | Quilt));
     }
 
 };
-- 
cgit 


From 97a83c9b7a72d37218acfbf5c325245eab0b5b23 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sun, 1 May 2022 18:12:21 +0100
Subject: ATLauncher: Avoid downloading Forge twice for older packs

This resolves a quirk where Forge would still be downloaded for use as
a jarmod, even when we detected Forge as a component.
---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 9dcb3504..991d737c 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -574,8 +574,6 @@ void PackInstallTask::downloadMods()
             jobPtr->addNetAction(dl);
 
             auto path = FS::PathCombine(m_stagingPath, "minecraft", relpath, mod.file);
-            qDebug() << "Will download" << url << "to" << path;
-            modsToCopy[entry->getFullPath()] = path;
 
             if(mod.type == ModType::Forge) {
                 auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
@@ -597,6 +595,10 @@ void PackInstallTask::downloadMods()
                 qDebug() << "Jarmod: " + path;
                 jarmods.push_back(path);
             }
+
+            // Download after Forge handling, to avoid downloading Forge twice.
+            qDebug() << "Will download" << url << "to" << path;
+            modsToCopy[entry->getFullPath()] = path;
         }
     }
 
-- 
cgit 


From c329730de848f9ecf864aa4edbbc650faad7f21a Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sun, 1 May 2022 19:32:34 +0100
Subject: ATLauncher: Install LiteLoader as a component where possible

---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp  | 91 +++++++++++++++++++---
 1 file changed, 80 insertions(+), 11 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 991d737c..e9e3b872 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -1,18 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
- * Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
- * Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
+ *      Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "ATLPackInstallTask.h"
@@ -305,7 +324,55 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
     auto f = std::make_shared<VersionFile>();
     f->name = m_pack + " " + m_version_name + " (libraries)";
 
+    const static QMap<QString, QString> liteLoaderMap = {
+            { "61179803bcd5fb7790789b790908663d", "1.12-SNAPSHOT" },
+            { "1420785ecbfed5aff4a586c5c9dd97eb", "1.12.2-SNAPSHOT" },
+            { "073f68e2fcb518b91fd0d99462441714", "1.6.2_03" },
+            { "10a15b52fc59b1bfb9c05b56de1097d6", "1.6.2_02" },
+            { "b52f90f08303edd3d4c374e268a5acf1", "1.6.2_04" },
+            { "ea747e24e03e24b7cad5bc8a246e0319", "1.6.2_01" },
+            { "55785ccc82c07ff0ba038fe24be63ea2", "1.7.10_01" },
+            { "63ada46e033d0cb6782bada09ad5ca4e", "1.7.10_04" },
+            { "7983e4b28217c9ae8569074388409c86", "1.7.10_03" },
+            { "c09882458d74fe0697c7681b8993097e", "1.7.10_02" },
+            { "db7235aefd407ac1fde09a7baba50839", "1.7.10_00" },
+            { "6e9028816027f53957bd8fcdfabae064", "1.8" },
+            { "5e732dc446f9fe2abe5f9decaec40cde", "1.10-SNAPSHOT" },
+            { "3a98b5ed95810bf164e71c1a53be568d", "1.11.2-SNAPSHOT" },
+            { "ba8e6285966d7d988a96496f48cbddaa", "1.8.9-SNAPSHOT" },
+            { "8524af3ac3325a82444cc75ae6e9112f", "1.11-SNAPSHOT" },
+            { "53639d52340479ccf206a04f5e16606f", "1.5.2_01" },
+            { "1fcdcf66ce0a0806b7ad8686afdce3f7", "1.6.4_00" },
+            { "531c116f71ae2b11033f9a11a0f8e668", "1.6.4_01" },
+            { "4009eeb99c9068f608d3483a6439af88", "1.7.2_03" },
+            { "66f343354b8417abce1a10d557d2c6e9", "1.7.2_04" },
+            { "ab554c21f28fbc4ae9b098bcb5f4cceb", "1.7.2_05" },
+            { "e1d76a05a3723920e2f80a5e66c45f16", "1.7.2_02" },
+            { "00318cb0c787934d523f63cdfe8ddde4", "1.9-SNAPSHOT" },
+            { "986fd1ee9525cb0dcab7609401cef754", "1.9.4-SNAPSHOT" },
+            { "571ad5e6edd5ff40259570c9be588bb5", "1.9.4" },
+            { "1cdd72f7232e45551f16cc8ffd27ccf3", "1.10.2-SNAPSHOT" },
+            { "8a7c21f32d77ee08b393dd3921ced8eb", "1.10.2" },
+            { "b9bef8abc8dc309069aeba6fbbe58980", "1.12.1-SNAPSHOT" }
+    };
+
     for(const auto & lib : m_version.libraries) {
+        // If the library is LiteLoader, we need to ignore it and handle it separately.
+        if (liteLoaderMap.contains(lib.md5)) {
+            auto vlist = APPLICATION->metadataIndex()->get("com.mumfrey.liteloader");
+            if (vlist) {
+                if (!vlist->isLoaded())
+                    vlist->load(Net::Mode::Online);
+
+                auto ver = vlist->getVersion(liteLoaderMap.value(lib.md5));
+                if (ver) {
+                    ver->load(Net::Mode::Online);
+                    componentsToInstall.insert("com.mumfrey.liteloader", ver);
+                    continue;
+                }
+            }
+        }
+
         auto libName = detectLibrary(lib);
         GradleSpecifier libSpecifier(libName);
 
@@ -579,6 +646,8 @@ void PackInstallTask::downloadMods()
                 auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
                 if(vlist)
                 {
+                    if (!vlist->isLoaded())
+                        vlist->load(Net::Mode::Online);
                     auto ver = vlist->getVersion(mod.version);
                     if(ver) {
                         ver->load(Net::Mode::Online);
-- 
cgit 


From f5f59203a203318371fbc5257234b8c2c5eeb300 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sun, 1 May 2022 22:42:29 +0100
Subject: ATLauncher: Reduce boilerplate code for fetching versions

---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp  | 63 +++++++++++-----------
 1 file changed, 31 insertions(+), 32 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index e9e3b872..4b8b8eb0 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -58,6 +58,8 @@
 
 namespace ATLauncher {
 
+static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version);
+
 PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString pack, QString version)
 {
     m_support = support;
@@ -115,19 +117,11 @@ void PackInstallTask::onDownloadSucceeded()
     }
     m_version = version;
 
-    auto vlist = APPLICATION->metadataIndex()->get("net.minecraft");
-    if(!vlist)
-    {
-        emitFailed(tr("Failed to get local metadata index for %1").arg("net.minecraft"));
-        return;
-    }
-
-    auto ver = vlist->getVersion(m_version.minecraft);
+    auto ver = getComponentVersion("net.minecraft", m_version.minecraft);
     if (!ver) {
-        emitFailed(tr("Failed to get local metadata index for '%1' v%2").arg("net.minecraft").arg(m_version.minecraft));
+        emitFailed(tr("Failed to get local metadata index for '%1' v%2").arg("net.minecraft", m_version.minecraft));
         return;
     }
-    ver->load(Net::Mode::Online);
     minecraftVersion = ver;
 
     if(m_version.noConfigs) {
@@ -359,17 +353,10 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
     for(const auto & lib : m_version.libraries) {
         // If the library is LiteLoader, we need to ignore it and handle it separately.
         if (liteLoaderMap.contains(lib.md5)) {
-            auto vlist = APPLICATION->metadataIndex()->get("com.mumfrey.liteloader");
-            if (vlist) {
-                if (!vlist->isLoaded())
-                    vlist->load(Net::Mode::Online);
-
-                auto ver = vlist->getVersion(liteLoaderMap.value(lib.md5));
-                if (ver) {
-                    ver->load(Net::Mode::Online);
-                    componentsToInstall.insert("com.mumfrey.liteloader", ver);
-                    continue;
-                }
+            auto ver = getComponentVersion("com.mumfrey.liteloader", liteLoaderMap.value(lib.md5));
+            if (ver) {
+                componentsToInstall.insert("com.mumfrey.liteloader", ver);
+                continue;
             }
         }
 
@@ -643,17 +630,10 @@ void PackInstallTask::downloadMods()
             auto path = FS::PathCombine(m_stagingPath, "minecraft", relpath, mod.file);
 
             if(mod.type == ModType::Forge) {
-                auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
-                if(vlist)
-                {
-                    if (!vlist->isLoaded())
-                        vlist->load(Net::Mode::Online);
-                    auto ver = vlist->getVersion(mod.version);
-                    if(ver) {
-                        ver->load(Net::Mode::Online);
-                        componentsToInstall.insert("net.minecraftforge", ver);
-                        continue;
-                    }
+                auto ver = getComponentVersion("net.minecraftforge", mod.version);
+                if (ver) {
+                    componentsToInstall.insert("net.minecraftforge", ver);
+                    continue;
                 }
 
                 qDebug() << "Jarmod: " + path;
@@ -850,4 +830,23 @@ void PackInstallTask::install()
     emitSucceeded();
 }
 
+static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version)
+{
+    auto vlist = APPLICATION->metadataIndex()->get(uid);
+    if (!vlist)
+        return {};
+
+    if (!vlist->isLoaded())
+        vlist->load(Net::Mode::Online);
+
+    auto ver = vlist->getVersion(version);
+    if (!ver)
+        return {};
+
+    if (!ver->isLoaded())
+        ver->load(Net::Mode::Online);
+
+    return ver;
+}
+
 }
-- 
cgit 


From c04adf74521127bc50c67f3e2ddd1edfe2330358 Mon Sep 17 00:00:00 2001
From: timoreo <timo.oreo34@gmail.com>
Date: Sat, 21 May 2022 08:31:07 +0200
Subject: Do the url trick on initial modpack download too

---
 launcher/modplatform/flame/FlamePackIndex.cpp | 10 +++++++++-
 launcher/modplatform/flame/FlamePackIndex.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'launcher/modplatform')

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
-- 
cgit 


From 7c251efc473ee90069d1e87a056bde64f1d6fbf7 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Mon, 2 May 2022 20:27:20 +0100
Subject: ATLauncher: Display mod colours in optional mod dialog

---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 2 +-
 launcher/modplatform/atlauncher/ATLPackInstallTask.h   | 2 +-
 launcher/modplatform/atlauncher/ATLPackManifest.cpp    | 6 ++++++
 launcher/modplatform/atlauncher/ATLPackManifest.h      | 6 +++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 4b8b8eb0..90dc1365 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -556,7 +556,7 @@ void PackInstallTask::downloadMods()
     QVector<QString> selectedMods;
     if (!optionalMods.isEmpty()) {
         setStatus(tr("Selecting optional mods..."));
-        selectedMods = m_support->chooseOptionalMods(optionalMods);
+        selectedMods = m_support->chooseOptionalMods(m_version, optionalMods);
     }
 
     setStatus(tr("Downloading mods..."));
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index 783ec19b..6bc30689 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -37,7 +37,7 @@ public:
     /**
      * Requests a user interaction to select which optional mods should be installed.
      */
-    virtual QVector<QString> chooseOptionalMods(QVector<ATLauncher::VersionMod> mods) = 0;
+    virtual QVector<QString> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
 
     /**
      * Requests a user interaction to select a component version from a given version list
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index 40be6d53..a8f2711b 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -178,6 +178,7 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
             p.depends.append(Json::requireString(depends));
         }
     }
+    p.colour = Json::ensureString(obj, QString("colour"), "");
 
     p.client = Json::ensureBoolean(obj, QString("client"), false);
 
@@ -232,4 +233,9 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
         auto configsObj = Json::requireObject(obj, "configs");
         loadVersionConfigs(v.configs, configsObj);
     }
+
+    auto colourObj = Json::ensureObject(obj, "colours");
+    for (const auto &key : colourObj.keys()) {
+        v.colours[key] = Json::requireString(colourObj.value(key), "colour");
+    }
 }
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 673f2f8b..2911107e 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -16,9 +16,10 @@
 
 #pragma once
 
+#include <QJsonObject>
+#include <QMap>
 #include <QString>
 #include <QVector>
-#include <QJsonObject>
 
 namespace ATLauncher
 {
@@ -109,6 +110,7 @@ struct VersionMod
     bool library;
     QString group;
     QVector<QString> depends;
+    QString colour;
 
     bool client;
 
@@ -134,6 +136,8 @@ struct PackVersion
     QVector<VersionLibrary> libraries;
     QVector<VersionMod> mods;
     VersionConfigs configs;
+
+    QMap<QString, QString> colours;
 };
 
 void loadVersion(PackVersion & v, QJsonObject & obj);
-- 
cgit 


From 305973c0e7c07693a8b08d1908e64fc4986e13e0 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Thu, 5 May 2022 20:14:19 +0100
Subject: ATLauncher: Display install messages if applicable

---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp  |  7 ++-
 .../modplatform/atlauncher/ATLPackInstallTask.h    | 45 ++++++++++++++-----
 .../modplatform/atlauncher/ATLPackManifest.cpp     | 50 +++++++++++++++++-----
 launcher/modplatform/atlauncher/ATLPackManifest.h  | 46 +++++++++++++++-----
 4 files changed, 114 insertions(+), 34 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 90dc1365..9b14f355 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -95,14 +95,13 @@ void PackInstallTask::onDownloadSucceeded()
     qDebug() << "PackInstallTask::onDownloadSucceeded: " << QThread::currentThreadId();
     jobPtr.reset();
 
-    QJsonParseError parse_error;
+    QJsonParseError parse_error {};
     QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
     if(parse_error.error != QJsonParseError::NoError) {
         qWarning() << "Error while parsing JSON response from FTB at " << parse_error.offset << " reason: " << parse_error.errorString();
         qWarning() << response;
         return;
     }
-
     auto obj = doc.object();
 
     ATLauncher::PackVersion version;
@@ -117,6 +116,10 @@ void PackInstallTask::onDownloadSucceeded()
     }
     m_version = version;
 
+    // Display install message if one exists
+    if (!m_version.messages.install.isEmpty())
+        m_support->displayMessage(m_version.messages.install);
+
     auto ver = getComponentVersion("net.minecraft", m_version.minecraft);
     if (!ver) {
         emitFailed(tr("Failed to get local metadata index for '%1' v%2").arg("net.minecraft", m_version.minecraft));
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index 6bc30689..f0af4e3a 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -1,18 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
- * Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
- * Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
+ *      Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
@@ -45,6 +64,10 @@ public:
      */
     virtual QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) = 0;
 
+    /**
+     * Requests a user interaction to display a message.
+     */
+    virtual void displayMessage(QString message) = 0;
 };
 
 class PackInstallTask : public InstanceTask
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index a8f2711b..259c170c 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -1,18 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
- * Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
- * Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
+ *      Copyright 2021 Petr Mrazek <peterix@gmail.com>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "ATLPackManifest.h"
@@ -186,6 +205,12 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
     p.effectively_hidden = p.hidden || p.library;
 }
 
+static void loadVersionMessages(ATLauncher::VersionMessages& m, QJsonObject& obj)
+{
+    m.install = Json::ensureString(obj, "install", "");
+    m.update = Json::ensureString(obj, "update", "");
+}
+
 void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
 {
     v.version = Json::requireString(obj, "version");
@@ -238,4 +263,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
     for (const auto &key : colourObj.keys()) {
         v.colours[key] = Json::requireString(colourObj.value(key), "colour");
     }
+
+    auto messages = Json::ensureObject(obj, "messages");
+    loadVersionMessages(v.messages, messages);
 }
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 2911107e..931a11dc 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -1,17 +1,36 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
- * Copyright 2020 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
@@ -124,6 +143,12 @@ struct VersionConfigs
     QString sha1;
 };
 
+struct VersionMessages
+{
+    QString install;
+    QString update;
+};
+
 struct PackVersion
 {
     QString version;
@@ -138,6 +163,7 @@ struct PackVersion
     VersionConfigs configs;
 
     QMap<QString, QString> colours;
+    VersionMessages messages;
 };
 
 void loadVersion(PackVersion & v, QJsonObject & obj);
-- 
cgit 


From b84d52be3d1109efc2c9e35304831314050bd398 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Thu, 5 May 2022 20:58:12 +0100
Subject: ATLauncher: Display warnings when selecting optional mods

---
 launcher/modplatform/atlauncher/ATLPackManifest.cpp | 6 ++++++
 launcher/modplatform/atlauncher/ATLPackManifest.h   | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index 259c170c..d01ec32c 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -198,6 +198,7 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
         }
     }
     p.colour = Json::ensureString(obj, QString("colour"), "");
+    p.warning = Json::ensureString(obj, QString("warning"), "");
 
     p.client = Json::ensureBoolean(obj, QString("client"), false);
 
@@ -264,6 +265,11 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
         v.colours[key] = Json::requireString(colourObj.value(key), "colour");
     }
 
+    auto warningsObj = Json::ensureObject(obj, "warnings");
+    for (const auto &key : warningsObj.keys()) {
+        v.warnings[key] = Json::requireString(warningsObj.value(key), "warning");
+    }
+
     auto messages = Json::ensureObject(obj, "messages");
     loadVersionMessages(v.messages, messages);
 }
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 931a11dc..23e162e3 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -130,6 +130,7 @@ struct VersionMod
     QString group;
     QVector<QString> depends;
     QString colour;
+    QString warning;
 
     bool client;
 
@@ -163,6 +164,7 @@ struct PackVersion
     VersionConfigs configs;
 
     QMap<QString, QString> colours;
+    QMap<QString, QString> warnings;
     VersionMessages messages;
 };
 
-- 
cgit 


From cb69869836d2b4ed4b50a43694e95c4a801332f7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 May 2022 22:04:24 +0200
Subject: revert: remove CurseForge workaround

We have been asked by CurseForge to remove this workaround as it
violates their terms of service. This is just a partial revert, as the
UI changes were otherwise unrelated.

This reverts commit 92e8aaf36f72b7527322add169b253d0698939d0, reversing
changes made to 88a93945d4c9a11bf53016133335d359b819585e.
---
 launcher/modplatform/flame/FileResolvingTask.cpp | 16 +---------------
 launcher/modplatform/flame/FlameModIndex.cpp     |  9 +--------
 launcher/modplatform/flame/PackManifest.cpp      | 15 +++++----------
 3 files changed, 7 insertions(+), 33 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 0deb99c4..95924a68 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -31,21 +31,7 @@ void Flame::FileResolvingTask::netJobFinished()
     for (auto& bytes : results) {
         auto& out = m_toProcess.files[index];
         try {
-            bool fail = (!out.parseFromBytes(bytes));
-            if(fail){
-                //failed :( probably disabled mod, try to add to the list
-                auto doc = Json::requireDocument(bytes);
-                if (!doc.isObject()) {
-                    throw JSONValidationError(QString("data is not an object? that's not supposed to happen"));
-                }
-                auto obj = Json::ensureObject(doc.object(), "data");
-                //FIXME : HACK, MAY NOT WORK FOR LONG
-                out.url = QUrl(QString("https://media.forgecdn.net/files/%1/%2/%3")
-                        .arg(QString::number(QString::number(out.fileId).leftRef(4).toInt())
-                             ,QString::number(QString::number(out.fileId).rightRef(3).toInt())
-                             ,QUrl::toPercentEncoding(out.fileName)), QUrl::TolerantMode);
-            }
-            failed &= fail;
+            failed &= (!out.parseFromBytes(bytes));
         } catch (const JSONValidationError& e) {
             qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:";
             qCritical() << e.cause();
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 9846b156..ba0824cf 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -56,15 +56,8 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         file.fileId = Json::requireInteger(obj, "id");
         file.date = Json::requireString(obj, "fileDate");
         file.version = Json::requireString(obj, "displayName");
+        file.downloadUrl = Json::requireString(obj, "downloadUrl");
         file.fileName = Json::requireString(obj, "fileName");
-        file.downloadUrl = Json::ensureString(obj, "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.toInt()).leftRef(4).toInt())
-                                           ,QString::number(QString::number(file.fileId.toInt()).rightRef(3).toInt())
-                                           ,QUrl::toPercentEncoding(file.fileName));
-        }
 
         unsortedVersions.append(file);
     }
diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index 3217a756..e4f90c1a 100644
--- a/launcher/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
@@ -71,6 +71,11 @@ bool Flame::File::parseFromBytes(const QByteArray& bytes)
 
     fileName = Json::requireString(obj, "fileName");
 
+    QString rawUrl = Json::requireString(obj, "downloadUrl");
+    url = QUrl(rawUrl, QUrl::TolerantMode);
+    if (!url.isValid()) {
+        throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
+    }
     // This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience
     // It is also optional
     type = File::Type::SingleFile;
@@ -82,17 +87,7 @@ bool Flame::File::parseFromBytes(const QByteArray& bytes)
         // this is probably a mod, dunno what else could modpacks download
         targetFolder = "mods";
     }
-    QString rawUrl = Json::ensureString(obj, "downloadUrl");
 
-    if(rawUrl.isEmpty()){
-        //either there somehow is an emtpy string as a link, or it's null either way it's invalid
-        //soft failing
-        return false;
-    }
-    url = QUrl(rawUrl, QUrl::TolerantMode);
-    if (!url.isValid()) {
-        throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
-    }
     resolved = true;
     return true;
 }
-- 
cgit 


From f28a0aa666565354e657dec59249aa1fd237cdb0 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Mon, 23 May 2022 19:42:04 +0100
Subject: ATLauncher: Handle main class depends

---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp    | 20 +++++++++++++++++---
 launcher/modplatform/atlauncher/ATLPackManifest.cpp  |  8 +++++++-
 launcher/modplatform/atlauncher/ATLPackManifest.h    |  8 +++++++-
 3 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 9b14f355..e6fd1334 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -414,10 +414,24 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
 
 bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<PackProfile> profile)
 {
-    if(m_version.mainClass == QString() && m_version.extraArguments == QString()) {
+    if (m_version.mainClass.mainClass.isEmpty() && m_version.extraArguments.isEmpty()) {
         return true;
     }
 
+    auto mainClass = m_version.mainClass.mainClass;
+
+    auto hasMainClassDepends = !m_version.mainClass.depends.isEmpty();
+    if (hasMainClassDepends) {
+        QSet<QString> mods;
+        for (const auto& item : m_version.mods) {
+            mods.insert(item.name);
+        }
+
+        if (hasMainClassDepends && !mods.contains(m_version.mainClass.depends)) {
+            mainClass = "";
+        }
+    }
+
     auto uuid = QUuid::createUuid();
     auto id = uuid.toString().remove('{').remove('}');
     auto target_id = "org.multimc.atlauncher." + id;
@@ -442,8 +456,8 @@ bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<
 
     auto f = std::make_shared<VersionFile>();
     f->name = m_pack + " " + m_version_name;
-    if(m_version.mainClass != QString() && !mainClasses.contains(m_version.mainClass)) {
-        f->mainClass = m_version.mainClass;
+    if (!mainClass.isEmpty() && !mainClasses.contains(mainClass)) {
+        f->mainClass = mainClass;
     }
 
     // Parse out tweakers
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index d01ec32c..cec9896b 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -212,6 +212,12 @@ static void loadVersionMessages(ATLauncher::VersionMessages& m, QJsonObject& obj
     m.update = Json::ensureString(obj, "update", "");
 }
 
+static void loadVersionMainClass(ATLauncher::PackVersionMainClass& m, QJsonObject& obj)
+{
+    m.mainClass = Json::ensureString(obj, "mainClass", "");
+    m.depends = Json::ensureString(obj, "depends", "");
+}
+
 void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
 {
     v.version = Json::requireString(obj, "version");
@@ -220,7 +226,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
 
     if(obj.contains("mainClass")) {
         auto main = Json::requireObject(obj, "mainClass");
-        v.mainClass = Json::ensureString(main, "mainClass", "");
+        loadVersionMainClass(v.mainClass, main);
     }
 
     if(obj.contains("extraArguments")) {
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 23e162e3..bf88d91d 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -150,12 +150,18 @@ struct VersionMessages
     QString update;
 };
 
+struct PackVersionMainClass
+{
+    QString mainClass;
+    QString depends;
+};
+
 struct PackVersion
 {
     QString version;
     QString minecraft;
     bool noConfigs;
-    QString mainClass;
+    PackVersionMainClass mainClass;
     QString extraArguments;
 
     VersionLoader loader;
-- 
cgit 


From 101ca60b2bb1d3c3047bc5842461c68d05708e39 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Mon, 23 May 2022 20:14:23 +0100
Subject: ATLauncher: Handle extra arguments depends

---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 16 +++++++++++++---
 launcher/modplatform/atlauncher/ATLPackManifest.cpp    |  8 +++++++-
 launcher/modplatform/atlauncher/ATLPackManifest.h      |  8 +++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index e6fd1334..b2dda4e4 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -414,14 +414,16 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
 
 bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<PackProfile> profile)
 {
-    if (m_version.mainClass.mainClass.isEmpty() && m_version.extraArguments.isEmpty()) {
+    if (m_version.mainClass.mainClass.isEmpty() && m_version.extraArguments.arguments.isEmpty()) {
         return true;
     }
 
     auto mainClass = m_version.mainClass.mainClass;
+    auto extraArguments = m_version.extraArguments.arguments;
 
     auto hasMainClassDepends = !m_version.mainClass.depends.isEmpty();
-    if (hasMainClassDepends) {
+    auto hasExtraArgumentsDepends = !m_version.extraArguments.depends.isEmpty();
+    if (hasMainClassDepends || hasExtraArgumentsDepends) {
         QSet<QString> mods;
         for (const auto& item : m_version.mods) {
             mods.insert(item.name);
@@ -430,6 +432,14 @@ bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<
         if (hasMainClassDepends && !mods.contains(m_version.mainClass.depends)) {
             mainClass = "";
         }
+
+        if (hasExtraArgumentsDepends && !mods.contains(m_version.extraArguments.depends)) {
+            extraArguments = "";
+        }
+    }
+
+    if (mainClass.isEmpty() && extraArguments.isEmpty()) {
+        return true;
     }
 
     auto uuid = QUuid::createUuid();
@@ -461,7 +471,7 @@ bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<
     }
 
     // Parse out tweakers
-    auto args = m_version.extraArguments.split(" ");
+    auto args = extraArguments.split(" ");
     QString previous;
     for(auto arg : args) {
         if(arg.startsWith("--tweakClass=") || previous == "--tweakClass") {
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index cec9896b..3af02a09 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
@@ -218,6 +218,12 @@ static void loadVersionMainClass(ATLauncher::PackVersionMainClass& m, QJsonObjec
     m.depends = Json::ensureString(obj, "depends", "");
 }
 
+static void loadVersionExtraArguments(ATLauncher::PackVersionExtraArguments& a, QJsonObject& obj)
+{
+    a.arguments = Json::ensureString(obj, "arguments", "");
+    a.depends = Json::ensureString(obj, "depends", "");
+}
+
 void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
 {
     v.version = Json::requireString(obj, "version");
@@ -231,7 +237,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
 
     if(obj.contains("extraArguments")) {
         auto arguments = Json::requireObject(obj, "extraArguments");
-        v.extraArguments = Json::ensureString(arguments, "arguments", "");
+        loadVersionExtraArguments(v.extraArguments, arguments);
     }
 
     if(obj.contains("loader")) {
diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index bf88d91d..43510c50 100644
--- a/launcher/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -156,13 +156,19 @@ struct PackVersionMainClass
     QString depends;
 };
 
+struct PackVersionExtraArguments
+{
+    QString arguments;
+    QString depends;
+};
+
 struct PackVersion
 {
     QString version;
     QString minecraft;
     bool noConfigs;
     PackVersionMainClass mainClass;
-    QString extraArguments;
+    PackVersionExtraArguments extraArguments;
 
     VersionLoader loader;
     QVector<VersionLibrary> libraries;
-- 
cgit 


From 4ee5264e24e21d89185d424072dc39cb6b2dd10f Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Mon, 23 May 2022 21:37:09 +0100
Subject: ATLauncher: Delete files from configs if they conflict with a mod

---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index b2dda4e4..62c7bf6d 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -781,6 +781,17 @@ bool PackInstallTask::extractMods(
     for (auto iter = toCopy.begin(); iter != toCopy.end(); iter++) {
         auto &from = iter.key();
         auto &to = iter.value();
+
+        // If the file already exists, assume the mod is the correct copy - and remove
+        // the copy from the Configs.zip
+        QFileInfo fileInfo(to);
+        if (fileInfo.exists()) {
+            if (!QFile::remove(to)) {
+                qWarning() << "Failed to delete" << to;
+                return false;
+            }
+        }
+
         FS::copy fileCopyOperation(from, to);
         if(!fileCopyOperation()) {
             qWarning() << "Failed to copy" << from << "to" << to;
-- 
cgit 


From 938cae1130464fcedaa776d9f54898dece14f9a7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 25 May 2022 23:04:49 +0200
Subject: revert: remove CurseForge workaround for packs too

Partial revert. Handles missing download URLs.
---
 launcher/modplatform/flame/FlamePackIndex.cpp | 12 ++++--------
 launcher/modplatform/flame/FlamePackIndex.h   |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index 6d48a3bf..bece7843 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -65,16 +65,12 @@ 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.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));
+
+        // only add if we have a download URL (third party distribution is enabled)
+        if (!file.downloadUrl.isEmpty()) {
+            unsortedVersions.append(file);
         }
-        unsortedVersions.append(file);
     }
 
     auto orderSortPredicate = [](const IndexedVersion& a, const IndexedVersion& b) -> bool { return a.fileId > b.fileId; };
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index a8bb15be..7ffa29c3 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -18,7 +18,6 @@ struct IndexedVersion {
     QString version;
     QString mcVersion;
     QString downloadUrl;
-    QString fileName;
 };
 
 struct IndexedPack
-- 
cgit