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

.github/workflows/backport.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Create backport PRs
-        uses: korthout/backport-action@v2.5.0
+        uses: korthout/backport-action@v3.0.2
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           pull_description: |-

.github/workflows/build.yml

@@ -611,7 +611,7 @@ jobs:
   flatpak:
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
       options: --privileged
     steps:
       - name: Checkout

.github/workflows/update-flake.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
 
       - uses: DeterminateSystems/update-flake-lock@v21
         with:

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714641030,
+        "lastModified": 1717285511,
-        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -36,24 +36,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -93,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715413075,
+        "lastModified": 1717112898,
-        "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
+        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
+        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
         "type": "github"
       },
       "original": {
@@ -112,7 +94,6 @@
         "flake-compat": [
           "flake-compat"
         ],
-        "flake-utils": "flake-utils",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
@@ -122,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714478972,
+        "lastModified": 1716213921,
-        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
+        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
+        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
         "type": "github"
       },
       "original": {
@@ -143,21 +124,6 @@
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flatpak/org.prismlauncher.PrismLauncher.yml

@@ -1,6 +1,6 @@
 id: org.prismlauncher.PrismLauncher
 runtime: org.kde.Platform
-runtime-version: 5.15-23.08
+runtime-version: 6.7
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk21
@@ -38,7 +38,6 @@ modules:
     config-opts:
       - -DLauncher_BUILD_PLATFORM=flatpak
       - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DLauncher_QT_VERSION_MAJOR=5
     build-options:
       env:
         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17

launcher/Application.cpp

@@ -48,6 +48,7 @@
 #include "pathmatcher/MultiMatcher.h"
 #include "pathmatcher/SimplePrefixMatcher.h"
 #include "settings/INIFile.h"
+#include "tools/GenericProfiler.h"
 #include "ui/InstanceWindow.h"
 #include "ui/MainWindow.h"
 
@@ -874,6 +875,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     // FIXME: what to do with these?
     m_profilers.insert("jprofiler", std::shared_ptr<BaseProfilerFactory>(new JProfilerFactory()));
     m_profilers.insert("jvisualvm", std::shared_ptr<BaseProfilerFactory>(new JVisualVMFactory()));
+    m_profilers.insert("generic", std::shared_ptr<BaseProfilerFactory>(new GenericProfilerFactory()));
     for (auto profiler : m_profilers.values()) {
         profiler->registerSettings(m_settings);
     }

launcher/CMakeLists.txt

@@ -443,6 +443,8 @@ set(TOOLS_SOURCES
     tools/JVisualVM.h
     tools/MCEditTool.cpp
     tools/MCEditTool.h
+    tools/GenericProfiler.cpp
+    tools/GenericProfiler.h
 )
 
 set(META_SOURCES

launcher/FileSystem.h

@@ -378,6 +378,7 @@ enum class FilesystemType {
     HFSX,
     FUSEBLK,
     F2FS,
+    BCACHEFS,
     UNKNOWN
 };
 
@@ -406,6 +407,7 @@ static const QMap<FilesystemType, QStringList> s_filesystem_type_names = { { Fil
                                                                            { FilesystemType::HFSX, { "HFSX" } },
                                                                            { FilesystemType::FUSEBLK, { "FUSEBLK" } },
                                                                            { FilesystemType::F2FS, { "F2FS" } },
+                                                                           { FilesystemType::BCACHEFS, { "BCACHEFS" } },
                                                                            { FilesystemType::UNKNOWN, { "UNKNOWN" } } };
 
 /**
@@ -458,7 +460,7 @@ QString nearestExistentAncestor(const QString& path);
 FilesystemInfo statFS(const QString& path);
 
 static const QList<FilesystemType> s_clone_filesystems = { FilesystemType::BTRFS, FilesystemType::APFS, FilesystemType::ZFS,
-                                                           FilesystemType::XFS, FilesystemType::REFS };
+                                                           FilesystemType::XFS,   FilesystemType::REFS, FilesystemType::BCACHEFS };
 
 /**
  * @brief if the Filesystem is reflink/clone capable

launcher/StringUtils.cpp

@@ -212,3 +212,25 @@ QPair<QString, QString> StringUtils::splitFirst(const QString& s, const QRegular
     right = s.mid(end);
     return qMakePair(left, right);
 }
+
+static const QRegularExpression ulMatcher("<\\s*/\\s*ul\\s*>");
+
+QString StringUtils::htmlListPatch(QString htmlStr)
+{
+    int pos = htmlStr.indexOf(ulMatcher);
+    int imgPos;
+    while (pos != -1) {
+        pos = htmlStr.indexOf(">", pos) + 1;  // Get the size of the </ul> tag. Add one for zeroeth index
+        imgPos = htmlStr.indexOf("<img ", pos);
+        if (imgPos == -1)
+            break;  // no image after the tag
+
+        auto textBetween = htmlStr.mid(pos, imgPos - pos).trimmed();  // trim all white spaces
+
+        if (textBetween.isEmpty())
+            htmlStr.insert(pos, "<br>");
+
+        pos = htmlStr.indexOf(ulMatcher, pos);
+    }
+    return htmlStr;
+}

launcher/StringUtils.h

@@ -85,4 +85,6 @@ QPair<QString, QString> splitFirst(const QString& s, const QString& sep, Qt::Cas
 QPair<QString, QString> splitFirst(const QString& s, QChar sep, Qt::CaseSensitivity cs = Qt::CaseSensitive);
 QPair<QString, QString> splitFirst(const QString& s, const QRegularExpression& re);
 
+QString htmlListPatch(QString htmlStr);
+
 }  // namespace StringUtils

launcher/java/JavaUtils.cpp

@@ -362,6 +362,12 @@ QList<QString> JavaUtils::FindJavaPaths()
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
     }
+
+    auto home = qEnvironmentVariable("HOME");
+
+    // javas downloaded by sdkman
+    javas.append(FS::PathCombine(home, ".sdkman/candidates/java"));
+
     javas.append(getMinecraftJavaBundle());
     javas = addJavasFromEnv(javas);
     javas.removeDuplicates();

launcher/minecraft/MinecraftInstance.cpp

@@ -1000,7 +1000,7 @@ QString MinecraftInstance::getStatusbarDescription()
     QString description;
     description.append(tr("Minecraft %1").arg(mcVersion));
     if (m_settings->get("ShowGameTime").toBool()) {
-        if (lastTimePlayed() > 0) {
+        if (lastTimePlayed() > 0 && lastLaunch() > 0) {
             QDateTime lastLaunchTime = QDateTime::fromMSecsSinceEpoch(lastLaunch());
             description.append(
                 tr(", last played on %1 for %2")

launcher/modplatform/helpers/ExportToModList.cpp

@@ -42,17 +42,28 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line += " by " + mod->authors().join(", ").toHtmlEscaped();
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(mod->fileinfo().fileName().toHtmlEscaped());
+
         lines.append(QString("<li>%1</li>").arg(line));
     }
     return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
 }
 
+QString toMarkdownEscaped(QString src)
+{
+    for (auto ch : "\\`*_{}[]<>()#+-.!|")
+        src.replace(ch, QString("\\%1").arg(ch));
+    return src;
+}
+
 QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
+
     for (auto mod : mods) {
         auto meta = mod->metadata();
-        auto modName = mod->name();
+        auto modName = toMarkdownEscaped(mod->name());
         if (extraData & Url) {
             auto url = mod->metaurl();
             if (!url.isEmpty())
@@ -60,14 +71,16 @@ QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
         }
         auto line = modName;
         if (extraData & Version) {
-            auto ver = mod->version();
+            auto ver = toMarkdownEscaped(mod->version());
             if (ver.isEmpty() && meta != nullptr)
-                ver = meta->version().toString();
+                ver = toMarkdownEscaped(meta->version().toString());
             if (!ver.isEmpty())
                 line += QString(" [%1]").arg(ver);
         }
         if (extraData & Authors && !mod->authors().isEmpty())
-            line += " by " + mod->authors().join(", ");
+            line += " by " + toMarkdownEscaped(mod->authors().join(", "));
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(toMarkdownEscaped(mod->fileinfo().fileName()));
         lines << "- " + line;
     }
     return lines.join("\n");
@@ -95,6 +108,8 @@ QString toPlainTXT(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line += " by " + mod->authors().join(", ");
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(mod->fileinfo().fileName());
         lines << line;
     }
     return lines.join("\n");
@@ -122,6 +137,8 @@ QString toJSON(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line["authors"] = QJsonArray::fromStringList(mod->authors());
+        if (extraData & FileName)
+            line["filename"] = mod->fileinfo().fileName();
         lines << line;
     }
     QJsonDocument doc;
@@ -154,6 +171,8 @@ QString toCSV(QList<Mod*> mods, OptionalData extraData)
                 authors = QString("\"%1\"").arg(mod->authors().join(","));
             data << authors;
         }
+        if (extraData & FileName)
+            data << mod->fileinfo().fileName();
         lines << data.join(",");
     }
     return lines.join("\n");
@@ -189,11 +208,13 @@ QString exportToModList(QList<Mod*> mods, QString lineTemplate)
         if (ver.isEmpty() && meta != nullptr)
             ver = meta->version().toString();
         auto authors = mod->authors().join(", ");
+        auto filename = mod->fileinfo().fileName();
         lines << QString(lineTemplate)
                      .replace("{name}", modName)
                      .replace("{url}", url)
                      .replace("{version}", ver)
-                     .replace("{authors}", authors);
+                     .replace("{authors}", authors)
+                     .replace("{filename}", filename);
     }
     return lines.join("\n");
 }

