3 files changed, 50 insertions, 0 deletions
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index e63b1434..09b199fb 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -26,6 +26,7 @@
 #include "Application.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/GuiUtil.h"
 
 #include "DesktopServices.h"
@@ -36,6 +37,7 @@
 #include "minecraft/PackProfile.h"
 
 #include "Version.h"
+#include "ui/dialogs/ProgressDialog.h"
 
 namespace {
     // FIXME: wasteful
@@ -342,6 +344,44 @@ void ModFolderPage::on_actionRemove_triggered()
     m_mods->deleteMods(selection.indexes());
 }
 
+void ModFolderPage::on_actionInstall_mods_triggered()
+{
+    if(!m_controlsEnabled) {
+        return;
+    }
+    if(m_inst->typeName() != "Minecraft"){
+        return; //this is a null instance or a legacy instance
+    }
+    bool hasFabric = !((MinecraftInstance *)m_inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
+    bool hasForge = !((MinecraftInstance *)m_inst)->getPackProfile()->getComponentVersion("net.minecraftforge").isEmpty();
+    if (!hasFabric && !hasForge) {
+        QMessageBox::critical(this,tr("Error"),tr("Please install a mod loader first!"));
+        return;
+    }
+    ModDownloadDialog mdownload(m_mods, this, m_inst);
+    if(mdownload.exec()) {
+        ModDownloadTask *task = mdownload.getTask();
+        if (task) {
+            connect(task, &Task::failed, [this, task](QString reason) {
+                task->deleteLater();
+                CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
+            });
+            connect(task, &Task::succeeded, [this, task]() {
+                QStringList warnings = task->warnings();
+                if (warnings.count()) {
+                    CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'),
+                                                 QMessageBox::Warning)->show();
+                }
+                task->deleteLater();
+            });
+            ProgressDialog loadDialog(this);
+            loadDialog.setSkipButton(true, tr("Abort"));
+            loadDialog.execWithTask(task);
+            m_mods->update();
+        }
+    }
+}
+
 void ModFolderPage::on_actionView_configs_triggered()
 {
     DesktopServices::openDirectory(m_inst->instanceConfigFolder(), true);
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 8ef7559b..fbda3cd8 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -102,6 +102,7 @@ slots:
     void on_actionRemove_triggered();
     void on_actionEnable_triggered();
     void on_actionDisable_triggered();
+    void on_actionInstall_mods_triggered();
     void on_actionView_Folder_triggered();
     void on_actionView_configs_triggered();
     void ShowContextMenu(const QPoint &pos);
diff --git a/launcher/ui/pages/instance/ModFolderPage.ui b/launcher/ui/pages/instance/ModFolderPage.ui
index 0fb51e84..b5b4c9b2 100644
--- a/launcher/ui/pages/instance/ModFolderPage.ui
+++ b/launcher/ui/pages/instance/ModFolderPage.ui
@@ -88,6 +88,7 @@
    <addaction name="actionRemove"/>
    <addaction name="actionEnable"/>
    <addaction name="actionDisable"/>
+   <addaction name="actionInstall_mods"/>
    <addaction name="actionView_configs"/>
    <addaction name="actionView_Folder"/>
   </widget>
@@ -136,6 +137,14 @@
     <string>View &amp;Folder</string>
    </property>
   </action>
+  <action name="actionInstall_mods">
+   <property name="text">
+    <string>Install mods</string>
+   </property>
+   <property name="toolTip">
+    <string>Install mods from Modrinth or Curseforge</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>