1 files changed, 17 insertions, 15 deletions

diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index d5684805..de0afc96 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -60,7 +60,7 @@
 #include "net/ChecksumValidator.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ScrollMessageBox.h"
+#include "ui/dialogs/BlockedModsDialog.h"
 
 #include <algorithm>
 
@@ -325,7 +325,7 @@ void InstanceImportTask::processFlame()
     // Hack to correct some 'special sauce'...
     if(mcVersion.endsWith('.'))
     {
-        mcVersion.remove(QRegExp("[.]+$"));
+        mcVersion.remove(QRegularExpression("[.]+$"));
         logWarning(tr("Mysterious trailing dots removed from Minecraft version while importing pack."));
     }
     auto components = instance.getPackProfile();
@@ -396,28 +396,27 @@ void InstanceImportTask::processFlame()
         auto results = m_modIdResolver->getResults();
         //first check for blocked mods
         QString text;
+        QList<QUrl> urls;
         auto anyBlocked = false;
         for(const auto& result: results.files.values()) {
             if (!result.resolved || result.url.isEmpty()) {
                 text += QString("%1: <a href='%2'>%2</a><br/>").arg(result.fileName, result.websiteUrl);
+                urls.append(QUrl(result.websiteUrl));
                 anyBlocked = true;
             }
         }
         if(anyBlocked) {
             qWarning() << "Blocked mods found, displaying mod list";
 
-            auto message_dialog = new ScrollMessageBox(m_parent,
+            auto message_dialog = new BlockedModsDialog(m_parent,
                                                        tr("Blocked mods found"),
                                                        tr("The following mods were blocked on third party launchers.<br/>"
                                                           "You will need to manually download them and add them to the modpack"),
-                                                       text);
+                                                       text,
+                                                       urls);
             message_dialog->setModal(true);
-            message_dialog->show();
-            connect(message_dialog, &QDialog::rejected, [&]() {
-                m_modIdResolver.reset();
-                emitFailed("Canceled");
-            });
-            connect(message_dialog, &QDialog::accepted, [&]() {
+
+            if (message_dialog->exec()) {
                 m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
                 for (const auto &result: m_modIdResolver->getResults().files) {
                     QString filename = result.fileName;
@@ -469,8 +468,11 @@ void InstanceImportTask::processFlame()
                 });
                 setStatus(tr("Downloading mods..."));
                 m_filesNetJob->start();
-            });
-        }else{
+            } else {
+                m_modIdResolver.reset();
+                emitFailed("Canceled");
+            }
+        } else {
             //TODO extract to function ?
             m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
             for (const auto &result: m_modIdResolver->getResults().files) {
@@ -723,11 +725,11 @@ void InstanceImportTask::processModrinth()
     components->buildingFromScratch();
     components->setComponentVersion("net.minecraft", minecraftVersion, true);
     if (!fabricVersion.isEmpty())
-        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion, true);
+        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
     if (!quiltVersion.isEmpty())
-        components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion, true);
+        components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
     if (!forgeVersion.isEmpty())
-        components->setComponentVersion("net.minecraftforge", forgeVersion, true);
+        components->setComponentVersion("net.minecraftforge", forgeVersion);
     if (m_instIcon != "default")
     {
         instance.setIconKey(m_instIcon);