launcher/modplatform/helpers/ExportToModList.h

@@ -23,11 +23,7 @@
 namespace ExportToModList {
 
 enum Formats { HTML, MARKDOWN, PLAINTXT, JSON, CSV, CUSTOM };
-enum OptionalData {
+enum OptionalData { Authors = 1 << 0, Url = 1 << 1, Version = 1 << 2, FileName = 1 << 3 };
-    Authors = 1 << 0,
-    Url = 1 << 1,
-    Version = 1 << 2,
-};
 QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
 QString exportToModList(QList<Mod*> mods, QString lineTemplate);
 }  // namespace ExportToModList

launcher/net/NetJob.cpp

@@ -40,6 +40,7 @@
 #include "tasks/ConcurrentTask.h"
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #endif
 
 NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : ConcurrentTask(nullptr, job_name), m_network(network)
@@ -63,8 +64,11 @@ void NetJob::executeNextSubTask()
     // We're finished, check for failures and retry if we can (up to 3 times)
     if (isRunning() && m_queue.isEmpty() && m_doing.isEmpty() && !m_failed.isEmpty() && m_try < 3) {
         m_try += 1;
-        while (!m_failed.isEmpty())
+        while (!m_failed.isEmpty()) {
-            m_queue.enqueue(m_failed.take(*m_failed.keyBegin()));
+            auto task = m_failed.take(*m_failed.keyBegin());
+            m_done.remove(task.get());
+            m_queue.enqueue(task);
+        }
     }
     ConcurrentTask::executeNextSubTask();
 }
