Support for CurseForge recommended memory (#3711)

launcher/ui/dialogs/ExportPackDialog.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "ExportPackDialog.h"
-#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/mod/ResourceFolderModel.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/flame/FlamePackExportTask.h"
 #include "ui/dialogs/CustomMessageBox.h"
@@ -33,7 +33,7 @@
 #include "MMCZip.h"
 #include "modplatform/modrinth/ModrinthPackExportTask.h"
 
-ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPlatform::ResourceProvider provider)
+ExportPackDialog::ExportPackDialog(MinecraftInstancePtr instance, QWidget* parent, ModPlatform::ResourceProvider provider)
     : QDialog(parent), m_instance(instance), m_ui(new Ui::ExportPackDialog), m_provider(provider)
 {
     Q_ASSERT(m_provider == ModPlatform::ResourceProvider::MODRINTH || m_provider == ModPlatform::ResourceProvider::FLAME);
@@ -44,12 +44,16 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     m_ui->version->setText(instance->settings()->get("ExportVersion").toString());
     m_ui->optionalFiles->setChecked(instance->settings()->get("ExportOptionalFiles").toBool());
 
+    connect(m_ui->recommendedMemoryCheckBox, &QCheckBox::toggled, m_ui->recommendedMemory, &QWidget::setEnabled);
+
     if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
         setWindowTitle(tr("Export Modrinth Pack"));
 
         m_ui->authorLabel->hide();
         m_ui->author->hide();
 
+        m_ui->recommendedMemoryWidget->hide();
+
         m_ui->summary->setPlainText(instance->settings()->get("ExportSummary").toString());
     } else {
         setWindowTitle(tr("Export CurseForge Pack"));
@@ -57,6 +61,19 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
         m_ui->summaryLabel->hide();
         m_ui->summary->hide();
 
+        const int recommendedRAM = instance->settings()->get("ExportRecommendedRAM").toInt();
+
+        if (recommendedRAM > 0) {
+            m_ui->recommendedMemoryCheckBox->setChecked(true);
+            m_ui->recommendedMemory->setValue(recommendedRAM);
+        } else {
+            m_ui->recommendedMemoryCheckBox->setChecked(false);
+
+            // recommend based on setting - limited to 12 GiB (CurseForge warns above this amount)
+            const int defaultRecommendation = qMin(m_instance->settings()->get("MaxMemAlloc").toInt(), 1024 * 12);
+            m_ui->recommendedMemory->setValue(defaultRecommendation);
+        }
+
         m_ui->author->setText(instance->settings()->get("ExportAuthor").toString());
     }
 
@@ -120,9 +137,15 @@ void ExportPackDialog::done(int result)
 
     if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
         settings->set("ExportSummary", m_ui->summary->toPlainText());
