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

.editorconfig

@@ -0,0 +1,8 @@
+# EditorConfig specs and documentation: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# C++ Code Style settings
+[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
+cpp_generate_documentation_comments = doxygen_slash_star

.github/workflows/backport.yml

@@ -0,0 +1,32 @@
+name: Backport
+on:
+  pull_request_target:
+    types: [closed, labeled]
+
+# WARNING:
+# When extending this action, be aware that $GITHUB_TOKEN allows write access to
+# the GitHub repository. This means that it should not evaluate user input in a
+# way that allows code injection.
+
+permissions:
+  contents: read
+
+jobs:
+  backport:
+    permissions:
+      contents: write # for korthout/backport-action to create branch
+      pull-requests: write # for korthout/backport-action to create PR to backport
+    name: Backport Pull Request
+    if: github.repository_owner == 'PrismLauncher' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Create backport PRs
+        uses: korthout/backport-action@v1.3.1
+        with:
+          # Config README: https://github.com/korthout/backport-action#backport-action
+          pull_description: |-
+            Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
+

.github/workflows/build.yml

@@ -264,23 +264,23 @@ jobs:
       - name: Configure CMake (macOS)
         if: runner.os == 'macOS' && matrix.qt_ver == 6
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -G Ninja
 
       - name: Configure CMake (macOS-Legacy)
         if: runner.os == 'macOS' && matrix.qt_ver == 5
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DMACOSX_SPARKLE_UPDATE_PUBLIC_KEY="" -DMACOSX_SPARKLE_UPDATE_FEED_URL="" -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DMACOSX_SPARKLE_UPDATE_PUBLIC_KEY="" -DMACOSX_SPARKLE_UPDATE_FEED_URL="" -G Ninja
 
       - name: Configure CMake (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != ''
         shell: msys2 {0}
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=6 -DCMAKE_OBJDUMP=/mingw64/bin/objdump.exe -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=6 -DCMAKE_OBJDUMP=/mingw64/bin/objdump.exe -G Ninja
 
       - name: Configure CMake (Windows MSVC)
         if: runner.os == 'Windows' && matrix.msystem == ''
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} -DLauncher_FORCE_BUNDLED_LIBS=ON
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} -DLauncher_FORCE_BUNDLED_LIBS=ON
           # https://github.com/ccache/ccache/wiki/MS-Visual-Studio (I coudn't figure out the compiler prefix)
           if ("${{ env.CCACHE_VAR }}")
           {
@@ -295,7 +295,7 @@ jobs:
       - name: Configure CMake (Linux)
         if: runner.os == 'Linux'
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
 
       ##
       # BUILD
@@ -586,33 +586,3 @@ jobs:
         with:
           bundle: "Prism Launcher.flatpak"
           manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml 
-
-  nix:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package:
-          - prismlauncher
-          - prismlauncher-qt5
-    steps:
-      - name: Clone repository
-        if: inputs.build_type == 'Debug'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Install nix
-        if: inputs.build_type == 'Debug'
-        uses: cachix/install-nix-action@v22
-        with:
-          install_url: https://nixos.org/nix/install
-          extra_nix_config: |
-            auto-optimise-store = true
-            experimental-features = nix-command flakes
-      - uses: cachix/cachix-action@v12
-        if: inputs.build_type == 'Debug'
-        with:
-          name: prismlauncher
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - name: Build
-        if: inputs.build_type == 'Debug'
-        run: nix build .#${{ matrix.package }} --print-build-logs

.github/workflows/update-flake.yml

@@ -7,10 +7,12 @@ on:
   workflow_dispatch:
 
 permissions:
+  contents: write
   pull-requests: write
 
 jobs:
   update-flake:
+    if: github.repository == 'PrismLauncher/PrismLauncher'
     runs-on: ubuntu-latest
 
     steps:

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "libraries/cmark"]
 	path = libraries/cmark
 	url = https://github.com/commonmark/cmark.git
+[submodule "flatpak/shared-modules"]
+	path = flatpak/shared-modules
+	url = https://github.com/flathub/shared-modules.git

CMakeLists.txt

@@ -85,6 +85,38 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0")
 # set CXXFLAGS for build targets
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}")
 
+option(DEBUG_ADDRESS_SANITIZER "Enable Address Sanitizer in Debug builds" on)
+
+# If this is a Debug build turn on address sanitiser
+if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND DEBUG_ADDRESS_SANITIZER)
+    message(STATUS "Address Sanitizer enabled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off")
+    if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+            # using clang with clang-cl front end 
+            message(STATUS "Address Sanitizer available on Clang MSVC frontend")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
+        else()
+            # AppleClang and Clang
+            message(STATUS "Address Sanitizer available on Clang")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+        endif()
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        # GCC
+        message(STATUS "Address Sanitizer available on GCC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+        link_libraries("asan")
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+        message(STATUS "Address Sanitizer available on MSVC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
+    else()
+        message(STATUS "Address Sanitizer not available on compiler ${CMAKE_CXX_COMPILER_ID}")
+    endif()
+endif()
+
 option(ENABLE_LTO "Enable Link Time Optimization" off)
 
 if(ENABLE_LTO)
@@ -146,7 +178,7 @@ set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.
 set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_MINOR},0,0")
 
 # Build platform.
-set(Launcher_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
+set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
 
 # Channel list URL
 set(Launcher_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
@@ -332,7 +364,7 @@ elseif(UNIX)
 
     set(BINARY_DEST_DIR "bin")
     set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}")
-    set(JARS_DEST_DIR "share/${Launcher_APP_BINARY_NAME}")
+    set(JARS_DEST_DIR "share/${Launcher_Name}")
 
     # install as bundle with no dependencies included
     set(INSTALL_BUNDLE "nodeps")
@@ -345,7 +377,7 @@ elseif(UNIX)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps")
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_mrpack_MIMEInfo} DESTINATION ${KDE_INSTALL_MIMEDIR})
 
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/launcher/qtlogging.ini" DESTINATION "${KDE_INSTALL_DATADIR}/${Launcher_Name}")
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/launcher/qtlogging.ini" DESTINATION "share/${Launcher_Name}")
     
     if(Launcher_ManPage)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_ManPage} DESTINATION "${KDE_INSTALL_MANDIR}/man6")

CONTRIBUTING.md

@@ -61,3 +61,10 @@ As a bonus, you can also [cryptographically sign your commits][gh-signing-commit
 
 [gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
 [gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
+
+
+## Backporting to Release Branches
+
+We use [automated backports](https://github.com/PrismLauncher/PrismLauncher/blob/develop/.github/workflows/backport.yml) to merge specific contributions from develop into `release` branches.
+
+This is done when pull requests are merged and have labels such as `backport release-7.x` - which should be added along with the milestone for the release.

README.md

@@ -42,7 +42,7 @@ Feel free to create a GitHub issue if you find a bug or want to suggest a new fe
 
 - **Our Matrix space:**
 
-[![PrismLauncher Space](https://img.shields.io/matrix/prismlauncher:matrix.org?style=for-the-badge&label=Matrix%20Space&logo=matrix&color=purple)](https://prismlauncher.org/matrix)
+[![Prism Launcher Space](https://img.shields.io/matrix/prismlauncher:matrix.org?style=for-the-badge&label=Matrix%20Space&logo=matrix&color=purple)](https://prismlauncher.org/matrix)
 
 - **Our Subreddit:**
 
@@ -50,7 +50,7 @@ Feel free to create a GitHub issue if you find a bug or want to suggest a new fe
 
 ## Translations
 
-The translation effort for PrismLauncher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations>
+The translation effort for Prism Launcher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations>
 
 ## Building
 
@@ -82,14 +82,16 @@ Thanks to the awesome people over at [MacStadium](https://www.macstadium.com/),
 
 ## Forking/Redistributing/Custom builds policy
 
-We don't care what you do with your fork/custom build as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy:
+You are free to fork, redistribute and provide custom builds as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy:
 
-- Make it clear that your fork is not PrismLauncher and is not endorsed by or affiliated with the PrismLauncher project (<https://prismlauncher.org>).
+- Make it clear that your fork is not Prism Launcher and is not endorsed by or affiliated with the Prism Launcher project (<https://prismlauncher.org>).
-- Go through [CMakeLists.txt](CMakeLists.txt) and change PrismLauncher's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled).
+- Go through [CMakeLists.txt](CMakeLists.txt) and change Prism Launcher's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled).
 
 If you have any questions or want any clarification on the above conditions please make an issue and ask us.
 
-Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions:
+If you are just building Prism Launcher for your distribution, please make sure to set the `Launcher_BUILD_PLATFORM` to a slug representing your distribution. Examples are `archlinux`, `fedora` and `nixpkgs`.
+
+Note that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions:
 
 - [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use)
 - [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions)

buildconfig/BuildConfig.cpp.in

@@ -65,7 +65,7 @@ Config::Config()
     MAC_SPARKLE_PUB_KEY = "@MACOSX_SPARKLE_UPDATE_PUBLIC_KEY@";
     MAC_SPARKLE_APPCAST_URL = "@MACOSX_SPARKLE_UPDATE_FEED_URL@";
 
-    if (BUILD_PLATFORM == "macOS" && !MAC_SPARKLE_PUB_KEY.isEmpty() && !MAC_SPARKLE_APPCAST_URL.isEmpty())
+    if (!MAC_SPARKLE_PUB_KEY.isEmpty() && !MAC_SPARKLE_APPCAST_URL.isEmpty())
     {
         UPDATER_ENABLED = true;
     }

buildconfig/BuildConfig.h

@@ -68,7 +68,7 @@ class Config {
 
     bool UPDATER_ENABLED = false;
 
-    /// A short string identifying this build's platform. For example, "lin64" or "win32".
+    /// A short string identifying this build's platform or distribution.
     QString BUILD_PLATFORM;
 
     /// A string containing the build timestamp

flake.lock

@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1688254665,
+        "lastModified": 1688466019,
-        "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=",
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "267149c58a14d15f7f81b4d737308421de9d7152",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     "libnbtplusplus": {
       "flake": false,
       "locked": {
-        "lastModified": 1650031308,
+        "lastModified": 1690036783,
-        "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=",
+        "narHash": "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=",
         "owner": "PrismLauncher",
         "repo": "libnbtplusplus",
-        "rev": "2203af7eeb48c45398139b583615134efd8d407f",
+        "rev": "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688221086,
+        "lastModified": 1690026219,
-        "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
+        "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
+        "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688386108,
+        "lastModified": 1689668210,
-        "narHash": "sha256-Vffto9QaVonzYAcPlAzd0soqWYpPpKk60dfNLSIXcFA=",
+        "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "42587d3414d1747999a5f71e92a83cf6547b62da",
+        "rev": "eb433bff05b285258be76513add6f6c57b441775",
         "type": "github"
       },
       "original": {

flatpak/libdecor.json

@@ -0,0 +1,22 @@
+{
+  "name": "libdecor",
+  "buildsystem": "meson",
+  "config-opts": [
+    "-Ddemo=false"
+  ],
+  "sources": [
+    {
+      "type": "git",
+      "url": "https://gitlab.freedesktop.org/libdecor/libdecor.git",
+      "commit": "73260393a97291c887e1074ab7f318e031be0ac6"
+    },
+    {
+      "type": "patch",
+      "path": "patches/weird_libdecor.patch"
+    }
+  ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig"
+  ]
+}

flatpak/org.prismlauncher.PrismLauncher.yml

@@ -5,13 +5,6 @@ sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk17
   - org.freedesktop.Sdk.Extension.openjdk8
-add-extensions:
-  com.valvesoftware.Steam.Utility.gamescope:
-    version: stable
-    add-ld-path: lib
-    no-autodownload: true
-    autodelete: false
-    directory: utils/gamescope
 
 command: prismlauncher
 finish-args:
@@ -26,12 +19,22 @@ finish-args:
     # Mod drag&drop
   - --filesystem=xdg-download:ro
 
+cleanup:
+  - /lib/libGLU*
+
 modules:
+  # Might be needed by some Controller mods (see https://github.com/isXander/Controlify/issues/31)
+  - shared-modules/libusb/libusb.json
+
+  # Needed for proper Wayland support
+  - libdecor.json
+
   - name: prismlauncher
     buildsystem: cmake-ninja
+    builddir: true
     config-opts:
       - -DLauncher_BUILD_PLATFORM=flatpak
-      - -DCMAKE_BUILD_TYPE=Debug
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - -DLauncher_QT_VERSION_MAJOR=5
     build-options:
       env:
@@ -40,7 +43,7 @@ modules:
     sources:
       - type: dir
         path: ../
-    builddir: true
+
   - name: openjdk
     buildsystem: simple
     build-commands:
@@ -49,14 +52,45 @@ modules:
       - mv /app/jre /app/jdk/17
       - /usr/lib/sdk/openjdk8/install.sh
       - mv /app/jre /app/jdk/8
-    cleanup: [/jre]
+    cleanup:
+      - /jre
+
+  - name: glfw
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DBUILD_SHARED_LIBS:BOOL=ON
+      - -DGLFW_USE_WAYLAND=ON
+    sources:
+      - type: git
+        url: https://github.com/glfw/glfw.git
+        commit: 3fa2360720eeba1964df3c0ecf4b5df8648a8e52
+      - type: patch
+        path: patches/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
+      - type: patch
+        path: patches/0005-Add-warning-about-being-an-unofficial-patch.patch
+      - type: patch
+        path: patches/0007-Platform-Prefer-Wayland-over-X11.patch
+    cleanup:
+      - /include
+      - /lib/cmake
+      - /lib/pkgconfig
+
   - name: xrandr
     buildsystem: autotools
     sources:
       - type: archive
-        url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.1.tar.xz
+        url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.2.tar.xz
-        sha256: 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762
+        sha256: c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240
-    cleanup: [/share/man, /bin/xkeystone]
+        x-checker-data:
+          type: anitya
+          project-id: 14957
+          stable-only: true
+          url-template: https://xorg.freedesktop.org/archive/individual/app/xrandr-$version.tar.xz
+    cleanup:
+      - /share/man
+      - /bin/xkeystone
+
   - name: gamemode
     buildsystem: meson
     config-opts:
@@ -67,19 +101,56 @@ modules:
       # post-install is running inside the build dir, we need it from the source though
       - install -Dm755 ../data/gamemoderun -t /app/bin
     sources:
-      - type: git
+      - type: archive
-        url: https://github.com/FeralInteractive/gamemode
+        archive-type: tar-gzip
-        tag: "1.7"
+        url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.7
-        commit: 4dc99dff76218718763a6b07fc1900fa6d1dafd9
+        sha256: 57ce73ba605d1cf12f8d13725006a895182308d93eba0f69f285648449641803
+        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
+    cleanup:
+      - /include
+      - /lib/pkgconfig
+      - /lib/libgamemodeauto.a
+
+  - name: glxinfo
+    buildsystem: meson
+    config-opts:
+      - --bindir=/app/mesa-demos
+      - -Degl=disabled
+      - -Dglut=disabled
+      - -Dosmesa=disabled
+      - -Dvulkan=disabled
+      - -Dwayland=disabled
+    post-install:
+      - mv -v /app/mesa-demos/glxinfo /app/bin
+    sources:
+      - type: archive
+        url: https://archive.mesa3d.org/demos/mesa-demos-9.0.0.tar.xz
+        sha256: 3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
+        x-checker-data:
+          type: anitya
+          project-id: 16781
+          stable-only: true
+          url-template: https://archive.mesa3d.org/demos/mesa-demos-$version.tar.xz
+    cleanup:
+      - /include
+      - /mesa-demos
+      - /share
+    modules:
+      - shared-modules/glu/glu-9.json
+
   - name: enhance
     buildsystem: simple
     build-commands:
-      - mkdir -p /app/utils/gamescope
       - install -Dm755 prime-run /app/bin/prime-run
       - mv /app/bin/prismlauncher /app/bin/prismrun
       - install -Dm755 prismlauncher /app/bin/prismlauncher
     sources:
       - type: file
-        path: ../flatpak/prime-run
+        path: prime-run
       - type: file
-        path: ../flatpak/prismlauncher
+        path: prismlauncher

flatpak/patches/0003-Don-t-crash-on-calls-to-focus-or-icon.patch

@@ -0,0 +1,24 @@
+diff --git a/src/wl_window.c b/src/wl_window.c
+index 52d3b9eb..4ac4eb5d 100644
+--- a/src/wl_window.c
++++ b/src/wl_window.c
+@@ -2117,8 +2117,7 @@ void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title)
+ void _glfwSetWindowIconWayland(_GLFWwindow* window,
+                                int count, const GLFWimage* images)
+ {
+-    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
+-                    "Wayland: The platform does not support setting the window icon");
++    fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not support setting the window icon\n");
+ }
+ 
+ void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos)
+@@ -2361,8 +2360,7 @@ void _glfwRequestWindowAttentionWayland(_GLFWwindow* window)
+ 
+ void _glfwFocusWindowWayland(_GLFWwindow* window)
+ {
+-    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
+-                    "Wayland: The platform does not support setting the input focus");
++    fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not support setting the input focus\n");
+ }
+ 
+ void _glfwSetWindowMonitorWayland(_GLFWwindow* window,

flatpak/patches/0005-Add-warning-about-being-an-unofficial-patch.patch

@@ -0,0 +1,17 @@
+diff --git a/src/init.c b/src/init.c
+index 06dbb3f2..a7c6da86 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -449,6 +449,12 @@ GLFWAPI int glfwInit(void)
+     _glfw.initialized = GLFW_TRUE;
+ 
+     glfwDefaultWindowHints();
++
++    fprintf(stderr, "!!! Patched GLFW from https://github.com/Admicos/minecraft-wayland\n"
++         "!!! If any issues with the window, or some issues with rendering, occur, "
++         "first try with the built-in GLFW, and if that solves the issue, report there first.\n"
++         "!!! Use outside Minecraft is untested, and things might break.\n");
++
+     return GLFW_TRUE;
+ }
+ 

flatpak/patches/0007-Platform-Prefer-Wayland-over-X11.patch

@@ -0,0 +1,20 @@
+diff --git a/src/platform.c b/src/platform.c
+index c5966ae7..3e7442f9 100644
+--- a/src/platform.c
++++ b/src/platform.c
+@@ -49,12 +49,12 @@ static const struct
+ #if defined(_GLFW_COCOA)
+     { GLFW_PLATFORM_COCOA, _glfwConnectCocoa },
+ #endif
+-#if defined(_GLFW_X11)
+-    { GLFW_PLATFORM_X11, _glfwConnectX11 },
+-#endif
+ #if defined(_GLFW_WAYLAND)
+     { GLFW_PLATFORM_WAYLAND, _glfwConnectWayland },
+ #endif
++#if defined(_GLFW_X11)
++    { GLFW_PLATFORM_X11, _glfwConnectX11 },
++#endif
+ };
+ 
+ GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)

flatpak/patches/weird_libdecor.patch

@@ -0,0 +1,40 @@
+diff --git a/src/libdecor.c b/src/libdecor.c
+index a9c1106..1aa38b3 100644
+--- a/src/libdecor.c
++++ b/src/libdecor.c
+@@ -1391,22 +1391,32 @@ calculate_priority(const struct libdecor_plugin_description *plugin_description)
+ static bool
+ check_symbol_conflicts(const struct libdecor_plugin_description *plugin_description)
+ {
++	bool ret = true;
+ 	char * const *symbol;
++	void* main_prog = dlopen(NULL, RTLD_LAZY);
++	if (!main_prog) {
++		fprintf(stderr, "Plugin \"%s\" couldn't check conflicting symbols: \"%s\".\n",
++					plugin_description->description, dlerror());
++		return false;
++	}
++
+ 
+ 	symbol = plugin_description->conflicting_symbols;
+ 	while (*symbol) {
+ 		dlerror();
+-		dlsym (RTLD_DEFAULT, *symbol);
++		dlsym (main_prog, *symbol);
+ 		if (!dlerror()) {
+ 			fprintf(stderr, "Plugin \"%s\" uses conflicting symbol \"%s\".\n",
+ 					plugin_description->description, *symbol);
+-			return false;
++			ret = false;
++			break;
+ 		}
+ 
+ 		symbol++;
+ 	}
+ 
+-	return true;
++	dlclose(main_prog);
++	return ret;
+ }
+ 
+ static struct plugin_loader *

flatpak/prismlauncher

@@ -5,7 +5,7 @@ for i in {0..9}; do
     test -S "$XDG_RUNTIME_DIR"/discord-ipc-"$i" || ln -sf {app/com.discordapp.Discord,"$XDG_RUNTIME_DIR"}/discord-ipc-"$i";
 done
 
-export PATH="${PATH}${PATH:+:}/app/utils/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
+export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}/usr/lib/extensions/vulkan/MangoHud/\$LIB/"
+export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
 
 exec /app/bin/prismrun "$@"

flatpak/shared-modules

@@ -0,0 +1 @@
+Subproject commit 45094ca570be383d06df729b6972830ec63bd3df

garnix.yaml

@@ -0,0 +1,5 @@
+builds:
+  exclude: []
+  include:
+    - "devShells.*-linux.*"
+    - "packages.*-linux.*"

launcher/Application.cpp

@@ -6,9 +6,10 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  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
@@ -433,7 +434,11 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         }
         // seach root path
         if(!foundLoggingRules) {
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+           logRulesPath = FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME, logRulesFile); 
+#else
            logRulesPath = FS::PathCombine(m_rootPath, logRulesFile); 
+#endif
             qDebug() << "Testing" << logRulesPath << "...";
             foundLoggingRules = QFile::exists(logRulesPath);
         }
@@ -471,6 +476,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT;
         qDebug() << "Version                    : " << BuildConfig.printableVersionString();
+        qDebug() << "Platform                   : " << BuildConfig.BUILD_PLATFORM;
         qDebug() << "Git commit                 : " << BuildConfig.GIT_COMMIT;
         qDebug() << "Git refspec                : " << BuildConfig.GIT_REFSPEC;
         if (adjustedBy.size())
@@ -568,6 +574,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         // Language
         m_settings->registerSetting("Language", QString());
+        m_settings->registerSetting("UseSystemLocale", false);
 
         // Console
         m_settings->registerSetting("ShowConsole", false);
@@ -604,6 +611,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("IgnoreJavaCompatibility", false);
         m_settings->registerSetting("IgnoreJavaWizard", false);
 
+        // Mod loader settings
+        m_settings->registerSetting("DisableQuiltBeacon", false);
+
         // Native library workarounds
         m_settings->registerSetting("UseNativeOpenAL", false);
         m_settings->registerSetting("UseNativeGLFW", false);
@@ -918,12 +928,7 @@ bool Application::createSetupWizard()
         }
         return false;
     }();
-    bool languageRequired = [&]()
+    bool languageRequired = settings()->get("Language").toString().isEmpty();
-    {
-        if (settings()->get("Language").toString().isEmpty())
-            return true;
-        return false;
-    }();
     bool pasteInterventionRequired = settings()->get("PastebinURL") != "";
     bool themeInterventionRequired = settings()->get("ApplicationTheme") == "";
     bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired;
@@ -1181,7 +1186,17 @@ QIcon Application::getThemedIcon(const QString& name)
     return QIcon::fromTheme(name);
 }
 
-bool Application::openJsonEditor(const QString &filename)
+QList<CatPack*> Application::getValidCatPacks()
+{
+    return m_themeManager->getValidCatPacks();
+}
+
+QString Application::getCatPack(QString catName)
+{
+    return m_themeManager->getCatPack(catName);
+}
+
+bool Application::openJsonEditor(const QString& filename)
 {
     const QString file = QDir::current().absoluteFilePath(filename);
     if (m_settings->get("JsonEditor").toString().isEmpty())
@@ -1567,7 +1582,7 @@ QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME),
+        FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME),
 #endif
         FS::PathCombine(m_rootPath, "jars"),
         FS::PathCombine(applicationDirPath(), "jars"),

launcher/Application.h

@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -48,6 +48,7 @@
 #include <BaseInstance.h>
 
 #include "minecraft/launch/MinecraftServerTarget.h"
+#include "ui/themes/CatPack.h"
 
 class LaunchController;
 class LocalPeer;
@@ -126,9 +127,11 @@ public:
 
     void setApplicationTheme(const QString& name);
 
-    shared_qobject_ptr<ExternalUpdater> updater() {
+    QList<CatPack*> getValidCatPacks();
-        return m_updater;
+
-    }
+    QString getCatPack(QString catName = "");
+
+    shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
 
     void triggerUpdateCheck();
 

launcher/BaseVersion.h

@@ -15,16 +15,15 @@
 
 #pragma once
 
-#include <memory>
-#include <QString>
 #include <QMetaType>
+#include <QString>
+#include <memory>
 
 /*!
  * An abstract base class for versions.
  */
-class BaseVersion
+class BaseVersion {
-{
+   public:
-public:
     using Ptr = std::shared_ptr<BaseVersion>;
     virtual ~BaseVersion() {}
     /*!
@@ -45,14 +44,8 @@ public:
      */
     virtual QString typeString() const = 0;
 
-    virtual bool operator<(BaseVersion &a)
+    virtual bool operator<(BaseVersion& a) { return name() < a.name(); };
-    {
+    virtual bool operator>(BaseVersion& a) { return name() > a.name(); };
-        return name() < a.name();
-    };
-    virtual bool operator>(BaseVersion &a)
-    {
-        return name() > a.name();
-    };
 };
 
 Q_DECLARE_METATYPE(BaseVersion::Ptr)

launcher/CMakeLists.txt

@@ -487,6 +487,9 @@ set(API_SOURCES
     modplatform/helpers/HashUtils.cpp
     modplatform/helpers/OverrideUtils.h
     modplatform/helpers/OverrideUtils.cpp
+
+    modplatform/helpers/ExportToModList.h
+    modplatform/helpers/ExportToModList.cpp
 )
 
 set(FTB_SOURCES
@@ -758,6 +761,8 @@ SET(LAUNCHER_SOURCES
     ui/themes/SystemTheme.h
     ui/themes/ThemeManager.cpp
     ui/themes/ThemeManager.h
+    ui/themes/CatPack.cpp
+    ui/themes/CatPack.h
 
     # Processes
     LaunchController.h
@@ -911,6 +916,8 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ExportInstanceDialog.h
     ui/dialogs/ExportPackDialog.cpp
     ui/dialogs/ExportPackDialog.h
+    ui/dialogs/ExportToModListDialog.cpp
+    ui/dialogs/ExportToModListDialog.h
     ui/dialogs/IconPickerDialog.cpp
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
@@ -1058,6 +1065,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
     ui/dialogs/ExportPackDialog.ui
+    ui/dialogs/ExportToModListDialog.ui
     ui/dialogs/IconPickerDialog.ui
     ui/dialogs/ImportResourceDialog.ui
     ui/dialogs/MSALoginDialog.ui

launcher/FileSystem.cpp

@@ -778,9 +778,43 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
         destination = PathCombine(getDesktopDir(), RemoveInvalidFilenameChars(name));
     }
 #if defined(Q_OS_MACOS)
-    destination += ".command";
+    // Create the Application
+    QDir applicationDirectory = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation) + "/" + BuildConfig.LAUNCHER_NAME + " Instances/";
 
-    QFile f(destination);
+    if (!applicationDirectory.mkpath(".")) {
+        qWarning() << "Couldn't create application directory";
+        return false;
+    }
+
+    QDir application = applicationDirectory.path() + "/" + name + ".app/";
+
+    if (application.exists()) {
+        qWarning() << "Application already exists!";
+        return false;
+    }
+
+    if (!application.mkpath(".")) {
+        qWarning() << "Couldn't create application";
+        return false;
+    }
+
+    QDir content = application.path() + "/Contents/";
+    QDir resources = content.path() + "/Resources/";
+    QDir binaryDir = content.path() + "/MacOS/";
+    QFile info = content.path() + "/Info.plist";
+
+    if (!(content.mkpath(".") && resources.mkpath(".") && binaryDir.mkpath("."))) {
+        qWarning() << "Couldn't create directories within application";
+        return false;
+    }
+    info.open(QIODevice::WriteOnly | QIODevice::Text);
+
+    QFile(icon).rename(resources.path() + "/Icon.icns");
+
+    // Create the Command file
+    QString exec = binaryDir.path() + "/Run.command";
+
+    QFile f(exec);
     f.open(QIODevice::WriteOnly | QIODevice::Text);
     QTextStream stream(&f);
 
@@ -797,6 +831,28 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
 
     f.setPermissions(f.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeGroup | QFileDevice::ExeOther);
 
+    // Generate the Info.plist
+    QTextStream infoStream(&info);
+    infoStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n"
+                  "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" "
+                  "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
+                  "<plist version=\"1.0\">\n"
+                  "<dict>\n"
+                  "    <key>CFBundleExecutable</key>\n"
+                  "    <string>Run.command</string>\n"  // The path to the executable
+                  "    <key>CFBundleIconFile</key>\n"
+                  "    <string>Icon.icns</string>\n"
+                  "    <key>CFBundleName</key>\n"
+                  "    <string>" << name << "</string>\n"  // Name of the application
+                  "    <key>CFBundlePackageType</key>\n"
+                  "    <string>APPL</string>\n"
+                  "    <key>CFBundleShortVersionString</key>\n"
+                  "    <string>1.0</string>\n"
+                  "    <key>CFBundleVersion</key>\n"
+                  "    <string>1.0</string>\n"
+                  "</dict>\n"
+                  "</plist>";
+
     return true;
 #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
     if (!destination.endsWith(".desktop"))  // in case of isFlatpak destination is already populated

launcher/LaunchController.cpp

@@ -390,7 +390,10 @@ void LaunchController::launchInstance()
     m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher));
 
     // Prepend Version