@@ -136,3 +140,25 @@ void NetJob::updateState()
     setStatus(tr("Executing %1 task(s) (%2 out of %3 are done)")
                   .arg(QString::number(m_doing.count()), QString::number(m_done.count()), QString::number(totalSize())));
 }
+
+void NetJob::emitFailed(QString reason)
+{
+#if defined(LAUNCHER_APPLICATION)
+    auto response = CustomMessageBox::selectable(nullptr, "Confirm retry",
+                                                 "The tasks failed\n"
+                                                 "Failed urls\n" +
+                                                     getFailedFiles().join("\n\t") +
+                                                     "\n"
+                                                     "If this continues to happen please check the logs of the application"
+                                                     "Do you want to retry?",
+                                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                        ->exec();
+
+    if (response == QMessageBox::Yes) {
+        m_try = 0;
+        executeNextSubTask();
+        return;
+    }
+#endif
+    ConcurrentTask::emitFailed(reason);
+}

launcher/net/NetJob.h

@@ -66,6 +66,7 @@ class NetJob : public ConcurrentTask {
    public slots:
     // Qt can't handle auto at the start for some reason?
     bool abort() override;
+    void emitFailed(QString reason) override;
 
    protected slots:
     void executeNextSubTask() override;

launcher/tools/GenericProfiler.cpp

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "GenericProfiler.h"
+
+#include "BaseInstance.h"
+#include "launch/LaunchTask.h"
+#include "settings/SettingsObject.h"
+
+class GenericProfiler : public BaseProfiler {
+    Q_OBJECT
+   public:
+    GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
+
+   protected:
+    void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
+};
+
+GenericProfiler::GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent)
+    : BaseProfiler(settings, instance, parent)
+{}
+
+void GenericProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
+{
+    emit readyToLaunch(tr("Started process: %1").arg(process->pid()));
+}
+
+BaseExternalTool* GenericProfilerFactory::createTool(InstancePtr instance, QObject* parent)
+{
+    return new GenericProfiler(globalSettings, instance, parent);
+}
+#include "GenericProfiler.moc"

launcher/tools/GenericProfiler.h

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "BaseProfiler.h"
+
+class GenericProfilerFactory : public BaseProfilerFactory {
+   public:
+    QString name() const override { return "Generic"; }
+    void registerSettings([[maybe_unused]] SettingsObjectPtr settings) override{};
+    BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
+    bool check([[maybe_unused]] QString* error) override { return true; };
+    bool check([[maybe_unused]] const QString& path, [[maybe_unused]] QString* error) override { return true; };
+};

launcher/ui/MainWindow.cpp

@@ -96,7 +96,6 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ExportInstanceDialog.h"
 #include "ui/dialogs/ExportPackDialog.h"
-#include "ui/dialogs/ExportToModListDialog.h"
 #include "ui/dialogs/IconPickerDialog.h"
 #include "ui/dialogs/ImportResourceDialog.h"
 #include "ui/dialogs/NewInstanceDialog.h"
@@ -209,7 +208,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         exportInstanceMenu->addAction(ui->actionExportInstanceZip);
         exportInstanceMenu->addAction(ui->actionExportInstanceMrPack);
         exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
-        exportInstanceMenu->addAction(ui->actionExportInstanceToModList);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
     }
 
