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

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

.github/workflows/backport.yml

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

.github/workflows/build.yml

@@ -61,7 +61,7 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: ''
-            qt_version: '6.6.0'
+            qt_version: '6.6.1'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -73,7 +73,7 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.6.0'
+            qt_version: '6.6.1'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -83,7 +83,7 @@ jobs:
             qt_ver: 6
             qt_host: mac
             qt_arch: ''
-            qt_version: '6.6.0'
+            qt_version: '6.6.1'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -145,7 +145,7 @@ jobs:
 
       - name: Setup ccache
         if: (runner.os != 'Windows' || matrix.msystem == '') && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.10
+        uses: hendrikmuhs/ccache-action@v1.2.11
         with:
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}-${{ matrix.architecture }}
 
@@ -517,70 +517,70 @@ jobs:
 
       - name: Upload binary tarball (macOS)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher.tar.gz
 
       - name: Upload binary zip (Windows)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_DIR }}/**
 
       - name: Upload binary zip (Windows, portable)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_PORTABLE_DIR }}/**
 
       - name: Upload installer (Windows)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher-Setup.exe
 
       - name: Upload binary tarball (Linux, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-Qt5-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher.tar.gz
 
       - name: Upload binary tarball (Linux, portable, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher-portable.tar.gz
 
       - name: Upload binary tarball (Linux, Qt 6)
         if: runner.os == 'Linux' && matrix.qt_ver !=5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-Qt6-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher.tar.gz
 
       - name: Upload binary tarball (Linux, portable, Qt 6)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher-portable.tar.gz
 
       - name: Upload AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
           path: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
 
       - name: Upload AppImage Zsync (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
           path: PrismLauncher-Linux-x86_64.AppImage.zsync

.github/workflows/codeql.yml

@@ -13,7 +13,7 @@ jobs:
           submodules: 'true'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           queries: security-and-quality
@@ -32,4 +32,4 @@ jobs:
           cmake --build build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/trigger_release.yml

@@ -32,7 +32,7 @@ jobs:
           submodules: "true"
           path: "PrismLauncher-source"
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Grab and store version
         run: |
           tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")

.github/workflows/update-flake.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
+      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
 
       - uses: DeterminateSystems/update-flake-lock@v20
         with:

CMakeLists.txt

@@ -377,7 +377,7 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
-    set(MACOSX_BUNDLE_COPYRIGHT "© 2022-2023 ${Launcher_Copyright_Mac}")
+    set(MACOSX_BUNDLE_COPYRIGHT "${Launcher_Copyright_Mac}")
     set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=" CACHE STRING "Public key for Sparkle update feed")
     set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml" CACHE STRING "URL for Sparkle update feed")
 

COPYING.md

@@ -1,7 +1,7 @@
 ## Prism Launcher
 
      Prism Launcher - Minecraft Launcher
-     Copyright (C) 2022-2023 Prism Launcher Contributors
+     Copyright (C) 2022-2024 Prism Launcher Contributors
 
      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
@@ -436,7 +436,7 @@
         Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
         Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
         Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
-    
+
     and others
 
     This library is free software; you can redistribute it and/or

flake.lock

@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1698882062,
+        "lastModified": 1704152458,
-        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
+        "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
+        "rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nix-filter": {
       "locked": {
-        "lastModified": 1694857738,
+        "lastModified": 1701697642,
-        "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
+        "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
+        "rev": "c843418ecfd0344ecb85844b082ff5675e02c443",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700108881,
+        "lastModified": 1704161960,
-        "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
+        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
+        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1698611440,
+        "lastModified": 1703961334,
-        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
+        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700064067,
+        "lastModified": 1703939133,
-        "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
+        "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
+        "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38",
         "type": "github"
       },
       "original": {

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: 5.15-23.08
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk17
@@ -104,18 +104,15 @@ modules:
       - install -Dm755 ../data/gamemoderun -t /app/bin
     sources:
       - type: archive
-        archive-type: tar-gzip
+        dest-filename: gamemode.tar.gz
-        url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.7
+        url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.8.1
-        sha256: 57ce73ba605d1cf12f8d13725006a895182308d93eba0f69f285648449641803
+        sha256: 969cf85b5ca3944f3e315cd73a0ee9bea4f9c968cd7d485e9f4745bc1e679c4e
         x-checker-data:
           type: json
           url: https://api.github.com/repos/FeralInteractive/gamemode/releases/latest
           version-query: .tag_name
           url-query: .tarball_url
           timestamp-query: .published_at
-      # from https://github.com/flathub/net.gaijin.WarThunder/blob/7ea6f7a9f84b9c77150c003a7059dc03f8dcbc7f/gamemode.patch
-      - type: patch
-        path: patches/gamemode.patch
     cleanup:
       - /include
       - /lib/pkgconfig

flatpak/patches/gamemode.patch

@@ -1,12 +0,0 @@
-diff -ruN a/common/common-pidfds.c b/common/common-pidfds.c
---- a/common/common-pidfds.c	2021-02-18 20:00:12.000000000 +0100
-+++ b/common/common-pidfds.c	2023-09-07 08:57:42.954362763 +0200
-@@ -58,6 +58,8 @@
- {
- 	return (int)syscall(__NR_pidfd_open, pid, flags);
- }
-+#else
-+#include <sys/pidfd.h>
- #endif
- 
- /* pidfd functions */

flatpak/shared-modules

@@ -1 +1 @@
-Subproject commit 45094ca570be383d06df729b6972830ec63bd3df
+Subproject commit 55a8e460c6343229597a13e973ba4855c27a1c4c

launcher/Application.cpp

@@ -132,6 +132,15 @@
 #include "gamemode_client.h"
 #endif
 
+#if defined(Q_OS_LINUX)
+#include <sys/statvfs.h>
+#endif
+
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+#include <sys/mount.h>
+#include <sys/types.h>
+#endif
+
 #if defined(Q_OS_MAC)
 #if defined(SPARKLE_ENABLED)
 #include "updater/MacSparkleUpdater.h"
@@ -485,8 +494,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     }
 
     {
-        qDebug() << qPrintable(BuildConfig.LAUNCHER_DISPLAYNAME) << ", (c) 2022-2023 "
+        qDebug() << qPrintable(BuildConfig.LAUNCHER_DISPLAYNAME + ", " + QString(BuildConfig.LAUNCHER_COPYRIGHT).replace("\n", ", "));
-                 << qPrintable(QString(BuildConfig.LAUNCHER_COPYRIGHT).replace("\n", ", "));
         qDebug() << "Version                    : " << BuildConfig.printableVersionString();
         qDebug() << "Platform                   : " << BuildConfig.BUILD_PLATFORM;
         qDebug() << "Git commit                 : " << BuildConfig.GIT_COMMIT;
@@ -658,6 +666,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // The cat
         m_settings->registerSetting("TheCat", false);
+        m_settings->registerSetting("CatOpacity", 100);
+
+        m_settings->registerSetting("StatusBarVisible", true);
 
         m_settings->registerSetting("ToolbarsLocked", false);
 
@@ -988,6 +999,37 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         }
     }
 
+    // notify user if /tmp is mounted with `noexec` (#1693)
+    {
+        bool is_tmp_noexec = false;
+
+#if defined(Q_OS_LINUX)
+
+        struct statvfs tmp_stat;
+        statvfs("/tmp", &tmp_stat);
+        is_tmp_noexec = tmp_stat.f_flag & ST_NOEXEC;
+
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+
+        struct statfs tmp_stat;
+        statfs("/tmp", &tmp_stat);
+        is_tmp_noexec = tmp_stat.f_flags & MNT_NOEXEC;
+
+#endif
+
+        if (is_tmp_noexec) {
+            auto infoMsg =
+                tr("Your /tmp directory is currently mounted with the 'noexec' flag enabled.\n"
+                   "Some versions of Minecraft may not launch.\n");
+            auto msgBox = new QMessageBox(QMessageBox::Information, tr("Incompatible system configuration"), infoMsg, QMessageBox::Ok);
+            msgBox->setDefaultButton(QMessageBox::Ok);
+            msgBox->setAttribute(Qt::WA_DeleteOnClose);
+            msgBox->setMinimumWidth(460);
+            msgBox->adjustSize();
+            msgBox->open();
+        }
+    }
+
     if (createSetupWizard()) {
         return;
     }
@@ -1471,6 +1513,17 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
     auto& window = extras.window;
 
     if (window) {
+// If the window is minimized on macOS or Windows, activate and bring it up
+#ifdef Q_OS_MACOS
+        if (window->isMinimized()) {
+            window->setWindowState(window->windowState() & ~Qt::WindowMinimized);
+        }
+#elif defined(Q_OS_WIN)
+        if (window->isMinimized()) {
+            window->showNormal();
+        }
+#endif
+
         window->raise();
         window->activateWindow();
     } else {
@@ -1478,6 +1531,7 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
         m_openWindows++;
         connect(window, &InstanceWindow::isClosing, this, &Application::on_windowClose);
     }
