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

43 files changed, 852 insertions, 703 deletions

diff --git a/launcher/ui/pages/modplatform/CustomPage.cpp b/launcher/ui/pages/modplatform/CustomPage.cpp
index e164171a..4ac21b01 100644
--- a/launcher/ui/pages/modplatform/CustomPage.cpp
+++ b/launcher/ui/pages/modplatform/CustomPage.cpp
@@ -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
@@ -46,8 +46,7 @@
 #include "minecraft/VanillaInstanceCreationTask.h"
 #include "ui/dialogs/NewInstanceDialog.h"
 
-CustomPage::CustomPage(NewInstanceDialog *dialog, QWidget *parent)
-    : QWidget(parent), dialog(dialog), ui(new Ui::CustomPage)
+CustomPage::CustomPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), dialog(dialog), ui(new Ui::CustomPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -68,19 +67,15 @@ CustomPage::CustomPage(NewInstanceDialog *dialog, QWidget *parent)
     connect(ui->quiltFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
     connect(ui->liteLoaderFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
     connect(ui->loaderRefreshBtn, &QPushButton::clicked, this, &CustomPage::loaderRefresh);
-
 }
 
 void CustomPage::openedImpl()
 {
-    if(!initialized)
-    {
+    if (!initialized) {
         auto vlist = APPLICATION->metadataIndex()->get("net.minecraft");
         ui->versionList->initialize(vlist.get());
         initialized = true;
-    }
-    else
-    {
+    } else {
         suggestCurrent();
     }
 }
@@ -92,7 +87,7 @@ void CustomPage::refresh()
 
 void CustomPage::loaderRefresh()
 {
-    if(ui->noneFilter->isChecked())
+    if (ui->noneFilter->isChecked())
         return;
     ui->loaderVersionList->loadList();
 }
@@ -100,17 +95,17 @@ void CustomPage::loaderRefresh()
 void CustomPage::filterChanged()
 {
     QStringList out;
-    if(ui->alphaFilter->isChecked())
+    if (ui->alphaFilter->isChecked())
         out << "(old_alpha)";
-    if(ui->betaFilter->isChecked())
+    if (ui->betaFilter->isChecked())
         out << "(old_beta)";
-    if(ui->snapshotFilter->isChecked())
+    if (ui->snapshotFilter->isChecked())
         out << "(snapshot)";
-    if(ui->oldSnapshotFilter->isChecked())
+    if (ui->oldSnapshotFilter->isChecked())
         out << "(old_snapshot)";
-    if(ui->releaseFilter->isChecked())
+    if (ui->releaseFilter->isChecked())
         out << "(release)";
-    if(ui->experimentsFilter->isChecked())
+    if (ui->experimentsFilter->isChecked())
         out << "(experiment)";
     auto regexp = out.join('|');
     ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false));
@@ -119,49 +114,37 @@ void CustomPage::filterChanged()
 void CustomPage::loaderFilterChanged()
 {
     QString minecraftVersion;
-    if (m_selectedVersion)
-    {
+    if (m_selectedVersion) {
         minecraftVersion = m_selectedVersion->descriptor();
-    }
-    else
-    {
-        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // empty list
+    } else {
+        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // empty list
         ui->loaderVersionList->setEmptyString(tr("No Minecraft version is selected."));
         ui->loaderVersionList->setEmptyMode(VersionListView::String);
         return;
     }
-    if(ui->noneFilter->isChecked())
-    {
-        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // empty list
+    if (ui->noneFilter->isChecked()) {
+        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // empty list
         ui->loaderVersionList->setEmptyString(tr("No mod loader is selected."));
         ui->loaderVersionList->setEmptyMode(VersionListView::String);
         return;
-    }
-    else if(ui->forgeFilter->isChecked())
-    {
+    } else if (ui->forgeFilter->isChecked()) {
         ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
         m_selectedLoader = "net.minecraftforge";
-    }
-    else if(ui->fabricFilter->isChecked())
-    {
+    } else if (ui->fabricFilter->isChecked()) {
         // FIXME: dirty hack because the launcher is unaware of Fabric's dependencies
-        if (Version(minecraftVersion) >= Version("1.14")) // Fabric/Quilt supported
+        if (Version(minecraftVersion) >= Version("1.14"))  // Fabric/Quilt supported
             ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "");
-        else // Fabric/Quilt unsupported
-            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // clear list
+        else                                                                                   // Fabric/Quilt unsupported
+            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // clear list
         m_selectedLoader = "net.fabricmc.fabric-loader";
-    }
-    else if(ui->quiltFilter->isChecked())
-    {
+    } else if (ui->quiltFilter->isChecked()) {
         // FIXME: dirty hack because the launcher is unaware of Quilt's dependencies (same as Fabric)
-        if (Version(minecraftVersion) >= Version("1.14")) // Fabric/Quilt supported
+        if (Version(minecraftVersion) >= Version("1.14"))  // Fabric/Quilt supported
             ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "");
-        else // Fabric/Quilt unsupported
-            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // clear list
+        else                                                                                   // Fabric/Quilt unsupported
+            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // clear list
         m_selectedLoader = "org.quiltmc.quilt-loader";
-    }
-    else if(ui->liteLoaderFilter->isChecked())
-    {
+    } else if (ui->liteLoaderFilter->isChecked()) {
         ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
         m_selectedLoader = "com.mumfrey.liteloader";
     }
@@ -204,25 +187,21 @@ QString CustomPage::selectedLoader() const
 
 void CustomPage::suggestCurrent()
 {
-    if (!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-        
-    if(!m_selectedVersion)
-    {
+
+    if (!m_selectedVersion) {
         dialog->setSuggestedPack();
         return;
     }
 
     // There isn't a selected version if the version list is empty
-    if(ui->loaderVersionList->selectedVersion() == nullptr)
+    if (ui->loaderVersionList->selectedVersion() == nullptr)
         dialog->setSuggestedPack(m_selectedVersion->descriptor(), new VanillaCreationTask(m_selectedVersion));
-    else
-    {
+    else {
         dialog->setSuggestedPack(m_selectedVersion->descriptor(),
-                                 new VanillaCreationTask(m_selectedVersion, m_selectedLoader,
-                                                          m_selectedLoaderVersion));
+                                 new VanillaCreationTask(m_selectedVersion, m_selectedLoader, m_selectedLoaderVersion));
     }
     dialog->setSuggestedIcon("default");
 }
diff --git a/launcher/ui/pages/modplatform/CustomPage.h b/launcher/ui/pages/modplatform/CustomPage.h
index 8b5a5011..c5d6d5af 100644
--- a/launcher/ui/pages/modplatform/CustomPage.h
+++ b/launcher/ui/pages/modplatform/CustomPage.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
@@ -37,40 +37,26 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class CustomPage;
 }
 
 class NewInstanceDialog;
 
-class CustomPage : public QWidget, public BasePage
-{
+class CustomPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit CustomPage(NewInstanceDialog *dialog, QWidget *parent = 0);
+   public:
+    explicit CustomPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~CustomPage();
-    virtual QString displayName() const override
-    {
-        return tr("Custom");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("minecraft");
-    }
-    virtual QString id() const override
-    {
-        return "vanilla";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Vanilla-platform";
-    }
+    virtual QString displayName() const override { return tr("Custom"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    virtual QString id() const override { return "vanilla"; }
+    virtual QString helpPage() const override { return "Vanilla-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -80,23 +66,23 @@ public:
     BaseVersion::Ptr selectedLoaderVersion() const;
     QString selectedLoader() const;
 
-public slots:
+   public slots:
     void setSelectedVersion(BaseVersion::Ptr version);
     void setSelectedLoaderVersion(BaseVersion::Ptr version);
 
-private slots:
+   private slots:
     void filterChanged();
     void loaderFilterChanged();
 
-private:
+   private:
     void refresh();
     void loaderRefresh();
     void suggestCurrent();
 
-private:
+   private:
     bool initialized = false;
-    NewInstanceDialog *dialog = nullptr;
-    Ui::CustomPage *ui = nullptr;
+    NewInstanceDialog* dialog = nullptr;
+    Ui::CustomPage* ui = nullptr;
     bool m_versionSetByUser = false;
     BaseVersion::Ptr m_selectedVersion;
     BaseVersion::Ptr m_selectedLoaderVersion;
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index 30196aad..ba53d033 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -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>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -44,32 +44,24 @@
 
 #include "InstanceImportTask.h"
 
-
-class UrlValidator : public QValidator
-{
-public:
+class UrlValidator : public QValidator {
+   public:
     using QValidator::QValidator;
 
-    State validate(QString &in, int &pos) const
+    State validate(QString& in, int& pos) const
     {
         const QUrl url(in);
-        if (url.isValid() && !url.isRelative() && !url.isEmpty())
-        {
+        if (url.isValid() && !url.isRelative() && !url.isEmpty()) {
             return Acceptable;
-        }
-        else if (QFile::exists(in))
-        {
+        } else if (QFile::exists(in)) {
             return Acceptable;
-        }
-        else
-        {
+        } else {
             return Intermediate;
         }
     }
 };
 
-ImportPage::ImportPage(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::ImportPage), dialog(dialog)
+ImportPage::ImportPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::ImportPage), dialog(dialog)
 {
     ui->setupUi(this);
     ui->modpackEdit->setValidator(new UrlValidator(ui->modpackEdit));
@@ -98,16 +90,13 @@ void ImportPage::openedImpl()
 
 void ImportPage::updateState()
 {
-    if(!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-    if(ui->modpackEdit->hasAcceptableInput())
-    {
+    if (ui->modpackEdit->hasAcceptableInput()) {
         QString input = ui->modpackEdit->text();
         auto url = QUrl::fromUserInput(input);
-        if(url.isLocalFile())
-        {
+        if (url.isLocalFile()) {
             // FIXME: actually do some validation of what's inside here... this is fake AF
             QFileInfo fi(input);
 
@@ -116,28 +105,23 @@ void ImportPage::updateState()
             // mrpack is a modrinth pack
             bool isMRPack = fi.suffix() == "mrpack";
 
-            if(fi.exists() && (isZip || isMRPack))
-            {
+            if (fi.exists() && (isZip || isMRPack)) {
                 QFileInfo fi(url.fileName());
-                dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url,this));
+                dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this));
                 dialog->setSuggestedIcon("default");
             }
-        }
-        else
-        {
-            if(input.endsWith("?client=y")) {
+        } else {
+            if (input.endsWith("?client=y")) {
                 input.chop(9);
                 input.append("/file");
                 url = QUrl::fromUserInput(input);
             }
             // hook, line and sinker.
             QFileInfo fi(url.fileName());
-            dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url,this));
+            dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this));
             dialog->setSuggestedIcon("default");
         }
-    }
-    else
-    {
+    } else {
         dialog->setSuggestedPack();
     }
 }
@@ -154,29 +138,21 @@ void ImportPage::on_modpackBtn_clicked()
     //: Option for filtering for *.mrpack files when importing
     filter += ";;" + tr("Modrinth pack") + " (*.mrpack)";
     const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), filter);
-    if (url.isValid())
-    {
-        if (url.isLocalFile())
-        {
+    if (url.isValid()) {
+        if (url.isLocalFile()) {
             ui->modpackEdit->setText(url.toLocalFile());
-        }
-        else
-        {
+        } else {
             ui->modpackEdit->setText(url.toString());
         }
     }
 }
 
-
 QUrl ImportPage::modpackUrl() const
 {
     const QUrl url(ui->modpackEdit->text());
-    if (url.isValid() && !url.isRelative() && !url.host().isEmpty())
-    {
+    if (url.isValid() && !url.isRelative() && !url.host().isEmpty()) {
         return url;
-    }
-    else
-    {
+    } else {
         return QUrl::fromLocalFile(ui->modpackEdit->text());
     }
 }
diff --git a/launcher/ui/pages/modplatform/ImportPage.h b/launcher/ui/pages/modplatform/ImportPage.h
index c2acb92d..d846d566 100644
--- a/launcher/ui/pages/modplatform/ImportPage.h
+++ b/launcher/ui/pages/modplatform/ImportPage.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
@@ -37,55 +37,40 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class ImportPage;
 }
 
 class NewInstanceDialog;
 
-class ImportPage : public QWidget, public BasePage
-{
+class ImportPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ImportPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit ImportPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~ImportPage();
-    virtual QString displayName() const override
-    {
-        return tr("Import");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("viewfolder");
-    }
-    virtual QString id() const override
-    {
-        return "import";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Zip-import";
-    }
+    virtual QString displayName() const override { return tr("Import"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("viewfolder"); }
+    virtual QString id() const override { return "import"; }
+    virtual QString helpPage() const override { return "Zip-import"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
-    void setUrl(const QString & url);
+    void setUrl(const QString& url);
     void openedImpl() override;
 
-private slots:
+   private slots:
     void on_modpackBtn_clicked();
     void updateState();
 
-private:
+   private:
     QUrl modpackUrl() const;
 
-private:
-    Ui::ImportPage *ui = nullptr;
+   private:
+    Ui::ImportPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
 };
-
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.cpp b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
index 52fb4802..2a4d0281 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
@@ -13,8 +13,7 @@
 
 namespace ResourceDownload {
 
-ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance)
-    : ResourcePage(dialog, instance)
+ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
     connect(m_ui->searchButton, &QPushButton::clicked, this, &ResourcePackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ResourcePackResourcePage::onResourceSelected);
@@ -38,7 +37,8 @@ QMap<QString, QString> ResourcePackResourcePage::urlHandlers() const
 {
     QMap<QString, QString> map;
     map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/resourcepack\\/([^\\/]+)\\/?"), "modrinth");
-    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/texture-packs\\/([^\\/]+)\\/?"), "curseforge");
+    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/texture-packs\\/([^\\/]+)\\/?"),
+               "curseforge");
     map.insert(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"), "curseforge");
     return map;
 }
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.h b/launcher/ui/pages/modplatform/ResourcePackPage.h
index 8c5cf08b..6015aec0 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.h
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "ui/pages/modplatform/ResourcePage.h"
 #include "ui/pages/modplatform/ResourcePackModel.h"
+#include "ui/pages/modplatform/ResourcePage.h"
 
 namespace Ui {
 class ResourcePage;
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index aab2ee89..48afbd90 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -104,6 +104,7 @@ void ResourcePage::openedImpl()
 
     updateSelectionButton();
     triggerSearch();
+    m_ui->searchEdit->setFocus();
 }
 
 auto ResourcePage::eventFilter(QObject* watched, QEvent* event) -> bool
diff --git a/launcher/ui/pages/modplatform/TexturePackPage.h b/launcher/ui/pages/modplatform/TexturePackPage.h
index 0bdce2f9..948e5286 100644
--- a/launcher/ui/pages/modplatform/TexturePackPage.h
+++ b/launcher/ui/pages/modplatform/TexturePackPage.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "ui_ResourcePage.h"
 #include "ui/dialogs/ResourceDownloadDialog.h"
 #include "ui/pages/modplatform/ResourcePackPage.h"
 #include "ui/pages/modplatform/TexturePackModel.h"
+#include "ui_ResourcePage.h"
 
 namespace Ui {
 class ResourcePage;
@@ -39,8 +39,7 @@ class TexturePackResourcePage : public ResourcePackResourcePage {
     [[nodiscard]] inline QString resourceString() const override { return tr("texture pack"); }
 
    protected:
-    TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance)
-        : ResourcePackResourcePage(dialog, instance)
+    TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance) : ResourcePackResourcePage(dialog, instance)
     {
         connect(m_ui->searchButton, &QPushButton::clicked, this, &TexturePackResourcePage::triggerSearch);
         connect(m_ui->packView, &QListView::doubleClicked, this, &TexturePackResourcePage::onResourceSelected);
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
index 0887ebee..9cd5eed5 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
@@ -18,14 +18,14 @@
 
 #include <QDebug>
 
-#include <modplatform/atlauncher/ATLPackIndex.h>
 #include <Version.h>
+#include <modplatform/atlauncher/ATLPackIndex.h>
 
 #include "StringUtils.h"
 
 namespace Atl {
 
-FilterModel::FilterModel(QObject *parent) : QSortFilterProxyModel(parent)
+FilterModel::FilterModel(QObject* parent) : QSortFilterProxyModel(parent)
 {
     currentSorting = Sorting::ByPopularity;
     sortings.insert(tr("Sort by Popularity"), Sorting::ByPopularity);
@@ -62,7 +62,7 @@ void FilterModel::setSearchTerm(const QString term)
     invalidate();
 }