@@ -1416,14 +1414,6 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
     }
 }
 
-void MainWindow::on_actionExportInstanceToModList_triggered()
-{
-    if (m_selectedInstance) {
-        ExportToModListDialog dlg(m_selectedInstance, this);
-        dlg.exec();
-    }
-}
-
 void MainWindow::on_actionExportInstanceFlamePack_triggered()
 {
     if (m_selectedInstance) {

launcher/ui/MainWindow.h

@@ -158,7 +158,6 @@ class MainWindow : public QMainWindow {
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
     void on_actionExportInstanceFlamePack_triggered();
-    void on_actionExportInstanceToModList_triggered();
 
     void on_actionRenameInstance_triggered();
 

launcher/ui/MainWindow.ui

@@ -491,15 +491,6 @@
     <string>CurseForge (zip)</string>
    </property>
   </action>
-  <action name="actionExportInstanceToModList">
-   <property name="icon">
-    <iconset theme="new">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
-   <property name="text">
-    <string>Mod List</string>
-   </property>
-  </action>
   <action name="actionCreateInstanceShortcut">
    <property name="icon">
     <iconset theme="shortcut">

launcher/ui/dialogs/AboutDialog.cpp

@@ -38,6 +38,7 @@
 #include "Application.h"
 #include "BuildConfig.h"
 #include "Markdown.h"
+#include "StringUtils.h"
 #include "ui_AboutDialog.h"
 
 #include <net/NetJob.h>
@@ -139,10 +140,10 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDia
     setWindowTitle(tr("About %1").arg(launcherName));
 
     QString chtml = getCreditsHtml();
-    ui->creditsText->setHtml(chtml);
+    ui->creditsText->setHtml(StringUtils::htmlListPatch(chtml));
 
     QString lhtml = getLicenseHtml();
-    ui->licenseText->setHtml(lhtml);
+    ui->licenseText->setHtml(StringUtils::htmlListPatch(lhtml));
 
     ui->urlLabel->setOpenExternalLinks(true);
 

launcher/ui/dialogs/ExportToModListDialog.cpp

@@ -22,8 +22,7 @@
 #include <QTextEdit>
 #include "FileSystem.h"
 #include "Markdown.h"
-#include "minecraft/MinecraftInstance.h"
+#include "StringUtils.h"
-#include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/helpers/ExportToModList.h"
 #include "ui_ExportToModListDialog.h"
 
@@ -41,38 +40,31 @@ const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLin
     { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
 };
 
-ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
+ExportToModListDialog::ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent)
-    : QDialog(parent), m_template_changed(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
+    : QDialog(parent), m_mods(mods), m_template_changed(false), m_name(name), ui(new Ui::ExportToModListDialog)
 {
     ui->setupUi(this);
     enableCustom(false);
 
-    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
-    if (mcInstance) {
-        mcInstance->loaderModList()->update();
-        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this, mcInstance]() {
-            m_allMods = mcInstance->loaderModList()->allMods();
-            triggerImp();
-        });
-    }
-
     connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportToModListDialog::formatChanged);
     connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
+    connect(ui->filenameCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->authorsButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Authors); });
     connect(ui->versionButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Version); });
     connect(ui->urlButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Url); });
+    connect(ui->filenameButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::FileName); });
     connect(ui->templateText, &QTextEdit::textChanged, this, [this] {
-        if (ui->templateText->toPlainText() != exampleLines[format])
+        if (ui->templateText->toPlainText() != exampleLines[m_format])
             ui->formatComboBox->setCurrentIndex(5);
-        else
+        triggerImp();
-            triggerImp();
     });
     connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
         this->ui->finalText->selectAll();
         this->ui->finalText->copy();
     });
+    triggerImp();
 }
 
 ExportToModListDialog::~ExportToModListDialog()