+
     if (!page.isEmpty()) {
         window->selectPage(page);
     }

launcher/BaseInstance.cpp

@@ -64,6 +64,8 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
 
     m_settings->registerSetting("lastLaunchTime", 0);
     m_settings->registerSetting("totalTimePlayed", 0);
+    if (m_settings->get("totalTimePlayed").toLongLong() < 0)
+        m_settings->reset("totalTimePlayed");
     m_settings->registerSetting("lastTimePlayed", 0);
 
     m_settings->registerSetting("linkedInstances", "[]");

launcher/InstanceCopyTask.cpp

@@ -142,9 +142,8 @@ void InstanceCopyTask::copyFinished()
     if (!m_keepPlaytime) {
         inst->resetTimePlayed();
     }
-    if (m_useLinks)
-        inst->addLinkedInstanceId(m_origInstance->id());
     if (m_useLinks) {
+        inst->addLinkedInstanceId(m_origInstance->id());
         auto allowed_symlinks_file = QFileInfo(FS::PathCombine(inst->gameRoot(), "allowed_symlinks.txt"));
 
         QByteArray allowed_symlinks;

launcher/minecraft/MojangVersionFormat.cpp

@@ -157,20 +157,6 @@ void MojangVersionFormat::readVersionProperties(const QJsonObject& in, VersionFi
     Bits::readString(in, "id", out->minecraftVersion);
     Bits::readString(in, "mainClass", out->mainClass);
     Bits::readString(in, "minecraftArguments", out->minecraftArguments);
-    if (out->minecraftArguments.isEmpty()) {
-        QString processArguments;
-        Bits::readString(in, "processArguments", processArguments);
-        QString toCompare = processArguments.toLower();
-        if (toCompare == "legacy") {
-            out->minecraftArguments = " ${auth_player_name} ${auth_session}";
-        } else if (toCompare == "username_session") {
-            out->minecraftArguments = "--username ${auth_player_name} --session ${auth_session}";
-        } else if (toCompare == "username_session_version") {
-            out->minecraftArguments = "--username ${auth_player_name} --session ${auth_session} --version ${profile_name}";
-        } else if (!toCompare.isEmpty()) {
-            out->addProblem(ProblemSeverity::Error, QObject::tr("processArguments is set to unknown value '%1'").arg(processArguments));
-        }
-    }
     Bits::readString(in, "type", out->type);
 
     Bits::readString(in, "assets", out->assets);

launcher/minecraft/mod/ResourceFolderModel.h

@@ -306,7 +306,6 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
             auto removed_it = m_resources.begin() + removed_index;
 
             Q_ASSERT(removed_it != m_resources.end());
-            Q_ASSERT(removed_set.contains(removed_it->get()->internal_id()));
 
             if ((*removed_it)->isResolving()) {
                 auto ticket = (*removed_it)->resolutionTicket();

launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp

@@ -184,7 +184,9 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
 
     ResourceAPI::DependencySearchArgs args = { dep, m_version, m_loaderType };
     ResourceAPI::DependencySearchCallbacks callbacks;
-
+    callbacks.on_fail = [](QString reason, int) {
+        qCritical() << tr("A network error occurred. Could not load project dependencies:%1").arg(reason);
+    };
     callbacks.on_succeed = [dep, provider, pDep, level, this](auto& doc, [[maybe_unused]] auto& pack) {
         try {
             QJsonArray arr;

launcher/modplatform/EnsureMetadataTask.cpp

@@ -149,6 +149,7 @@ void EnsureMetadataTask::executeTask()
             if (m_current_task)
                 m_current_task.reset();
         });
+        connect(project_task.get(), &Task::failed, this, &EnsureMetadataTask::emitFailed);
 
         m_current_task = project_task;
         project_task->start();

launcher/modplatform/ModIndex.h

@@ -122,6 +122,8 @@ struct ExtraPackData {
     QString wikiUrl;
     QString discordUrl;
 
+    QString status;
+
     QString body;
 };
 

launcher/modplatform/ResourceAPI.h

@@ -96,6 +96,7 @@ class ResourceAPI {
     };
     struct VersionSearchCallbacks {
         std::function<void(QJsonDocument&, ModPlatform::IndexedPack)> on_succeed;
+        std::function<void(QString const& reason, int network_error_code)> on_fail;
     };
 
     struct ProjectInfoArgs {
@@ -118,6 +119,7 @@ class ResourceAPI {
 
     struct DependencySearchCallbacks {
         std::function<void(QJsonDocument&, const ModPlatform::Dependency&)> on_succeed;
+        std::function<void(QString const& reason, int network_error_code)> on_fail;
     };
 
    public:

launcher/modplatform/flame/FileResolvingTask.cpp

@@ -119,7 +119,6 @@ void Flame::FileResolvingTask::netJobFinished()
     connect(m_checkJob.get(), &NetJob::failed, this, [this, step_progress](QString reason) {
         step_progress->state = TaskStepState::Failed;
         stepProgress(*step_progress);
-        emitFailed(reason);
     });
     connect(m_checkJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
     connect(m_checkJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {

launcher/modplatform/flame/FlameCheckUpdate.cpp

@@ -24,7 +24,7 @@ bool FlameCheckUpdate::abort()
     return true;
 }
 
-ModPlatform::IndexedPack getProjectInfo(ModPlatform::IndexedVersion& ver_info)
+ModPlatform::IndexedPack FlameCheckUpdate::getProjectInfo(ModPlatform::IndexedVersion& ver_info)
 {
     ModPlatform::IndexedPack pack;
 
@@ -57,6 +57,7 @@ ModPlatform::IndexedPack getProjectInfo(ModPlatform::IndexedVersion& ver_info)
         }
     });
 
+    connect(get_project_job, &NetJob::failed, this, &FlameCheckUpdate::emitFailed);
     QObject::connect(get_project_job, &NetJob::finished, [&loop, get_project_job] {
         get_project_job->deleteLater();
         loop.quit();
@@ -68,7 +69,7 @@ ModPlatform::IndexedPack getProjectInfo(ModPlatform::IndexedVersion& ver_info)
     return pack;
 }
 
-ModPlatform::IndexedVersion getFileInfo(int addonId, int fileId)
+ModPlatform::IndexedVersion FlameCheckUpdate::getFileInfo(int addonId, int fileId)
 {
     ModPlatform::IndexedVersion ver;
 
@@ -100,7 +101,7 @@ ModPlatform::IndexedVersion getFileInfo(int addonId, int fileId)
             qDebug() << doc;
         }
     });
-
+    connect(get_file_info_job, &NetJob::failed, this, &FlameCheckUpdate::emitFailed);
     QObject::connect(get_file_info_job, &NetJob::finished, [&loop, get_file_info_job] {
         get_file_info_job->deleteLater();
         loop.quit();

launcher/modplatform/flame/FlameCheckUpdate.h

@@ -22,6 +22,9 @@ class FlameCheckUpdate : public CheckUpdateTask {
     void executeTask() override;
 
    private:
+    ModPlatform::IndexedPack getProjectInfo(ModPlatform::IndexedVersion& ver_info);
+    ModPlatform::IndexedVersion getFileInfo(int addonId, int fileId);
+
     NetJob* m_net_job = nullptr;
 
     bool m_was_aborted = false;

launcher/modplatform/flame/FlameInstanceCreationTask.cpp

@@ -227,6 +227,7 @@ bool FlameCreationTask::updateInstance()
                 m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(relative_path));
             }
         });
+        connect(job.get(), &Task::failed, this, [](QString reason) { qCritical() << "Failed to get files: " << reason; });
         connect(job.get(), &Task::finished, &loop, &QEventLoop::quit);
 
         m_process_update_file_info_job = job;
@@ -427,6 +428,9 @@ bool FlameCreationTask::createInstance()
     // Don't add managed info to packs without an ID (most likely imported from ZIP)
     if (!m_managed_id.isEmpty())
         instance.setManagedPack("flame", m_managed_id, m_pack.name, m_managed_version_id, m_pack.version);
+    else
+        instance.setManagedPack("flame", "", name(), "", "");
+
     instance.setName(name());
 
     m_mod_id_resolver.reset(new Flame::FileResolvingTask(APPLICATION->network(), m_pack));

launcher/modplatform/flame/FlamePackExportTask.cpp

@@ -323,6 +323,7 @@ void FlamePackExportTask::getProjectsInfo()
         }
         buildZip();
     });
+    connect(projTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
     task.reset(projTask);
     task->start();
 }

launcher/modplatform/helpers/NetworkResourceAPI.cpp

@@ -102,6 +102,13 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
 
         callbacks.on_succeed(doc, args.pack);
     });
