Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

101 files changed, 2172 insertions, 2747 deletions

diff --git a/launcher/ui/pages/BasePage.h b/launcher/ui/pages/BasePage.h
index 5537c28f..d35206a0 100644
--- a/launcher/ui/pages/BasePage.h
+++ b/launcher/ui/pages/BasePage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,7 @@
 
 class BasePage {
    public:
-    using updateExtraInfoFunc = std::function<void(QString)>;
+    using updateExtraInfoFunc = std::function<void(QString, QString)>;
     virtual ~BasePage() {}
     virtual QString id() const = 0;
     virtual QString displayName() const = 0;
diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index b41fe12a..b750e827 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -2,9 +2,8 @@
 
 class BasePage;
 
-class BasePageContainer
-{
-public:
+class BasePageContainer {
+   public:
     virtual ~BasePageContainer(){};
     virtual bool selectPage(QString pageId) = 0;
     virtual BasePage* getPage(QString pageId) { return nullptr; };
diff --git a/launcher/ui/pages/BasePageProvider.h b/launcher/ui/pages/BasePageProvider.h
index 873e8dce..4c3ecd6c 100644
--- a/launcher/ui/pages/BasePageProvider.h
+++ b/launcher/ui/pages/BasePageProvider.h
@@ -15,54 +15,43 @@
 
 #pragma once
 
-#include "ui/pages/BasePage.h"
-#include <memory>
 #include <functional>
+#include <memory>
+#include "ui/pages/BasePage.h"
 
-class BasePageProvider
-{
-public:
-    virtual QList<BasePage *> getPages() = 0;
+class BasePageProvider {
+   public:
+    virtual QList<BasePage*> getPages() = 0;
     virtual QString dialogTitle() = 0;
 };
 
-class GenericPageProvider : public BasePageProvider
-{
-    typedef std::function<BasePage *()> PageCreator;
-public:
-    explicit GenericPageProvider(const QString &dialogTitle)
-        : m_dialogTitle(dialogTitle)
-    {
-    }
+class GenericPageProvider : public BasePageProvider {
+    typedef std::function<BasePage*()> PageCreator;
+
+   public:
+    explicit GenericPageProvider(const QString& dialogTitle) : m_dialogTitle(dialogTitle) {}
     virtual ~GenericPageProvider() {}
 
-    QList<BasePage *> getPages() override
+    QList<BasePage*> getPages() override
     {
-        QList<BasePage *> pages;
-        for (PageCreator creator : m_creators)
-        {
+        QList<BasePage*> pages;
+        for (PageCreator creator : m_creators) {
             pages.append(creator());
         }
         return pages;
     }
     QString dialogTitle() override { return m_dialogTitle; }
 
-    void setDialogTitle(const QString &title)
-    {
-        m_dialogTitle = title;
-    }
-    void addPageCreator(PageCreator page)
-    {
-        m_creators.append(page);
-    }
+    void setDialogTitle(const QString& title) { m_dialogTitle = title; }
+    void addPageCreator(PageCreator page) { m_creators.append(page); }
 
-    template<typename PageClass>
+    template <typename PageClass>
     void addPage()
     {
-        addPageCreator([](){return new PageClass();});
+        addPageCreator([]() { return new PageClass(); });
     }
 
-private:
+   private:
     QList<PageCreator> m_creators;
     QString m_dialogTitle;
 };
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index dca1b3a6..82aa76a4 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -39,37 +39,30 @@
 #include "APIPage.h"
 #include "ui_APIPage.h"
 
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTabBar>
 #include <QValidator>
 #include <QVariant>
 
-#include "settings/SettingsObject.h"
-#include "tools/BaseProfiler.h"
 #include "Application.h"
-#include "net/PasteUpload.h"
 #include "BuildConfig.h"
+#include "net/PasteUpload.h"
+#include "settings/SettingsObject.h"
+#include "tools/BaseProfiler.h"
 
-APIPage::APIPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::APIPage)
+APIPage::APIPage(QWidget* parent) : QWidget(parent), ui(new Ui::APIPage)
 {
     // This is here so you can reorder the entries in the combobox without messing stuff up
-    int comboBoxEntries[] = {
-        PasteUpload::PasteType::Mclogs,
-        PasteUpload::PasteType::NullPointer,
-        PasteUpload::PasteType::PasteGG,
-        PasteUpload::PasteType::Hastebin
-    };
+    int comboBoxEntries[] = { PasteUpload::PasteType::Mclogs, PasteUpload::PasteType::NullPointer, PasteUpload::PasteType::PasteGG,
+                              PasteUpload::PasteType::Hastebin };
 
     static QRegularExpression validUrlRegExp("https?://.+");
-    static QRegularExpression validMSAClientID(QRegularExpression::anchoredPattern(
-                "[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"));
-    static QRegularExpression validFlameKey(QRegularExpression::anchoredPattern(
-                "\\$2[ayb]\\$.{56}"));
+    static QRegularExpression validMSAClientID(
+        QRegularExpression::anchoredPattern("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"));
+    static QRegularExpression validFlameKey(QRegularExpression::anchoredPattern("\\$2[ayb]\\$.{56}"));
 
     ui->setupUi(this);
 
@@ -77,10 +70,12 @@ APIPage::APIPage(QWidget *parent) :
         ui->pasteTypeComboBox->addItem(PasteUpload::PasteTypes.at(pasteType).name, pasteType);
     }
 
-    void (QComboBox::*currentIndexChangedSignal)(int) (&QCom