@@ -86,38 +78,38 @@ void ExportToModListDialog::formatChanged(int index)
         case 0: {
             enableCustom(false);
             ui->resultText->show();
-            format = ExportToModList::HTML;
+            m_format = ExportToModList::HTML;
             break;
         }
         case 1: {
             enableCustom(false);
             ui->resultText->show();
-            format = ExportToModList::MARKDOWN;
+            m_format = ExportToModList::MARKDOWN;
             break;
         }
         case 2: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::PLAINTXT;
+            m_format = ExportToModList::PLAINTXT;
             break;
         }
         case 3: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::JSON;
+            m_format = ExportToModList::JSON;
             break;
         }
         case 4: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::CSV;
+            m_format = ExportToModList::CSV;
             break;
         }
         case 5: {
             m_template_changed = true;
             enableCustom(true);
             ui->resultText->hide();
-            format = ExportToModList::CUSTOM;
+            m_format = ExportToModList::CUSTOM;
             break;
         }
     }
@@ -126,8 +118,8 @@ void ExportToModListDialog::formatChanged(int index)
 
 void ExportToModListDialog::triggerImp()
 {
-    if (format == ExportToModList::CUSTOM) {
+    if (m_format == ExportToModList::CUSTOM) {
-        ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText()));
+        ui->finalText->setPlainText(ExportToModList::exportToModList(m_mods, ui->templateText->toPlainText()));
         return;
     }
     auto opt = 0;
@@ -137,16 +129,18 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Version;
     if (ui->urlCheckBox->isChecked())
         opt |= ExportToModList::Url;