+    QObject::connect(netJob.get(), &NetJob::failed, [&netJob, callbacks](QString reason) {
+        int network_error_code = -1;
+        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
+            network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+        callbacks.on_fail(reason, network_error_code);
+    });
 
     return netJob;
 }
@@ -146,6 +153,12 @@ Task::Ptr NetworkResourceAPI::getDependencyVersion(DependencySearchArgs&& args,
 
         callbacks.on_succeed(doc, args.dependency);
     });
+    QObject::connect(netJob.get(), &NetJob::failed, [&netJob, callbacks](QString reason) {
+        int network_error_code = -1;
+        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
+            network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 
+        callbacks.on_fail(reason, network_error_code);
+    });
     return netJob;
 }

launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp

@@ -72,9 +72,7 @@ void ModrinthCheckUpdate::executeTask()
     auto response = std::make_shared<QByteArray>();
     auto job = api.latestVersions(hashes, best_hash_type, m_game_versions, m_loaders, response);
 
-    QEventLoop lock;
+    connect(job.get(), &Task::succeeded, this, [this, response, mappings, best_hash_type, job] {
-
-    connect(job.get(), &Task::succeeded, this, [this, response, &mappings, best_hash_type, job] {
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
@@ -82,7 +80,7 @@ void ModrinthCheckUpdate::executeTask()
                        << " reason: " << parse_error.errorString();
             qWarning() << *response;
 
-            failed(parse_error.errorString());
+            emitFailed(parse_error.errorString());
             return;
         }
 
@@ -167,19 +165,17 @@ void ModrinthCheckUpdate::executeTask()
                 m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, project_ver));
             }
         } catch (Json::JsonException& e) {
-            failed(e.cause() + " : " + e.what());
+            emitFailed(e.cause() + " : " + e.what());
+            return;
         }
+        emitSucceeded();
     });
 
-    connect(job.get(), &Task::finished, &lock, &QEventLoop::quit);
+    connect(job.get(), &Task::failed, this, &ModrinthCheckUpdate::emitFailed);
 
     setStatus(tr("Waiting for the API response from Modrinth..."));
     setProgress(1, 3);
 
     m_net_job = qSharedPointerObjectCast<NetJob, Task>(job);
     job->start();
-
-    lock.exec();
-
-    emitSucceeded();
 }

launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp

@@ -226,6 +226,9 @@ bool ModrinthCreationTask::createInstance()
     // Don't add managed info to packs without an ID (most likely imported from ZIP)
     if (!m_managed_id.isEmpty())
         instance.setManagedPack("modrinth", m_managed_id, m_managed_name, m_managed_version_id, version());
+    else
+        instance.setManagedPack("modrinth", "", name(), "", "");
+
     instance.setName(name());
     instance.saveNow();
 
@@ -289,7 +292,7 @@ bool ModrinthCreationTask::createInstance()
         // Only change the name if it didn't use a custom name, so that the previous custom name
         // is preserved, but if we're using the original one, we update the version string.
         // NOTE: This needs to come before the copyManagedPack call!
-        if (inst->name().contains(inst->getManagedPackVersionName())) {
+        if (inst->name().contains(inst->getManagedPackVersionName()) && inst->name() != instance.name()) {
             if (askForChangingInstanceName(m_parent, inst->name(), instance.name()) == InstanceNameChange::ShouldChange)
                 inst->setName(instance.name());
         }

launcher/modplatform/modrinth/ModrinthPackIndex.cpp

@@ -104,6 +104,8 @@ void Modrinth::loadExtraPackData(ModPlatform::IndexedPack& pack, QJsonObject& ob
         pack.extraData.donate.append(donate);
     }
 
+    pack.extraData.status = Json::ensureString(obj, "status");
+
     pack.extraData.body = Json::ensureString(obj, "body").remove("<br>");
 
     pack.extraDataLoaded = true;

launcher/modplatform/modrinth/ModrinthPackManifest.cpp

@@ -95,6 +95,8 @@ void loadIndexedInfo(Modpack& pack, QJsonObject& obj)
         pack.extra.donate.append(donate);
     }
 
+    pack.extra.status = Json::ensureString(obj, "status");
+
     pack.extraInfoLoaded = true;
 }
 

launcher/modplatform/modrinth/ModrinthPackManifest.h

@@ -77,6 +77,8 @@ struct ModpackExtra {
     QString discordUrl;
 
     QList<DonationData> donate;
+
+    QString status;
 };
 
 struct ModpackVersion {

launcher/net/NetJob.cpp

@@ -36,6 +36,7 @@
  */
 
 #include "NetJob.h"
+#include "tasks/ConcurrentTask.h"
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
 #endif
@@ -56,18 +57,15 @@ auto NetJob::addNetAction(NetAction::Ptr action) -> bool
     return true;
 }
 
-void NetJob::startNext()
+void NetJob::executeNextSubTask()
 {
-    if (m_queue.isEmpty() && m_doing.isEmpty()) {
+    // We're finished, check for failures and retry if we can (up to 3 times)
-        // 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) {
-        if (!m_failed.isEmpty() && m_try < 3) {
+        m_try += 1;
-            m_try += 1;
+        while (!m_failed.isEmpty())
-            while (!m_failed.isEmpty())
+            m_queue.enqueue(m_failed.take(*m_failed.keyBegin()));
-                m_queue.enqueue(m_failed.take(*m_failed.keyBegin()));
-        }
     }
-
+    ConcurrentTask::executeNextSubTask();
-    ConcurrentTask::startNext();
 }
 
 auto NetJob::size() const -> int

launcher/net/NetJob.h

@@ -55,8 +55,6 @@ class NetJob : public ConcurrentTask {
     explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network);
     ~NetJob() override = default;
 
-    void startNext() override;
-
     auto size() const -> int;
 
     auto canAbort() const -> bool override;
