From b2e18253a1dcbeb09f587e90dd6cc9c02bd75aab Mon Sep 17 00:00:00 2001
From: kb1000 <kaeptmblaubaer1000@gmail.com>
Date: Mon, 3 May 2021 21:29:09 +0200
Subject: [PATCH] GH-3742 add Install Quilt button

---
 launcher/minecraft/ComponentUpdateTask.cpp |  2 +-
 launcher/ui/pages/instance/VersionPage.cpp | 30 +++++++++++++++++++++-
 launcher/ui/pages/instance/VersionPage.h   |  1 +
 launcher/ui/pages/instance/VersionPage.ui  |  9 +++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp
index 8bc05a1b..329d7d6b 100644
--- a/launcher/minecraft/ComponentUpdateTask.cpp
+++ b/launcher/minecraft/ComponentUpdateTask.cpp
@@ -591,7 +591,7 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
                     {
                         component->m_version = "3.1.2";
                     }
-                    else if (add.uid == "net.fabricmc.intermediary")
+                    else if (add.uid == "net.fabricmc.intermediary" || add.uid == "org.quiltmc.intermediary")
                     {
                         auto minecraft = std::find_if(components.begin(), components.end(), [](ComponentPtr & cmp){
                             return cmp->getID() == "net.minecraft";
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index 6e57909b..3024ec1e 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -214,6 +214,7 @@ void VersionPage::updateVersionControls()
 
     bool supportsFabric = minecraftVersion >= Version("1.14");
     ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric);
+    ui->actionInstall_Quilt->setEnabled((controlsEnabled) && supportsFabric);
 
     bool supportsLiteLoader = minecraftVersion <= Version("1.12.2");
     ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && supportsLiteLoader);
@@ -364,7 +365,7 @@ void VersionPage::on_actionChange_version_triggered()
         return;
     }
     VersionSelectDialog vselect(list.get(), tr("Change %1 version").arg(name), this);
-    if (uid == "net.fabricmc.intermediary")
+    if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.intermediary")
     {
         vselect.setEmptyString(tr("No intermediary mappings versions are currently available."));
         vselect.setEmptyErrorString(tr("Couldn't load or download the intermediary mappings version lists!"));
@@ -470,6 +471,33 @@ void VersionPage::on_actionInstall_Fabric_triggered()
     }
 }
 
+void VersionPage::on_actionInstall_Quilt_triggered()
+{
+    auto vlist = APPLICATION->metadataIndex()->get("org.quiltmc.quilt-loader");
+    if(!vlist)
+    {
+        return;
+    }
+    VersionSelectDialog vselect(vlist.get(), tr("Select Quilt Loader version"), this);
+    vselect.setEmptyString(tr("No Quilt Loader versions are currently available."));
+    vselect.setEmptyErrorString(tr("Couldn't load or download the Quilt Loader version lists!"));
+
+    auto currentVersion = m_profile->getComponentVersion("org.quiltmc.quilt-loader");
+    if(!currentVersion.isEmpty())
+    {
+        vselect.setCurrentVersion(currentVersion);
+    }
+
+    if (vselect.exec() && vselect.selectedVersion())
+    {
+        auto vsn = vselect.selectedVersion();
+        m_profile->setComponentVersion("org.quiltmc.quilt-loader", vsn->descriptor());
+        m_profile->resolve(Net::Mode::Online);
+        preselect(m_profile->rowCount(QModelIndex())-1);
+        m_container->refreshContainer();
+    }
+}
+
 void VersionPage::on_actionAdd_Empty_triggered()
 {
     NewComponentDialog compdialog(QString(), QString(), this);
diff --git a/launcher/ui/pages/instance/VersionPage.h b/launcher/ui/pages/instance/VersionPage.h
index b5ce4064..9045d4ad 100644
--- a/launcher/ui/pages/instance/VersionPage.h
+++ b/launcher/ui/pages/instance/VersionPage.h
@@ -52,6 +52,7 @@ private slots:
     void on_actionChange_version_triggered();
     void on_actionInstall_Forge_triggered();
     void on_actionInstall_Fabric_triggered();
+    void on_actionInstall_Quilt_triggered();
     void on_actionAdd_Empty_triggered();
     void on_actionInstall_LiteLoader_triggered();
     void on_actionReload_triggered();
diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui
index a4990ff3..489f7218 100644
--- a/launcher/ui/pages/instance/VersionPage.ui
+++ b/launcher/ui/pages/instance/VersionPage.ui
@@ -107,6 +107,7 @@
    <addaction name="separator"/>
    <addaction name="actionInstall_Forge"/>
    <addaction name="actionInstall_Fabric"/>
+   <addaction name="actionInstall_Quilt"/>
    <addaction name="actionInstall_LiteLoader"/>
    <addaction name="actionInstall_mods"/>
    <addaction name="separator"/>
@@ -192,6 +193,14 @@
     <string>Install the Fabric Loader package.</string>
    </property>
   </action>
+  <action name="actionInstall_Quilt">
+   <property name="text">
+    <string>Install Quilt</string>
+   </property>
+   <property name="toolTip">
+    <string>Install the Quilt Loader package.</string>
+   </property>
+  </action>
   <action name="actionInstall_LiteLoader">
    <property name="text">
     <string>Install LiteLoader</string>