-    auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    if (ui->filenameCheckBox->isChecked())
+        opt |= ExportToModList::FileName;
+    auto txt = ExportToModList::exportToModList(m_mods, m_format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
-    switch (format) {
+    switch (m_format) {
         case ExportToModList::CUSTOM:
             return;
         case ExportToModList::HTML:
-            ui->resultText->setHtml(txt);
+            ui->resultText->setHtml(StringUtils::htmlListPatch(txt));
             break;
         case ExportToModList::MARKDOWN:
-            ui->resultText->setHtml(markdownToHTML(txt));
+            ui->resultText->setHtml(StringUtils::htmlListPatch(markdownToHTML(txt)));
             break;
         case ExportToModList::PLAINTXT:
             break;
@@ -155,7 +149,7 @@ void ExportToModListDialog::triggerImp()
         case ExportToModList::CSV:
             break;
     }
-    auto exampleLine = exampleLines[format];
+    auto exampleLine = exampleLines[m_format];
     if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
         ui->templateText->setPlainText(exampleLine);
 }
@@ -163,9 +157,9 @@ void ExportToModListDialog::triggerImp()
 void ExportToModListDialog::done(int result)
 {
     if (result == Accepted) {
-        const QString filename = FS::RemoveInvalidFilenameChars(name);
+        const QString filename = FS::RemoveInvalidFilenameChars(m_name);
         const QString output =
-            QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
+            QFileDialog::getSaveFileName(this, tr("Export %1").arg(m_name), FS::PathCombine(QDir::homePath(), filename + extension()),
                                          "File (*.txt *.html *.md *.json *.csv)", nullptr);
 
         if (output.isEmpty())
@@ -178,7 +172,7 @@ void ExportToModListDialog::done(int result)
 
 QString ExportToModListDialog::extension()
 {
-    switch (format) {
+    switch (m_format) {
         case ExportToModList::HTML:
             return ".html";
         case ExportToModList::MARKDOWN:
@@ -197,7 +191,7 @@ QString ExportToModListDialog::extension()
 
 void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
 {
-    if (format != ExportToModList::CUSTOM)
+    if (m_format != ExportToModList::CUSTOM)
         return;
     switch (option) {
         case ExportToModList::Authors:
@@ -209,6 +203,9 @@ void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
         case ExportToModList::Version:
             ui->templateText->insertPlainText("{version}");
             break;
+        case ExportToModList::FileName:
+            ui->templateText->insertPlainText("{filename}");
+            break;
     }
 }
 void ExportToModListDialog::enableCustom(bool enabled)
@@ -221,4 +218,7 @@ void ExportToModListDialog::enableCustom(bool enabled)
 
     ui->urlCheckBox->setHidden(enabled);
     ui->urlButton->setHidden(!enabled);
+
+    ui->filenameCheckBox->setHidden(enabled);
+    ui->filenameButton->setHidden(!enabled);
 }

launcher/ui/dialogs/ExportToModListDialog.h

@@ -20,7 +20,6 @@
 
 #include <QDialog>
 #include <QList>
-#include "BaseInstance.h"
 #include "minecraft/mod/Mod.h"
 #include "modplatform/helpers/ExportToModList.h"
 
@@ -32,7 +31,7 @@ class ExportToModListDialog : public QDialog {
     Q_OBJECT
 
    public:
-    explicit ExportToModListDialog(InstancePtr instance, QWidget* parent = nullptr);
+    explicit ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent = nullptr);
     ~ExportToModListDialog();
 
     void done(int result) override;
@@ -46,10 +45,11 @@ class ExportToModListDialog : public QDialog {
    private:
     QString extension();
     void enableCustom(bool enabled);
-    QList<Mod*> m_allMods;
+
+    QList<Mod*> m_mods;
     bool m_template_changed;
-    QString name;
+    QString m_name;
-    ExportToModList::Formats format = ExportToModList::Formats::HTML;
+    ExportToModList::Formats m_format = ExportToModList::Formats::HTML;
     Ui::ExportToModListDialog* ui;
     static const QHash<ExportToModList::Formats, QString> exampleLines;
 };

launcher/ui/dialogs/ExportToModListDialog.ui

@@ -117,6 +117,13 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QCheckBox" name="filenameCheckBox">
+             <property name="text">
+              <string>Filename</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QPushButton" name="versionButton">
              <property name="text">
@@ -138,6 +145,13 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="filenameButton">
+             <property name="text">
+              <string>Filename</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>

launcher/ui/dialogs/ModUpdateDialog.cpp

@@ -3,6 +3,7 @@
 #include "CustomMessageBox.h"
 #include "ProgressDialog.h"
 #include "ScrollMessageBox.h"
+#include "StringUtils.h"
 #include "minecraft/mod/tasks/GetModDependenciesTask.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/flame/FlameAPI.h"
@@ -473,7 +474,7 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info, QStri
             break;
     }
 
-    changelog_area->setHtml(text);
+    changelog_area->setHtml(StringUtils::htmlListPatch(text));
     changelog_area->setOpenExternalLinks(true);
     changelog_area->setLineWrapMode(QTextBrowser::LineWrapMode::WidgetWidth);
     changelog_area->setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);

launcher/ui/dialogs/UpdateAvailableDialog.cpp

@@ -25,6 +25,7 @@
 #include "Application.h"
 #include "BuildConfig.h"
 #include "Markdown.h"
+#include "StringUtils.h"
 #include "ui_UpdateAvailableDialog.h"
 
 UpdateAvailableDialog::UpdateAvailableDialog(const QString& currentVersion,
@@ -43,7 +44,7 @@ UpdateAvailableDialog::UpdateAvailableDialog(const QString& currentVersion,
     ui->icon->setPixmap(APPLICATION->getThemedIcon("checkupdate").pixmap(64));
 
     auto releaseNotesHtml = markdownToHTML(releaseNotes);
-    ui->releaseNotes->setHtml(releaseNotesHtml);
+    ui->releaseNotes->setHtml(StringUtils::htmlListPatch(releaseNotesHtml));
     ui->releaseNotes->setOpenExternalLinks(true);
 
     connect(ui->skipButton, &QPushButton::clicked, this, [this]() {

launcher/ui/pages/instance/ExternalResourcesPage.ui

@@ -70,15 +70,15 @@
    </layout>
   </widget>
   <widget class="WideBar" name="actionsToolbar">
-   <property name="useDefaultAction" stdset="0">
-    <bool>true</bool>
-   </property>
    <property name="windowTitle">
     <string>Actions</string>
    </property>
    <property name="toolButtonStyle">
     <enum>Qt::ToolButtonTextOnly</enum>
    </property>
+   <property name="useDefaultAction" stdset="0">
+    <bool>true</bool>
+   </property>
    <attribute name="toolBarArea">
     <enum>RightToolBarArea</enum>
    </attribute>
@@ -171,6 +171,17 @@
     <string>Try to check or update all selected resources (all resources if none are selected)</string>
    </property>
   </action>
+  <action name="actionExportMetadata">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Export modlist</string>
+   </property>
+   <property name="toolTip">
+    <string>Export mod's metadata to text</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

launcher/ui/pages/instance/ManagedPackPage.cpp

@@ -20,6 +20,7 @@
 #include "InstanceTask.h"
 #include "Json.h"
 #include "Markdown.h"
+#include "StringUtils.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 
@@ -332,7 +333,7 @@ void ModrinthManagedPackPage::suggestVersion()
     }
     auto version = m_pack.versions.at(index);
 
-    ui->changelogTextBrowser->setHtml(markdownToHTML(version.changelog.toUtf8()));
+    ui->changelogTextBrowser->setHtml(StringUtils::htmlListPatch(markdownToHTML(version.changelog.toUtf8())));
 
     ManagedPackPage::suggestVersion();
 }
@@ -420,7 +421,7 @@ void FlameManagedPackPage::parseManagedPack()
                "Don't worry though, it will ask you to update this instance instead, so you'll not lose this instance!"
                "</h4>");
 
-        ui->changelogTextBrowser->setHtml(message);
+        ui->changelogTextBrowser->setHtml(StringUtils::htmlListPatch(message));
         return;
     }
 
@@ -502,7 +503,8 @@ void FlameManagedPackPage::suggestVersion()
     }
     auto version = m_pack.versions.at(index);
 
-    ui->changelogTextBrowser->setHtml(m_api.getModFileChangelog(m_inst->getManagedPackID().toInt(), version.fileId));
+    ui->changelogTextBrowser->setHtml(
+        StringUtils::htmlListPatch(m_api.getModFileChangelog(m_inst->getManagedPackID().toInt(), version.fileId)));
 
     ManagedPackPage::suggestVersion();
 }

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -37,6 +37,7 @@
  */
 
 #include "ModFolderPage.h"
+#include "ui/dialogs/ExportToModListDialog.h"
 #include "ui_ExternalResourcesPage.h"
 
 #include <QAbstractItemModel>
@@ -121,6 +122,9 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
         ui->actionsToolbar->addAction(ui->actionVisitItemPage);
         connect(ui->actionVisitItemPage, &QAction::triggered, this, &ModFolderPage::visitModPages);
 
+        ui->actionsToolbar->insertActionAfter(ui->actionVisitItemPage, ui->actionExportMetadata);
+        connect(ui->actionExportMetadata, &QAction::triggered, this, &ModFolderPage::exportModMetadata);
+
         auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); };
 
         connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