-    else
+    else {
         settings->set("ExportAuthor", m_ui->author->text());
 
+        if (m_ui->recommendedMemoryCheckBox->isChecked())
+            settings->set("ExportRecommendedRAM", m_ui->recommendedMemory->value());
+        else
+            settings->reset("ExportRecommendedRAM");
+    }
+
     if (result == Accepted) {
         const QString name = m_ui->name->text().isEmpty() ? m_instance->name() : m_ui->name->text();
         const QString filename = FS::RemoveInvalidFilenameChars(name);
@@ -149,8 +172,18 @@ void ExportPackDialog::done(int result)
             task = new ModrinthPackExportTask(name, m_ui->version->text(), m_ui->summary->toPlainText(), m_ui->optionalFiles->isChecked(),
                                               m_instance, output, std::bind(&FileIgnoreProxy::filterFile, m_proxy, std::placeholders::_1));
         } else {
-            task = new FlamePackExportTask(name, m_ui->version->text(), m_ui->author->text(), m_ui->optionalFiles->isChecked(), m_instance,
-                                           output, std::bind(&FileIgnoreProxy::filterFile, m_proxy, std::placeholders::_1));
+            FlamePackExportOptions options{};
+
+            options.name = name;
+            options.version = m_ui->version->text();
+            options.author = m_ui->author->text();
+            options.optionalFiles = m_ui->optionalFiles->isChecked();
+            options.instance = m_instance;
+            options.output = output;
+            options.filter = std::bind(&FileIgnoreProxy::filterFile, m_proxy, std::placeholders::_1);
+            options.recommendedRAM = m_ui->recommendedMemoryCheckBox->isChecked() ? m_ui->recommendedMemory->value() : 0;
+
+            task = new FlamePackExportTask(std::move(options));
         }
 
         connect(task, &Task::failed,

launcher/ui/dialogs/ExportPackDialog.h

@@ -22,6 +22,7 @@
 #include "BaseInstance.h"
 #include "FastFileIconProvider.h"
 #include "FileIgnoreProxy.h"
+#include "minecraft/MinecraftInstance.h"
 #include "modplatform/ModIndex.h"
 
 namespace Ui {
@@ -32,7 +33,7 @@ class ExportPackDialog : public QDialog {
     Q_OBJECT
 
    public:
-    explicit ExportPackDialog(InstancePtr instance,
+    explicit ExportPackDialog(MinecraftInstancePtr instance,
                               QWidget* parent = nullptr,
                               ModPlatform::ResourceProvider provider = ModPlatform::ResourceProvider::MODRINTH);
     ~ExportPackDialog();
@@ -44,7 +45,7 @@ class ExportPackDialog : public QDialog {
     QString ignoreFileName();
 
    private:
-    const InstancePtr m_instance;
+    const MinecraftInstancePtr m_instance;
     Ui::ExportPackDialog* m_ui;
     FileIgnoreProxy* m_proxy;
     FastFileIconProvider m_icons;

launcher/ui/dialogs/ExportPackDialog.ui

@@ -19,36 +19,56 @@
      <property name="title">
       <string>&amp;Description</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QLabel" name="nameLabel">
-        <property name="text">
-         <string>&amp;Name</string>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="labelAlignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
-        <property name="buddy">
-         <cstring>name</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="name"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="versionLabel">
-        <property name="text">
-         <string>&amp;Version</string>
-        </property>
-        <property name="buddy">
-         <cstring>version</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="version">
-        <property name="text">
-         <string>1.0.0</string>
-        </property>
-       </widget>
+        <item row="0" column="0">
+         <widget class="QLabel" name="nameLabel">
+          <property name="text">
+           <string>&amp;Name:</string>
+          </property>
+          <property name="buddy">
+           <cstring>name</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="name"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="versionLabel">
+          <property name="text">
+           <string>&amp;Version:</string>
+          </property>
+          <property name="buddy">
+           <cstring>version</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="version">
+          <property name="text">
+           <string>1.0.0</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="authorLabel">
+          <property name="text">
+           <string>&amp;Author:</string>
+          </property>
+          <property name="buddy">
+           <cstring>author</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="author"/>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="QLabel" name="summaryLabel">
@@ -62,24 +82,29 @@
       </item>
       <item>
        <widget class="QPlainTextEdit" name="summary">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>100</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>100</height>
+         </size>
+        </property>
         <property name="tabChangesFocus">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="authorLabel">
-        <property name="text">
-         <string>&amp;Author</string>
-        </property>
-        <property name="buddy">
-         <cstring>author</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="author"/>
-      </item>
      </layout>
     </widget>
    </item>
@@ -88,7 +113,70 @@
      <property name="title">
       <string>&amp;Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QWidget" name="recommendedMemoryWidget" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="recommendedMemoryCheckBox">
+           <property name="text">
+            <string>&amp;Recommended Memory:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="recommendedMemory">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="suffix">
+            <string> MiB</string>
+           </property>
+           <property name="minimum">
+            <number>8</number>
+           </property>
+           <property name="maximum">
+            <number>32768</number>
+           </property>
+           <property name="singleStep">
+            <number>128</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="filesLabel">
         <property name="text">
@@ -138,10 +226,6 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>name</tabstop>
-  <tabstop>version</tabstop>
-  <tabstop>summary</tabstop>
-  <tabstop>author</tabstop>
   <tabstop>files</tabstop>
   <tabstop>optionalFiles</tabstop>
  </tabstops>