-    m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), BuildConfig.LAUNCHER_DISPLAYNAME + " version: " + BuildConfig.printableVersionString() + "\n\n", MessageLevel::Launcher));
+    {
+        auto versionString = QString("%1 version: %2 (%3)").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM);
+        m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), versionString + "\n\n", MessageLevel::Launcher));
+    }
     m_launcher->start();
 }
 

launcher/MMCZip.cpp

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  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
@@ -33,56 +34,50 @@
  *      limitations under the License.
  */
 
+#include "MMCZip.h"
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
 #include <quazip/quazipfile.h>
-#include "MMCZip.h"
 #include "FileSystem.h"
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QtConcurrentRun>
 
+namespace MMCZip {
 // ours
-bool MMCZip::mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained, const FilterFunction filter)
+bool mergeZipFiles(QuaZip* into, QFileInfo from, QSet<QString>& contained, const FilterFunction filter)
 {
     QuaZip modZip(from.filePath());
     modZip.open(QuaZip::mdUnzip);
 
     QuaZipFile fileInsideMod(&modZip);
     QuaZipFile zipOutFile(into);
-    for (bool more = modZip.goToFirstFile(); more; more = modZip.goToNextFile())
+    for (bool more = modZip.goToFirstFile(); more; more = modZip.goToNextFile()) {
-    {
         QString filename = modZip.getCurrentFileName();
-        if (filter && !filter(filename))
+        if (filter && !filter(filename)) {
-        {
+            qDebug() << "Skipping file " << filename << " from " << from.fileName() << " - filtered";
-            qDebug() << "Skipping file " << filename << " from "
-                        << from.fileName() << " - filtered";
             continue;
         }
-        if (contained.contains(filename))
+        if (contained.contains(filename)) {
-        {
+            qDebug() << "Skipping already contained file " << filename << " from " << from.fileName();
-            qDebug() << "Skipping already contained file " << filename << " from "
-                        << from.fileName();
             continue;
         }
         contained.insert(filename);
 
-        if (!fileInsideMod.open(QIODevice::ReadOnly))
+        if (!fileInsideMod.open(QIODevice::ReadOnly)) {
-        {
             qCritical() << "Failed to open " << filename << " from " << from.fileName();
             return false;
         }
 
         QuaZipNewInfo info_out(fileInsideMod.getActualFileName());
 
-        if (!zipOutFile.open(QIODevice::WriteOnly, info_out))
+        if (!zipOutFile.open(QIODevice::WriteOnly, info_out)) {
-        {
             qCritical() << "Failed to open " << filename << " in the jar";
             fileInsideMod.close();
             return false;
         }
-        if (!JlCompress::copyData(fileInsideMod, zipOutFile))
+        if (!JlCompress::copyData(fileInsideMod, zipOutFile)) {
-        {
             zipOutFile.close();
             fileInsideMod.close();
             qCritical() << "Failed to copy data of " << filename << " into the jar";
@@ -94,10 +89,11 @@ bool MMCZip::mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &containe
     return true;
 }
 
-bool MMCZip::compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files, bool followSymlinks)
+bool compressDirFiles(QuaZip* zip, QString dir, QFileInfoList files, bool followSymlinks)
 {
     QDir directory(dir);
-    if (!directory.exists()) return false;
+    if (!directory.exists())
+        return false;
 
     for (auto e : files) {
         auto filePath = directory.relativeFilePath(e.absoluteFilePath());
@@ -109,17 +105,18 @@ bool MMCZip::compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files, boo
                 srcPath = e.canonicalFilePath();
             }
         }
-        if( !JlCompress::compressFile(zip, srcPath, filePath)) return false;
+        if (!JlCompress::compressFile(zip, srcPath, filePath))
+            return false;
     }
 
     return true;
 }
 
-bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks)
+bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks)
 {
     QuaZip zip(fileCompressed);
     QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
-    if(!zip.open(QuaZip::mdCreate)) {
+    if (!zip.open(QuaZip::mdCreate)) {
         QFile::remove(fileCompressed);
         return false;
     }
@@ -127,7 +124,7 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
     auto result = compressDirFiles(&zip, dir, files, followSymlinks);
 
     zip.close();
-    if(zip.getZipError()!=0) {
+    if (zip.getZipError() != 0) {
         QFile::remove(fileCompressed);
         return false;
     }
@@ -136,11 +133,10 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
 }
 
 // ours
-bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods)
+bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods)
 {
     QuaZip zipOut(targetJarPath);
-    if (!zipOut.open(QuaZip::mdCreate))
+    if (!zipOut.open(QuaZip::mdCreate)) {
-    {
         QFile::remove(targetJarPath);
         qCritical() << "Failed to open the minecraft.jar for modding";
         return false;
@@ -151,37 +147,29 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
 
     // Modify the jar
     // This needs to be done in reverse-order to ensure we respect the loading order of components
-    for (auto i = mods.crbegin(); i != mods.crend(); i++)
+    for (auto i = mods.crbegin(); i != mods.crend(); i++) {
-    {
         const auto* mod = *i;
         // do not merge disabled mods.
         if (!mod->enabled())
             continue;
-        if (mod->type() == ResourceType::ZIPFILE)
+        if (mod->type() == ResourceType::ZIPFILE) {
-        {
+            if (!mergeZipFiles(&zipOut, mod->fileinfo(), addedFiles)) {
-            if (!mergeZipFiles(&zipOut, mod->fileinfo(), addedFiles))
-            {
                 zipOut.close();
                 QFile::remove(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
-        }
+        } else if (mod->type() == ResourceType::SINGLEFILE) {
-        else if (mod->type() == ResourceType::SINGLEFILE)
-        {
             // FIXME: buggy - does not work with addedFiles
             auto filename = mod->fileinfo();
-            if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName()))
+            if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName())) {
-            {
                 zipOut.close();
                 QFile::remove(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
             addedFiles.insert(filename.fileName());
-        }
+        } else if (mod->type() == ResourceType::FOLDER) {
-        else if (mod->type() == ResourceType::FOLDER)
-        {
             // untested, but seems to be unused / not possible to reach
             // FIXME: buggy - does not work with addedFiles
             auto filename = mod->fileinfo();
@@ -190,25 +178,21 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             dir.cdUp();
             QString parent_dir = dir.absolutePath();
             auto files = QFileInfoList();
-            MMCZip::collectFileListRecursively(what_to_zip, nullptr, &files, nullptr);
+            collectFileListRecursively(what_to_zip, nullptr, &files, nullptr);
 
             for (auto e : files) {
                 if (addedFiles.contains(e.filePath()))
                     files.removeAll(e);
             }
 
-            if (!MMCZip::compressDirFiles(&zipOut, parent_dir, files))
+            if (!compressDirFiles(&zipOut, parent_dir, files)) {
-            {
                 zipOut.close();
                 QFile::remove(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
-            qDebug() << "Adding folder " << filename.fileName() << " from "
+            qDebug() << "Adding folder " << filename.fileName() << " from " << filename.absoluteFilePath();
-                     << filename.absoluteFilePath();
+        } else {
-        }
-        else
-        {
             // Make sure we do not continue launching when something is missing or undefined...
             zipOut.close();
             QFile::remove(targetJarPath);
@@ -217,8 +201,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
         }
     }
 
-    if (!mergeZipFiles(&zipOut, QFileInfo(sourceJarPath), addedFiles, [](const QString key){return !key.contains("META-INF");}))
+    if (!mergeZipFiles(&zipOut, QFileInfo(sourceJarPath), addedFiles, [](const QString key) { return !key.contains("META-INF"); })) {
-    {
         zipOut.close();
         QFile::remove(targetJarPath);
         qCritical() << "Failed to insert minecraft.jar contents.";
@@ -227,8 +210,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
 
     // Recompress the jar
     zipOut.close();
-    if (zipOut.getZipError() != 0)
+    if (zipOut.getZipError() != 0) {
-    {
         QFile::remove(targetJarPath);
         qCritical() << "Failed to finalize minecraft.jar!";
         return false;
@@ -237,7 +219,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
 }
 
 // ours
-QString MMCZip::findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths, const QString& root)
+QString findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths, const QString& root)
 {
     QuaZipDir rootDir(zip, root);
     for (auto&& fileName : rootDir.entryList(QDir::Files)) {
@@ -261,27 +243,23 @@ QString MMCZip::findFolderOfFileInZip(QuaZip* zip, const QString& what, const QS
 }
 
 // ours
-bool MMCZip::findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root)
+bool findFilesInZip(QuaZip* zip, const QString& what, QStringList& result, const QString& root)
 {
     QuaZipDir rootDir(zip, root);
-    for(auto fileName: rootDir.entryList(QDir::Files))
+    for (auto fileName : rootDir.entryList(QDir::Files)) {
-    {
+        if (fileName == what) {
-        if(fileName == what)
-        {
             result.append(root);
             return true;
         }
     }
-    for(auto fileName: rootDir.entryList(QDir::Dirs))
+    for (auto fileName : rootDir.entryList(QDir::Dirs)) {
-    {
         findFilesInZip(zip, what, result, root + fileName);
     }
     return !result.isEmpty();
 }
 
-
 // ours
-std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
+std::optional<QStringList> extractSubDir(QuaZip* zip, const QString& subdir, const QString& target)
 {
     auto target_top_dir = QUrl::fromLocalFile(target);
 
@@ -289,16 +267,13 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
 
     qDebug() << "Extracting subdir" << subdir << "from" << zip->getZipName() << "to" << target;
     auto numEntries = zip->getEntriesCount();
-    if(numEntries < 0) {
+    if (numEntries < 0) {
         qWarning() << "Failed to enumerate files in archive";
         return std::nullopt;
-    }
+    } else if (numEntries == 0) {
-    else if(numEntries == 0) {
         qDebug() << "Extracting empty archives seems odd...";
         return extracted;
-    }
+    } else if (!zip->goToFirstFile()) {
-    else if (!zip->goToFirstFile())
-    {
         qWarning() << "Failed to seek to first file in zip";
         return std::nullopt;
     }
@@ -334,7 +309,8 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
         }
 
         if (!target_top_dir.isParentOf(QUrl::fromLocalFile(target_file_path))) {
-            qWarning() << "Extracting" << relative_file_name << "was cancelled, because it was effectively outside of the target path" << target;
+            qWarning() << "Extracting" << relative_file_name << "was cancelled, because it was effectively outside of the target path"
+                       << target;
             return std::nullopt;
         }
 
@@ -345,7 +321,8 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
         }
 
         extracted.append(target_file_path);
-        QFile::setPermissions(target_file_path, QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
+        QFile::setPermissions(target_file_path,
+                              QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
 
         qDebug() << "Extracted file" << relative_file_name << "to" << target_file_path;
     } while (zip->goToNextFile());
@@ -354,66 +331,66 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
 }
 
 // ours
-bool MMCZip::extractRelFile(QuaZip *zip, const QString &file, const QString &target)
+bool extractRelFile(QuaZip* zip, const QString& file, const QString& target)
 {
     return JlCompress::extractFile(zip, file, target);
 }
 
 // ours
-std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString dir)
+std::optional<QStringList> extractDir(QString fileCompressed, QString dir)
 {
     QuaZip zip(fileCompressed);
-    if (!zip.open(QuaZip::mdUnzip))
+    if (!zip.open(QuaZip::mdUnzip)) {
-    {
         // check if this is a minimum size empty zip file...
         QFileInfo fileInfo(fileCompressed);
-        if(fileInfo.size() == 22) {
+        if (fileInfo.size() == 22) {
             return QStringList();
         }
-        qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
+        qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();
+        ;
         return std::nullopt;
     }
-    return MMCZip::extractSubDir(&zip, "", dir);
+    return extractSubDir(&zip, "", dir);
 }
 
 // ours
-std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString subdir, QString dir)
+std::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir)
 {
     QuaZip zip(fileCompressed);
-    if (!zip.open(QuaZip::mdUnzip))
+    if (!zip.open(QuaZip::mdUnzip)) {
-    {
         // check if this is a minimum size empty zip file...
         QFileInfo fileInfo(fileCompressed);
-        if(fileInfo.size() == 22) {
+        if (fileInfo.size() == 22) {
             return QStringList();
         }
-        qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
+        qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();
+        ;
         return std::nullopt;
     }
-    return MMCZip::extractSubDir(&zip, subdir, dir);
+    return extractSubDir(&zip, subdir, dir);
 }
 
 // ours
-bool MMCZip::extractFile(QString fileCompressed, QString file, QString target)
+bool extractFile(QString fileCompressed, QString file, QString target)
 {
     QuaZip zip(fileCompressed);
-    if (!zip.open(QuaZip::mdUnzip))
+    if (!zip.open(QuaZip::mdUnzip)) {
-    {
         // check if this is a minimum size empty zip file...
         QFileInfo fileInfo(fileCompressed);
-        if(fileInfo.size() == 22) {
+        if (fileInfo.size() == 22) {
             return true;
         }
         qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();
         return false;
     }
-    return MMCZip::extractRelFile(&zip, file, target);
+    return extractRelFile(&zip, file, target);
 }
 
-bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& subDir, QFileInfoList *files,
+bool collectFileListRecursively(const QString& rootDir, const QString& subDir, QFileInfoList* files, FilterFunction excludeFilter)
-                                        MMCZip::FilterFunction excludeFilter) {
+{
     QDir rootDirectory(rootDir);
-    if (!rootDirectory.exists()) return false;
+    if (!rootDirectory.exists())
+        return false;
 
     QDir directory;
     if (subDir == nullptr)
@@ -421,25 +398,107 @@ bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& s
     else
         directory = QDir(subDir);
 
-    if (!directory.exists()) return false;  // shouldn't ever happen
+    if (!directory.exists())
+        return false;  // shouldn't ever happen
 
     // recurse directories
     QFileInfoList entries = directory.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden);
-    for (const auto& e: entries) {
+    for (const auto& e : entries) {
         if (!collectFileListRecursively(rootDir, e.filePath(), files, excludeFilter))
             return false;
     }
 
     // collect files
     entries = directory.entryInfoList(QDir::Files);
-    for (const auto& e: entries) {
+    for (const auto& e : entries) {
         QString relativeFilePath = rootDirectory.relativeFilePath(e.absoluteFilePath());
         if (excludeFilter && excludeFilter(relativeFilePath)) {
             qDebug() << "Skipping file " << relativeFilePath;
             continue;
         }
 
-        files->append(e);  // we want the original paths for MMCZip::compressDirFiles
+        files->append(e);  // we want the original paths for compressDirFiles
     }
     return true;
 }
+
+void ExportToZipTask::executeTask()
+{
+    setStatus("Adding files...");
+    setProgress(0, m_files.length());
+    m_build_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return exportZip(); });
+    connect(&m_build_zip_watcher, &QFutureWatcher<ZipResult>::finished, this, &ExportToZipTask::finish);
+    m_build_zip_watcher.setFuture(m_build_zip_future);
+}
+
+auto ExportToZipTask::exportZip() -> ZipResult
+{
+    if (!m_dir.exists()) {
+        return ZipResult(tr("Folder doesn't exist"));
+    }
+    if (!m_output.isOpen() && !m_output.open(QuaZip::mdCreate)) {
+        return ZipResult(tr("Could not create file"));
+    }
+
+    for (auto fileName : m_extra_files.keys()) {
+        if (m_build_zip_future.isCanceled())
+            return ZipResult();
+        QuaZipFile indexFile(&m_output);
+        if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo(fileName))) {
+            return ZipResult(tr("Could not create:") + fileName);
+        }
+        indexFile.write(m_extra_files[fileName]);
+    }
+
+    for (const QFileInfo& file : m_files) {
+        if (m_build_zip_future.isCanceled())
+            return ZipResult();
+
+        auto absolute = file.absoluteFilePath();
+        auto relative = m_dir.relativeFilePath(absolute);
+        setStatus("Compresing: " + relative);
+        setProgress(m_progress + 1, m_progressTotal);
+        if (m_follow_symlinks) {
+            if (file.isSymLink())
+                absolute = file.symLinkTarget();
+            else
+                absolute = file.canonicalFilePath();
+        }
+
+        if (!m_exclude_files.contains(relative) && !JlCompress::compressFile(&m_output, absolute, m_destination_prefix + relative)) {
+            return ZipResult(tr("Could not read and compress %1").arg(relative));
+        }
+    }
+
+    m_output.close();
+    if (m_output.getZipError() != 0) {
+        return ZipResult(tr("A zip error occurred"));
+    }
+    return ZipResult();
+}
+
+void ExportToZipTask::finish()
+{
+    if (m_build_zip_future.isCanceled()) {
+        QFile::remove(m_output_path);
+        emitAborted();
+    } else if (auto result = m_build_zip_future.result(); result.has_value()) {
+        QFile::remove(m_output_path);
+        emitFailed(result.value());
+    } else {
+        emitSucceeded();
+    }
+}
+
+bool ExportToZipTask::abort()
+{
+    if (m_build_zip_future.isRunning()) {
+        m_build_zip_future.cancel();
+        // NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not occur
+        // immediately.
+        return true;
+    }
+    return false;
+}
+
+}  // namespace MMCZip

launcher/MMCZip.h

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  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
@@ -35,26 +36,30 @@
 
 #pragma once
 
-#include <QString>
+#include <quazip.h>
-#include <QFileInfo>
-#include <QSet>
-#include "minecraft/mod/Mod.h"
-#include <functional>
-
 #include <quazip/JlCompress.h>
+#include <QDir>
+#include <QFileInfo>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QHash>
+#include <QSet>
+#include <QString>
+#include <functional>
+#include <memory>
 #include <optional>
+#include "minecraft/mod/Mod.h"
+#include "tasks/Task.h"
 
-namespace MMCZip
+namespace MMCZip {
-{
+using FilterFunction = std::function<bool(const QString&)>;
-    using FilterFunction = std::function<bool(const QString &)>;
 
-    /**
+/**
  * Merge two zip files, using a filter function
  */
-    bool mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained,
+bool mergeZipFiles(QuaZip* into, QFileInfo from, QSet<QString>& contained, const FilterFunction filter = nullptr);
-                                            const FilterFunction filter = nullptr);
 
-    /**
+/**
  * Compress directory, by providing a list of files to compress
  * \param zip target archive
  * \param dir directory that will be compressed (to compress with relative paths)
@@ -62,9 +67,9 @@ namespace MMCZip
  * \param followSymlinks should follow symlinks when compressing file data
  * \return true for success or false for failure
  */
-    bool compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files, bool followSymlinks = false);
+bool compressDirFiles(QuaZip* zip, QString dir, QFileInfoList files, bool followSymlinks = false);
 
-    /**
+/**
  * Compress directory, by providing a list of files to compress
  * \param fileCompressed target archive file
  * \param dir directory that will be compressed (to compress with relative paths)
@@ -72,47 +77,47 @@ namespace MMCZip
  * \param followSymlinks should follow symlinks when compressing file data
  * \return true for success or false for failure
  */
-    bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks = false);
+bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks = false);
 
-    /**
+/**
  * take a source jar, add mods to it, resulting in target jar
  */
-    bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods);
+bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods);
 
-    /**
+/**
  * Find a single file in archive by file name (not path)
  *
  * \param ignore_paths paths to skip when recursing the search
  *
  * \return the path prefix where the file is
  */
-    QString findFolderOfFileInZip(QuaZip * zip, const QString & what, const QStringList& ignore_paths = {}, const QString &root = QString(""));
+QString findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths = {}, const QString& root = QString(""));
 
-    /**
+/**
  * Find a multiple files of the same name in archive by file name
  * If a file is found in a path, no deeper paths are searched
  *
  * \return true if anything was found
  */
-    bool findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString());
+bool findFilesInZip(QuaZip* zip, const QString& what, QStringList& result, const QString& root = QString());
 
-    /**
+/**
  * Extract a subdirectory from an archive
  */
-    std::optional<QStringList> extractSubDir(QuaZip *zip, const QString & subdir, const QString &target);
+std::optional<QStringList> extractSubDir(QuaZip* zip, const QString& subdir, const QString& target);
 
-    bool extractRelFile(QuaZip *zip, const QString & file, const QString &target);
+bool extractRelFile(QuaZip* zip, const QString& file, const QString& target);
 
-    /**
+/**
  * Extract a whole archive.
  *
  * \param fileCompressed The name of the archive.
  * \param dir The directory to extract to, the current directory if left empty.
  * \return The list of the full paths of the files extracted, empty on failure.
  */
-    std::optional<QStringList> extractDir(QString fileCompressed, QString dir);
+std::optional<QStringList> extractDir(QString fileCompressed, QString dir);
 
-    /**
+/**
  * Extract a subdirectory from an archive
  *
  * \param fileCompressed The name of the archive.
@@ -120,9 +125,9 @@ namespace MMCZip
  * \param dir The directory to extract to, the current directory if left empty.
  * \return The list of the full paths of the files extracted, empty on failure.
  */
-    std::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir);
+std::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir);
 
-    /**
+/**
  * Extract a single file from an archive into a directory
  *
  * \param fileCompressed The name of the archive.
@@ -130,9 +135,9 @@ namespace MMCZip
  * \param dir The directory to extract to, the current directory if left empty.
  * \return true for success or false for failure
  */
-    bool extractFile(QString fileCompressed, QString file, QString dir);
+bool extractFile(QString fileCompressed, QString file, QString dir);
 
-    /**
+/**
  * Populate a QFileInfoList with a directory tree recursively, while allowing to excludeFilter what shouldn't be included.
  * \param rootDir directory to start off
  * \param subDir subdirectory, should be nullptr for first invocation
@@ -140,5 +145,48 @@ namespace MMCZip
  * \param excludeFilter function to excludeFilter which files shouldn't be included (returning true means to excude)
  * \return true for success or false for failure
  */
-    bool collectFileListRecursively(const QString &rootDir, const QString &subDir, QFileInfoList *files, FilterFunction excludeFilter);
+bool collectFileListRecursively(const QString& rootDir, const QString& subDir, QFileInfoList* files, FilterFunction excludeFilter);
-}
+
+class ExportToZipTask : public Task {
+   public:
+    ExportToZipTask(QString outputPath, QDir dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false)
+        : m_output_path(outputPath)
+        , m_output(outputPath)
+        , m_dir(dir)
+        , m_files(files)
+        , m_destination_prefix(destinationPrefix)
+        , m_follow_symlinks(followSymlinks)
+    {
+        setAbortable(true);
+    };
+    ExportToZipTask(QString outputPath, QString dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false)
+        : ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks){};
+
+    virtual ~ExportToZipTask() = default;
+
+    void setExcludeFiles(QStringList excludeFiles) { m_exclude_files = excludeFiles; }
+    void addExtraFile(QString fileName, QByteArray data) { m_extra_files.insert(fileName, data); }
+
+    typedef std::optional<QString> ZipResult;
+
+   protected:
+    virtual void executeTask() override;
+    bool abort() override;
+
+    ZipResult exportZip();
+    void finish();
+
+   private:
+    QString m_output_path;
+    QuaZip m_output;
+    QDir m_dir;
+    QFileInfoList m_files;
+    QString m_destination_prefix;
+    bool m_follow_symlinks;
+    QStringList m_exclude_files;
+    QHash<QString, QByteArray> m_extra_files;
+
+    QFuture<ZipResult> m_build_zip_future;
+    QFutureWatcher<ZipResult> m_build_zip_watcher;
+};
+}  // namespace MMCZip

launcher/java/JavaInstall.cpp

@@ -1,29 +1,64 @@
+// 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 "JavaInstall.h"
 
+#include "BaseVersion.h"
 #include "StringUtils.h"
 
-bool JavaInstall::operator<(const JavaInstall &rhs)
+bool JavaInstall::operator<(const JavaInstall& rhs)
 {
     auto archCompare = StringUtils::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive);
-    if(archCompare != 0)
+    if (archCompare != 0)
         return archCompare < 0;
-    if(id < rhs.id)
+    if (id < rhs.id) {
-    {
         return true;
     }
-    if(id > rhs.id)
+    if (id > rhs.id) {
-    {
         return false;
     }
     return StringUtils::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0;
 }
 
-bool JavaInstall::operator==(const JavaInstall &rhs)
+bool JavaInstall::operator==(const JavaInstall& rhs)
 {
     return arch == rhs.arch && id == rhs.id && path == rhs.path;
 }
 
-bool JavaInstall::operator>(const JavaInstall &rhs)
+bool JavaInstall::operator>(const JavaInstall& rhs)
 {
     return (!operator<(rhs)) && (!operator==(rhs));
 }
+
+bool JavaInstall::operator<(BaseVersion& a)
+{
+    try {
+        return operator<(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator<(a);
+    }
+}
+
+bool JavaInstall::operator>(BaseVersion& a)
+{
+    try {
+        return operator>(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator>(a);
+    }
+}

launcher/java/JavaInstall.h

@@ -1,33 +1,40 @@
+// 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 "BaseVersion.h"
 #include "JavaVersion.h"
 
-struct JavaInstall : public BaseVersion
+struct JavaInstall : public BaseVersion {
-{
+    JavaInstall() {}
-    JavaInstall(){}
+    JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
-    JavaInstall(QString id, QString arch, QString path)
+    virtual QString descriptor() { return id.toString(); }
-    : id(id), arch(arch), path(path)
-    {
-    }
-    virtual QString descriptor()
-    {
-        return id.toString();
-    }
 
-    virtual QString name()
+    virtual QString name() { return id.toString(); }
-    {
-        return id.toString();
-    }
 
-    virtual QString typeString() const
+    virtual QString typeString() const { return arch; }
-    {
-        return arch;
-    }
 
-    bool operator<(const JavaInstall & rhs);
+    virtual bool operator<(BaseVersion& a) override;
-    bool operator==(const JavaInstall & rhs);
+    virtual bool operator>(BaseVersion& a) override;
-    bool operator>(const JavaInstall & rhs);
+    bool operator<(const JavaInstall& rhs);
+    bool operator==(const JavaInstall& rhs);
+    bool operator>(const JavaInstall& rhs);
 
     JavaVersion id;
     QString arch;

launcher/minecraft/MinecraftInstance.cpp

@@ -4,6 +4,7 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 seth <getchoo at tuta dot io>
  *
  *  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
@@ -186,6 +187,10 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
         m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
 
+        // Mod loader specific options
+        auto modLoaderSettings = m_settings->registerSetting("OverrideModLoaderSettings", false);
+        m_settings->registerOverride(global_settings->getSetting("DisableQuiltBeacon"), modLoaderSettings);
+
         m_settings->set("InstanceType", "OneSix");
     }
 
@@ -391,6 +396,12 @@ QStringList MinecraftInstance::extraArguments()
         agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath());
         list.append("-javaagent:"+jar[0]+(agent->argument().isEmpty() ? "" : "="+agent->argument()));
     }
+
+    {
+        const auto loaders = version->getModLoaders();
+        if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool())
+            list.append("-Dloader.disable_beacon=true");
+    }
     return list;
 }
 
@@ -832,7 +843,7 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess
     {
         addToFilter(sessionRef.session, tr("<SESSION ID>"));
     }
-    if (sessionRef.access_token != "offline") {
+    if (sessionRef.access_token != "0") {
         addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
     }
     if(sessionRef.client_token.size()) {
@@ -1112,36 +1123,27 @@ JavaVersion MinecraftInstance::getJavaVersion()
 
 std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList()
 {
-    if (!m_loader_mod_list)
+    if (!m_loader_mod_list) {
-    {
         bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
         m_loader_mod_list.reset(new ModFolderModel(modsRoot(), this, is_indexed));
-        m_loader_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_loader_mod_list;
 }
 
 std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList()
 {
-    if (!m_core_mod_list)
+    if (!m_core_mod_list) {
-    {
         bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
         m_core_mod_list.reset(new ModFolderModel(coreModsDir(), this, is_indexed));
-        m_core_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_core_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_core_mod_list;
 }
 
 std::shared_ptr<ModFolderModel> MinecraftInstance::nilModList()
 {
-    if (!m_nil_mod_list)
+    if (!m_nil_mod_list) {
-    {
         bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
         m_nil_mod_list.reset(new ModFolderModel(nilModsDir(), this, is_indexed, false));
-        m_nil_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_nil_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_nil_mod_list;
 }

launcher/minecraft/PackProfile.cpp

@@ -65,7 +65,8 @@
 static const QMap<QString, ResourceAPI::ModLoaderType> modloaderMapping{
     {"net.minecraftforge", ResourceAPI::Forge},
     {"net.fabricmc.fabric-loader", ResourceAPI::Fabric},
-    {"org.quiltmc.quilt-loader", ResourceAPI::Quilt}
+    {"org.quiltmc.quilt-loader", ResourceAPI::Quilt},
+    {"com.mumfrey.liteloader", ResourceAPI::LiteLoader}
 };
 
 PackProfile::PackProfile(MinecraftInstance * instance)

launcher/minecraft/auth/AccountData.cpp

@@ -374,6 +374,10 @@ bool AccountData::resumeStateFromV3(QJsonObject data) {
     }
 
     yggdrasilToken = tokenFromJSONV3(data, "ygg");
+    // versions before 7.2 used "offline" as the offline token
+    if (yggdrasilToken.token == "offline")
+        yggdrasilToken.token = "0";
+
     minecraftProfile = profileFromJSONV3(data, "profile");
     if(!entitlementFromJSONV3(data, minecraftEntitlement)) {
         if(minecraftProfile.validity != Katabasis::Validity::None) {

launcher/minecraft/auth/AuthSession.cpp

@@ -26,6 +26,7 @@ bool AuthSession::MakeOffline(QString offline_playername)
         return false;
     }
     session = "-";
+    access_token = "0";
     player_name = offline_playername;
     status = PlayableOffline;
     return true;

launcher/minecraft/auth/MinecraftAccount.cpp

@@ -37,6 +37,7 @@
 
 #include "MinecraftAccount.h"
 
+#include <QCryptographicHash>
 #include <QUuid>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -93,14 +94,14 @@ MinecraftAccountPtr MinecraftAccount::createOffline(const QString &username)
 {
     auto account = makeShared<MinecraftAccount>();
     account->data.type = AccountType::Offline;
-    account->data.yggdrasilToken.token = "offline";
+    account->data.yggdrasilToken.token = "0";
     account->data.yggdrasilToken.validity = Katabasis::Validity::Certain;
     account->data.yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
     account->data.yggdrasilToken.extra["userName"] = username;
     account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
     account->data.minecraftEntitlement.ownsMinecraft = true;
     account->data.minecraftEntitlement.canPlayMinecraft = true;
-    account->data.minecraftProfile.id = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
+    account->data.minecraftProfile.id = uuidFromUsername(username).toString().remove(QRegularExpression("[{}-]"));
     account->data.minecraftProfile.name = username;
     account->data.minecraftProfile.validity = Katabasis::Validity::Certain;
     return account;
@@ -334,3 +335,32 @@ void MinecraftAccount::incrementUses()
         qWarning() << "Profile" << data.profileId() << "is now in use.";
     }
 }
+
+QUuid MinecraftAccount::uuidFromUsername(QString username) {
+    auto input = QString("OfflinePlayer:%1").arg(username).toUtf8();
+
+    // basically a reimplementation of Java's UUID#nameUUIDFromBytes
+    QByteArray digest = QCryptographicHash::hash(input, QCryptographicHash::Md5);
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    auto bOr = [](QByteArray& array, int index, char value) {
+        array[index] = array.at(index) | value;
+    };
+    auto bAnd = [](QByteArray& array, int index, char value) {
+        array[index] = array.at(index) & value;
+    };
+#else
+    auto bOr = [](QByteArray& array, qsizetype index, char value) {
+        array[index] |= value;
+    };
+    auto bAnd = [](QByteArray& array, qsizetype index, char value) {
+        array[index] &= value;
+    };
+#endif
+    bAnd(digest, 6, (char) 0x0f); // clear version
+    bOr(digest, 6, (char) 0x30); // set to version 3
+    bAnd(digest, 8, (char) 0x3f); // clear variant
+    bOr(digest, 8, (char) 0x80); // set to IETF variant
+
+    return QUuid::fromRfc4122(digest);
+}

launcher/minecraft/auth/MinecraftAccount.h

@@ -98,6 +98,8 @@ public: /* construction */
     static MinecraftAccountPtr loadFromJsonV2(const QJsonObject &json);
     static MinecraftAccountPtr loadFromJsonV3(const QJsonObject &json);
 
+    static QUuid uuidFromUsername(QString username);
+
     //! Saves a MinecraftAccount to a JSON object and returns it.
     QJsonObject saveToJson() const;
 

launcher/minecraft/mod/Mod.cpp

@@ -126,7 +126,7 @@ bool Mod::applyFilter(QRegularExpression filter) const
     return Resource::applyFilter(filter);
 }
 
-auto Mod::destroy(QDir& index_dir, bool preserve_metadata) -> bool
+auto Mod::destroy(QDir& index_dir, bool preserve_metadata, bool attempt_trash) -> bool
 {
     if (!preserve_metadata) {
         qDebug() << QString("Destroying metadata for '%1' on purpose").arg(name());
@@ -139,7 +139,7 @@ auto Mod::destroy(QDir& index_dir, bool preserve_metadata) -> bool
         }
     }
 
-    return Resource::destroy();
+    return Resource::destroy(attempt_trash);
 }
 
 auto Mod::details() const -> const ModDetails&

launcher/minecraft/mod/Mod.h

@@ -93,7 +93,7 @@ public:
     [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
     // Delete all the files of this mod
-    auto destroy(QDir& index_dir, bool preserve_metadata = false) -> bool;
+    auto destroy(QDir& index_dir, bool preserve_metadata = false, bool attempt_trash = true) -> bool;
 
     void finishResolvingWithDetails(ModDetails&& details);
 

launcher/minecraft/mod/ModFolderModel.cpp

@@ -199,10 +199,10 @@ Task* ModFolderModel::createParseTask(Resource& resource)
 
 bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadata)
 {
-    for(auto mod : allMods()){
+    for(auto mod : allMods()) {
-        if(mod->fileinfo().fileName() == filename){
+        if(mod->fileinfo().fileName() == filename) {
             auto index_dir = indexDir();
-            mod->destroy(index_dir, preserve_metadata);
+            mod->destroy(index_dir, preserve_metadata, false);
 
             update();
 
@@ -215,16 +215,11 @@ bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadat
 
 bool ModFolderModel::deleteMods(const QModelIndexList& indexes)
 {
-    if(!m_can_interact) {
+    if (indexes.isEmpty())
-        return false;
-    }
-
-    if(indexes.isEmpty())
         return true;
 
-    for (auto i: indexes)
+    for (auto i : indexes) {
-    {
+        if (i.column() != 0) {
-        if(i.column() != 0) {
             continue;
         }
         auto m = at(i.row());

launcher/minecraft/mod/Resource.cpp

@@ -148,14 +148,10 @@ bool Resource::enable(EnableAction action)
     return true;
 }
 
-bool Resource::destroy()
+bool Resource::destroy(bool attemptTrash)
 {
     m_type = ResourceType::UNKNOWN;
-
+    return (attemptTrash && FS::trash(m_file_info.filePath())) || FS::deletePath(m_file_info.filePath());
-    if (FS::trash(m_file_info.filePath()))
-        return true;
-
-    return FS::deletePath(m_file_info.filePath());
 }
 
 bool Resource::isSymLinkUnder(const QString& instPath) const 

launcher/minecraft/mod/Resource.h

@@ -92,7 +92,7 @@ class Resource : public QObject {
     }
 
     // Delete all files of this resource.
-    bool destroy();
+    bool destroy(bool attemptTrash = true);
 
     [[nodiscard]] auto isSymLink() const -> bool { return m_file_info.isSymLink(); }
 

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -1,14 +1,15 @@
 #include "ResourceFolderModel.h"
+#include <QMessageBox>
 
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFileInfo>
 #include <QIcon>
+#include <QMenu>
 #include <QMimeData>
 #include <QStyle>
 #include <QThreadPool>
 #include <QUrl>
-#include <QMenu>
 
 #include "Application.h"
 #include "FileSystem.h"
@@ -18,6 +19,7 @@
 
 #include "settings/Setting.h"
 #include "tasks/Task.h"
+#include "ui/dialogs/CustomMessageBox.h"
 
 ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObject* parent, bool create_dir)
     : QAbstractListModel(parent), m_dir(dir), m_instance(instance), m_watcher(this)
@@ -77,10 +79,6 @@ bool ResourceFolderModel::stopWatching(const QStringList paths)
 
 bool ResourceFolderModel::installResource(QString original_path)
 {
-    if (!m_can_interact) {
-        return false;
-    }
-
     // NOTE: fix for GH-1178: remove trailing slash to avoid issues with using the empty result of QFileInfo::fileName
     original_path = FS::NormalizePath(original_path);
     QFileInfo file_info(original_path);
@@ -159,7 +157,7 @@ bool ResourceFolderModel::uninstallResource(QString file_name)
 {
     for (auto& resource : m_resources) {
         if (resource->fileinfo().fileName() == file_name) {
-            auto res = resource->destroy();
+            auto res = resource->destroy(false);
 
             update();
 
@@ -171,9 +169,6 @@ bool ResourceFolderModel::uninstallResource(QString file_name)
 
 bool ResourceFolderModel::deleteResources(const QModelIndexList& indexes)
 {
-    if (!m_can_interact)
-        return false;
-
     if (indexes.isEmpty())
         return true;
 
@@ -192,11 +187,8 @@ bool ResourceFolderModel::deleteResources(const QModelIndexList& indexes)
     return true;
 }
 
-bool ResourceFolderModel::setResourceEnabled(const QModelIndexList &indexes, EnableAction action)
+bool ResourceFolderModel::setResourceEnabled(const QModelIndexList& indexes, EnableAction action)
 {
-    if (!m_can_interact)
-        return false;
-
     if (indexes.isEmpty())
         return true;
 
@@ -249,7 +241,9 @@ bool ResourceFolderModel::update()
     connect(m_current_update_task.get(), &Task::succeeded, this, &ResourceFolderModel::onUpdateSucceeded,
             Qt::ConnectionType::QueuedConnection);
     connect(m_current_update_task.get(), &Task::failed, this, &ResourceFolderModel::onUpdateFailed, Qt::ConnectionType::QueuedConnection);
-    connect(m_current_update_task.get(), &Task::finished, this, [=] {
+    connect(
+        m_current_update_task.get(), &Task::finished, this,
+        [=] {
             m_current_update_task.reset();
             if (m_scheduled_update) {
                 m_scheduled_update = false;
@@ -257,7 +251,8 @@ bool ResourceFolderModel::update()
             } else {
                 emit updateFinished();
             }
-    }, Qt::ConnectionType::QueuedConnection);
+        },
+        Qt::ConnectionType::QueuedConnection);
 
     QThreadPool::globalInstance()->start(m_current_update_task.get());
 
@@ -347,15 +342,9 @@ Qt::DropActions ResourceFolderModel::supportedDropActions() const
 Qt::ItemFlags ResourceFolderModel::flags(const QModelIndex& index) const
 {
     Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
-    auto flags = defaultFlags;
+    auto flags = defaultFlags | Qt::ItemIsDropEnabled;
-    if (!m_can_interact) {
+    if (index.isValid())
-        flags &= ~Qt::ItemIsDropEnabled;
-    } else {
-        flags |= Qt::ItemIsDropEnabled;
-        if (index.isValid()) {
         flags |= Qt::ItemIsUserCheckable;
-        }
-    }
     return flags;
 }
 
@@ -430,7 +419,8 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
                     return m_resources[row]->internal_id() +
                            tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original."
                               "\nCanonical Path: %1")
-                            .arg(at(row).fileinfo().canonicalFilePath());;
+                               .arg(at(row).fileinfo().canonicalFilePath());
+                    ;
                 }
                 if (at(row).isMoreThanOneHardLink()) {
                     return m_resources[row]->internal_id() +
@@ -463,8 +453,20 @@ bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& valu
     if (row < 0 || row >= rowCount(index.parent()) || !index.isValid())
         return false;
 
-    if (role == Qt::CheckStateRole)
+    if (role == Qt::CheckStateRole) {
+        if (m_instance != nullptr && m_instance->isRunning()) {
+            auto response =
+                CustomMessageBox::selectable(nullptr, "Confirm toggle",
+                                             "If you enable/disable this resource while the game is running it may crash your game.\n"
+                                             "Are you sure you want to do this?",
+                                             QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                    ->exec();
+
+            if (response != QMessageBox::Yes)
+                return false;
+        }
         return setResourceEnabled({ index }, EnableAction::TOGGLE);
+    }
 
     return false;
 }
@@ -583,16 +585,6 @@ SortType ResourceFolderModel::columnToSortKey(size_t column) const
     return m_column_sort_keys.at(column);
 }
 
-void ResourceFolderModel::enableInteraction(bool enabled)
-{
-    if (m_can_interact == enabled)
-        return;
-
-    m_can_interact = enabled;
-    if (size())
-        emit dataChanged(index(0), index(size() - 1));
-}
-
 /* Standard Proxy Model for createFilterProxyModel */
 [[nodiscard]] bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
 {
@@ -628,6 +620,7 @@ void ResourceFolderModel::enableInteraction(bool enabled)
     return (compare_result.first > 0);
 }
 
-QString ResourceFolderModel::instDirPath() const {
+QString ResourceFolderModel::instDirPath() const
+{
     return QFileInfo(m_instance->instanceRoot()).absoluteFilePath();
 }

launcher/minecraft/mod/ResourceFolderModel.h

@@ -14,8 +14,8 @@
 
 #include "BaseInstance.h"
 
-#include "tasks/Task.h"
 #include "tasks/ConcurrentTask.h"
+#include "tasks/Task.h"
 
 class QSortFilterProxyModel;
 
@@ -141,10 +141,6 @@ class ResourceFolderModel : public QAbstractListModel {
 
     QString instDirPath() const;
 
-   public slots:
-    void enableInteraction(bool enabled);
-    void disableInteraction(bool disabled) { enableInteraction(!disabled); }
-
    signals:
     void updateFinished();
 
@@ -193,7 +189,11 @@ class ResourceFolderModel : public QAbstractListModel {
      *  if the resource is complex and has more stuff to parse.
      */
     virtual void onParseSucceeded(int ticket, QString resource_id);
-    virtual void onParseFailed(int ticket, QString resource_id) { Q_UNUSED(ticket); Q_UNUSED(resource_id); }
+    virtual void onParseFailed(int ticket, QString resource_id)
+    {
+        Q_UNUSED(ticket);
+        Q_UNUSED(resource_id);
+    }
 
    protected:
     // Represents the relationship between a column's index (represented by the list index), and it's sorting key.
@@ -203,8 +203,6 @@ class ResourceFolderModel : public QAbstractListModel {
     QStringList m_column_names_translated = {tr("Enable"), tr("Name"), tr("Last Modified")};
     QList<QHeaderView::ResizeMode> m_column_resize_modes = {  QHeaderView::ResizeToContents, QHeaderView::Stretch, QHeaderView::ResizeToContents };
 
-    bool m_can_interact = true;
-
     QDir m_dir;
     BaseInstance* m_instance;
     QFileSystemWatcher m_watcher;

launcher/minecraft/mod/tasks/LocalResourceParse.cpp

@@ -44,7 +44,11 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = {
 namespace ResourceUtils {
 PackedResourceType identify(QFileInfo file){
     if (file.exists() && file.isFile()) {
-        if (ResourcePackUtils::validate(file)) {
+        if (ModUtils::validate(file)) {
+            // mods can contain resource and data packs so they must be tested first
+            qDebug() << file.fileName() << "is a mod";
+            return PackedResourceType::Mod;
+        } else if (ResourcePackUtils::validate(file)) {
             qDebug() << file.fileName() << "is a resource pack";
             return PackedResourceType::ResourcePack;
         } else if (TexturePackUtils::validate(file)) {
@@ -53,9 +57,6 @@ PackedResourceType identify(QFileInfo file){
         } else if (DataPackUtils::validate(file)) {
             qDebug() << file.fileName() << "is a data pack";
             return PackedResourceType::DataPack;
-        } else if (ModUtils::validate(file)) {
-            qDebug() << file.fileName() << "is a mod";
-            return PackedResourceType::Mod;
         } else if (WorldSaveUtils::validate(file)) {
             qDebug() << file.fileName() << "is a world save";
             return PackedResourceType::WorldSave;

launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp

@@ -103,7 +103,7 @@ void ModFolderLoadTask::executeTask()
         while (iter.hasNext()) {
             auto mod = iter.next().value();
             if (mod->status() == ModStatus::NotInstalled) {
-                mod->destroy(m_index_dir, false);
+                mod->destroy(m_index_dir, false, false);
                 iter.remove();
             }
         }

launcher/modplatform/EnsureMetadataTask.cpp

@@ -145,7 +145,8 @@ void EnsureMetadataTask::executeTask()
         connect(project_task.get(), &Task::finished, this, [=] {
             invalidade_leftover();
             project_task->deleteLater();
-            m_current_task = nullptr;
+            if (m_current_task)
+                m_current_task.reset();
         });
 
         m_current_task = project_task;
@@ -154,7 +155,8 @@ void EnsureMetadataTask::executeTask()
 
     connect(version_task.get(), &Task::finished, [=] {
         version_task->deleteLater();
-        m_current_task = nullptr;
+        if (m_current_task)
+            m_current_task.reset();
     });
 
     if (m_mods.size() > 1)

launcher/modplatform/flame/FileResolvingTask.cpp

@@ -21,6 +21,10 @@ bool Flame::FileResolvingTask::abort()
 
 void Flame::FileResolvingTask::executeTask()
 {
+    if (m_toProcess.files.isEmpty()) {  // no file to resolve so leave it empty and emit success immediately
+        emitSucceeded();
+        return;
+    }
     setStatus(tr("Resolving mod IDs..."));
     setProgress(0, 3);
     m_dljob.reset(new NetJob("Mod id resolver", m_network));
@@ -128,12 +132,13 @@ void Flame::FileResolvingTask::netJobFinished()
     m_checkJob->start();
 }
 
-void Flame::FileResolvingTask::modrinthCheckFinished() {
+void Flame::FileResolvingTask::modrinthCheckFinished()
+{
     setProgress(2, 3);
     qDebug() << "Finished with blocked mods : " << blockedProjects.size();
 
     for (auto it = blockedProjects.keyBegin(); it != blockedProjects.keyEnd(); it++) {
-        auto &out = *it;
+        auto& out = *it;
         auto bytes = blockedProjects[out];
         if (!out->resolved) {
             continue;
@@ -153,15 +158,13 @@ void Flame::FileResolvingTask::modrinthCheckFinished() {
             out->resolved = false;
         }
     }
-    //copy to an output list and filter out projects found on modrinth
+    // copy to an output list and filter out projects found on modrinth
     auto block = std::make_shared<QList<File*>>();
     auto it = blockedProjects.keys();
-    std::copy_if(it.begin(), it.end(), std::back_inserter(*block), [](File *f) {
+    std::copy_if(it.begin(), it.end(), std::back_inserter(*block), [](File* f) { return !f->resolved; });
-        return !f->resolved;
+    // Display not found mods early
-    });
-    //Display not found mods early
     if (!block->empty()) {
-        //blocked mods found, we need the slug for displaying.... we need another job :D !
+        // blocked mods found, we need the slug for displaying.... we need another job :D !
         m_slugJob.reset(new NetJob("Slug Job", m_network));
         int index = 0;
         for (auto mod : *block) {
@@ -173,8 +176,8 @@ void Flame::FileResolvingTask::modrinthCheckFinished() {
             QObject::connect(dl.get(), &Net::Download::succeeded, [block, index, output]() {
                 auto mod = block->at(index);  // use the shared_ptr so it is captured and only freed when we are done
                 auto json = QJsonDocument::fromJson(*output);
-                auto base = Json::requireString(Json::requireObject(Json::requireObject(Json::requireObject(json),"data"),"links"),
+                auto base =
-                        "websiteUrl");
+                    Json::requireString(Json::requireObject(Json::requireObject(Json::requireObject(json), "data"), "links"), "websiteUrl");
                 auto link = QString("%1/download/%2").arg(base, QString::number(mod->fileId));
                 mod->websiteUrl = link;
             });

launcher/modplatform/flame/FlameAPI.h

@@ -23,6 +23,8 @@ class FlameAPI : public NetworkResourceAPI {
 
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
+    static inline auto validateModLoaders(ModLoaderTypes loaders) -> bool { return loaders & (Forge | Fabric | Quilt); }
+
    private:
     static int getClassId(ModPlatform::ResourceType type)
     {

launcher/modplatform/flame/FlameInstanceCreationTask.cpp

@@ -57,15 +57,11 @@
 #include <QDebug>
 #include <QFileInfo>
 
+#include "meta/Index.h"
+#include "meta/VersionList.h"
 #include "minecraft/World.h"
 #include "minecraft/mod/tasks/LocalResourceParse.h"
 
-
-const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
-                                                 { "1.4.2", "6.0.1.355" },
-                                                 { "1.4.7", "6.6.2.534" },
-                                                 { "1.5.2", "7.8.1.737" } };
-
 static const FlameAPI api;
 
 bool FlameCreationTask::abort()
@@ -259,6 +255,56 @@ bool FlameCreationTask::updateInstance()
     return false;
 }
 
+QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString loaderVersion, QString mcVersion)
+{
+    if (loaderVersion == "recommended") {
+        auto vlist = APPLICATION->metadataIndex()->get(uid);
+        if (!vlist) {
+            setError(tr("Failed to get local metadata index for %1").arg(uid));
+            return {};
+        }
+
+        if (!vlist->isLoaded()) {
+            QEventLoop loadVersionLoop;
+            auto task = vlist->getLoadTask();
+            connect(task.get(), &Task::finished, &loadVersionLoop, &QEventLoop::quit);
+            if (!task->isRunning())
+                task->start();
+
+            loadVersionLoop.exec();
+        }
+
+        for (auto version : vlist->versions()) {
+            // first recommended build we find, we use.
+            if (!version->isRecommended())
+                continue;
+            auto reqs = version->requiredSet();
+
+            // filter by minecraft version, if the loader depends on a certain version.
+            // not all mod loaders depend on a given Minecraft version, so we won't do this
+            // filtering for those loaders.
+            if (loaderType == "forge") {
+                auto iter = std::find_if(reqs.begin(), reqs.end(), [mcVersion](const Meta::Require& req) {
+                    return req.uid == "net.minecraft" && req.equalsVersion == mcVersion;
+                });
+                if (iter == reqs.end())
+                    continue;
+            }
+            return version->descriptor();
+        }
+
+        setError(tr("Failed to find version for %1 loader").arg(loaderType));
+        return {};
+    }
+
+    if (loaderVersion.isEmpty()) {
+        emitFailed(tr("No loader version set for modpack!"));
+        return {};
+    }
+
+    return loaderVersion;
+}
+
 bool FlameCreationTask::createInstance()
 {
     QEventLoop loop;
@@ -297,22 +343,29 @@ bool FlameCreationTask::createInstance()
         }
     }
 
-    QString forgeVersion;
+    QString loaderType;
-    QString fabricVersion;
+    QString loaderUid;
-    // TODO: is Quilt relevant here?
+    QString loaderVersion;
+
     for (auto& loader : m_pack.minecraft.modLoaders) {
         auto id = loader.id;
         if (id.startsWith("forge-")) {
             id.remove("forge-");
-            forgeVersion = id;
+            loaderType = "forge";
-            continue;
+            loaderUid = "net.minecraftforge";
-        }
+        } else if (loaderType == "fabric") {
-        if (id.startsWith("fabric-")) {
             id.remove("fabric-");
-            fabricVersion = id;
+            loaderType = "fabric";
+            loaderUid = "net.fabricmc.fabric-loader";
+        } else if (loaderType == "quilt") {
+            id.remove("quilt-");
+            loaderType = "quilt";
+            loaderUid = "org.quiltmc.quilt-loader";
+        } else {
+            logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
             continue;
         }
-        logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
+        loaderVersion = id;
     }
 
     QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg");
@@ -329,19 +382,12 @@ bool FlameCreationTask::createInstance()
     auto components = instance.getPackProfile();
     components->buildingFromScratch();
     components->setComponentVersion("net.minecraft", mcVersion, true);
-    if (!forgeVersion.isEmpty()) {
+    if (!loaderType.isEmpty()) {
-        // FIXME: dirty, nasty, hack. Proper solution requires dependency resolution and knowledge of the metadata.
+        auto version = getVersionForLoader(loaderUid, loaderType, loaderVersion, mcVersion);
-        if (forgeVersion == "recommended") {
+        if (version.isEmpty())
-            if (forgemap.contains(mcVersion)) {
+            return false;
-                forgeVersion = forgemap[mcVersion];
+        components->setComponentVersion(loaderUid, version);
-            } else {
-                logWarning(tr("Could not map recommended Forge version for Minecraft %1").arg(mcVersion));
     }
-        }
-        components->setComponentVersion("net.minecraftforge", forgeVersion);
-    }
-    if (!fabricVersion.isEmpty())
-        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
 
     if (m_instIcon != "default") {
         instance.setIconKey(m_instIcon);
@@ -502,7 +548,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         m_files_job.reset();
         setError(reason);
     });
-    connect(m_files_job.get(), &NetJob::progress, this, [this](qint64 current, qint64 total){
+    connect(m_files_job.get(), &NetJob::progress, this, [this](qint64 current, qint64 total) {
         setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
         setProgress(current, total);
     });
@@ -545,7 +591,6 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
     setAbortable(true);
 }
 
-
 void FlameCreationTask::validateZIPResouces()
 {
     qDebug() << "Validating whether resources stored as .zip are in the right place";
@@ -563,11 +608,13 @@ void FlameCreationTask::validateZIPResouces()
                 if (FS::move(localPath, destPath)) {
                     return destPath;
                 }
+            } else {
+                qDebug() << "Target folder of" << fileName << "is correct at" << targetFolder;
             }
             return localPath;
         };
 
-        auto installWorld = [this](QString worldPath){
+        auto installWorld = [this](QString worldPath) {
             qDebug() << "Installing World from" << worldPath;
             QFileInfo worldFileInfo(worldPath);
             World w(worldFileInfo);
@@ -584,29 +631,29 @@ void FlameCreationTask::validateZIPResouces()
         QString worldPath;
 
         switch (type) {
-            case PackedResourceType::ResourcePack :
+            case PackedResourceType::Mod:
-                validatePath(fileName, targetFolder, "resourcepacks");
-                break;
-            case PackedResourceType::TexturePack :
-                validatePath(fileName, targetFolder, "texturepacks");
-                break;
-            case PackedResourceType::DataPack :
-                validatePath(fileName, targetFolder, "datapacks");
-                break;
-            case PackedResourceType::Mod :
                 validatePath(fileName, targetFolder, "mods");
                 break;
-            case PackedResourceType::ShaderPack :
+            case PackedResourceType::ResourcePack:
+                validatePath(fileName, targetFolder, "resourcepacks");
+                break;
+            case PackedResourceType::TexturePack:
+                validatePath(fileName, targetFolder, "texturepacks");
+                break;
+            case PackedResourceType::DataPack:
+                validatePath(fileName, targetFolder, "datapacks");
+                break;
+            case PackedResourceType::ShaderPack:
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
                 validatePath(fileName, targetFolder, "shaderpacks");
                 break;
-            case PackedResourceType::WorldSave :
+            case PackedResourceType::WorldSave:
                 worldPath = validatePath(fileName, targetFolder, "saves");
                 installWorld(worldPath);
                 break;
-            case PackedResourceType::UNKNOWN :
+            case PackedResourceType::UNKNOWN:
-            default :
+            default:
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
                 break;
         }

launcher/modplatform/flame/FlameInstanceCreationTask.h

@@ -57,10 +57,7 @@ class FlameCreationTask final : public InstanceCreationTask {
                       QString id,
                       QString version_id,
                       QString original_instance_id = {})
-        : InstanceCreationTask()
+        : InstanceCreationTask(), m_parent(parent), m_managed_id(std::move(id)), m_managed_version_id(std::move(version_id))
-        , m_parent(parent)
-        , m_managed_id(std::move(id))
-        , m_managed_version_id(std::move(version_id))
     {
         setStagingPath(staging_path);
         setParentSettings(global_settings);
@@ -78,6 +75,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     void setupDownloadJob(QEventLoop&);
     void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
     void validateZIPResouces();
+    QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion);
 
    private:
     QWidget* m_parent = nullptr;

launcher/modplatform/flame/PackManifest.cpp

@@ -76,13 +76,8 @@ bool Flame::File::parseFromObject(const QJsonObject& obj,  bool throw_on_blocked
     // It is also optional
     type = File::Type::SingleFile;
 
-    if (fileName.endsWith(".zip")) {
-        // this is probably a resource pack
-        targetFolder = "resourcepacks";
-    } else {
-        // this is probably a mod, dunno what else could modpacks download
     targetFolder = "mods";
-    }
+
     // get the hash
     hash = QString();
     auto hashes = Json::ensureArray(obj, "hashes");

launcher/modplatform/helpers/ExportToModList.cpp

@@ -0,0 +1,200 @@
+// 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 "ExportToModList.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+namespace ExportToModList {
+QString toHTML(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name().toHtmlEscaped();
+        if (extraData & Url) {
+            auto url = mod->metaurl().toHtmlEscaped();
+            if (!url.isEmpty())
+                modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
+        }
+        auto line = modName;
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            if (!ver.isEmpty())
+                line += QString(" [%1]").arg(ver.toHtmlEscaped());
+        }
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line += " by " + mod->authors().join(", ").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 toMarkdown(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+        if (extraData & Url) {
+            auto url = mod->metaurl();
+            if (!url.isEmpty())
+                modName = QString("[%1](%2)").arg(modName, url);
+        }
+        auto line = modName;
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            if (!ver.isEmpty())
+                line += QString(" [%1]").arg(ver);
+        }
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line += " by " + mod->authors().join(", ");
+        lines << "- " + line;
+    }
+    return lines.join("\n");
+}
+
+QString toPlainTXT(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+
+        auto line = modName;
+        if (extraData & Url) {
+            auto url = mod->metaurl();
+            if (!url.isEmpty())
+                line += QString(" (%1)").arg(url);
+        }
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            if (!ver.isEmpty())
+                line += QString(" [%1]").arg(ver);
+        }
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line += " by " + mod->authors().join(", ");
+        lines << line;
+    }
+    return lines.join("\n");
+}
+
+QString toJSON(QList<Mod*> mods, OptionalData extraData)
+{
+    QJsonArray lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+        QJsonObject line;
+        line["name"] = modName;
+        if (extraData & Url) {
+            auto url = mod->metaurl();
+            if (!url.isEmpty())
+                line["url"] = url;
+        }
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            if (!ver.isEmpty())
+                line["version"] = ver;
+        }
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line["authors"] = QJsonArray::fromStringList(mod->authors());
+        lines << line;
+    }
+    QJsonDocument doc;
+    doc.setArray(lines);
+    return doc.toJson();
+}
+
+QString toCSV(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        QStringList data;
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+
+        data << modName;
+        if (extraData & Url)
+            data << mod->metaurl();
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            data << ver;
+        }
+        if (extraData & Authors) {
+            QString authors;
+            if (mod->authors().length() == 1)
+                authors = mod->authors().back();
+            else if (mod->authors().length() > 1)
+                authors = QString("\"%1\"").arg(mod->authors().join(","));
+            data << authors;
+        }
+        lines << data.join(",");
+    }
+    return lines.join("\n");
+}
+
+QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
+{
+    switch (format) {
+        case HTML:
+            return toHTML(mods, extraData);
+        case MARKDOWN:
+            return toMarkdown(mods, extraData);
+        case PLAINTXT:
+            return toPlainTXT(mods, extraData);
+        case JSON:
+            return toJSON(mods, extraData);
+        case CSV:
+            return toCSV(mods, extraData);
+        default: {
+            return QString("unknown format:%1").arg(format);
+        }
+    }
+}
+
+QString exportToModList(QList<Mod*> mods, QString lineTemplate)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+        auto url = mod->metaurl();
+        auto ver = mod->version();
+        if (ver.isEmpty() && meta != nullptr)
+            ver = meta->version().toString();
+        auto authors = mod->authors().join(", ");
+        lines << QString(lineTemplate)
+                     .replace("{name}", modName)
+                     .replace("{url}", url)
+                     .replace("{version}", ver)
+                     .replace("{authors}", authors);
+    }
+    return lines.join("\n");
+}
+}  // namespace ExportToModList

launcher/modplatform/helpers/ExportToModList.h

@@ -0,0 +1,33 @@
+// 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 <QList>
+#include <QString>
+#include "minecraft/mod/Mod.h"
+
+namespace ExportToModList {
+
+enum Formats { HTML, MARKDOWN, PLAINTXT, JSON, CSV, CUSTOM };
+enum OptionalData {
+    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/modplatform/legacy_ftb/PackInstallTask.cpp

@@ -37,16 +37,16 @@
 
 #include <QtConcurrent>
 
-#include "MMCZip.h"
 #include "BaseInstance.h"
 #include "FileSystem.h"
-#include "settings/INISettingsObject.h"
+#include "MMCZip.h"
+#include "minecraft/GradleSpecifier.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
-#include "minecraft/GradleSpecifier.h"
+#include "settings/INISettingsObject.h"
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
 namespace LegacyFTB {
 
@@ -65,6 +65,7 @@ void PackInstallTask::executeTask()
 void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading zip for %1").arg(m_pack.name));
+    setProgress(1, 4);
     setAbortable(false);
 
     archivePath = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
@@ -78,11 +79,10 @@ void PackInstallTask::downloadPack()
     }
     netJobContainer->addNetAction(Net::Download::makeFile(url, archivePath));
 
-    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
+    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::unzip);
-    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
+    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::emitFailed);
-    connect(netJobContainer.get(), &NetJob::progress, this, &PackInstallTask::onDownloadProgress);
     connect(netJobContainer.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
-    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::onDownloadAborted);
+    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::emitAborted);
 
     netJobContainer->start();
 
@@ -90,27 +90,6 @@ void PackInstallTask::downloadPack()
     progress(1, 4);
 }
 
-void PackInstallTask::onDownloadSucceeded()
-{
-    unzip();
-}
-
-void PackInstallTask::onDownloadFailed(QString reason)
-{
-    emitFailed(reason);
-}
-
-void PackInstallTask::onDownloadProgress(qint64 current, qint64 total)
-{
-    progress(current, total * 4);
-    setStatus(tr("Downloading zip for %1 (%2%)").arg(m_pack.name).arg(current / 10));
-}
-
-void PackInstallTask::onDownloadAborted()
-{
-    emitAborted();
-}
-
 void PackInstallTask::unzip()
 {
     setStatus(tr("Extracting modpack"));
@@ -120,16 +99,17 @@ void PackInstallTask::unzip()
     QDir extractDir(m_stagingPath);
 
     m_packZip.reset(new QuaZip(archivePath));
-    if(!m_packZip->open(QuaZip::mdUnzip))
+    if (!m_packZip->open(QuaZip::mdUnzip)) {
-    {
         emitFailed(tr("Failed to open modpack file %1!").arg(archivePath));
         return;
     }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath, extractDir.absolutePath() + "/unzip");
+    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath,
+                                        extractDir.absolutePath() + "/unzip");
 #else
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
+    m_extractFuture =
+        QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
 #endif
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onUnzipFinished);
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, &PackInstallTask::onUnzipCanceled);
@@ -151,11 +131,9 @@ void PackInstallTask::install()
     setStatus(tr("Installing modpack"));
     progress(3, 4);
     QDir unzipMcDir(m_stagingPath + "/unzip/minecraft");
-    if(unzipMcDir.exists())
+    if (unzipMcDir.exists()) {
-    {
+        // ok, found minecraft dir, move contents to instance dir
-        //ok, found minecraft dir, move contents to instance dir
+        if (!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft")) {
-        if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft"))
-        {
             emitFailed(tr("Failed to move unzipped Minecraft!"));
             return;
         }
@@ -172,23 +150,20 @@ void PackInstallTask::install()
 
     bool fallback = true;
 
-    //handle different versions
+    // handle different versions
     QFile packJson(m_stagingPath + "/.minecraft/pack.json");
     QDir jarmodDir = QDir(m_stagingPath + "/unzip/instMods");
-    if(packJson.exists())
+    if (packJson.exists()) {
-    {
         packJson.open(QIODevice::ReadOnly | QIODevice::Text);
         QJsonDocument doc = QJsonDocument::fromJson(packJson.readAll());
         packJson.close();
 
-        //we only care about the libs
+        // we only care about the libs
         QJsonArray libs = doc.object().value("libraries").toArray();
 
-        foreach (const QJsonValue &value, libs)
+        foreach (const QJsonValue& value, libs) {
-        {
             QString nameValue = value.toObject().value("name").toString();
-            if(!nameValue.startsWith("net.minecraftforge"))
+            if (!nameValue.startsWith("net.minecraftforge")) {
-            {
                 continue;
             }
 
@@ -199,16 +174,13 @@ void PackInstallTask::install()
             fallback = false;
             break;
         }
-
     }
 
-    if(jarmodDir.exists())
+    if (jarmodDir.exists()) {
-    {
         qDebug() << "Found jarmods, installing...";
 
         QStringList jarmods;
-        for (auto info: jarmodDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files))
+        for (auto info : jarmodDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files)) {
-        {
             qDebug() << "Jarmod:" << info.fileName();
             jarmods.push_back(info.absoluteFilePath());
         }
@@ -217,12 +189,11 @@ void PackInstallTask::install()
         fallback = false;
     }
 
-    //just nuke unzip directory, it s not needed anymore
+    // just nuke unzip directory, it s not needed anymore
     FS::deletePath(m_stagingPath + "/unzip");
 
-    if(fallback)
+    if (fallback) {
-    {
+        // TODO: Some fallback mechanism... or just keep failing!
-        //TODO: Some fallback mechanism... or just keep failing!
         emitFailed(tr("No installation method found!"));
         return;
     }
@@ -232,8 +203,7 @@ void PackInstallTask::install()
     progress(4, 4);
 
     instance.setName(name());
-    if(m_instIcon == "default")
+    if (m_instIcon == "default") {
-    {
         m_instIcon = "ftb_logo";
     }
     instance.setIconKey(m_instIcon);
@@ -252,4 +222,4 @@ bool PackInstallTask::abort()
     return InstanceTask::abort();
 }
 
-}
+}  // namespace LegacyFTB

launcher/modplatform/legacy_ftb/PackInstallTask.h

@@ -1,12 +1,12 @@
 #pragma once
-#include "InstanceTask.h"
-#include "net/NetJob.h"
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
+#include "InstanceTask.h"
+#include "PackHelpers.h"
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
-#include "PackHelpers.h"
+#include "net/NetJob.h"
 
 #include "net/NetJob.h"
 
@@ -14,36 +14,31 @@
 
 namespace LegacyFTB {
 
-class PackInstallTask : public InstanceTask
+class PackInstallTask : public InstanceTask {
-{
     Q_OBJECT
 
-public:
+   public:
     explicit PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version);
-    virtual ~PackInstallTask(){}
+    virtual ~PackInstallTask() {}
 
     bool canAbort() const override { return true; }
     bool abort() override;
 
-protected:
+   protected:
     //! Entry point for tasks.
     virtual void executeTask() override;
 
-private:
+   private:
     void downloadPack();
     void unzip();
     void install();
 
-private slots:
+   private slots:
-    void onDownloadSucceeded();
-    void onDownloadFailed(QString reason);
-    void onDownloadProgress(qint64 current, qint64 total);
-    void onDownloadAborted();
 
     void onUnzipFinished();
     void onUnzipCanceled();
 
-private: /* data */
+   private: /* data */
     shared_qobject_ptr<QNetworkAccessManager> m_network;
     bool abortable = false;
     std::unique_ptr<QuaZip> m_packZip;
@@ -56,4 +51,4 @@ private: /* data */
     QString m_version;
 };
 
-}
+}  // namespace LegacyFTB

launcher/modplatform/modrinth/ModrinthAPI.h

@@ -38,7 +38,7 @@ class ModrinthAPI : public NetworkResourceAPI {
     static auto getModLoaderStrings(const ModLoaderTypes types) -> const QStringList
     {
         QStringList l;
-        for (auto loader : { Forge, Fabric, Quilt }) {
+        for (auto loader : { Forge, Fabric, Quilt, LiteLoader }) {
             if (types & loader) {
                 l << getModLoaderString(loader);
             }
@@ -92,7 +92,7 @@ class ModrinthAPI : public NetworkResourceAPI {
     {
         if (args.loaders.has_value()) {
             if (!validateModLoaders(args.loaders.value())) {
-                qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
+                qWarning() << "Modrinth - or our interface - does not support any the provided mod loaders!";
                 return {};
             }
         }
@@ -141,7 +141,7 @@ class ModrinthAPI : public NetworkResourceAPI {
         return s.isEmpty() ? QString() : s;
     }
 
-    inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool { return loaders & (Forge | Fabric | Quilt); }
+    static inline auto validateModLoaders(ModLoaderTypes loaders) -> bool { return loaders & (Forge | Fabric | Quilt | LiteLoader); }
 
     [[nodiscard]] std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
     {

launcher/modplatform/modrinth/ModrinthPackExportTask.cpp

@@ -266,13 +266,13 @@ void ModrinthPackExportTask::finish()
 
 QByteArray ModrinthPackExportTask::generateIndex()
 {
-    QJsonObject obj;
+    QJsonObject out;
-    obj["formatVersion"] = 1;
+    out["formatVersion"] = 1;
-    obj["game"] = "minecraft";
+    out["game"] = "minecraft";
-    obj["name"] = name;
+    out["name"] = name;
-    obj["versionId"] = version;
+    out["versionId"] = version;
     if (!summary.isEmpty())
-        obj["summary"] = summary;
+        out["summary"] = summary;
 
     if (mcInstance) {
         auto profile = mcInstance->getPackProfile();
@@ -293,30 +293,40 @@ QByteArray ModrinthPackExportTask::generateIndex()
         if (forge != nullptr)
             dependencies["forge"] = forge->m_version;
 
-        obj["dependencies"] = dependencies;
+        out["dependencies"] = dependencies;
     }
 
-    QJsonArray files;
+    QJsonArray filesOut;
-    QMapIterator<QString, ResolvedFile> iterator(resolvedFiles);
+    for (auto iterator = resolvedFiles.constBegin(); iterator != resolvedFiles.constEnd(); iterator++) {
-    while (iterator.hasNext()) {
+        QJsonObject fileOut;
-        iterator.next();
 
+        QString path = iterator.key();
         const ResolvedFile& value = iterator.value();
 
-        QJsonObject file;
+        // detect disabled mod
-        file["path"] = iterator.key();
+        const QFileInfo pathInfo(path);
-        file["downloads"] = QJsonArray({ iterator.value().url });
+        if (pathInfo.suffix() == "disabled") {
+            // rename it
+            path = pathInfo.dir().filePath(pathInfo.completeBaseName());
+            // ...and make it optional
+            QJsonObject env;
+            env["client"] = "optional";
+            env["server"] = "optional";
+            fileOut["env"] = env;
+        }
+
+        fileOut["path"] = path;
+        fileOut["downloads"] = QJsonArray{ iterator.value().url };
 
         QJsonObject hashes;
         hashes["sha1"] = value.sha1;
         hashes["sha512"] = value.sha512;
+        fileOut["hashes"] = hashes;
 
-        file["hashes"] = hashes;
+        fileOut["fileSize"] = value.size;
-        file["fileSize"] = value.size;
+        filesOut << fileOut;
-
-        files << file;
     }
-    obj["files"] = files;
+    out["files"] = filesOut;
 
-    return QJsonDocument(obj).toJson(QJsonDocument::Compact);
+    return QJsonDocument(out).toJson(QJsonDocument::Compact);
 }

launcher/translations/TranslationsModel.cpp

@@ -42,6 +42,7 @@
 #include <QDir>
 #include <QLibraryInfo>
 #include <QDebug>
+#include <locale>
 
 #include "FileSystem.h"
 #include "net/NetJob.h"
@@ -527,34 +528,34 @@ Language * TranslationsModel::findLanguage(const QString& key)
     }
 }
 
+void TranslationsModel::setUseSystemLocale(bool useSystemLocale)
+{
+    APPLICATION->settings()->set("UseSystemLocale", useSystemLocale);
+    QLocale::setDefault(QLocale(useSystemLocale ? QString::fromStdString(std::locale().name()) : defaultLangCode));
+}
+
 bool TranslationsModel::selectLanguage(QString key)
 {
-    QString &langCode = key;
+    QString& langCode = key;
     auto langPtr = findLanguage(key);
 
-    if (langCode.isEmpty())
+    if (langCode.isEmpty()) {
-    {
         d->no_language_set = true;
     }
 
-    if(!langPtr)
+    if (!langPtr) {
-    {
         qWarning() << "Selected invalid language" << key << ", defaulting to" << defaultLangCode;
         langCode = defaultLangCode;
-    }
+    } else {
-    else
-    {
         langCode = langPtr->key;
     }
 
     // uninstall existing translators if there are any
-    if (d->m_app_translator)
+    if (d->m_app_translator) {
-    {
         QCoreApplication::removeTranslator(d->m_app_translator.get());
         d->m_app_translator.reset();
     }
-    if (d->m_qt_translator)
+    if (d->m_qt_translator) {
-    {
         QCoreApplication::removeTranslator(d->m_qt_translator.get());
         d->m_qt_translator.reset();
     }
@@ -564,8 +565,9 @@ bool TranslationsModel::selectLanguage(QString key)
      * In a multithreaded application, the default locale should be set at application startup, before any non-GUI threads are created.
      * This function is not reentrant.
      */
-    QLocale locale = QLocale(langCode);
+    QLocale::setDefault(
-    QLocale::setDefault(locale);
+        QLocale(APPLICATION->settings()->get("UseSystemLocale").toBool() ? QString::fromStdString(std::locale().name()) : langCode));
+
 
     // if it's the default UI language, finish
     if(langCode == defaultLangCode)

launcher/translations/TranslationsModel.h

@@ -20,17 +20,16 @@
 
 struct Language;
 
-class TranslationsModel : public QAbstractListModel
+class TranslationsModel : public QAbstractListModel {
-{
     Q_OBJECT
-public:
+   public:
-    explicit TranslationsModel(QString path, QObject *parent = 0);
+    explicit TranslationsModel(QString path, QObject* parent = 0);
     virtual ~TranslationsModel();
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex & parent) const override;
+    int columnCount(const QModelIndex& parent) const override;
 
     bool selectLanguage(QString key);
     void updateLanguage(QString key);
@@ -38,27 +37,27 @@ public:
     QString selectedLanguage();
 
     void downloadIndex();
+    void setUseSystemLocale(bool useSystemLocale);
 
-private:
+   private:
-    Language *findLanguage(const QString & key);
+    Language* findLanguage(const QString& key);
     void reloadLocalFiles();
     void downloadTranslation(QString key);
     void downloadNext();
 
     // hide copy constructor
-    TranslationsModel(const TranslationsModel &) = delete;
+    TranslationsModel(const TranslationsModel&) = delete;
     // hide assign op
-    TranslationsModel &operator=(const TranslationsModel &) = delete;
+    TranslationsModel& operator=(const TranslationsModel&) = delete;
 
-private slots:
+   private slots:
     void indexReceived();
     void indexFailed(QString reason);
     void dlFailed(QString reason);
     void dlGood();
-    void translationDirChanged(const QString &path);
+    void translationDirChanged(const QString& path);
 
-
+   private: /* data */
-private: /* data */
     struct Private;
     std::unique_ptr<Private> d;
 };

launcher/ui/MainWindow.h

@@ -158,6 +158,7 @@ private slots:
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
     void on_actionExportInstanceFlamePack_triggered();
+    void on_actionExportInstanceToModList_triggered();
 
     void on_actionRenameInstance_triggered();
 

launcher/ui/MainWindow.ui

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

launcher/ui/dialogs/ExportInstanceDialog.cpp

@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -41,6 +42,9 @@
 #include <QFileSystemModel>
 #include <QMessageBox>
 #include "FileIgnoreProxy.h"
+#include "QObjectPtr.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
 #include "ui_ExportInstanceDialog.h"
 
 #include <FileSystem.h>
@@ -72,7 +76,7 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent
     ui->treeView->setRootIndex(proxyModel->mapFromSource(model->index(root)));
     ui->treeView->sortByColumn(0, Qt::AscendingOrder);
 
-    connect(proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SLOT(rowsInserted(QModelIndex,int,int)));
+    connect(proxyModel, SIGNAL(rowsInserted(QModelIndex, int, int)), SLOT(rowsInserted(QModelIndex, int, int)));
 
     model->setFilter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
     model->setRootPath(root);
@@ -92,32 +96,26 @@ void SaveIcon(InstancePtr m_instance)
     auto iconKey = m_instance->iconKey();
     auto iconList = APPLICATION->icons();
     auto mmcIcon = iconList->icon(iconKey);
-    if(!mmcIcon || mmcIcon->isBuiltIn()) {
+    if (!mmcIcon || mmcIcon->isBuiltIn()) {
         return;
     }
     auto path = mmcIcon->getFilePath();
-    if(!path.isNull()) {
+    if (!path.isNull()) {
-        QFileInfo inInfo (path);
+        QFileInfo inInfo(path);
-        FS::copy(path, FS::PathCombine(m_instance->instanceRoot(), inInfo.fileName())) ();
+        FS::copy(path, FS::PathCombine(m_instance->instanceRoot(), inInfo.fileName()))();
         return;
     }
-    auto & image = mmcIcon->m_images[mmcIcon->type()];
+    auto& image = mmcIcon->m_images[mmcIcon->type()];
-    auto & icon = image.icon;
+    auto& icon = image.icon;
     auto sizes = icon.availableSizes();
-    if(sizes.size() == 0)
+    if (sizes.size() == 0) {
-    {
         return;
     }
-    auto areaOf = [](QSize size)
+    auto areaOf = [](QSize size) { return size.width() * size.height(); };
-    {
-        return size.width() * size.height();
-    };
     QSize largest = sizes[0];
     // find variant with largest area
-    for(auto size: sizes)
+    for (auto size : sizes) {
-    {
+        if (areaOf(largest) < areaOf(size)) {
-        if(areaOf(largest) < areaOf(size))
-        {
             largest = size;
         }
     }
@@ -125,16 +123,15 @@ void SaveIcon(InstancePtr m_instance)
     pixmap.save(FS::PathCombine(m_instance->instanceRoot(), iconKey + ".png"));
 }
 
-bool ExportInstanceDialog::doExport()
+void ExportInstanceDialog::doExport()
 {
     auto name = FS::RemoveInvalidFilenameChars(m_instance->name());
 
-    const QString output = QFileDialog::getSaveFileName(
+    const QString output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(m_instance->name()),
-        this, tr("Export %1").arg(m_instance->name()),
                                                         FS::PathCombine(QDir::homePath(), name + ".zip"), "Zip (*.zip)", nullptr);
-    if (output.isEmpty())
+    if (output.isEmpty()) {
-    {
+        QDialog::done(QDialog::Rejected);
-        return false;
+        return;
     }
 
     SaveIcon(m_instance);
@@ -143,46 +140,40 @@ bool ExportInstanceDialog::doExport()
     if (!MMCZip::collectFileListRecursively(m_instance->instanceRoot(), nullptr, &files,
                                             std::bind(&FileIgnoreProxy::filterFile, proxyModel, std::placeholders::_1))) {
         QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
-        return false;
+        QDialog::done(QDialog::Rejected);
+        return;
     }
 
-    if (!MMCZip::compressDirFiles(output, m_instance->instanceRoot(), files, true))
+    auto task = makeShared<MMCZip::ExportToZipTask>(output, m_instance->instanceRoot(), files, "", true);
-    {
+
-        QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
+    connect(task.get(), &Task::failed, this,
-        return false;
+            [this, output](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
-    }
+    connect(task.get(), &Task::finished, this, [task] { task->deleteLater(); });
-    return true;
+
+    ProgressDialog progress(this);
+    progress.setSkipButton(true, tr("Abort"));
+    auto result = progress.execWithTask(task.get());
+    QDialog::done(result);
 }
 
 void ExportInstanceDialog::done(int result)
 {
     savePackIgnore();
-    if (result == QDialog::Accepted)
+    if (result == QDialog::Accepted) {
-    {
+        doExport();
-        if (doExport())
-        {
-            QDialog::done(QDialog::Accepted);
         return;
     }
-        else
-        {
-            return;
-        }
-    }
     QDialog::done(result);
 }
 
 void ExportInstanceDialog::rowsInserted(QModelIndex parent, int top, int bottom)
 {
-    //WARNING: possible off-by-one?
+    // WARNING: possible off-by-one?
-    for(int i = top; i < bottom; i++)
+    for (int i = top; i < bottom; i++) {
-    {
         auto node = proxyModel->index(i, 0, parent);
-        if(proxyModel->shouldExpand(node))
+        if (proxyModel->shouldExpand(node)) {
-        {
             auto expNode = node.parent();
-            if(!expNode.isValid())
+            if (!expNode.isValid()) {
-            {
                 continue;
             }
             ui->treeView->expand(node);
@@ -199,8 +190,7 @@ void ExportInstanceDialog::loadPackIgnore()
 {
     auto filename = ignoreFileName();
     QFile ignoreFile(filename);
-    if(!ignoreFile.open(QIODevice::ReadOnly))
+    if (!ignoreFile.open(QIODevice::ReadOnly)) {
-    {
         return;
     }
     auto data = ignoreFile.readAll();
@@ -216,12 +206,9 @@ void ExportInstanceDialog::savePackIgnore()
 {
     auto data = proxyModel->blockedPaths().toStringList().join('\n').toUtf8();
     auto filename = ignoreFileName();
-    try
+    try {
-    {
         FS::write(filename, data);
-    }
+    } catch (const Exception& e) {
-    catch (const Exception &e)
-    {
         qWarning() << e.cause();
     }
 }

launcher/ui/dialogs/ExportInstanceDialog.h

@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -38,39 +39,37 @@
 #include <QDialog>
 #include <QModelIndex>
 #include <memory>
-#include "FileIgnoreProxy.h"
 #include "FastFileIconProvider.h"
+#include "FileIgnoreProxy.h"
 
 class BaseInstance;
 typedef std::shared_ptr<BaseInstance> InstancePtr;
 
-namespace Ui
+namespace Ui {
-{
 class ExportInstanceDialog;
 }
 
-class ExportInstanceDialog : public QDialog
+class ExportInstanceDialog : public QDialog {
-{
     Q_OBJECT
 
-public:
+   public:
-    explicit ExportInstanceDialog(InstancePtr instance, QWidget *parent = 0);
+    explicit ExportInstanceDialog(InstancePtr instance, QWidget* parent = 0);
     ~ExportInstanceDialog();
 
     virtual void done(int result);
 
-private:
+   private:
-    bool doExport();
+    void doExport();
     void loadPackIgnore();
     void savePackIgnore();
     QString ignoreFileName();
 
-private:
+   private:
-    Ui::ExportInstanceDialog *ui;
+    Ui::ExportInstanceDialog* ui;
     InstancePtr m_instance;
-    FileIgnoreProxy * proxyModel;
+    FileIgnoreProxy* proxyModel;
     FastFileIconProvider icons;
 
-private slots:
+   private slots:
     void rowsInserted(QModelIndex parent, int top, int bottom);
 };

launcher/ui/dialogs/ExportToModListDialog.cpp

@@ -0,0 +1,223 @@
+// 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 "ExportToModListDialog.h"
+#include <QCheckBox>
+#include <QComboBox>
+#include <QTextEdit>
+#include "FileSystem.h"
+#include "Markdown.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/helpers/ExportToModList.h"
+#include "ui_ExportToModListDialog.h"
+
+#include <QFileDialog>
+#include <QFileSystemModel>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QPushButton>
+
+const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLines = {
+    { ExportToModList::HTML, "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>" },
+    { ExportToModList::MARKDOWN, "[{name}]({url}) [{version}] by {authors}" },
+    { ExportToModList::PLAINTXT, "{name} ({url}) [{version}] by {authors}" },
+    { ExportToModList::JSON, "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"}," },
+    { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
+};
+
+ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
+    : QDialog(parent), m_template_changed(false), name(instance->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->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->templateText, &QTextEdit::textChanged, this, [this] {
+        if (ui->templateText->toPlainText() != exampleLines[format])
+            ui->formatComboBox->setCurrentIndex(5);
+        else
+            triggerImp();
+    });
+    connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
+        this->ui->finalText->selectAll();
+        this->ui->finalText->copy();
+    });
+}
+
+ExportToModListDialog::~ExportToModListDialog()
+{
+    delete ui;
+}
+
+void ExportToModListDialog::formatChanged(int index)
+{
+    switch (index) {
+        case 0: {
+            enableCustom(false);
+            ui->resultText->show();
+            format = ExportToModList::HTML;
+            break;
+        }
+        case 1: {
+            enableCustom(false);
+            ui->resultText->show();
+            format = ExportToModList::MARKDOWN;
+            break;
+        }
+        case 2: {
+            enableCustom(false);
+            ui->resultText->hide();
+            format = ExportToModList::PLAINTXT;
+            break;
+        }
+        case 3: {
+            enableCustom(false);
+            ui->resultText->hide();
+            format = ExportToModList::JSON;
+            break;
+        }
+        case 4: {
+            enableCustom(false);
+            ui->resultText->hide();
+            format = ExportToModList::CSV;
+            break;
+        }
+        case 5: {
+            m_template_changed = true;
+            enableCustom(true);
+            ui->resultText->hide();
+            format = ExportToModList::CUSTOM;
+            break;
+        }
+    }
+    triggerImp();
+}
+
+void ExportToModListDialog::triggerImp()
+{
+    if (format == ExportToModList::CUSTOM) {
+        ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText()));
+        return;
+    }
+    auto opt = 0;
+    if (ui->authorsCheckBox->isChecked())
+        opt |= ExportToModList::Authors;
+    if (ui->versionCheckBox->isChecked())
+        opt |= ExportToModList::Version;
+    if (ui->urlCheckBox->isChecked())
+        opt |= ExportToModList::Url;
+    auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    ui->finalText->setPlainText(txt);
+    switch (format) {
+        case ExportToModList::CUSTOM:
+            return;
+        case ExportToModList::HTML:
+            ui->resultText->setHtml(txt);
+            break;
+        case ExportToModList::MARKDOWN:
+            ui->resultText->setHtml(markdownToHTML(txt));
+            break;
+        case ExportToModList::PLAINTXT:
+            break;
+        case ExportToModList::JSON:
+            break;
+        case ExportToModList::CSV:
+            break;
+    }
+    auto exampleLine = exampleLines[format];
+    if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
+        ui->templateText->setPlainText(exampleLine);
+}
+
+void ExportToModListDialog::done(int result)
+{
+    if (result == Accepted) {
+        const QString filename = FS::RemoveInvalidFilenameChars(name);
+        const QString output =
+            QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
+                                         "File (*.txt *.html *.md *.json *.csv)", nullptr);
+
+        if (output.isEmpty())
+            return;
+        FS::write(output, ui->finalText->toPlainText().toUtf8());
+    }
+
+    QDialog::done(result);
+}
+
+QString ExportToModListDialog::extension()
+{
+    switch (format) {
+        case ExportToModList::HTML:
+            return ".html";
+        case ExportToModList::MARKDOWN:
+            return ".md";
+        case ExportToModList::PLAINTXT:
+            return ".txt";
+        case ExportToModList::CUSTOM:
+            return ".txt";
+        case ExportToModList::JSON:
+            return ".json";
+        case ExportToModList::CSV:
+            return ".csv";
+    }
+    return ".txt";
+}
+
+void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
+{
+    if (format != ExportToModList::CUSTOM)
+        return;
+    switch (option) {
+        case ExportToModList::Authors:
+            ui->templateText->insertPlainText("{authors}");
+            break;
+        case ExportToModList::Url:
+            ui->templateText->insertPlainText("{url}");
+            break;
+        case ExportToModList::Version:
+            ui->templateText->insertPlainText("{version}");
+            break;
+    }
+}
+void ExportToModListDialog::enableCustom(bool enabled)
+{
+    ui->authorsCheckBox->setHidden(enabled);
+    ui->versionCheckBox->setHidden(enabled);
+    ui->urlCheckBox->setHidden(enabled);
+
+    ui->authorsButton->setHidden(!enabled);
+    ui->versionButton->setHidden(!enabled);
+    ui->urlButton->setHidden(!enabled);
+}

launcher/ui/dialogs/ExportToModListDialog.h

@@ -0,0 +1,55 @@
+// 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 <QDialog>
+#include <QList>
+#include "BaseInstance.h"
+#include "minecraft/mod/Mod.h"
+#include "modplatform/helpers/ExportToModList.h"
+
+namespace Ui {
+class ExportToModListDialog;
+}
+
+class ExportToModListDialog : public QDialog {
+    Q_OBJECT
+
+   public:
+    explicit ExportToModListDialog(InstancePtr instance, QWidget* parent = nullptr);
+    ~ExportToModListDialog();
+
+    void done(int result) override;
+
+   protected slots:
+    void formatChanged(int index);
+    void triggerImp();
+    void trigger(int) { triggerImp(); };
+    void addExtra(ExportToModList::OptionalData option);
+
+   private:
+    QString extension();
+    void enableCustom(bool enabled);
+    QList<Mod*> m_allMods;
+    bool m_template_changed;
+    QString name;
+    ExportToModList::Formats format = ExportToModList::Formats::HTML;
+    Ui::ExportToModListDialog* ui;
+    static const QHash<ExportToModList::Formats, QString> exampleLines;
+};

launcher/ui/dialogs/ExportToModListDialog.ui

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExportToModListDialog</class>
+ <widget class="QDialog" name="ExportToModListDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Export Pack to ModList</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
+     <item>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string>Settings</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="1">
+         <widget class="QComboBox" name="formatComboBox">
+          <item>
+           <property name="text">
+            <string>HTML</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Markdown</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Plaintext</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>JSON</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>CSV</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Custom</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QGroupBox" name="templateGroup">
+          <property name="title">
+           <string>Template</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="QTextEdit" name="templateText"/>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QGroupBox" name="optionsGroup">
+          <property name="title">
+           <string>Optional Info</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QCheckBox" name="versionCheckBox">
+             <property name="text">
+              <string>Version</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="authorsCheckBox">
+             <property name="text">
+              <string>Authors</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="urlCheckBox">
+             <property name="text">
+              <string>URL</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="versionButton">
+             <property name="text">
+              <string>Version</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="authorsButton">
+             <property name="text">
+              <string>Authors</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="urlButton">
+             <property name="text">
+              <string>URL</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="lineWidth">
+           <number>1</number>
+          </property>
+          <property name="text">
+           <string>Format</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_4">
+       <property name="title">
+        <string>Result</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPlainTextEdit" name="finalText">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>143</height>
+           </size>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTextBrowser" name="resultText">
+          <property name="openExternalLinks">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="warningLabel">
+       <property name="text">
+        <string>This depends on the mods' metadata. To ensure it is available, run an update on the instance. Installing the updates isn't necessary.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="copyButton">
+       <property name="text">
+        <string>Copy</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ExportToModListDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>334</x>
+     <y>435</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>206</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ExportToModListDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>324</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>206</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

launcher/ui/dialogs/ResourceDownloadDialog.cpp

@@ -43,6 +43,8 @@
 #include "ui/pages/modplatform/flame/FlameResourcePages.h"
 #include "ui/pages/modplatform/modrinth/ModrinthResourcePages.h"
 
+#include "modplatform/flame/FlameAPI.h"
+#include "modplatform/modrinth/ModrinthAPI.h"
 #include "ui/widgets/PageContainer.h"
 
 namespace ResourceDownload {
@@ -281,8 +283,11 @@ QList<BasePage*> ModDownloadDialog::getPages()
 {
     QList<BasePage*> pages;
 
+    auto loaders = static_cast<MinecraftInstance*>(m_instance)->getPackProfile()->getModLoaders().value();
+
+    if (ModrinthAPI::validateModLoaders(loaders))
         pages.append(ModrinthModPage::create(this, *m_instance));
-    if (APPLICATION->capabilities() & Application::SupportsFlame)
+    if (APPLICATION->capabilities() & Application::SupportsFlame && FlameAPI::validateModLoaders(loaders))
         pages.append(FlameModPage::create(this, *m_instance));
 
     m_selectedPage = dynamic_cast<ModPage*>(pages[0]);

launcher/ui/instanceview/InstanceView.cpp

@@ -48,7 +48,6 @@
 #include <QAccessible>
 
 #include "VisualGroup.h"
-#include "ui/themes/ThemeManager.h"
 #include <QDebug>
 
 #include <Application.h>
@@ -504,7 +503,7 @@ void InstanceView::setPaintCat(bool visible)
 {
     m_catVisible = visible;
     if (visible)
-        m_catPixmap.load(QString(":/backgrounds/%1").arg(ThemeManager::getCatImage()));
+        m_catPixmap.load(APPLICATION->getCatPack());
     else
         m_catPixmap = QPixmap();
 }

launcher/ui/instanceview/VisualGroup.cpp

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Tayou <git@tayou.org>
  *
  *  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
@@ -35,22 +36,18 @@
 
 #include "VisualGroup.h"
 
+#include <QApplication>
+#include <QDebug>
 #include <QModelIndex>
 #include <QPainter>
 #include <QtMath>
-#include <QApplication>
+#include <utility>
-#include <QDebug>
 
 #include "InstanceView.h"
 
-VisualGroup::VisualGroup(const QString &text, InstanceView *view) : view(view), text(text), collapsed(false)
+VisualGroup::VisualGroup(QString text, InstanceView* view) : view(view), text(std::move(text)), collapsed(false) {}
-{
-}
 
-VisualGroup::VisualGroup(const VisualGroup *other)
+VisualGroup::VisualGroup(const VisualGroup* other) : view(other->view), text(other->text), collapsed(other->collapsed) {}
-    : view(other->view), text(other->text), collapsed(other->collapsed)
-{
-}
 
 void VisualGroup::update()
 {
@@ -64,13 +61,11 @@ void VisualGroup::update()
     int positionInRow = 0;
     int currentRow = 0;
     int offsetFromTop = 0;
-    for (auto item: temp_items)
+    for (auto item : temp_items) {
-    {
+        if (positionInRow == itemsPerRow) {
-        if(positionInRow == itemsPerRow)
-        {
             rows[currentRow].height = maxRowHeight;
             rows[currentRow].top = offsetFromTop;
-            currentRow ++;
+            currentRow++;
             offsetFromTop += maxRowHeight + 5;
             positionInRow = 0;
             maxRowHeight = 0;
@@ -83,8 +78,7 @@ void VisualGroup::update()
 #endif
 
         auto itemHeight = view->itemDelegate()->sizeHint(viewItemOption, item).height();
-        if(itemHeight > maxRowHeight)
+        if (itemHeight > maxRowHeight) {
-        {
             maxRowHeight = itemHeight;
         }
         rows[currentRow].items.append(item);
@@ -94,16 +88,13 @@ void VisualGroup::update()
     rows[currentRow].top = offsetFromTop;
 }
 
-QPair<int, int> VisualGroup::positionOf(const QModelIndex &index) const
+QPair<int, int> VisualGroup::positionOf(const QModelIndex& index) const
 {
     int y = 0;
-    for (auto & row: rows)
+    for (auto& row : rows) {
-    {
+        for (auto x = 0; x < row.items.size(); x++) {
-        for(auto x = 0; x < row.items.size(); x++)
+            if (row.items[x] == index) {
-        {
+                return qMakePair(x, y);
-            if(row.items[x] == index)
-            {
-                return qMakePair(x,y);
             }
         }
         y++;
@@ -112,186 +103,102 @@ QPair<int, int> VisualGroup::positionOf(const QModelIndex &index) const
     return qMakePair(0, 0);
 }
 
-int VisualGroup::rowTopOf(const QModelIndex &index) const
+int VisualGroup::rowTopOf(const QModelIndex& index) const
 {
     auto position = positionOf(index);
     return rows[position.second].top;
 }
 
-int VisualGroup::rowHeightOf(const QModelIndex &index) const
+int VisualGroup::rowHeightOf(const QModelIndex& index) const
 {
     auto position = positionOf(index);
     return rows[position.second].height;
 }
 
-VisualGroup::HitResults VisualGroup::hitScan(const QPoint &pos) const
+VisualGroup::HitResults VisualGroup::hitScan(const QPoint& pos) const
 {
     VisualGroup::HitResults results = VisualGroup::NoHit;
     int y_start = verticalPosition();
     int body_start = y_start + headerHeight();
-    int body_end = body_start + contentHeight() + 5; // FIXME: wtf is this 5?
+    int body_end = body_start + contentHeight();
     int y = pos.y();
     // int x = pos.x();
-    if (y < y_start)
+    if (y < y_start) {
-    {
         results = VisualGroup::NoHit;
-    }
+    } else if (y < body_start) {
-    else if (y < body_start)
-    {
         results = VisualGroup::HeaderHit;
         int collapseSize = headerHeight() - 4;
 
         // the icon
-        QRect iconRect = QRect(view->m_leftMargin + 2, 2 + y_start, collapseSize, collapseSize);
+        QRect iconRect = QRect(view->m_leftMargin + 2, 2 + y_start, view->width() - 4, collapseSize);
-        if (iconRect.contains(pos))
+        if (iconRect.contains(pos)) {
-        {
             results |= VisualGroup::CheckboxHit;
         }
-    }
+    } else if (y < body_end) {
-    else if (y < body_end)
-    {
         results |= VisualGroup::BodyHit;
     }
     return results;
 }
 
-void VisualGroup::drawHeader(QPainter *painter, const QStyleOptionViewItem &option)
+void VisualGroup::drawHeader(QPainter* painter, const QStyleOptionViewItem& option) const
 {
-    painter->setRenderHint(QPainter::Antialiasing);
+    QRect optRect = option.rect;
-
+    optRect.setTop(optRect.top() + 7);
-    const QRect optRect = option.rect;
     QFont font(QApplication::font());
     font.setBold(true);
     const QFontMetrics fontMetrics = QFontMetrics(font);
-
-    QColor outlineColor = option.palette.text().color();
-    outlineColor.setAlphaF(0.35);
-
-    //BEGIN: top left corner
-    {
-        painter->save();
-        painter->setPen(outlineColor);
-        const QPointF topLeft(optRect.topLeft());
-        QRectF arc(topLeft, QSizeF(4, 4));
-        arc.translate(0.5, 0.5);
-        painter->drawArc(arc, 1440, 1440);
-        painter->restore();
-    }
-    //END: top left corner
-
-    //BEGIN: left vertical line
-    {
-        QPoint start(optRect.topLeft());
-        start.ry() += 3;
-        QPoint verticalGradBottom(optRect.topLeft());
-        verticalGradBottom.ry() += fontMetrics.height() + 5;
-        QLinearGradient gradient(start, verticalGradBottom);
-        gradient.setColorAt(0, outlineColor);
-        gradient.setColorAt(1, Qt::transparent);
-        painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
-    }
-    //END: left vertical line
-
-    //BEGIN: horizontal line
-    {
-        QPoint start(optRect.topLeft());
-        start.rx() += 3;
-        QPoint horizontalGradTop(optRect.topLeft());
-        horizontalGradTop.rx() += optRect.width() - 6;
-        painter->fillRect(QRect(start, QSize(optRect.width() - 6, 1)), outlineColor);
-    }
-    //END: horizontal line
-
-    //BEGIN: top right corner
-    {
-        painter->save();
-        painter->setPen(outlineColor);
-        QPointF topRight(optRect.topRight());
-        topRight.rx() -= 4;
-        QRectF arc(topRight, QSizeF(4, 4));
-        arc.translate(0.5, 0.5);
-        painter->drawArc(arc, 0, 1440);
-        painter->restore();
-    }
-    //END: top right corner
-
-    //BEGIN: right vertical line
-    {
-        QPoint start(optRect.topRight());
-        start.ry() += 3;
-        QPoint verticalGradBottom(optRect.topRight());
-        verticalGradBottom.ry() += fontMetrics.height() + 5;
-        QLinearGradient gradient(start, verticalGradBottom);
-        gradient.setColorAt(0, outlineColor);
-        gradient.setColorAt(1, Qt::transparent);
-        painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
-    }
-    //END: right vertical line
-
-    //BEGIN: checkboxy thing
-    {
-        painter->save();
-        painter->setRenderHint(QPainter::Antialiasing, false);
     painter->setFont(font);
-        QColor penColor(option.palette.text().color());
+
+    QPen pen;
+    pen.setWidth(2);
+    QColor penColor = option.palette.text().color();
     penColor.setAlphaF(0.6);
-        painter->setPen(penColor);
+    pen.setColor(penColor);
-        QRect iconSubRect(option.rect);
+    painter->setPen(pen);
-        iconSubRect.setTop(iconSubRect.top() + 7);
+    painter->setRenderHint(QPainter::Antialiasing);
-        iconSubRect.setLeft(iconSubRect.left() + 7);
 
-        int sizing = fontMetrics.height();
+    // sizes and offsets, to keep things consistent below
-        int even = ( (sizing - 1) % 2 );
+    int arrowOffsetLeft = fontMetrics.height() / 2 + 7;
+    int textOffsetLeft = arrowOffsetLeft * 2;
+    int arrowSize = 6;
+    int centerHeight = optRect.top() + fontMetrics.height() / 2;
 
-        iconSubRect.setHeight(sizing - even);
+    // BEGIN: arrow
-        iconSubRect.setWidth(sizing - even);
-        painter->drawRect(iconSubRect);
-
-
-        /*
-        if(collapsed)
-            painter->drawText(iconSubRect, Qt::AlignHCenter | Qt::AlignVCenter, "+");
-        else
-            painter->drawText(iconSubRect, Qt::AlignHCenter | Qt::AlignVCenter, "-");
-        */
-        painter->setBrush(option.palette.text());
-        painter->fillRect(iconSubRect.x(), iconSubRect.y() + iconSubRect.height() / 2,
-                          iconSubRect.width(), 2, penColor);
-        if (collapsed)
     {
-            painter->fillRect(iconSubRect.x() + iconSubRect.width() / 2, iconSubRect.y(), 2,
+        QPolygon arrowPolygon;
-                              iconSubRect.height(), penColor);
+        if (collapsed) {
+            arrowPolygon << QPoint(arrowOffsetLeft - arrowSize / 2, centerHeight - arrowSize)
+                         << QPoint(arrowOffsetLeft + arrowSize / 2, centerHeight)
+                         << QPoint(arrowOffsetLeft - arrowSize / 2, centerHeight + arrowSize);
+            painter->drawPolyline(arrowPolygon);
+        } else {
+            arrowPolygon << QPoint(arrowOffsetLeft - arrowSize, centerHeight - arrowSize / 2)
+                         << QPoint(arrowOffsetLeft, centerHeight + arrowSize / 2)
+                         << QPoint(arrowOffsetLeft + arrowSize, centerHeight - arrowSize / 2);
+            painter->drawPolyline(arrowPolygon);
         }
-
-        painter->restore();
     }
-    //END: checkboxy thing
+    // END: arrow
 
-    //BEGIN: text
+    // BEGIN: text
     {
-        QRect textRect(option.rect);
+        QRect textRect(optRect);
-        textRect.setTop(textRect.top() + 7);
+        textRect.setTop(textRect.top());
-        textRect.setLeft(textRect.left() + 7 + fontMetrics.height() + 7);
+        textRect.setLeft(textOffsetLeft);
         textRect.setHeight(fontMetrics.height());
         textRect.setRight(textRect.right() - 7);
 
-        painter->save();
+        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, !text.isEmpty() ? text : QObject::tr("Ungrouped"));
-        painter->setFont(font);
-        QColor penColor(option.palette.text().color());
-        penColor.setAlphaF(0.6);
-        painter->setPen(penColor);
-        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text);
-        painter->restore();
     }
-    //END: text
+    // END: text
 }
 
 int VisualGroup::totalHeight() const
 {
-    return headerHeight() + 5 + contentHeight(); // FIXME: wtf is that '5'?
+    return headerHeight() + contentHeight();
 }
 
-int VisualGroup::headerHeight() const
+int VisualGroup::headerHeight()
 {
     QFont font(QApplication::font());
     font.setBold(true);
@@ -311,8 +218,7 @@ int VisualGroup::headerHeight() const
 
 int VisualGroup::contentHeight() const
 {
-    if (collapsed)
+    if (collapsed) {
-    {
         return 0;
     }
     auto last = rows[numRows() - 1];
@@ -321,7 +227,7 @@ int VisualGroup::contentHeight() const
 
 int VisualGroup::numRows() const
 {
-    return rows.size();
+    return (int)rows.size();
 }
 
 int VisualGroup::verticalPosition() const
@@ -332,11 +238,9 @@ int VisualGroup::verticalPosition() const
 QList<QModelIndex> VisualGroup::items() const
 {
     QList<QModelIndex> indices;
-    for (int i = 0; i < view->model()->rowCount(); ++i)
+    for (int i = 0; i < view->model()->rowCount(); ++i) {
-    {
         const QModelIndex index = view->model()->index(i, 0);
-        if (index.data(InstanceViewRoles::GroupRole).toString() == text)
+        if (index.data(InstanceViewRoles::GroupRole).toString() == text) {
-        {
             indices.append(index);
         }
     }

launcher/ui/instanceview/VisualGroup.h

@@ -1,4 +1,24 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Tayou <git@tayou.org>
+ *
+ *  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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
  *
  *      Licensed under the Apache License, Version 2.0 (the "License");
  *      you may not use this file except in compliance with the License.
@@ -42,8 +62,8 @@ struct VisualRow
 struct VisualGroup
 {
 /* constructors */
-    VisualGroup(const QString &text, InstanceView *view);
+    VisualGroup(QString text, InstanceView *view);
-    VisualGroup(const VisualGroup *other);
+    explicit VisualGroup(const VisualGroup *other);
 
 /* data */
     InstanceView *view = nullptr;
@@ -58,13 +78,13 @@ struct VisualGroup
     void update();
 
     /// draw the header at y-position.
-    void drawHeader(QPainter *painter, const QStyleOptionViewItem &option);
+    void drawHeader(QPainter *painter, const QStyleOptionViewItem &option) const;
 
     /// height of the group, in total. includes a small bit of padding.
     int totalHeight() const;
 
     /// height of the group header, in pixels
-    int headerHeight() const;
+    static int headerHeight() ;
 
     /// height of the group content, in pixels
     int contentHeight() const;

launcher/ui/pages/global/APIPage.ui

@@ -30,7 +30,7 @@
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
-       <string notr="true">Services</string>
+       <string>Services</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>

launcher/ui/pages/global/AccountListPage.cpp

@@ -159,19 +159,6 @@ void AccountListPage::on_actionAddMojang_triggered()
 
 void AccountListPage::on_actionAddMicrosoft_triggered()
 {
-    if(BuildConfig.BUILD_PLATFORM == "osx64") {
-        CustomMessageBox::selectable(
-            this,
-            tr("Microsoft Accounts not available"),
-            //: %1 refers to the launcher itself
-            tr(
-                "Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated %1.\n\n"
-                "Please update both your operating system and %1."
-            ).arg(BuildConfig.LAUNCHER_DISPLAYNAME),
-            QMessageBox::Warning
-        )->exec();
-        return;
-    }
     MinecraftAccountPtr account = MSALoginDialog::newAccount(
         this,
         tr("Please enter your Mojang account email and password to add your account.")

launcher/ui/pages/global/JavaPage.ui

@@ -58,7 +58,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="labelPermGen">
             <property name="text">
-             <string notr="true">&amp;PermGen:</string>
+             <string>&amp;PermGen:</string>
             </property>
             <property name="buddy">
              <cstring>permGenSpinBox</cstring>

launcher/ui/pages/global/LauncherPage.cpp

@@ -3,7 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (c) 2022 dada513 <dada513@protonmail.com>
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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

launcher/ui/pages/global/LauncherPage.h

@@ -62,7 +62,7 @@ public:
 
     QString displayName() const override
     {
-        return "Launcher";
+        return tr("Launcher");
     }
     QIcon icon() const override
     {

launcher/ui/pages/global/MinecraftPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  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
@@ -99,6 +100,9 @@ void MinecraftPage::applySettings()
     // Miscellaneous
     s->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked());
     s->set("QuitAfterGameStop", ui->quitAfterGameStopCheck->isChecked());
+
+    // Mod loader settings
+    s->set("DisableQuiltBeacon", ui->disableQuiltBeaconCheckBox->isChecked());
 }
 
 void MinecraftPage::loadSettings()
@@ -137,6 +141,8 @@ void MinecraftPage::loadSettings()
 
     ui->closeAfterLaunchCheck->setChecked(s->get("CloseAfterLaunch").toBool());
     ui->quitAfterGameStopCheck->setChecked(s->get("QuitAfterGameStop").toBool());
+
+    ui->disableQuiltBeaconCheckBox->setChecked(s->get("DisableQuiltBeacon").toBool());
 }
 
 void MinecraftPage::retranslate()

launcher/ui/pages/global/MinecraftPage.ui

@@ -39,7 +39,7 @@
      </property>
      <widget class="QWidget" name="minecraftTab">
       <attribute name="title">
-       <string notr="true">General</string>
+       <string>General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
@@ -190,6 +190,25 @@
        <string>Tweaks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_12">
+       <item>
+        <widget class="QGroupBox" name="modLoaderSettingsGroupBox">
+         <property name="title">
+          <string>Mod loader settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_13">
+          <item>
+           <widget class="QCheckBox" name="disableQuiltBeaconCheckBox">
+            <property name="text">
+             <string>Disable Quilt Loader Beacon</string>
+            </property>
+            <property name="toolTip">
+             <string>Disable Quilt loader's beacon for counting monthly active users</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="nativeLibWorkaroundGroupBox">
          <property name="title">

launcher/ui/pages/instance/ExternalResourcesPage.cpp

@@ -151,9 +151,6 @@ void ExternalResourcesPage::retranslate()
 
 void ExternalResourcesPage::itemActivated(const QModelIndex&)
 {
-    if (!m_controlsEnabled)
-        return;
-
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
 }
 
@@ -197,9 +194,6 @@ bool ExternalResourcesPage::eventFilter(QObject* obj, QEvent* ev)
 
 void ExternalResourcesPage::addItem()
 {
-    if (!m_controlsEnabled)
-        return;
-
     auto list = GuiUtil::BrowseForFiles(
         helpPage(), tr("Select %1", "Select whatever type of files the page contains. Example: 'Loader Mods'").arg(displayName()),
         m_fileSelectionFilter.arg(displayName()), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
@@ -213,9 +207,6 @@ void ExternalResourcesPage::addItem()
 
 void ExternalResourcesPage::removeItem()
 {
-    if (!m_controlsEnabled)
-        return;
-
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
 
     int count = 0;
@@ -259,23 +250,37 @@ void ExternalResourcesPage::removeItem()
 
 void ExternalResourcesPage::removeItems(const QItemSelection& selection)
 {
+    if (m_instance != nullptr && m_instance->isRunning()) {
+        auto response = CustomMessageBox::selectable(this, "Confirm Delete",
+                                                     "If you remove this resource while the game is running it may crash your game.\n"
+                                                     "Are you sure you want to do this?",
+                                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
+
+        if (response != QMessageBox::Yes)
+            return;
+    }
     m_model->deleteResources(selection.indexes());
 }
 
 void ExternalResourcesPage::enableItem()
 {
-    if (!m_controlsEnabled)
-        return;
-
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
     m_model->setResourceEnabled(selection.indexes(), EnableAction::ENABLE);
 }
 
 void ExternalResourcesPage::disableItem()
 {
-    if (!m_controlsEnabled)
+    if (m_instance != nullptr && m_instance->isRunning()) {
-        return;
+        auto response = CustomMessageBox::selectable(this, "Confirm disable",
+                                                     "If you disable this resource while the game is running it may crash your game.\n"
+                                                     "Are you sure you want to do this?",
+                                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
 
+        if (response != QMessageBox::Yes)
+            return;
+    }
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
     m_model->setResourceEnabled(selection.indexes(), EnableAction::DISABLE);
 }

launcher/ui/pages/instance/ExternalResourcesPage.h

@@ -73,7 +73,5 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     QString m_fileSelectionFilter;
     QString m_viewFilter;
 
-    bool m_controlsEnabled = true;
-
     std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };

launcher/ui/pages/instance/InstanceSettingsPage.cpp

@@ -3,6 +3,7 @@
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  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
@@ -50,9 +51,9 @@
 #include "Application.h"
 #include "minecraft/auth/AccountList.h"
 
+#include "FileSystem.h"
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
-#include "FileSystem.h"
 
 InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
     : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
@@ -60,17 +61,13 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
     m_settings = inst->settings();
     ui->setupUi(this);
 
-    // As the signal will (probably) not be triggered once we click edit, let's update it manually instead.
-    updateRunningStatus(m_instance->isRunning());
-
-    connect(m_instance, &BaseInstance::runningStatusChanged, this, &InstanceSettingsPage::updateRunningStatus);
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
-    connect(ui->instanceAccountSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &InstanceSettingsPage::changeInstanceAccount);
+    connect(ui->instanceAccountSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &InstanceSettingsPage::changeInstanceAccount);
     loadSettings();
 
-
     updateThresholds();
 }
 
@@ -284,6 +281,14 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("InstanceAccountId");
     }
 
+    bool overrideModLoaderSettings = ui->modLoaderSettingsGroupBox->isChecked();
+    m_settings->set("OverrideModLoaderSettings", overrideModLoaderSettings);
+    if (overrideModLoaderSettings) {
+        m_settings->set("DisableQuiltBeacon", ui->disableQuiltBeaconCheckBox->isChecked());
+    } else {
+        m_settings->reset("DisableQuiltBeacon");
+    }
+
     // FIXME: This should probably be called by a signal instead
     m_instance->updateRuntimeContext();
 }
@@ -384,6 +389,10 @@ void InstanceSettingsPage::loadSettings()
 
     ui->instanceAccountGroupBox->setChecked(m_settings->get("UseAccountForInstance").toBool());
     updateAccountsMenu();
+
+    // Mod loader specific settings
+    ui->modLoaderSettingsGroupBox->setChecked(m_settings->get("OverrideModLoaderSettings").toBool());
+    ui->disableQuiltBeaconCheckBox->setChecked(m_settings->get("DisableQuiltBeacon").toBool());
 }
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
@@ -523,8 +532,3 @@ void InstanceSettingsPage::updateThresholds()
         ui->labelMaxMemIcon->setPixmap(pix);
     }
 }
-
-void InstanceSettingsPage::updateRunningStatus(bool running)
-{
-    setEnabled(!running);
-}

launcher/ui/pages/instance/InstanceSettingsPage.h

@@ -79,8 +79,7 @@ public:
 
     void updateThresholds();
 
-private slots:
+   private slots:
-    void updateRunningStatus(bool running);
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();

launcher/ui/pages/instance/InstanceSettingsPage.ui

@@ -116,7 +116,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="labelPermGen">
             <property name="text">
-             <string notr="true">PermGen:</string>
+             <string>PermGen:</string>
             </property>
            </widget>
           </item>
@@ -541,6 +541,31 @@
        <string>Miscellaneous</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
+       <item>
+        <widget class="QGroupBox" name="modLoaderSettingsGroupBox">
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <property name="title">
+          <string>Mod loader settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="VerticalLayout_16">
+          <item>
+           <widget class="QCheckBox" name="disableQuiltBeaconCheckBox">
+            <property name="text">
+             <string>Disable Quilt Loader Beacon</string>
+            </property>
+            <property name="toolTip">
+             <string>Disable Quilt loader's beacon for counting monthly active users</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="gameTimeGroupBox">
          <property name="enabled">

launcher/ui/pages/instance/ManagedPackPage.cpp

@@ -69,7 +69,6 @@ class NoBigComboBoxStyle : public QProxyStyle {
 
    private:
     NoBigComboBoxStyle(QStyle* style) : QProxyStyle(style) {}
-
 };
 
 ManagedPackPage* ManagedPackPage::createPage(BaseInstance* inst, QString type, QWidget* parent)
@@ -91,13 +90,13 @@ ManagedPackPage::ManagedPackPage(BaseInstance* inst, InstanceWindow* instance_wi
 
     // NOTE: GTK2 themes crash with the proxy style.
     // This seems like an upstream bug, so there's not much else that can be done.
-    if (!QStyleFactory::keys().contains("gtk2")){
+    if (!QStyleFactory::keys().contains("gtk2")) {
         auto comboStyle = NoBigComboBoxStyle::getInstance(ui->versionsComboBox->style());
         ui->versionsComboBox->setStyle(comboStyle);
     }
 
     ui->reloadButton->setVisible(false);
-    connect(ui->reloadButton, &QPushButton::clicked, this, [this](bool){
+    connect(ui->reloadButton, &QPushButton::clicked, this, [this](bool) {
         ui->reloadButton->setVisible(false);
 
         m_loaded = false;
@@ -226,7 +225,8 @@ void ModrinthManagedPackPage::parseManagedPack()
 
     QString id = m_inst->getManagedPackID();
 
-    m_fetch_job->addNetAction(Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
+    m_fetch_job->addNetAction(
+        Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
 
     QObject::connect(m_fetch_job.get(), &NetJob::succeeded, this, [this, response, id] {
         QJsonParseError parse_error{};
@@ -267,7 +267,6 @@ void ModrinthManagedPackPage::parseManagedPack()
             if (version.version == m_inst->getManagedPackVersionName())
                 name = tr("%1 (Current)").arg(name);
 
-
             ui->versionsComboBox->addItem(name, QVariant(version.id));
         }
 
@@ -291,6 +290,10 @@ QString ModrinthManagedPackPage::url() const
 void ModrinthManagedPackPage::suggestVersion()
 {
     auto index = ui->versionsComboBox->currentIndex();
+    if (m_pack.versions.length() == 0) {
+        setFailState();
+        return;
+    }
     auto version = m_pack.versions.at(index);
 
     ui->changelogTextBrowser->setHtml(markdownToHTML(version.changelog.toUtf8()));
@@ -301,6 +304,10 @@ void ModrinthManagedPackPage::suggestVersion()
 void ModrinthManagedPackPage::update()
 {
     auto index = ui->versionsComboBox->currentIndex();
+    if (m_pack.versions.length() == 0) {
+        setFailState();
+        return;
+    }
     auto version = m_pack.versions.at(index);
 
     QMap<QString, QString> extra_info;
@@ -429,6 +436,10 @@ QString FlameManagedPackPage::url() const
 void FlameManagedPackPage::suggestVersion()
 {
     auto index = ui->versionsComboBox->currentIndex();
+    if (m_pack.versions.length() == 0) {
+        setFailState();
+        return;
+    }
     auto version = m_pack.versions.at(index);
 
     ui->changelogTextBrowser->setHtml(m_api.getModFileChangelog(m_inst->getManagedPackID().toInt(), version.fileId));
@@ -439,6 +450,10 @@ void FlameManagedPackPage::suggestVersion()
 void FlameManagedPackPage::update()
 {
     auto index = ui->versionsComboBox->currentIndex();
+    if (m_pack.versions.length() == 0) {
+        setFailState();
+        return;
+    }
     auto version = m_pack.versions.at(index);
 
     QMap<QString, QString> extra_info;

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -89,12 +89,10 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
         connect(ui->actionUpdateItem, &QAction::triggered, this, &ModFolderPage::updateMods);
 
         ui->actionVisitItemPage->setToolTip(tr("Go to mod's home page"));
-        ui->actionsToolbar->insertActionAfter(ui->actionViewFolder, ui->actionVisitItemPage);
+        ui->actionsToolbar->addAction(ui->actionVisitItemPage);
         connect(ui->actionVisitItemPage, &QAction::triggered, this, &ModFolderPage::visitModPages);
 
-        auto check_allow_update = [this] {
+        auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); };
-            return (!m_instance || !m_instance->isRunning()) && (ui->treeView->selectionModel()->hasSelection() || !m_model->empty());
-        };
 
         connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [this, check_allow_update] {
             ui->actionUpdateItem->setEnabled(check_allow_update());
@@ -121,22 +119,9 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
 
         connect(mods.get(), &ModFolderModel::updateFinished, this,
                 [this, check_allow_update] { ui->actionUpdateItem->setEnabled(check_allow_update()); });
-
-        connect(m_instance, &BaseInstance::runningStatusChanged, this, &ModFolderPage::runningStateChanged);
-        ModFolderPage::runningStateChanged(m_instance && m_instance->isRunning());
     }
 }
 
-void ModFolderPage::runningStateChanged(bool running)
-{
-    ui->actionDownloadItem->setEnabled(!running);
-    ui->actionUpdateItem->setEnabled(!running);
-    ui->actionAddItem->setEnabled(!running);
-    ui->actionEnableItem->setEnabled(!running);
-    ui->actionDisableItem->setEnabled(!running);
-    ui->actionRemoveItem->setEnabled(!running);
-}
-
 bool ModFolderPage::shouldDisplay() const
 {
     return true;
@@ -155,13 +140,21 @@ bool ModFolderPage::onSelectionChanged(const QModelIndex& current, const QModelI
 
 void ModFolderPage::removeItems(const QItemSelection& selection)
 {
+    if (m_instance != nullptr && m_instance->isRunning()) {
+        auto response = CustomMessageBox::selectable(this, "Confirm Delete",
+                                                     "If you remove mods while the game is running it may crash your game.\n"
+                                                     "Are you sure you want to do this?",
+                                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
+
+        if (response != QMessageBox::Yes)
+            return;
+    }
     m_model->deleteMods(selection.indexes());
 }
 
 void ModFolderPage::installMods()
 {
-    if (!m_controlsEnabled)
-        return;
     if (m_instance->typeName() != "Minecraft")
         return;  // this is a null instance or a legacy instance
 

launcher/ui/pages/instance/ModFolderPage.h

@@ -60,7 +60,6 @@ class ModFolderPage : public ExternalResourcesPage {
     bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
 
    private slots:
-    void runningStateChanged(bool running);
     void removeItems(const QItemSelection& selection) override;
 
     void installMods();

launcher/ui/pages/instance/ResourcePackPage.cpp

@@ -67,8 +67,6 @@ bool ResourcePackPage::onSelectionChanged(const QModelIndex& current, const QMod
 
 void ResourcePackPage::downloadRPs()
 {
-    if (!m_controlsEnabled)
-        return;
     if (m_instance->typeName() != "Minecraft")
         return;  // this is a null instance or a legacy instance
 

launcher/ui/pages/instance/ShaderPackPage.cpp

@@ -46,7 +46,6 @@
 #include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/ResourceDownloadDialog.h"
 
-
 ShaderPackPage::ShaderPackPage(MinecraftInstance* instance, std::shared_ptr<ShaderPackFolderModel> model, QWidget* parent)
     : ExternalResourcesPage(instance, model, parent)
 {
@@ -61,8 +60,6 @@ ShaderPackPage::ShaderPackPage(MinecraftInstance* instance, std::shared_ptr<Shad
 
 void ShaderPackPage::downloadShaders()
 {
-    if (!m_controlsEnabled)
-        return;
     if (m_instance->typeName() != "Minecraft")
         return;  // this is a null instance or a legacy instance
 

launcher/ui/pages/instance/TexturePackPage.cpp

@@ -69,8 +69,6 @@ bool TexturePackPage::onSelectionChanged(const QModelIndex& current, const QMode
 
 void TexturePackPage::downloadTPs()
 {
-    if (!m_controlsEnabled)
-        return;
     if (m_instance->typeName() != "Minecraft")
         return;  // this is a null instance or a legacy instance
 

launcher/ui/pages/instance/VersionPage.cpp

@@ -40,14 +40,13 @@
 
 #include "Application.h"
 
-#include <QMessageBox>
+#include <QAbstractItemModel>
-#include <QLabel>
 #include <QEvent>
 #include <QKeyEvent>
-#include <QMenu>
+#include <QLabel>
-#include <QAbstractItemModel>
-#include <QMessageBox>
 #include <QListView>
+#include <QMenu>
+#include <QMessageBox>
 #include <QString>
 #include <QUrl>
 
@@ -55,49 +54,42 @@
 #include "ui_VersionPage.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/VersionSelectDialog.h"
 #include "ui/dialogs/NewComponentDialog.h"
 #include "ui/dialogs/ProgressDialog.h"
+#include "ui/dialogs/VersionSelectDialog.h"
 
 #include "ui/GuiUtil.h"
 
+#include "DesktopServices.h"
+#include "Exception.h"
+#include "Version.h"
+#include "icons/IconList.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/auth/AccountList.h"
 #include "minecraft/mod/Mod.h"
-#include "icons/IconList.h"
-#include "Exception.h"
-#include "Version.h"
-#include "DesktopServices.h"
 
 #include "meta/Index.h"
 #include "meta/VersionList.h"
 
-class IconProxy : public QIdentityProxyModel
+class IconProxy : public QIdentityProxyModel {
-{
     Q_OBJECT
-public:
+   public:
-
+    IconProxy(QWidget* parentWidget) : QIdentityProxyModel(parentWidget)
-    IconProxy(QWidget *parentWidget) : QIdentityProxyModel(parentWidget)
     {
         connect(parentWidget, &QObject::destroyed, this, &IconProxy::widgetGone);
         m_parentWidget = parentWidget;
     }
 
-    virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override
+    virtual QVariant data(const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const override
     {
         QVariant var = QIdentityProxyModel::data(proxyIndex, role);
         int column = proxyIndex.column();
-        if(column == 0 && role == Qt::DecorationRole && m_parentWidget)
+        if (column == 0 && role == Qt::DecorationRole && m_parentWidget) {
-        {
+            if (!var.isNull()) {
-            if(!var.isNull())
-            {
                 auto string = var.toString();
-                if(string == "warning")
+                if (string == "warning") {
-                {
                     return APPLICATION->getThemedIcon("status-yellow");
-                }
+                } else if (string == "error") {
-                else if(string == "error")
-                {
                     return APPLICATION->getThemedIcon("status-bad");
                 }
             }
@@ -105,14 +97,11 @@ public:
         }
         return var;
     }
-private slots:
+   private slots:
-    void widgetGone()
+    void widgetGone() { m_parentWidget = nullptr; }
-    {
-        m_parentWidget = nullptr;
-    }
 
-private:
+   private:
-    QWidget *m_parentWidget = nullptr;
+    QWidget* m_parentWidget = nullptr;
 };
 
 QIcon VersionPage::icon() const
@@ -144,15 +133,14 @@ void VersionPage::closedImpl()
     m_wide_bar_setting->set(ui->toolBar->getVisibilityState());
 }
 
-QMenu * VersionPage::createPopupMenu()
+QMenu* VersionPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction( ui->toolBar->toggleViewAction() );
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction());
     return filteredMenu;
 }
 
-VersionPage::VersionPage(MinecraftInstance *inst, QWidget *parent)
+VersionPage::VersionPage(MinecraftInstance* inst, QWidget* parent) : QMainWindow(parent), ui(new Ui::VersionPage), m_inst(inst)
-    : QMainWindow(parent), ui(new Ui::VersionPage), m_inst(inst)
 {
     ui->setupUi(this);
 
@@ -182,10 +170,8 @@ VersionPage::VersionPage(MinecraftInstance *inst, QWidget *parent)
     connect(smodel, &QItemSelectionModel::currentChanged, this, &VersionPage::packageCurrent);
 
     connect(m_profile.get(), &PackProfile::minecraftChanged, this, &VersionPage::updateVersionControls);
-    controlsEnabled = !m_inst->isRunning();
     updateVersionControls();
     preselect(0);
-    connect(m_inst, &BaseInstance::runningStatusChanged, this, &VersionPage::updateRunningStatus);
     connect(ui->packageView, &ModListView::customContextMenuRequested, this, &VersionPage::showContextMenu);
     connect(ui->filterEdit, &QLineEdit::textChanged, this, &VersionPage::onFilterTextChanged);
 }
@@ -202,18 +188,16 @@ void VersionPage::showContextMenu(const QPoint& pos)
     delete menu;
 }
 
-void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &previous)
+void VersionPage::packageCurrent(const QModelIndex& current, const QModelIndex& previous)
 {
-    if (!current.isValid())
+    if (!current.isValid()) {
-    {
         ui->frame->clear();
         return;
     }
     int row = current.row();
     auto patch = m_profile->getComponent(row);
     auto severity = patch->getProblemSeverity();
-    switch(severity)
+    switch (severity) {
-    {
         case ProblemSeverity::Warning:
             ui->frame->setName(tr("%1 possibly has issues.").arg(patch->getName()));
             break;
@@ -226,16 +210,12 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
             return;
     }
 
-    auto &problems = patch->getProblems();
+    auto& problems = patch->getProblems();
     QString problemOut;
-    for (auto &problem: problems)
+    for (auto& problem : problems) {
-    {
+        if (problem.m_severity == ProblemSeverity::Error) {
-        if(problem.m_severity == ProblemSeverity::Error)
-        {
             problemOut += tr("Error: ");
-        }
+        } else if (problem.m_severity == ProblemSeverity::Warning) {
-        else if(problem.m_severity == ProblemSeverity::Warning)
-        {
             problemOut += tr("Warning: ");
         }
         problemOut += problem.m_description;
@@ -244,71 +224,47 @@ void VersionPage::packageCurrent(const QModelIndex &current, const QModelIndex &
     ui->frame->setDescription(problemOut);
 }
 
-void VersionPage::updateRunningStatus(bool running)
-{
-    if(controlsEnabled == running) {
-        controlsEnabled = !running;
-        updateVersionControls();
-    }
-}
-
 void VersionPage::updateVersionControls()
 {
     // FIXME: this is a dirty hack
     auto minecraftVersion = Version(m_profile->getComponentVersion("net.minecraft"));
 
-    ui->actionInstall_Forge->setEnabled(controlsEnabled);
-
     bool supportsFabric = minecraftVersion >= Version("1.14");
-    ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric);
+    ui->actionInstall_Fabric->setEnabled(supportsFabric);
 
     bool supportsQuilt = minecraftVersion >= Version("1.14");
-    ui->actionInstall_Quilt->setEnabled(controlsEnabled && supportsQuilt);
+    ui->actionInstall_Quilt->setEnabled(supportsQuilt);
 
     bool supportsLiteLoader = minecraftVersion <= Version("1.12.2");
-    ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && supportsLiteLoader);
+    ui->actionInstall_LiteLoader->setEnabled(supportsLiteLoader);
 
     updateButtons();
 }
 
 void VersionPage::updateButtons(int row)
 {
-    if(row == -1)
+    if (row == -1)
         row = currentRow();
     auto patch = m_profile->getComponent(row);
-    ui->actionRemove->setEnabled(controlsEnabled && patch && patch->isRemovable());
+    ui->actionRemove->setEnabled(patch && patch->isRemovable());
-    ui->actionMove_down->setEnabled(controlsEnabled && patch && patch->isMoveable());
+    ui->actionMove_down->setEnabled(patch && patch->isMoveable());
-    ui->actionMove_up->setEnabled(controlsEnabled && patch && patch->isMoveable());
+    ui->actionMove_up->setEnabled(patch && patch->isMoveable());
-    ui->actionChange_version->setEnabled(controlsEnabled && patch && patch->isVersionChangeable());
+    ui->actionChange_version->setEnabled(patch && patch->isVersionChangeable());
-    ui->actionEdit->setEnabled(controlsEnabled && patch && patch->isCustom());
+    ui->actionEdit->setEnabled(patch && patch->isCustom());
-    ui->actionCustomize->setEnabled(controlsEnabled && patch && patch->isCustomizable());
+    ui->actionCustomize->setEnabled(patch && patch->isCustomizable());
-    ui->actionRevert->setEnabled(controlsEnabled && patch && patch->isRevertible());
+    ui->actionRevert->setEnabled(patch && patch->isRevertible());
-    ui->actionDownload_All->setEnabled(controlsEnabled);
-    ui->actionAdd_Empty->setEnabled(controlsEnabled);
-    ui->actionImport_Components->setEnabled(controlsEnabled);
-    ui->actionReload->setEnabled(controlsEnabled);
-    ui->actionReplace_Minecraft_jar->setEnabled(controlsEnabled);
-    ui->actionAdd_to_Minecraft_jar->setEnabled(controlsEnabled);
-    ui->actionAdd_Agents->setEnabled(controlsEnabled);
 }
 
 bool VersionPage::reloadPackProfile()
 {
-    try
+    try {
-    {
         m_profile->reload(Net::Mode::Online);
         return true;
-    }
+    } catch (const Exception& e) {
-    catch (const Exception &e)
-    {
         QMessageBox::critical(this, tr("Error"), e.cause());
         return false;
-    }
+    } catch (...) {
-    catch (...)
+        QMessageBox::critical(this, tr("Error"), tr("Couldn't load the instance profile."));
-    {
-        QMessageBox::critical(
-            this, tr("Error"),
-            tr("Couldn't load the instance profile."));
         return false;
     }
 }
@@ -321,14 +277,12 @@ void VersionPage::on_actionReload_triggered()
 
 void VersionPage::on_actionRemove_triggered()
 {
-    if (!ui->packageView->currentIndex().isValid())
+    if (!ui->packageView->currentIndex().isValid()) {
-    {
         return;
     }
     int index = ui->packageView->currentIndex().row();
     auto component = m_profile->getComponent(index);
-    if (component->isCustom())
+    if (component->isCustom()) {
-    {
         auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"),
                                                      tr("You are about to remove \"%1\".\n"
                                                         "This is permanent and will completely remove the custom component.\n\n"
@@ -341,8 +295,7 @@ void VersionPage::on_actionRemove_triggered()
             return;
     }
     // FIXME: use actual model, not reloading.
-    if (!m_profile->remove(index))
+    if (!m_profile->remove(index)) {
-    {
         QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
     }
     updateButtons();
@@ -352,17 +305,16 @@ void VersionPage::on_actionRemove_triggered()
 
 void VersionPage::on_actionInstall_mods_triggered()
 {
-    if(m_container)
+    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)"), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
+    auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods (*.zip *.jar)"),
-    if(!list.empty())
+                                        APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
-    {
+    if (!list.empty()) {
         m_profile->installJarMods(list);
     }
     updateButtons();
@@ -370,9 +322,9 @@ void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
 
 void VersionPage::on_actionReplace_Minecraft_jar_triggered()
 {
-    auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement (*.jar)"), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
+    auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement (*.jar)"),
-    if(!jarPath.isEmpty())
+                                          APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
-    {
+    if (!jarPath.isEmpty()) {
         m_profile->installCustomJar(jarPath);
     }
     updateButtons();
@@ -406,12 +358,9 @@ void VersionPage::on_actionAdd_Agents_triggered()
 
 void VersionPage::on_actionMove_up_triggered()
 {
-    try
+    try {
-    {
         m_profile->move(currentRow(), PackProfile::MoveUp);
-    }
+    } catch (const Exception& e) {
-    catch (const Exception &e)
-    {
         QMessageBox::critical(this, tr("Error"), e.cause());
     }
     updateButtons();
@@ -419,12 +368,9 @@ void VersionPage::on_actionMove_up_triggered()
 
 void VersionPage::on_actionMove_down_triggered()
 {
-    try
+    try {
-    {
         m_profile->move(currentRow(), PackProfile::MoveDown);
-    }
+    } catch (const Exception& e) {
-    catch (const Exception &e)
-    {
         QMessageBox::critical(this, tr("Error"), e.cause());
     }
     updateButtons();
@@ -433,39 +379,32 @@ void VersionPage::on_actionMove_down_triggered()
 void VersionPage::on_actionChange_version_triggered()
 {
     auto versionRow = currentRow();
-    if(versionRow == -1)
+    if (versionRow == -1) {
-    {
         return;
     }
     auto patch = m_profile->getComponent(versionRow);
     auto name = patch->getName();
     auto list = patch->getVersionList();
-    if(!list)
+    if (!list) {
-    {
         return;
     }
     auto uid = list->uid();
     // FIXME: this is a horrible HACK. Get version filtering information from the actual metadata...
-    if(uid == "net.minecraftforge")
+    if (uid == "net.minecraftforge") {
-    {
         on_actionInstall_Forge_triggered();
         return;
-    }
+    } else if (uid == "com.mumfrey.liteloader") {
-    else if (uid == "com.mumfrey.liteloader")
-    {
         on_actionInstall_LiteLoader_triggered();
         return;
     }
     VersionSelectDialog vselect(list.get(), tr("Change %1 version").arg(name), this);
-    if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.hashed")
+    if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.hashed") {
-    {
         vselect.setEmptyString(tr("No intermediary mappings versions are currently available."));
         vselect.setEmptyErrorString(tr("Couldn't load or download the intermediary mappings version lists!"));
         vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
     }
     auto currentVersion = patch->getVersion();
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
     if (!vselect.exec() || !vselect.selectedVersion())
@@ -473,8 +412,7 @@ void VersionPage::on_actionChange_version_triggered()
 
     qDebug() << "Change" << uid << "to" << vselect.selectedVersion()->descriptor();
     bool important = false;
-    if(uid == "net.minecraft")
+    if (uid == "net.minecraft") {
-    {
         important = true;
     }
     m_profile->setComponentVersion(uid, vselect.selectedVersion()->descriptor(), important);
@@ -484,19 +422,17 @@ void VersionPage::on_actionChange_version_triggered()
 
 void VersionPage::on_actionDownload_All_triggered()
 {
-    if (!APPLICATION->accounts()->anyAccountIsValid())
+    if (!APPLICATION->accounts()->anyAccountIsValid()) {
-    {
+        CustomMessageBox::selectable(this, tr("Error"),
-        CustomMessageBox::selectable(
-            this, tr("Error"),
                                      tr("Cannot download Minecraft or update instances unless you have at least "
                                         "one account added.\nPlease add your Mojang or Minecraft account."),
-            QMessageBox::Warning)->show();
+                                     QMessageBox::Warning)
+            ->show();
         return;
     }
 
     auto updateTask = m_inst->createUpdateTask(Net::Mode::Online);
-    if (!updateTask)
+    if (!updateTask) {
-    {
         return;
     }
     ProgressDialog tDialog(this);
@@ -510,28 +446,26 @@ void VersionPage::on_actionDownload_All_triggered()
 void VersionPage::on_actionInstall_Forge_triggered()
 {
     auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
-    if(!vlist)
+    if (!vlist) {
-    {
         return;
     }
     VersionSelectDialog vselect(vlist.get(), tr("Select Forge version"), this);
     vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") + m_profile->getComponentVersion("net.minecraft"));
+    vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
+                           m_profile->getComponentVersion("net.minecraft"));
     vselect.setEmptyErrorString(tr("Couldn't load or download the Forge version lists!"));
 
     auto currentVersion = m_profile->getComponentVersion("net.minecraftforge");
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
 
-    if (vselect.exec() && vselect.selectedVersion())
+    if (vselect.exec() && vselect.selectedVersion()) {
-    {
         auto vsn = vselect.selectedVersion();
         m_profile->setComponentVersion("net.minecraftforge", vsn->descriptor());
         m_profile->resolve(Net::Mode::Online);
         // m_profile->installVersion();
-        preselect(m_profile->rowCount(QModelIndex())-1);
+        preselect(m_profile->rowCount(QModelIndex()) - 1);
         m_container->refreshContainer();
     }
 }
@@ -539,8 +473,7 @@ void VersionPage::on_actionInstall_Forge_triggered()
 void VersionPage::on_actionInstall_Fabric_triggered()
 {
     auto vlist = APPLICATION->metadataIndex()->get("net.fabricmc.fabric-loader");
-    if(!vlist)
+    if (!vlist) {
-    {
         return;
     }
     VersionSelectDialog vselect(vlist.get(), tr("Select Fabric Loader version"), this);
@@ -548,17 +481,15 @@ void VersionPage::on_actionInstall_Fabric_triggered()
     vselect.setEmptyErrorString(tr("Couldn't load or download the Fabric Loader version lists!"));
 
     auto currentVersion = m_profile->getComponentVersion("net.fabricmc.fabric-loader");
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
 
-    if (vselect.exec() && vselect.selectedVersion())
+    if (vselect.exec() && vselect.selectedVersion()) {
-    {
         auto vsn = vselect.selectedVersion();
         m_profile->setComponentVersion("net.fabricmc.fabric-loader", vsn->descriptor());
         m_profile->resolve(Net::Mode::Online);
-        preselect(m_profile->rowCount(QModelIndex())-1);
+        preselect(m_profile->rowCount(QModelIndex()) - 1);
         m_container->refreshContainer();
     }
 }
@@ -566,8 +497,7 @@ void VersionPage::on_actionInstall_Fabric_triggered()
 void VersionPage::on_actionInstall_Quilt_triggered()
 {
     auto vlist = APPLICATION->metadataIndex()->get("org.quiltmc.quilt-loader");
-    if(!vlist)
+    if (!vlist) {
-    {
         return;
     }
     VersionSelectDialog vselect(vlist.get(), tr("Select Quilt Loader version"), this);
@@ -575,17 +505,15 @@ void VersionPage::on_actionInstall_Quilt_triggered()
     vselect.setEmptyErrorString(tr("Couldn't load or download the Quilt Loader version lists!"));
 
     auto currentVersion = m_profile->getComponentVersion("org.quiltmc.quilt-loader");
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
 
-    if (vselect.exec() && vselect.selectedVersion())
+    if (vselect.exec() && vselect.selectedVersion()) {
-    {
         auto vsn = vselect.selectedVersion();
         m_profile->setComponentVersion("org.quiltmc.quilt-loader", vsn->descriptor());
         m_profile->resolve(Net::Mode::Online);
-        preselect(m_profile->rowCount(QModelIndex())-1);
+        preselect(m_profile->rowCount(QModelIndex()) - 1);
         m_container->refreshContainer();
     }
 }
@@ -594,14 +522,12 @@ void VersionPage::on_actionAdd_Empty_triggered()
 {
     NewComponentDialog compdialog(QString(), QString(), this);
     QStringList blacklist;
-    for(int i = 0; i < m_profile->rowCount(); i++)
+    for (int i = 0; i < m_profile->rowCount(); i++) {
-    {
         auto comp = m_profile->getComponent(i);
         blacklist.push_back(comp->getID());
     }
     compdialog.setBlacklist(blacklist);
-    if (compdialog.exec())
+    if (compdialog.exec()) {
-    {
         qDebug() << "name:" << compdialog.name();
         qDebug() << "uid:" << compdialog.uid();
         m_profile->installEmpty(compdialog.uid(), compdialog.name());
@@ -611,28 +537,26 @@ void VersionPage::on_actionAdd_Empty_triggered()
 void VersionPage::on_actionInstall_LiteLoader_triggered()
 {
     auto vlist = APPLICATION->metadataIndex()->get("com.mumfrey.liteloader");
-    if(!vlist)
+    if (!vlist) {
-    {
         return;
     }
     VersionSelectDialog vselect(vlist.get(), tr("Select LiteLoader version"), this);
     vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") + m_profile->getComponentVersion("net.minecraft"));
+    vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") +
+                           m_profile->getComponentVersion("net.minecraft"));
     vselect.setEmptyErrorString(tr("Couldn't load or download the LiteLoader version lists!"));
 
     auto currentVersion = m_profile->getComponentVersion("com.mumfrey.liteloader");
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
 
-    if (vselect.exec() && vselect.selectedVersion())
+    if (vselect.exec() && vselect.selectedVersion()) {
-    {
         auto vsn = vselect.selectedVersion();
         m_profile->setComponentVersion("com.mumfrey.liteloader", vsn->descriptor());
         m_profile->resolve(Net::Mode::Online);
         // m_profile->installVersion(vselect.selectedVersion());
-        preselect(m_profile->rowCount(QModelIndex())-1);
+        preselect(m_profile->rowCount(QModelIndex()) - 1);
         m_container->refreshContainer();
     }
 }
@@ -647,7 +571,7 @@ void VersionPage::on_actionMinecraftFolder_triggered()
     DesktopServices::openDirectory(m_inst->gameRoot(), true);
 }
 
-void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &previous)
+void VersionPage::versionCurrent(const QModelIndex& current, const QModelIndex& previous)
 {
     currentIdx = current.row();
     updateButtons(currentIdx);
@@ -655,16 +579,13 @@ void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &
 
 void VersionPage::preselect(int row)
 {
-    if(row < 0)
+    if (row < 0) {
-    {
         row = 0;
     }
-    if(row >= m_profile->rowCount(QModelIndex()))
+    if (row >= m_profile->rowCount(QModelIndex())) {
-    {
         row = m_profile->rowCount(QModelIndex()) - 1;
     }
-    if(row < 0)
+    if (row < 0) {
-    {
         return;
     }
     auto model_index = m_profile->index(row);
@@ -680,8 +601,7 @@ void VersionPage::onGameUpdateError(QString error)
 ComponentPtr VersionPage::current()
 {
     auto row = currentRow();
-    if(row < 0)
+    if (row < 0) {
-    {
         return nullptr;
     }
     return m_profile->getComponent(row);
@@ -689,8 +609,7 @@ ComponentPtr VersionPage::current()
 
 int VersionPage::currentRow()
 {
-    if (ui->packageView->selectionModel()->selectedRows().isEmpty())
+    if (ui->packageView->selectionModel()->selectedRows().isEmpty()) {
-    {
         return -1;
     }
     return ui->packageView->selectionModel()->selectedRows().first().row();
@@ -699,18 +618,15 @@ int VersionPage::currentRow()
 void VersionPage::on_actionCustomize_triggered()
 {
     auto version = currentRow();
-    if(version == -1)
+    if (version == -1) {
-    {
         return;
     }
     auto patch = m_profile->getComponent(version);
-    if(!patch->getVersionFile())
+    if (!patch->getVersionFile()) {
-    {
         // TODO: wait for the update task to finish here...
         return;
     }
-    if(!m_profile->customize(version))
+    if (!m_profile->customize(version)) {
-    {
         // TODO: some error box here
     }
     updateButtons();
@@ -720,13 +636,11 @@ void VersionPage::on_actionCustomize_triggered()
 void VersionPage::on_actionEdit_triggered()
 {
     auto version = current();
-    if(!version)
+    if (!version) {
-    {
         return;
     }
     auto filename = version->getFilename();
-    if(!QFileInfo::exists(filename))
+    if (!QFileInfo::exists(filename)) {
-    {
         qWarning() << "file" << filename << "can't be opened for editing, doesn't exist!";
         return;
     }
@@ -736,8 +650,7 @@ void VersionPage::on_actionEdit_triggered()
 void VersionPage::on_actionRevert_triggered()
 {
     auto version = currentRow();
-    if(version == -1)
+    if (version == -1) {
-    {
         return;
     }
     auto component = m_profile->getComponent(version);
@@ -753,8 +666,7 @@ void VersionPage::on_actionRevert_triggered()
     if (response != QMessageBox::Yes)
         return;
 
-    if(!m_profile->revertToBase(version))
+    if (!m_profile->revertToBase(version)) {
-    {
         // TODO: some error box here
     }
     updateButtons();
@@ -762,7 +674,7 @@ void VersionPage::on_actionRevert_triggered()
     m_container->refreshContainer();
 }
 
-void VersionPage::onFilterTextChanged(const QString &newContents)
+void VersionPage::onFilterTextChanged(const QString& newContents)
 {
     m_filterModel->setFilterFixedString(newContents);
 }

launcher/ui/pages/instance/VersionPage.h

@@ -46,38 +46,27 @@
 #include "minecraft/PackProfile.h"
 #include "ui/pages/BasePage.h"
 
-namespace Ui
+namespace Ui {
-{
 class VersionPage;
 }
 
-class VersionPage : public QMainWindow, public BasePage
+class VersionPage : public QMainWindow, public BasePage {
-{
     Q_OBJECT
 
-public:
+   public:
-    explicit VersionPage(MinecraftInstance *inst, QWidget *parent = 0);
+    explicit VersionPage(MinecraftInstance* inst, QWidget* parent = 0);
     virtual ~VersionPage();
-    virtual QString displayName() const override
+    virtual QString displayName() const override { return tr("Version"); }
-    {
-        return tr("Version");
-    }
     virtual QIcon icon() const override;
-    virtual QString id() const override
+    virtual QString id() const override { return "version"; }
-    {
+    virtual QString helpPage() const override { return "Instance-Version"; }
-        return "version";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Instance-Version";
-    }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
     void openedImpl() override;
     void closedImpl() override;
 
-private slots:
+   private slots:
     void on_actionChange_version_triggered();
     void on_actionInstall_Forge_triggered();
     void on_actionInstall_Fabric_triggered();
@@ -103,36 +92,34 @@ private slots:
 
     void updateVersionControls();
 
-private:
+   private:
     ComponentPtr current();
     int currentRow();
     void updateButtons(int row = -1);
     void preselect(int row = 0);
     int doUpdate();
 
-protected:
+   protected:
-    QMenu * createPopupMenu() override;
+    QMenu* createPopupMenu() override;
 
     /// FIXME: this shouldn't be necessary!
     bool reloadPackProfile();
 
-private:
+   private:
-    Ui::VersionPage *ui;
+    Ui::VersionPage* ui;
-    QSortFilterProxyModel *m_filterModel;
+    QSortFilterProxyModel* m_filterModel;
     std::shared_ptr<PackProfile> m_profile;
-    MinecraftInstance *m_inst;
+    MinecraftInstance* m_inst;
     int currentIdx = 0;
-    bool controlsEnabled = false;
 
     std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 
-public slots:
+   public slots:
-    void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
+    void versionCurrent(const QModelIndex& current, const QModelIndex& previous);
 
-private slots:
+   private slots:
-    void updateRunningStatus(bool running);
     void onGameUpdateError(QString error);
-    void packageCurrent(const QModelIndex &current, const QModelIndex &previous);
+    void packageCurrent(const QModelIndex& current, const QModelIndex& previous);
-    void showContextMenu(const QPoint &pos);
+    void showContextMenu(const QPoint& pos);
-    void onFilterTextChanged(const QString & newContents);
+    void onFilterTextChanged(const QString& newContents);
 };

launcher/ui/pages/modplatform/ResourcePage.cpp

@@ -104,6 +104,7 @@ void ResourcePage::openedImpl()
 
     updateSelectionButton();
     triggerSearch();
+    m_ui->searchEdit->setFocus();
 }
 
 auto ResourcePage::eventFilter(QObject* watched, QEvent* event) -> bool

launcher/ui/setupwizard/ThemeWizardPage.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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
@@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons()
 void ThemeWizardPage::updateCat()
 {
     qDebug() << "Setting Cat";
-    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(:/backgrounds/%1)").arg(ThemeManager::getCatImage())));
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack())));
 }
 
 void ThemeWizardPage::retranslate()

launcher/ui/setupwizard/ThemeWizardPage.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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

launcher/ui/themes/CatPack.cpp

@@ -0,0 +1,117 @@
+// 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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "ui/themes/CatPack.h"
+#include <QDate>
+#include <QDir>
+#include <QFileInfo>
+#include "FileSystem.h"
+#include "Json.h"
+
+QString BasicCatPack::path()
+{
+    const auto now = QDate::currentDate();
+    const auto birthday = QDate(now.year(), 11, 30);
+    const auto xmas = QDate(now.year(), 12, 25);
+    const auto halloween = QDate(now.year(), 10, 31);
+
+    QString cat = QString(":/backgrounds/%1").arg(m_id);
+    if (std::abs(now.daysTo(xmas)) <= 4) {
+        cat += "-xmas";
+    } else if (std::abs(now.daysTo(halloween)) <= 4) {
+        cat += "-spooky";
+    } else if (std::abs(now.daysTo(birthday)) <= 12) {
+        cat += "-bday";
+    }
+    return cat;
+}
+
+JsonCatPack::PartialDate partialDate(QJsonObject date)
+{
+    auto month = Json::ensureInteger(date, "month", 1);
+    if (month > 12)
+        month = 12;
+    else if (month <= 0)
+        month = 1;
+    auto day = Json::ensureInteger(date, "day", 1);
+    if (day > 31)
+        day = 31;
+    else if (day <= 0)
+        day = 1;
+    return { month, day };
+};
+
+JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.dir().dirName())
+{
+    QString path = manifestInfo.path();
+    auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file");
+    const auto root = doc.object();
+    m_name = Json::requireString(root, "name", "Catpack name");
+    m_defaultPath = FS::PathCombine(path, Json::requireString(root, "default", "Default Cat"));
+    auto variants = Json::ensureArray(root, "variants", QJsonArray(), "Catpack Variants");
+    for (auto v : variants) {
+        auto variant = Json::ensureObject(v, QJsonObject(), "Cat variant");
+        m_variants << Variant{ FS::PathCombine(path, Json::requireString(variant, "path", "Variant path")),
+                               partialDate(Json::requireObject(variant, "startTime", "Variant startTime")),
+                               partialDate(Json::requireObject(variant, "endTime", "Variant endTime")) };
+    }
+}
+
+QDate ensureDay(int year, int month, int day)
+{
+    QDate date(year, month, 1);
+    if (day > date.daysInMonth())
+        day = date.daysInMonth();
+    return QDate(year, month, day);
+}
+
+QString JsonCatPack::path()
+{
+    const QDate now = QDate::currentDate();
+    for (auto var : m_variants) {
+        QDate startDate = ensureDay(now.year(), var.startTime.month, var.startTime.day);
+        QDate endDate = ensureDay(now.year(), var.endTime.month, var.endTime.day);
+        if (startDate > endDate) {  // it's spans over multiple years
+            if (endDate <= now)     // end date is in the past so jump one year into the future for endDate
+                endDate = endDate.addYears(1);
+            else  // end date is in the future so jump one year into the past for startDate
+                startDate = startDate.addYears(-1);
+        }
+
+        if (startDate >= now && now >= endDate)
+            return var.path;
+    }
+    return m_defaultPath;
+}

launcher/ui/themes/CatPack.h

@@ -0,0 +1,91 @@
+// 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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#pragma once
+
+#include <QDate>
+#include <QFileInfo>
+#include <QList>
+#include <QString>
+
+class CatPack {
+   public:
+    virtual ~CatPack() {}
+    virtual QString id() = 0;
+    virtual QString name() = 0;
+    virtual QString path() = 0;
+};
+
+class BasicCatPack : public CatPack {
+   public:
+    BasicCatPack(QString id, QString name) : m_id(id), m_name(name) {}
+    BasicCatPack(QString id) : BasicCatPack(id, id) {}
+    virtual QString id() { return m_id; };
+    virtual QString name() { return m_name; };
+    virtual QString path();
+
+   protected:
+    QString m_id;
+    QString m_name;
+};
+
+class FileCatPack : public BasicCatPack {
+   public:
+    FileCatPack(QString id, QFileInfo& fileInfo) : BasicCatPack(id), m_path(fileInfo.absoluteFilePath()) {}
+    FileCatPack(QFileInfo& fileInfo) : FileCatPack(fileInfo.baseName(), fileInfo) {}
+    virtual QString path() { return m_path; }
+
+   private:
+    QString m_path;
+};
+
+class JsonCatPack : public BasicCatPack {
+   public:
+    struct PartialDate {
+        int month;
+        int day;
+    };
+    struct Variant {
+        QString path;
+        PartialDate startTime;
+        PartialDate endTime;
+    };
+    JsonCatPack(QFileInfo& manifestInfo);
+    virtual QString path();
+
+   private:
+    QString m_defaultPath;
+    QList<Variant> m_variants;
+};

launcher/ui/themes/CustomTheme.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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

launcher/ui/themes/CustomTheme.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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

launcher/ui/themes/ITheme.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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

launcher/ui/themes/ITheme.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *  Copyright (C) 2022 Tayou <git@tayou.org>
  *
  *  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