@@ -372,3 +376,15 @@ void ModFolderPage::deleteModMetadata()
 
     m_model->deleteModsMetadata(selection);
 }
+
+void ModFolderPage::exportModMetadata()
+{
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
+    auto selectedMods = m_model->selectedMods(selection);
+    if (selectedMods.length() == 0)
+        selectedMods = m_model->allMods();
+
+    std::sort(selectedMods.begin(), selectedMods.end(), [](const Mod* a, const Mod* b) { return a->name() < b->name(); });
+    ExportToModListDialog dlg(m_instance->name(), selectedMods, this);
+    dlg.exec();
+}

launcher/ui/pages/instance/ModFolderPage.h

@@ -62,6 +62,7 @@ class ModFolderPage : public ExternalResourcesPage {
    private slots:
     void removeItems(const QItemSelection& selection) override;
     void deleteModMetadata();
+    void exportModMetadata();
 
     void installMods();
     void updateMods(bool includeDeps = false);

launcher/ui/pages/modplatform/ResourcePage.cpp

@@ -45,6 +45,7 @@
 
 #include "Markdown.h"
 
+#include "StringUtils.h"
 #include "ui/dialogs/ResourceDownloadDialog.h"
 #include "ui/pages/modplatform/ResourceModel.h"
 #include "ui/widgets/ProjectItem.h"
@@ -234,8 +235,8 @@ void ResourcePage::updateUi()
 
     text += "<hr>";
 
-    m_ui->packDescription->setHtml(
+    m_ui->packDescription->setHtml(StringUtils::htmlListPatch(
-        text + (current_pack->extraData.body.isEmpty() ? current_pack->description : markdownToHTML(current_pack->extraData.body)));
+        text + (current_pack->extraData.body.isEmpty() ? current_pack->description : markdownToHTML(current_pack->extraData.body))));
     m_ui->packDescription->flush();
 }
 

launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp

@@ -39,6 +39,7 @@
 #include "ui_AtlPage.h"
 
 #include "BuildConfig.h"
+#include "StringUtils.h"
 
 #include "AtlUserInteractionSupportImpl.h"
 #include "modplatform/atlauncher/ATLPackInstallTask.h"
@@ -144,7 +145,7 @@ void AtlPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelIndex
 
     selected = filterModel->data(first, Qt::UserRole).value<ATLauncher::IndexedPack>();
 