@@ -69,6 +67,9 @@ class NetJob : public ConcurrentTask {
     // Qt can't handle auto at the start for some reason?
     bool abort() override;
 
+   protected slots:
+    void executeNextSubTask() override;
+
    protected:
     void updateState() override;
 

launcher/qtlogging.ini

@@ -5,6 +5,7 @@
 qt.*.debug=false
 # don't log credentials by default
 launcher.auth.credentials.debug=false
+katabasis.*.debug=false
 # remove the debug lines, other log levels still get through
 launcher.task.net.download.debug=false
 # enable or disable whole catageries

launcher/screenshots/ImgurUpload.cpp

@@ -58,14 +58,14 @@ void ImgurUpload::init()
 
 QNetworkReply* ImgurUpload::getReply(QNetworkRequest& request)
 {
-    auto file = new QFile(m_fileInfo.absoluteFilePath());
+    auto file = new QFile(m_fileInfo.absoluteFilePath(), this);
 
     if (!file->open(QFile::ReadOnly)) {
         emitFailed();
         return nullptr;
     }
 
-    QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+    QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType, this);
     file->setParent(multipart);
     QHttpPart filePart;
     filePart.setBodyDevice(file);

launcher/settings/INIFile.cpp

@@ -54,6 +54,7 @@ bool INIFile::saveFile(QString fileName)
         insert("ConfigVersion", "1.2");
     QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
     _settings_obj.setFallbacksEnabled(false);
+    _settings_obj.clear();
 
     for (Iterator iter = begin(); iter != end(); iter++)
         _settings_obj.setValue(iter.key(), iter.value());

launcher/tasks/ConcurrentTask.cpp

@@ -35,7 +35,6 @@
  */
 #include "ConcurrentTask.h"
 
-#include <QCoreApplication>
 #include <QDebug>
 #include "tasks/Task.h"
 
@@ -47,9 +46,9 @@ ConcurrentTask::ConcurrentTask(QObject* parent, QString task_name, int max_concu
 
 ConcurrentTask::~ConcurrentTask()
 {
-    for (auto task : m_queue) {
+    for (auto task : m_doing) {
         if (task)
-            task->deleteLater();
+            task->disconnect(this);
     }
 }
 
@@ -65,15 +64,13 @@ void ConcurrentTask::addTask(Task::Ptr task)
 
 void ConcurrentTask::executeTask()
 {
-    // Start one task, startNext handles starting the up to the m_total_max_size
+    for (auto i = 0; i < m_total_max_size; i++)
-    // while tracking the number currently being done
+        QMetaObject::invokeMethod(this, &ConcurrentTask::executeNextSubTask, Qt::QueuedConnection);
-    QMetaObject::invokeMethod(this, &ConcurrentTask::startNext, Qt::QueuedConnection);
 }
 
 bool ConcurrentTask::abort()
 {
     m_queue.clear();
-    m_aborted = true;
 
     if (m_doing.isEmpty()) {
         // Don't call emitAborted() here, we want to bypass the 'is the task running' check
@@ -108,29 +105,36 @@ void ConcurrentTask::clear()
     m_failed.clear();
     m_queue.clear();
 
-    m_aborted = false;
-
     m_progress = 0;
     m_stepProgress = 0;
 }
 
-void ConcurrentTask::startNext()
+void ConcurrentTask::executeNextSubTask()
 {
-    if (m_aborted || m_doing.count() > m_total_max_size)
+    if (!isRunning()) {
         return;
-
+    }
-    if (m_queue.isEmpty() && m_doing.isEmpty() && !wasSuccessful()) {
+    if (m_doing.count() >= m_total_max_size) {
-        emitSucceeded();
+        return;
+    }
+    if (m_queue.isEmpty()) {
+        if (m_doing.isEmpty()) {
+            if (m_failed.isEmpty())
+                emitSucceeded();
+            else
+                emitFailed(tr("One or more subtasks failed"));
+        }
         return;
     }
 
-    if (m_queue.isEmpty())
+    startSubTask(m_queue.dequeue());
-        return;
+}
-
-    Task::Ptr next = m_queue.dequeue();
 
+void ConcurrentTask::startSubTask(Task::Ptr next)
+{
     connect(next.get(), &Task::succeeded, this, [this, next]() { subTaskSucceeded(next); });
     connect(next.get(), &Task::failed, this, [this, next](QString msg) { subTaskFailed(next, msg); });
+    // this should never happen but if it does, it's better to fail the task than get stuck
     connect(next.get(), &Task::aborted, this, [this, next] { subTaskFailed(next, "Aborted"); });
 
     connect(next.get(), &Task::status, this, [this, next](QString msg) { subTaskStatus(next, msg); });
@@ -140,55 +144,42 @@ void ConcurrentTask::startNext()
     connect(next.get(), &Task::progress, this, [this, next](qint64 current, qint64 total) { subTaskProgress(next, current, total); });
 
     m_doing.insert(next.get(), next);
-    qsizetype num_starts = qMin(m_queue.size(), m_total_max_size - m_doing.size());
+
     auto task_progress = std::make_shared<TaskStepProgress>(next->getUid());
     m_task_progress.insert(next->getUid(), task_progress);
 
     updateState();
     updateStepProgress(*task_progress.get(), Operation::ADDED);
 
-    QCoreApplication::processEvents();
-
     QMetaObject::invokeMethod(next.get(), &Task::start, Qt::QueuedConnection);
+}
 
-    // Allow going up the number of concurrent tasks in case of tasks being added in the middle of a running task.
+void ConcurrentTask::subTaskFinished(Task::Ptr task, TaskStepState state)
-    for (int i = 0; i < num_starts; i++)
+{
-        QMetaObject::invokeMethod(this, &ConcurrentTask::startNext, Qt::QueuedConnection);
+    m_done.insert(task.get(), task);
+    (state == TaskStepState::Succeeded ? m_succeeded : m_failed).insert(task.get(), task);
+
+    m_doing.remove(task.get());
+
+    auto task_progress = m_task_progress.value(task->getUid());
+    task_progress->state = state;
+
+    disconnect(task.get(), 0, this, 0);
+
+    emit stepProgress(*task_progress);
+    updateState();
+    updateStepProgress(*task_progress, Operation::REMOVED);
+    QMetaObject::invokeMethod(this, &ConcurrentTask::executeNextSubTask, Qt::QueuedConnection);
 }
 
 void ConcurrentTask::subTaskSucceeded(Task::Ptr task)
 {
-    m_done.insert(task.get(), task);
+    subTaskFinished(task, TaskStepState::Succeeded);
-    m_succeeded.insert(task.get(), task);
-
-    m_doing.remove(task.get());
-    auto task_progress = m_task_progress.value(task->getUid());
-    task_progress->state = TaskStepState::Succeeded;
-
-    disconnect(task.get(), 0, this, 0);
-
-    emit stepProgress(*task_progress);
-    updateState();
-    updateStepProgress(*task_progress, Operation::REMOVED);
-    startNext();
 }
 
 void ConcurrentTask::subTaskFailed(Task::Ptr task, [[maybe_unused]] const QString& msg)
 {
-    m_done.insert(task.get(), task);
+    subTaskFinished(task, TaskStepState::Failed);
-    m_failed.insert(task.get(), task);
-
-    m_doing.remove(task.get());
-
-    auto task_progress = m_task_progress.value(task->getUid());
-    task_progress->state = TaskStepState::Failed;
-
-    disconnect(task.get(), 0, this, 0);
-
-    emit stepProgress(*task_progress);
-    updateState();
-    updateStepProgress(*task_progress, Operation::REMOVED);
-    startNext();
 }
 
 void ConcurrentTask::subTaskStatus(Task::Ptr task, const QString& msg)

launcher/tasks/ConcurrentTask.h

@@ -72,10 +72,11 @@ class ConcurrentTask : public Task {
    protected slots:
     void executeTask() override;
 
-    virtual void startNext();
+    virtual void executeNextSubTask();
 
     void subTaskSucceeded(Task::Ptr);
-    void subTaskFailed(Task::Ptr, const QString& msg);
+    virtual void subTaskFailed(Task::Ptr, const QString& msg);
+    void subTaskFinished(Task::Ptr, TaskStepState);
     void subTaskStatus(Task::Ptr task, const QString& msg);
     void subTaskDetails(Task::Ptr task, const QString& msg);
     void subTaskProgress(Task::Ptr task, qint64 current, qint64 total);
@@ -90,6 +91,8 @@ class ConcurrentTask : public Task {
 
     virtual void updateState();
 
+    void startSubTask(Task::Ptr task);
+
    protected:
     QString m_name;
     QString m_step_status;
@@ -107,6 +110,4 @@ class ConcurrentTask : public Task {
 
     qint64 m_stepProgress = 0;
     qint64 m_stepTotalProgress = 100;
-
-    bool m_aborted = false;
 };

launcher/tasks/MultipleOptionsTask.cpp

@@ -36,9 +36,9 @@
 
 #include <QDebug>
 
-MultipleOptionsTask::MultipleOptionsTask(QObject* parent, const QString& task_name) : SequentialTask(parent, task_name) {}
+MultipleOptionsTask::MultipleOptionsTask(QObject* parent, const QString& task_name) : ConcurrentTask(parent, task_name, 1) {}
 
-void MultipleOptionsTask::startNext()
+void MultipleOptionsTask::executeNextSubTask()
 {
     if (m_done.size() != m_failed.size()) {
         emitSucceeded();
@@ -51,7 +51,7 @@ void MultipleOptionsTask::startNext()
         return;
     }
 
-    ConcurrentTask::startNext();
+    ConcurrentTask::executeNextSubTask();
 }
 
 void MultipleOptionsTask::updateState()

launcher/tasks/MultipleOptionsTask.h

@@ -34,18 +34,18 @@
  */
 #pragma once
 
-#include "SequentialTask.h"
+#include "ConcurrentTask.h"
 
 /* This task type will attempt to do run each of it's subtasks in sequence,
  * until one of them succeeds. When that happens, the remaining tasks will not run.
  * */
-class MultipleOptionsTask : public SequentialTask {
+class MultipleOptionsTask : public ConcurrentTask {
     Q_OBJECT
    public:
     explicit MultipleOptionsTask(QObject* parent = nullptr, const QString& task_name = "");
     ~MultipleOptionsTask() override = default;
 
    private slots:
-    void startNext() override;
+    void executeNextSubTask() override;
     void updateState() override;
 };

launcher/tasks/SequentialTask.cpp

@@ -36,18 +36,15 @@
 #include "SequentialTask.h"
 
 #include <QDebug>
+#include "tasks/ConcurrentTask.h"
 
 SequentialTask::SequentialTask(QObject* parent, QString task_name) : ConcurrentTask(parent, task_name, 1) {}
 
-void SequentialTask::startNext()
+void SequentialTask::subTaskFailed(Task::Ptr task, const QString& msg)
 {
-    if (m_failed.size() > 0) {
+    emitFailed(msg);
-        emitFailed(tr("One of the tasks failed!"));
+    qWarning() << msg;
-        qWarning() << m_failed.constBegin()->get()->failReason();
+    ConcurrentTask::subTaskFailed(task, msg);
-        return;
-    }
-
-    ConcurrentTask::startNext();
 }
 
 void SequentialTask::updateState()

launcher/tasks/SequentialTask.h

@@ -50,7 +50,9 @@ class SequentialTask : public ConcurrentTask {
     explicit SequentialTask(QObject* parent = nullptr, QString task_name = "");
     ~SequentialTask() override = default;
 
+   protected slots:
+    virtual void subTaskFailed(Task::Ptr, const QString& msg) override;
+
    protected:
-    void startNext() override;
     void updateState() override;
 };

launcher/ui/MainWindow.cpp

@@ -186,6 +186,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
 
         ui->instanceToolBar->addContextMenuAction(ui->newsToolBar->toggleViewAction());
         ui->instanceToolBar->addContextMenuAction(ui->instanceToolBar->toggleViewAction());
+        ui->instanceToolBar->addContextMenuAction(ui->actionToggleStatusBar);
         ui->instanceToolBar->addContextMenuAction(ui->actionLockToolbars);
     }
 
@@ -319,6 +320,14 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         setCatBackground(cat_enable);
     }
 
+    // Togglable status bar
+    {
+        bool statusBarVisible = APPLICATION->settings()->get("StatusBarVisible").toBool();
+        ui->actionToggleStatusBar->setChecked(statusBarVisible);
+        connect(ui->actionToggleStatusBar, &QAction::toggled, this, &MainWindow::setStatusBarVisibility);
+        setStatusBarVisibility(statusBarVisible);
+    }
+
     // Lock toolbars
     {
         bool toolbarsLocked = APPLICATION->settings()->get("ToolbarsLocked").toBool();
@@ -451,10 +460,16 @@ QMenu* MainWindow::createPopupMenu()
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
     filteredMenu->removeAction(ui->mainToolBar->toggleViewAction());
 
+    filteredMenu->addAction(ui->actionToggleStatusBar);
     filteredMenu->addAction(ui->actionLockToolbars);
 
     return filteredMenu;
 }
+void MainWindow::setStatusBarVisibility(bool state)
+{
+    statusBar()->setVisible(state);
+    APPLICATION->settings()->set("StatusBarVisible", state);
+}
 void MainWindow::lockToolbars(bool state)
 {
     ui->mainToolBar->setMovable(!state);

launcher/ui/MainWindow.h

@@ -205,6 +205,8 @@ class MainWindow : public QMainWindow {
 
     void globalSettingsClosed();
 
+    void setStatusBarVisibility(bool);
+
     void lockToolbars(bool);
 
 #ifndef Q_OS_MAC

launcher/ui/MainWindow.ui

@@ -176,6 +176,7 @@
     <addaction name="actionChangeTheme"/>
     <addaction name="separator"/>
     <addaction name="actionCAT"/>
+    <addaction name="actionToggleStatusBar"/>
     <addaction name="actionLockToolbars"/>
     <addaction name="separator"/>
    </widget>
@@ -257,6 +258,14 @@
     <string>It's a fluffy kitty :3</string>
    </property>
   </action>
+  <action name="actionToggleStatusBar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Status Bar</string>
+   </property>
+  </action>
   <action name="actionLockToolbars">
    <property name="checkable">
     <bool>true</bool>

launcher/ui/dialogs/AboutDialog.cpp

@@ -174,8 +174,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDia
     QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
     ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
 
-    QString copyText("© 2022-2023 %1");
+    ui->copyLabel->setText(BuildConfig.LAUNCHER_COPYRIGHT);
-    ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT));
 
     connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
 

launcher/ui/dialogs/AboutDialog.h

@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include <net/NetJob.h>
 #include <QDialog>
 
 namespace Ui {
@@ -31,7 +30,4 @@ class AboutDialog : public QDialog {
 
    private:
     Ui::AboutDialog* ui;
-
-    NetJob::Ptr netJob;
-    QByteArray dataSink;
 };

launcher/ui/dialogs/ModUpdateDialog.cpp

@@ -334,6 +334,8 @@ auto ModUpdateDialog::ensureMetadata() -> bool
         connect(modrinth_task.get(), &EnsureMetadataTask::metadataFailed, [this, &should_try_others](Mod* candidate) {
             onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::ResourceProvider::MODRINTH);
         });
+        connect(modrinth_task.get(), &EnsureMetadataTask::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
 
         if (modrinth_task->getHashingTask())
             seq.addTask(modrinth_task->getHashingTask());
@@ -347,6 +349,8 @@ auto ModUpdateDialog::ensureMetadata() -> bool
         connect(flame_task.get(), &EnsureMetadataTask::metadataFailed, [this, &should_try_others](Mod* candidate) {
             onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::ResourceProvider::FLAME);
         });
+        connect(flame_task.get(), &EnsureMetadataTask::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
 
         if (flame_task->getHashingTask())
             seq.addTask(flame_task->getHashingTask());
@@ -400,6 +404,8 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
         auto task = makeShared<EnsureMetadataTask>(mod, index_dir, next(first_choice));
         connect(task.get(), &EnsureMetadataTask::metadataReady, [this](Mod* candidate) { onMetadataEnsured(candidate); });
         connect(task.get(), &EnsureMetadataTask::metadataFailed, [this](Mod* candidate) { onMetadataFailed(candidate, false); });
+        connect(task.get(), &EnsureMetadataTask::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
 
         m_second_try_metadata->addTask(task);
     } else {

launcher/ui/instanceview/InstanceView.cpp

@@ -458,6 +458,7 @@ void InstanceView::paintEvent([[maybe_unused]] QPaintEvent* event)
     QPainter painter(this->viewport());
 
     if (m_catVisible) {
+        painter.setOpacity(APPLICATION->settings()->get("CatOpacity").toFloat() / 100);
         int widWidth = this->viewport()->width();
         int widHeight = this->viewport()->height();
         if (m_catPixmap.width() < widWidth)
@@ -468,6 +469,7 @@ void InstanceView::paintEvent([[maybe_unused]] QPaintEvent* event)
         QRect rectOfPixmap = pixmap.rect();
         rectOfPixmap.moveBottomRight(this->viewport()->rect().bottomRight());
         painter.drawPixmap(rectOfPixmap.topLeft(), pixmap);
+        painter.setOpacity(1.0);
     }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)

launcher/ui/instanceview/VisualGroup.cpp

@@ -158,13 +158,14 @@ void VisualGroup::drawHeader(QPainter* painter, const QStyleOptionViewItem& opti
     painter->setRenderHint(QPainter::Antialiasing);
 
     // sizes and offsets, to keep things consistent below
-    int arrowOffsetLeft = fontMetrics.height() / 2 + 7;
+    const int arrowOffsetLeft = fontMetrics.height() / 2 + 7;
-    int textOffsetLeft = arrowOffsetLeft * 2;
+    const int textOffsetLeft = arrowOffsetLeft * 2;
-    int arrowSize = 6;
+    const int centerHeight = optRect.top() + fontMetrics.height() / 2;
-    int centerHeight = optRect.top() + fontMetrics.height() / 2;
+    const QString& textToDraw = text.isEmpty() ? QObject::tr("Ungrouped") : text;
 
     // BEGIN: arrow
     {
+        constexpr int arrowSize = 6;
         QPolygon arrowPolygon;
         if (collapsed) {
             arrowPolygon << QPoint(arrowOffsetLeft - arrowSize / 2, centerHeight - arrowSize)
@@ -188,9 +189,26 @@ void VisualGroup::drawHeader(QPainter* painter, const QStyleOptionViewItem& opti
         textRect.setHeight(fontMetrics.height());
         textRect.setRight(textRect.right() - 7);
 
-        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, !text.isEmpty() ? text : QObject::tr("Ungrouped"));
+        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, textToDraw);
     }
     // END: text
+
+    // BEGIN: horizontal line
+    {
+        penColor.setAlphaF(0.05);
+        pen.setColor(penColor);
+        painter->setPen(pen);
+        // startPoint is left + arrow + text + space
+        const int startPoint =
+            optRect.left() + fontMetrics.height() + fontMetrics.size(Qt::AlignLeft | Qt::AlignVCenter, textToDraw).width() + 20;
+        painter->setRenderHint(QPainter::Antialiasing, false);
+        QPolygon polygon;
+        // for some reason the height (yPos) doesn't look centered, so we are adding 1 to the center height
+        const int lineHeight = centerHeight + 1;
+        polygon << QPoint(startPoint, lineHeight) << QPoint(optRect.right() - 3, lineHeight);
+        painter->drawPolyline(polygon);
+    }
+    // END: horizontal line
 }
 
 int VisualGroup::totalHeight() const

launcher/ui/pages/global/LauncherPage.cpp

@@ -221,6 +221,9 @@ void LauncherPage::applySettings()
             break;
     }
 
+    // Cat
+    s->set("CatOpacity", ui->catOpacitySpinBox->value());
+
     // Mods
     s->set("ModMetadataDisabled", ui->metadataDisableBtn->isChecked());
     s->set("ModDependenciesDisabled", ui->dependenciesDisableBtn->isChecked());
@@ -276,6 +279,9 @@ void LauncherPage::loadSettings()
         ui->sortByNameBtn->setChecked(true);
     }
 
+    // Cat
+    ui->catOpacitySpinBox->setValue(s->get("CatOpacity").toInt());
+
     // Mods
     ui->metadataDisableBtn->setChecked(s->get("ModMetadataDisabled").toBool());
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());

launcher/ui/pages/global/LauncherPage.ui

@@ -186,7 +186,7 @@
             </property>
            </widget>
           </item>
-           <item>
+          <item>
            <widget class="QCheckBox" name="dependenciesDisableBtn">
             <property name="toolTip">
              <string>Disable the automatic detection, installation, and updating of mod dependencies.</string>
@@ -300,6 +300,54 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="catBox">
+         <property name="title">
+          <string>Cat</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="catOpacityLabel">
+            <property name="toolTip">
+             <string>Set the cat's opacity. 0% is fully transparent and 100% is fully opaque.</string>
+            </property>
+            <property name="text">
+             <string>Opacity</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QSpinBox" name="catOpacitySpinBox">
+            <property name="specialValueText">
+             <string/>
+            </property>
+            <property name="suffix">
+             <string>%</string>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <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="QGroupBox" name="toolsBox">
          <property name="sizePolicy">

launcher/ui/pages/global/MinecraftPage.ui

@@ -206,7 +206,7 @@
           <item>
            <widget class="QCheckBox" name="onlineFixes">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Emulates usages of old online services which are no longer operating.&lt;/p&gt;&lt;p&gt;This currently allows modern skins to be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Emulates usages of old online services which are no longer operating.&lt;/p&gt;&lt;p&gt;Current fixes include: skin and online mode support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Enable online fixes (experimental)</string>

launcher/ui/pages/instance/InstanceSettingsPage.cpp

@@ -346,7 +346,7 @@ void InstanceSettingsPage::loadSettings()
 #ifdef Q_OS_LINUX
     ui->lineEditOpenALPath->setPlaceholderText(APPLICATION->m_detectedOpenALPath);
 #else
-    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
+    ui->lineEditOpenALPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
 #endif
 
     // Performance

launcher/ui/pages/instance/InstanceSettingsPage.ui

@@ -605,7 +605,7 @@
           <item>
            <widget class="QCheckBox" name="onlineFixes">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Emulates usages of old online services which are no longer operating.&lt;/p&gt;&lt;p&gt;This currently allows modern skins to be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Emulates usages of old online services which are no longer operating.&lt;/p&gt;&lt;p&gt;Current fixes include: skin and online mode support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Enable online fixes (experimental)</string>

launcher/ui/pages/instance/ManagedPackPage.cpp

@@ -131,6 +131,22 @@ ManagedPackPage::~ManagedPackPage()
 
 void ManagedPackPage::openedImpl()
 {
+    if (m_inst->getManagedPackID().isEmpty()) {
+        ui->packVersion->hide();
+        ui->packVersionLabel->hide();
+        ui->packOrigin->hide();
+        ui->packOriginLabel->hide();
+        ui->versionsComboBox->hide();
+        ui->updateButton->hide();
+        ui->updateToVersionLabel->hide();
+        ui->updateFromFileButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+        ui->packName->setText(m_inst->name());
+        ui->changelogTextBrowser->setText(tr("This is a local modpack.\n"
+                                             "This can be updated only using a file in %1 format\n")
+                                              .arg(displayName()));
+        return;
+    }
     ui->packName->setText(m_inst->getManagedPackName());
     ui->packVersion->setText(m_inst->getManagedPackVersionName());
     ui->packOrigin->setText(tr("Website: <a href=%1>%2</a>    |    Pack ID: %3    |    Version ID: %4")
@@ -355,6 +371,8 @@ void ModrinthManagedPackPage::update()
 void ModrinthManagedPackPage::updateFromFile()
 {
     auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), "Modrinth pack (*.mrpack *.zip)");
+    if (output.isEmpty())
+        return;
     QMap<QString, QString> extra_info;
     extra_info.insert("pack_id", m_inst->getManagedPackID());
     extra_info.insert("pack_version_id", QString());
@@ -472,7 +490,7 @@ void FlameManagedPackPage::parseManagedPack()
 QString FlameManagedPackPage::url() const
 {
     // FIXME: We should display the websiteUrl field, but this requires doing the API request first :(
-    return {};
+    return "https://www.curseforge.com/projects/" + m_inst->getManagedPackID();
 }
 
 void FlameManagedPackPage::suggestVersion()
@@ -519,6 +537,8 @@ void FlameManagedPackPage::update()
 void FlameManagedPackPage::updateFromFile()
 {
     auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), "CurseForge pack (*.zip)");
+    if (output.isEmpty())
+        return;
 
     QMap<QString, QString> extra_info;
     extra_info.insert("pack_id", m_inst->getManagedPackID());

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -242,7 +242,7 @@ void ModFolderPage::updateMods(bool includeDeps)
     if (m_instance != nullptr && m_instance->isRunning()) {
         auto response =
             CustomMessageBox::selectable(this, tr("Confirm Update"),
-                                         tr("If you update mods while the game is running may cause mod duplication and game crashes.\n"
+                                         tr("Updating mods while the game is running may cause mod duplication and game crashes.\n"
                                             "The old files may not be deleted as they are in use.\n"
                                             "Are you sure you want to do this?"),
                                          QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)

launcher/ui/pages/instance/VersionPage.cpp

@@ -295,13 +295,6 @@ void VersionPage::on_actionRemove_triggered()
     m_container->refreshContainer();
 }
 
-void VersionPage::on_actionInstall_mods_triggered()
-{
-    if (m_container) {
-        m_container->selectPage("mods");
-    }
-}
-
 void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
 {
     auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods (*.zip *.jar)"),

launcher/ui/pages/instance/VersionPage.h

@@ -80,7 +80,6 @@ class VersionPage : public QMainWindow, public BasePage {
     void on_actionAdd_Agents_triggered();
     void on_actionRevert_triggered();
     void on_actionEdit_triggered();
-    void on_actionInstall_mods_triggered();
     void on_actionCustomize_triggered();
     void on_actionDownload_All_triggered();
 

launcher/ui/pages/modplatform/ResourceModel.cpp

@@ -207,6 +207,10 @@ void ResourceModel::loadEntry(QModelIndex& entry)
                     return;
                 versionRequestSucceeded(doc, pack, entry);
             };
+        if (!callbacks.on_fail)
+            callbacks.on_fail = [](QString reason, int) {
+                QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load project versions:%1").arg(reason));
+            };
 
         if (auto job = m_api->getProjectVersions(std::move(args), std::move(callbacks)); job)
             runInfoJob(job);
@@ -230,6 +234,12 @@ void ResourceModel::loadEntry(QModelIndex& entry)
                     return;
                 QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load project info:%1").arg(reason));
             };
+        if (!callbacks.on_abort)
+            callbacks.on_abort = [this] {
+                if (!s_running_models.constFind(this).value())
+                    return;
+                qCritical() << tr("The request was aborted for an unknown reason");
+            };
 
         if (auto job = m_api->getProjectInfo(std::move(args), std::move(callbacks)); job)
             runInfoJob(job);

launcher/ui/pages/modplatform/ResourcePage.cpp

@@ -200,6 +200,11 @@ void ResourcePage::updateUi()
     }
 
     if (current_pack->extraDataLoaded) {
+        if (current_pack->extraData.status == "archived") {
+            text += "<br><br>" + tr("<b>This project has been archived. It will not receive any further updates unless the author decides "
+                                    "to unarchive the project.</b>");
+        }
+
         if (!current_pack->extraData.donate.isEmpty()) {
             text += "<br><br>" + tr("Donate information: ");
             auto donateToStr = [](ModPlatform::DonationData& donate) -> QString {
@@ -404,9 +409,9 @@ void ResourcePage::openUrl(const QUrl& url)
             auto jump = [url, slug, model, view] {
                 for (int row = 0; row < model->rowCount({}); row++) {
                     const QModelIndex index = model->index(row);
-                    const auto pack = model->data(index, Qt::UserRole).value<ModPlatform::IndexedPack>();
+                    const auto pack = model->data(index, Qt::UserRole).value<ModPlatform::IndexedPack::Ptr>();
 
-                    if (pack.slug == slug) {
+                    if (pack->slug == slug) {
                         view->setCurrentIndex(index);
                         return;
                     }

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

@@ -170,6 +170,10 @@ void ListModel::performPaginatedSearch()
 
             callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
             callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
+            callbacks.on_abort = [this] {
+                qCritical() << "Search task aborted by an unknown reason!";
+                searchRequestFailed("Abborted");
+            };
             static const FlameAPI api;
             if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {
                 jobPtr = job;

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

@@ -34,6 +34,7 @@
  */
 
 #include "FlamePage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui_FlamePage.h"
 
 #include <QKeyEvent>
@@ -193,6 +194,8 @@ void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelInde
             suggestCurrent();
         });
         QObject::connect(netJob, &NetJob::finished, this, [response, netJob] { netJob->deleteLater(); });
+        connect(netJob, &NetJob::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
         netJob->start();
     } else {
         for (auto version : current.versions) {

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

@@ -140,6 +140,10 @@ void ModpackListModel::performPaginatedSearch()
 
             callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
             callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
+            callbacks.on_abort = [this] {
+                qCritical() << "Search task aborted by an unknown reason!";
+                searchRequestFailed("Aborted");
+            };
             static const ModrinthAPI api;
             if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {
                 jobPtr = job;

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

@@ -35,6 +35,7 @@
  */
 
 #include "ModrinthPage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui_ModrinthPage.h"
 
 #include "ModrinthModel.h"
@@ -182,6 +183,8 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
             suggestCurrent();
         });
         QObject::connect(netJob, &NetJob::finished, this, [response, netJob] { netJob->deleteLater(); });
+        connect(netJob, &NetJob::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
         netJob->start();
     } else
         updateUI();
@@ -235,6 +238,8 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
             suggestCurrent();
         });
         QObject::connect(netJob, &NetJob::finished, this, [response, netJob] { netJob->deleteLater(); });
+        connect(netJob, &NetJob::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
         netJob->start();
 
     } else {
@@ -262,6 +267,11 @@ void ModrinthPage::updateUI()
     text += "<br>" + tr(" by ") + QString("<a href=%1>%2</a>").arg(std::get<1>(current.author).toString(), std::get<0>(current.author));
 
     if (current.extraInfoLoaded) {
+        if (current.extra.status == "archived") {
+            text += "<br><br>" + tr("<b>This project has been archived. It will not receive any further updates unless the author decides "
+                                    "to unarchive the project.</b>");
+        }
+
         if (!current.extra.donate.isEmpty()) {
             text += "<br><br>" + tr("Donate information: ");
             auto donateToStr = [](Modrinth::DonationData& donate) -> QString {

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

@@ -34,6 +34,7 @@
  */
 
 #include "TechnicPage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/ProjectItem.h"
 #include "ui_TechnicPage.h"
 
@@ -208,6 +209,8 @@ void TechnicPage::suggestCurrent()
 
         metadataLoaded();
     });
+    connect(jobPtr.get(), &NetJob::failed,
+            [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
 
     jobPtr = netJob;
     jobPtr->start();
@@ -258,6 +261,8 @@ void TechnicPage::metadataLoaded()
         netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), response));
 
         QObject::connect(netJob.get(), &NetJob::succeeded, this, &TechnicPage::onSolderLoaded);
+        connect(jobPtr.get(), &NetJob::failed,
+                [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
 
         jobPtr = netJob;
         jobPtr->start();

launcher/ui/widgets/ProjectItem.cpp

@@ -88,7 +88,7 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
     }
 
     {  // Description painting
-        auto description = index.data(UserDataTypes::DESCRIPTION).toString();
+        auto description = index.data(UserDataTypes::DESCRIPTION).toString().simplified();
 
         QTextLayout text_layout(description, opt.font);
 

launcher/ui/widgets/VariableSizedImageObject.cpp

@@ -102,14 +102,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
 
     auto full_entry_path = entry->getFullPath();
     auto source_url = source;
-    connect(job, &NetJob::succeeded, this, [this, doc, full_entry_path, source_url, posInDocument] {
+    auto loadImage = [this, doc, full_entry_path, source_url, posInDocument](const QImage& image) {
-        qDebug() << "Loaded resource at" << full_entry_path;
-
-        // If we flushed, don't proceed.
-        if (!m_fetching_images.contains(source_url))
-            return;
-
-        QImage image(full_entry_path);
         doc->addResource(QTextDocument::ImageResource, source_url, image);
 
         parseImage(doc, image, posInDocument);
@@ -121,6 +114,23 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
         doc->setPageSize(size);
 
         m_fetching_images.remove(source_url);
+    };
+    connect(job, &NetJob::succeeded, this, [this, full_entry_path, source_url, loadImage] {
+        qDebug() << "Loaded resource at:" << full_entry_path;
+        // If we flushed, don't proceed.
+        if (!m_fetching_images.contains(source_url))
+            return;
+
+        QImage image(full_entry_path);
+        loadImage(image);
+    });
+    connect(job, &NetJob::failed, this, [this, full_entry_path, source_url, loadImage](QString reason) {
+        qWarning() << "Failed resource at:" << full_entry_path << " because:" << reason;
+        // If we flushed, don't proceed.
+        if (!m_fetching_images.contains(source_url))
+            return;
+
+        loadImage(QImage());
     });
     connect(job, &NetJob::finished, job, &NetJob::deleteLater);
 

launcher/updater/prismupdater/PrismUpdater.cpp

@@ -436,8 +436,8 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
     }
 
     {  // log debug program info
-        qDebug() << qPrintable(BuildConfig.LAUNCHER_DISPLAYNAME) << "Updater"
+        qDebug() << qPrintable(BuildConfig.LAUNCHER_DISPLAYNAME + " Updater, " +
-                 << ", (c) 2022-2023 " << qPrintable(QString(BuildConfig.LAUNCHER_COPYRIGHT).replace("\n", ", "));
+                               QString(BuildConfig.LAUNCHER_COPYRIGHT).replace("\n", ", "));
         qDebug() << "Version                    : " << BuildConfig.printableVersionString();
         qDebug() << "Git commit                 : " << BuildConfig.GIT_COMMIT;
         qDebug() << "Git refspec                : " << BuildConfig.GIT_REFSPEC;

libraries/launcher/CMakeLists.txt

@@ -25,13 +25,14 @@ set(LEGACY_SRC
     legacy/org/prismlauncher/legacy/LegacyLauncher.java
     legacy/org/prismlauncher/legacy/fix/online/Handler.java
     legacy/org/prismlauncher/legacy/fix/online/OnlineFixes.java
+    legacy/org/prismlauncher/legacy/fix/online/OnlineModeFix.java
     legacy/org/prismlauncher/legacy/fix/online/SkinFix.java
     legacy/org/prismlauncher/legacy/utils/Base64.java
     legacy/org/prismlauncher/legacy/utils/api/MojangApi.java
     legacy/org/prismlauncher/legacy/utils/api/Texture.java
     legacy/org/prismlauncher/legacy/utils/json/JsonParseException.java
     legacy/org/prismlauncher/legacy/utils/json/JsonParser.java
-    legacy/org/prismlauncher/legacy/utils/url/CustomUrlConnection.java
+    legacy/org/prismlauncher/legacy/utils/url/ByteArrayUrlConnection.java
     legacy/org/prismlauncher/legacy/utils/url/UrlUtils.java
     legacy/net/minecraft/Launcher.java
     legacy/org/prismlauncher/legacy/LegacyProxy.java

libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/Handler.java

@@ -53,11 +53,16 @@ final class Handler extends URLStreamHandler {
     protected URLConnection openConnection(URL address, Proxy proxy) throws IOException {
         URLConnection result;
 
-        // try skin fix
+        // try various fixes...
         result = SkinFix.openConnection(address, proxy);
         if (result != null)
             return result;
 
+        result = OnlineModeFix.openConnection(address, proxy);
+        if (result != null)
+            return result;
+
+        // ...then give up and make the request directly
         return UrlUtils.openConnection(address, proxy);
     }
 }

libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/OnlineFixes.java

@@ -46,6 +46,8 @@ import java.net.URLStreamHandlerFactory;
 
 /**
  * Fixes skins by redirecting to other URLs.
+ * Thanks to MineOnline for the implementation from which this was inspired!
+ * See https://github.com/ahnewark/MineOnline/tree/main/src/main/java/gg/codie/mineonline/protocol.
  *
  * @see {@link Handler}
  * @see {@link UrlUtils}

libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/OnlineModeFix.java

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  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.
+ *
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.prismlauncher.legacy.fix.online;
+
+import org.prismlauncher.legacy.utils.url.UrlUtils;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+
+public final class OnlineModeFix {
+    public static URLConnection openConnection(URL address, Proxy proxy) throws IOException {
+        // we start with "http://www.minecraft.net/game/joinserver.jsp?user=..."
+        if (!(address.getHost().equals("www.minecraft.net") && address.getPath().equals("/game/joinserver.jsp")))
+            return null;
+
+        // change it to "https://session.minecraft.net/game/joinserver.jsp?user=..."
+        // this seems to be the modern version of the same endpoint...
+        // maybe Mojang planned to patch old versions of the game to use it
+        // if it ever disappears this should be changed to use sessionserver.mojang.com/session/minecraft/join
+        // which of course has a different usage requiring JSON serialisation...
+        URL url;
+        try {
+            url = new URL("https", "session.minecraft.net", address.getPort(), address.getFile());
+        } catch (MalformedURLException e) {
+            throw new AssertionError("url should be valid", e);
+        }
+
+        return UrlUtils.openConnection(url, proxy);
+    }
+}

libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/SkinFix.java

@@ -54,7 +54,7 @@ package org.prismlauncher.legacy.fix.online;
 
 import org.prismlauncher.legacy.utils.api.MojangApi;
 import org.prismlauncher.legacy.utils.api.Texture;
-import org.prismlauncher.legacy.utils.url.CustomUrlConnection;
+import org.prismlauncher.legacy.utils.url.ByteArrayUrlConnection;
 import org.prismlauncher.legacy.utils.url.UrlUtils;
 
 import java.awt.AlphaComposite;
@@ -97,9 +97,9 @@ final class SkinFix {
 
         URLConnection connection = UrlUtils.openConnection(texture.getUrl(), proxy);
         try (InputStream in = connection.getInputStream()) {
-            // thank you craftycodie!
+            // thank you ahnewark!
             // this is heavily based on
-            // https://github.com/craftycodie/MineOnline/blob/4f4f86f9d051e0a6fd7ff0b95b2a05f7437683d7/src/main/java/gg/codie/mineonline/gui/textures/TextureHelper.java#L17
+            // https://github.com/ahnewark/MineOnline/blob/4f4f86f9d051e0a6fd7ff0b95b2a05f7437683d7/src/main/java/gg/codie/mineonline/gui/textures/TextureHelper.java#L17
             BufferedImage image = ImageIO.read(in);
             Graphics2D graphics = image.createGraphics();
             graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
@@ -131,7 +131,7 @@ final class SkinFix {
             image = image.getSubimage(0, 0, 64, 32);
             ImageIO.write(image, "png", out);
 
-            return new CustomUrlConnection(out.toByteArray());
+            return new ByteArrayUrlConnection(out.toByteArray());
         }
     }
 

libraries/launcher/legacy/org/prismlauncher/legacy/utils/url/ByteArrayUrlConnection.java

@@ -40,16 +40,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 
-public final class CustomUrlConnection extends HttpURLConnection {
+public final class ByteArrayUrlConnection extends HttpURLConnection {
     private final InputStream in;
 
-    public CustomUrlConnection(byte[] data) {
+    public ByteArrayUrlConnection(byte[] data) {
-        this(new ByteArrayInputStream(data));
-    }
-
-    public CustomUrlConnection(InputStream in) {
         super(null);
-        this.in = in;
+        this.in = new ByteArrayInputStream(data);
     }
 
     @Override
@@ -58,12 +54,7 @@ public final class CustomUrlConnection extends HttpURLConnection {
     }
 
     @Override
-    public void disconnect() {
+    public void disconnect() {}
-        try {
-            in.close();
-        } catch (IOException e) {
-        }
-    }
 
     @Override
     public InputStream getInputStream() throws IOException {

libraries/launcher/legacy/org/prismlauncher/legacy/utils/url/UrlUtils.java

@@ -101,7 +101,7 @@ public final class UrlUtils {
         } catch (IOException | Error | RuntimeException e) {
             throw e; // rethrow if possible
         } catch (Throwable e) {
-            throw new AssertionError(e); // oh dear! this isn't meant to happen
+            throw new AssertionError("openConnection should not throw", e); // oh dear! this isn't meant to happen
         }
     }
 }

libraries/launcher/org/prismlauncher/EntryPoint.java

@@ -81,10 +81,9 @@ public final class EntryPoint {
         PreLaunchAction action = PreLaunchAction.PROCEED;
 
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8))) {
-            String line;
-
             while (action == PreLaunchAction.PROCEED) {
-                if ((line = reader.readLine()) != null)
+                String line = reader.readLine();
+                if (line != null)
                     action = parseLine(line, params);
                 else
                     action = PreLaunchAction.ABORT;
@@ -105,7 +104,7 @@ public final class EntryPoint {
             return ExitCode.ABORT;
         }
 
-        setProperties(params);
+        SystemProperties.apply(params);
 
         String launcherType = params.getString("launcher");
 
@@ -141,43 +140,10 @@ public final class EntryPoint {
         }
     }
 
-    private static void setProperties(Parameters params) {
-        String launcherBrand = params.getString("launcherBrand", null);
-        String launcherVersion = params.getString("launcherVersion", null);
-        String name = params.getString("instanceName", null);
-        String iconId = params.getString("instanceIconKey", null);
-        String iconPath = params.getString("instanceIconPath", null);
-        String windowTitle = params.getString("windowTitle", null);
-        String windowDimensions = params.getString("windowParams", null);
-
-        if (launcherBrand != null)
-            System.setProperty("minecraft.launcher.brand", launcherBrand);
-        if (launcherVersion != null)
-            System.setProperty("minecraft.launcher.version", launcherVersion);
-
-        // set useful properties for mods
-        if (name != null)
-            System.setProperty("org.prismlauncher.instance.name", name);
-        if (iconId != null)
-            System.setProperty("org.prismlauncher.instance.icon.id", iconId);
-        if (iconPath != null)
-            System.setProperty("org.prismlauncher.instance.icon.path", iconPath);
-        if (windowTitle != null)
-            System.setProperty("org.prismlauncher.window.title", windowTitle);
-        if (windowDimensions != null)
-            System.setProperty("org.prismlauncher.window.dimensions", windowDimensions);
-
-        // set multimc properties for compatibility
-        if (name != null)
-            System.setProperty("multimc.instance.title", name);
-        if (iconId != null)
-            System.setProperty("multimc.instance.icon", iconId);
-    }
-
     private static PreLaunchAction parseLine(String input, Parameters params) throws ParseException {
         switch (input) {
             case "":
-                break;
+                return PreLaunchAction.PROCEED;
 
             case "launch":
                 return PreLaunchAction.LAUNCH;
@@ -192,9 +158,9 @@ public final class EntryPoint {
                     throw new ParseException(input, "[key] [value]");
 
                 params.add(pair[0], pair[1]);
-        }
 
-        return PreLaunchAction.PROCEED;
+                return PreLaunchAction.PROCEED;
+        }
     }
 
     private enum PreLaunchAction { PROCEED, LAUNCH, ABORT }

libraries/launcher/org/prismlauncher/SystemProperties.java

@@ -0,0 +1,38 @@
+package org.prismlauncher;
+
+import org.prismlauncher.utils.Parameters;
+
+public final class SystemProperties {
+    public static void apply(Parameters params) {
+        String launcherBrand = params.getString("launcherBrand", null);
+        String launcherVersion = params.getString("launcherVersion", null);
+        String name = params.getString("instanceName", null);
+        String iconId = params.getString("instanceIconKey", null);
+        String iconPath = params.getString("instanceIconPath", null);
+        String windowTitle = params.getString("windowTitle", null);
+        String windowDimensions = params.getString("windowParams", null);
+
+        if (launcherBrand != null)
+            System.setProperty("minecraft.launcher.brand", launcherBrand);
+        if (launcherVersion != null)
+            System.setProperty("minecraft.launcher.version", launcherVersion);
+
+        // set useful properties for mods
+        if (name != null)
+            System.setProperty("org.prismlauncher.instance.name", name);
+        if (iconId != null)
+            System.setProperty("org.prismlauncher.instance.icon.id", iconId);
+        if (iconPath != null)
+            System.setProperty("org.prismlauncher.instance.icon.path", iconPath);
+        if (windowTitle != null)
+            System.setProperty("org.prismlauncher.window.title", windowTitle);
+        if (windowDimensions != null)
+            System.setProperty("org.prismlauncher.window.dimensions", windowDimensions);
+
+        // set multimc properties for compatibility
+        if (name != null)
+            System.setProperty("multimc.instance.title", name);
+        if (iconId != null)
+            System.setProperty("multimc.instance.icon", iconId);
+    }
+}

libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java

@@ -54,15 +54,9 @@
 
 package org.prismlauncher.utils;
 
-import org.prismlauncher.utils.logging.Log;
-
-import java.applet.Applet;
-import java.io.File;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 public final class ReflectionUtils {
     private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();

program_info/CMakeLists.txt

@@ -14,8 +14,8 @@ set(Launcher_DisplayName "Prism Launcher")
 set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
-set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
+set(Launcher_Copyright "© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
-set(Launcher_Copyright_Mac "Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
+set(Launcher_Copyright_Mac "© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)

tests/Task_test.cpp

@@ -37,13 +37,13 @@ class BasicTask_MultiStep : public Task {
 class BigConcurrentTask : public ConcurrentTask {
     Q_OBJECT
 
-    void startNext() override
+    void executeNextSubTask() override
     {
         // This is here only to help fill the stack a bit more quickly (if there's an issue, of course :^))
         // Each tasks thus adds 1024 * 4 bytes to the stack, at the very least.
         [[maybe_unused]] volatile std::array<uint32_t, 1024> some_data_on_the_stack{};
 
-        ConcurrentTask::startNext();
+        ConcurrentTask::executeNextSubTask();
     }
 };
 
@@ -71,11 +71,14 @@ class BigConcurrentTaskThread : public QThread {
             quit();
         });
 
-        m_deadline.start();
+        if (thread() != QThread::currentThread()) {
+            QMetaObject::invokeMethod(this, &BigConcurrentTaskThread::start_timer, Qt::QueuedConnection);
+        }
         big_task.run();
 
         exec();
     }
+    void start_timer() { m_deadline.start(); }
 
    public:
     bool passed_the_deadline = false;