-    ui->packDescription->setHtml(selected.description.replace("\n", "<br>"));
+    ui->packDescription->setHtml(StringUtils::htmlListPatch(selected.description.replace("\n", "<br>")));
 
     for (const auto& version : selected.versions) {
         ui->versionSelectionBox->addItem(version.version);

launcher/ui/pages/modplatform/flame/FlamePage.cpp

@@ -43,6 +43,7 @@
 #include "FlameModel.h"
 #include "InstanceImportTask.h"
 #include "Json.h"
+#include "StringUtils.h"
 #include "modplatform/flame/FlameAPI.h"
 #include "ui/dialogs/NewInstanceDialog.h"
 #include "ui/widgets/ProjectItem.h"
@@ -292,6 +293,6 @@ void FlamePage::updateUi()
     text += "<hr>";
     text += api.getModDescription(current.addonId).toUtf8();
 
-    ui->packDescription->setHtml(text + current.description);
+    ui->packDescription->setHtml(StringUtils::htmlListPatch(text + current.description));
     ui->packDescription->flush();
 }

launcher/ui/pages/modplatform/legacy_ftb/Page.cpp

@@ -35,6 +35,7 @@
  */
 
 #include "Page.h"
+#include "StringUtils.h"
 #include "ui/widgets/ProjectItem.h"
 #include "ui_Page.h"
 
@@ -260,8 +261,9 @@ void Page::onPackSelectionChanged(Modpack* pack)
 {
     ui->versionSelectionBox->clear();
     if (pack) {
-        currentModpackInfo->setHtml("Pack by <b>" + pack->author + "</b>" + "<br>Minecraft " + pack->mcVersion + "<br>" + "<br>" +
+        currentModpackInfo->setHtml(StringUtils::htmlListPatch("Pack by <b>" + pack->author + "</b>" + "<br>Minecraft " + pack->mcVersion +
-                                    pack->description + "<ul><li>" + pack->mods.replace(";", "</li><li>") + "</li></ul>");
+                                                               "<br>" + "<br>" + pack->description + "<ul><li>" +
+                                                               pack->mods.replace(";", "</li><li>") + "</li></ul>"));
         bool currentAdded = false;
 
         for (int i = 0; i < pack->oldVersions.size(); i++) {

launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp

@@ -44,6 +44,7 @@
 #include "InstanceImportTask.h"
 #include "Json.h"
 #include "Markdown.h"
+#include "StringUtils.h"
 
 #include "ui/widgets/ProjectItem.h"
 
@@ -304,7 +305,7 @@ void ModrinthPage::updateUI()
 
     text += markdownToHTML(current.extra.body.toUtf8());
 
-    ui->packDescription->setHtml(text + current.description);
+    ui->packDescription->setHtml(StringUtils::htmlListPatch(text + current.description));
     ui->packDescription->flush();
 }
 

launcher/ui/pages/modplatform/technic/TechnicPage.cpp

@@ -44,6 +44,7 @@
 
 #include "BuildConfig.h"
 #include "Json.h"
+#include "StringUtils.h"
 #include "TechnicModel.h"
 #include "modplatform/technic/SingleZipPackInstallTask.h"
 #include "modplatform/technic/SolderPackInstallTask.h"
@@ -233,7 +234,7 @@ void TechnicPage::metadataLoaded()
 
     text += "<br><br>";
 
-    ui->packDescription->setHtml(text + current.description);
+    ui->packDescription->setHtml(StringUtils::htmlListPatch(text + current.description));
 
     // Strip trailing forward-slashes from Solder URL's
     if (current.isSolder) {

launcher/updater/prismupdater/UpdaterDialogs.cpp

@@ -26,6 +26,7 @@
 
 #include <QTextBrowser>
 #include "Markdown.h"
+#include "StringUtils.h"
 
 SelectReleaseDialog::SelectReleaseDialog(const Version& current_version, const QList<GitHubRelease>& releases, QWidget* parent)
     : QDialog(parent), m_releases(releases), m_currentVersion(current_version), ui(new Ui::SelectReleaseDialog)
@@ -96,7 +97,7 @@ void SelectReleaseDialog::selectionChanged(QTreeWidgetItem* current, QTreeWidget
     QString body = markdownToHTML(release.body.toUtf8());
     m_selectedRelease = release;
 
-    ui->changelogTextBrowser->setHtml(body);
+    ui->changelogTextBrowser->setHtml(StringUtils::htmlListPatch(body));
 }
 
 SelectReleaseAssetDialog::SelectReleaseAssetDialog(const QList<GitHubReleaseAsset>& assets, QWidget* parent)

nix/pkg/wrapper.nix

@@ -18,7 +18,7 @@
   jdk21,
   gamemode,
   flite,
-  mesa-demos,
+  glxinfo,
   udev,
   libusb1,
   msaClientID ? null,
@@ -81,7 +81,7 @@ in
       runtimePrograms =
         [
           xorg.xrandr
-          mesa-demos # need glxinfo
+          glxinfo
         ]
         ++ additionalPrograms;
     in