Merge pull request #1739 from Trial97/mod_icons

fixed squished mod icons

.clang-format

@@ -1,10 +1,12 @@
 ---
-Language:        Cpp
 BasedOnStyle: Chromium
 IndentWidth: 4
-AlignConsecutiveMacros: false
-AlignConsecutiveAssignments: false
 AllowShortIfStatementsOnASingleLine: false
+ColumnLimit: 140
+---
+Language: Cpp
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
 BraceWrapping:
   AfterFunction: true
   SplitEmptyFunction: false
@@ -12,5 +14,4 @@ BraceWrapping:
   SplitEmptyNamespace: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
-ColumnLimit:     140
 Cpp11BracedListStyle: false

.clang-tidy

@@ -0,0 +1,4 @@
+Checks:
+  - modernize-use-using
+
+SystemHeaders: false

.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

.envrc

@@ -1 +1,2 @@
 use flake
+watch_file nix/*.nix

.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@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Create backport PRs
+        uses: korthout/backport-action@v2.1.0
+        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

@@ -24,6 +24,12 @@ on:
       CACHIX_AUTH_TOKEN:
         description: Private token for authenticating against Cachix cache
         required: false
+      GPG_PRIVATE_KEY:
+        description: Private key for AppImage signing
+        required: false
+      GPG_PRIVATE_KEY_ID:
+        description: ID for the GPG_PRIVATE_KEY, to select the signing key
+        required: false
 
 jobs:
   build:
@@ -31,56 +37,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-
           - os: ubuntu-20.04
             qt_ver: 5
 
           - os: ubuntu-20.04
             qt_ver: 6
             qt_host: linux
-            qt_arch: ''
+            qt_arch: ""
-            qt_version: '6.2.4'
+            qt_version: "6.2.4"
-            qt_modules: 'qt5compat qtimageformats'
+            qt_modules: "qt5compat qtimageformats"
-            qt_tools: ''
+            qt_tools: ""
 
           - os: windows-2022
             name: "Windows-MinGW-w64"
             msystem: clang64
-            vcvars_arch: 'amd64_x86'
+            vcvars_arch: "amd64_x86"
-
-          - os: windows-2022
-            name: "Windows-MSVC-Legacy"
-            msystem: ''
-            architecture: 'win32'
-            vcvars_arch: 'amd64_x86'
-            qt_ver: 5
-            qt_host: windows
-            qt_arch: 'win32_msvc2019'
-            qt_version: '5.15.2'
-            qt_modules: ''
-            qt_tools: 'tools_openssl_x86'
 
           - os: windows-2022
             name: "Windows-MSVC"
-            msystem: ''
+            msystem: ""
-            architecture: 'x64'
+            architecture: "x64"
-            vcvars_arch: 'amd64'
+            vcvars_arch: "amd64"
             qt_ver: 6
             qt_host: windows
             qt_arch: ''
-            qt_version: '6.5.1'
+            qt_version: '6.6.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
           - os: windows-2022
             name: "Windows-MSVC-arm64"
-            msystem: ''
+            msystem: ""
-            architecture: 'arm64'
+            architecture: "arm64"
-            vcvars_arch: 'amd64_arm64'
+            vcvars_arch: "amd64_arm64"
             qt_ver: 6
             qt_host: windows
             qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.5.1'
+            qt_version: '6.6.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -90,7 +83,7 @@ jobs:
             qt_ver: 6
             qt_host: mac
             qt_arch: ''
-            qt_version: '6.5.0'
+            qt_version: '6.6.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -99,9 +92,9 @@ jobs:
             macosx_deployment_target: 10.13
             qt_ver: 5
             qt_host: mac
-            qt_version: '5.15.2'
+            qt_version: "5.15.2"
-            qt_modules: ''
+            qt_modules: ""
-            qt_tools: ''
+            qt_tools: ""
 
     runs-on: ${{ matrix.os }}
 
@@ -119,11 +112,11 @@ jobs:
       # PREPARE
       ##
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          submodules: 'true'
+          submodules: "true"
 
-      - name: 'Setup MSYS2'
+      - name: "Setup MSYS2"
         if: runner.os == 'Windows' && matrix.msystem != ''
         uses: msys2/setup-msys2@v2
         with:
@@ -152,13 +145,13 @@ jobs:
 
       - name: Setup ccache
         if: (runner.os != 'Windows' || matrix.msystem == '') && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.9
+        uses: hendrikmuhs/ccache-action@v1.2.10
         with:
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}-${{ matrix.architecture }}
 
       - name: Retrieve ccache cache (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.3.2
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }}
@@ -208,12 +201,12 @@ jobs:
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
         uses: jurplel/install-qt-action@v3
         with:
-           aqtversion: '==3.1.*'
+          aqtversion: "==3.1.*"
-           py7zrversion: '>=0.20.2'
+          py7zrversion: ">=0.20.2"
           version: ${{ matrix.qt_version }}
-           host: 'windows'
+          host: "windows"
-           target: 'desktop'
+          target: "desktop"
-           arch: ''
+          arch: ""
           modules: ${{ matrix.qt_modules }}
           tools: ${{ matrix.qt_tools }}
           cache: ${{ inputs.is_qt_cached }}
@@ -225,11 +218,11 @@ jobs:
         if: runner.os == 'Linux' && matrix.qt_ver == 6 || runner.os == 'macOS' || (runner.os == 'Windows' && matrix.msystem == '')
         uses: jurplel/install-qt-action@v3
         with:
-           aqtversion: '==3.1.*'
+          aqtversion: "==3.1.*"
-           py7zrversion: '>=0.20.2'
+          py7zrversion: ">=0.20.2"
           version: ${{ matrix.qt_version }}
           host: ${{ matrix.qt_host }}
-           target: 'desktop'
+          target: "desktop"
           arch: ${{ matrix.qt_arch }}
           modules: ${{ matrix.qt_modules }}
           tools: ${{ matrix.qt_tools }}
@@ -249,6 +242,8 @@ jobs:
           wget "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage"
           wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
 
+          wget "https://github.com/AppImageCommunity/AppImageUpdate/releases/download/continuous/AppImageUpdate-x86_64.AppImage"
+
           ${{ github.workspace }}/.github/scripts/prepare_JREs.sh
           sudo apt install libopengl0
 
@@ -264,23 +259,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 -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }} -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  -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }}
           # https://github.com/ccache/ccache/wiki/MS-Visual-Studio (I coudn't figure out the compiler prefix)
           if ("${{ env.CCACHE_VAR }}")
           {
@@ -295,7 +290,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 }} -DLauncher_BUILD_ARTIFACT=Linux-Qt${{ matrix.qt_ver }} -G Ninja
 
       ##
       # BUILD
@@ -387,14 +382,13 @@ jobs:
           cd ${{ env.INSTALL_DIR }}
           if ("${{ matrix.qt_ver }}" -eq "5")
           {
-            Copy-Item D:/a/PrismLauncher/Qt/Tools/OpenSSL/Win_x86/bin/libcrypto-1_1.dll -Destination libcrypto-1_1.dll
+            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libcrypto-1_1.dll -Destination libcrypto-1_1.dll
-            Copy-Item D:/a/PrismLauncher/Qt/Tools/OpenSSL/Win_x86/bin/libssl-1_1.dll -Destination libssl-1_1.dll
+            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libssl-1_1.dll -Destination libssl-1_1.dll
           }
           cd ${{ github.workspace }}
 
           Get-ChildItem ${{ env.INSTALL_DIR }} -Recurse | ForEach FullName | Resolve-Path -Relative | %{ $_.TrimStart('.\') } | %{ $_.TrimStart('${{ env.INSTALL_DIR }}') } | %{ $_.TrimStart('\') } | Out-File -FilePath ${{ env.INSTALL_DIR }}/manifest.txt
 
-
       - name: Fetch codesign certificate (Windows)
         if: runner.os == 'Windows'
         shell: bash # yes, we are not using MSYS2 or PowerShell here
@@ -407,7 +401,7 @@ jobs:
           if (Get-Content ./codesign.pfx){
             cd ${{ env.INSTALL_DIR }}
             # We ship the exact same executable for portable and non-portable editions, so signing just once is fine
-            SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com prismlauncher.exe prismlauncher_filelink.exe
+            SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com prismlauncher.exe prismlauncher_updater.exe prismlauncher_filelink.exe 
           } else {
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
@@ -466,11 +460,15 @@ jobs:
       - name: Package AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
         shell: bash
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
+
           mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.appdata.xml
           export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated
-          export OUTPUT="PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
+
+          export OUTPUT="PrismLauncher-Linux-x86_64.AppImage"
 
           chmod +x linuxdeploy-*.AppImage
 
@@ -481,7 +479,7 @@ jobs:
 
           cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk
 
-          cp -r /home/runner/work/PrismLauncher/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
+          cp -r ${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
 
           cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
           cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
@@ -494,8 +492,25 @@ jobs:
           LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk/lib"
           export LD_LIBRARY_PATH
 
+          chmod +x AppImageUpdate-x86_64.AppImage
+          cp AppImageUpdate-x86_64.AppImage ${{ env.INSTALL_APPIMAGE_DIR }}/usr/bin
+
+          export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|PrismLauncher-Linux-x86_64.AppImage.zsync" 
+
+          if [ '${{ secrets.GPG_PRIVATE_KEY_ID }}' != '' ]; then
+            export SIGN=1
+            export SIGN_KEY=${{ secrets.GPG_PRIVATE_KEY_ID }}
+            mkdir -p ~/.gnupg/
+            echo "$GPG_PRIVATE_KEY" > ~/.gnupg/private.key
+            gpg --import ~/.gnupg/private.key
+          else
+            echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY
+          fi
+
           ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_APPIMAGE_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
 
+          mv "PrismLauncher-Linux-x86_64.AppImage" "PrismLauncher-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
+
       ##
       # UPLOAD BUILDS
       ##
@@ -532,14 +547,14 @@ jobs:
         if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v3
         with:
-          name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
+          name: PrismLauncher-${{ runner.os }}-Qt5-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher.tar.gz
 
       - name: Upload binary tarball (Linux, portable, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v3
         with:
-          name: PrismLauncher-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
+          name: PrismLauncher-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher-portable.tar.gz
 
       - name: Upload binary tarball (Linux, Qt 6)
@@ -563,6 +578,13 @@ jobs:
           name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
           path: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
 
+      - name: Upload AppImage Zsync (Linux)
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        uses: actions/upload-artifact@v3
+        with:
+          name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
+          path: PrismLauncher-Linux-x86_64.AppImage.zsync
+
       - name: ccache stats (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != ''
         shell: msys2 {0}
@@ -576,43 +598,13 @@ jobs:
       options: --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: inputs.build_type == 'Debug'
         with:
-          submodules: 'true'
+          submodules: "true"
       - name: Build Flatpak (Linux)
         if: inputs.build_type == 'Debug'
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         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/codeql.yml

@@ -8,7 +8,7 @@ jobs:
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'true'
 

.github/workflows/trigger_builds.yml

@@ -3,26 +3,25 @@ name: Build Application
 on:
   push:
     branches-ignore:
-      - 'renovate/**'
+      - "renovate/**"
     paths-ignore:
-      - '**.md'
+      - "**.md"
-      - '**/LICENSE'
+      - "**/LICENSE"
-      - 'flake.lock'
+      - "flake.lock"
-      - 'packages/**'
+      - "packages/**"
-      - '.github/ISSUE_TEMPLATE/**'
+      - ".github/ISSUE_TEMPLATE/**"
-      - '.markdownlint**'
+      - ".markdownlint**"
   pull_request:
     paths-ignore:
-      - '**.md'
+      - "**.md"
-      - '**/LICENSE'
+      - "**/LICENSE"
-      - 'flake.lock'
+      - "flake.lock"
-      - 'packages/**'
+      - "packages/**"
-      - '.github/ISSUE_TEMPLATE/**'
+      - ".github/ISSUE_TEMPLATE/**"
-      - '.markdownlint**'
+      - ".markdownlint**"
   workflow_dispatch:
 
 jobs:
-
   build_debug:
     name: Build Debug
     uses: ./.github/workflows/build.yml
@@ -34,3 +33,5 @@ jobs:
       WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
       WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}

.github/workflows/trigger_release.yml

@@ -3,10 +3,9 @@ name: Build Application and Make Release
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
-
   build_release:
     name: Build Release
     uses: ./.github/workflows/build.yml
@@ -18,6 +17,8 @@ jobs:
       WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
       WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}
 
   create_release:
     needs: build_release
@@ -26,10 +27,10 @@ jobs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          submodules: 'true'
+          submodules: "true"
-          path: 'PrismLauncher-source'
+          path: "PrismLauncher-source"
       - name: Download artifacts
         uses: actions/download-artifact@v3
       - name: Grab and store version
@@ -41,9 +42,10 @@ jobs:
           mv ${{ github.workspace }}/PrismLauncher-source PrismLauncher-${{ env.VERSION }}
           mv PrismLauncher-Linux-Qt6-Portable*/PrismLauncher-portable.tar.gz PrismLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
           mv PrismLauncher-Linux-Qt6*/PrismLauncher.tar.gz PrismLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz
-          mv PrismLauncher-Linux-Portable*/PrismLauncher-portable.tar.gz PrismLauncher-Linux-Portable-${{ env.VERSION }}.tar.gz
+          mv PrismLauncher-Linux-Qt5-Portable*/PrismLauncher-portable.tar.gz PrismLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
-          mv PrismLauncher-Linux*/PrismLauncher.tar.gz PrismLauncher-Linux-${{ env.VERSION }}.tar.gz
+          mv PrismLauncher-Linux-Qt5*/PrismLauncher.tar.gz PrismLauncher-Linux-Qt5-${{ env.VERSION }}.tar.gz       
-          mv PrismLauncher-*.AppImage/PrismLauncher-*.AppImage PrismLauncher-Linux-${{ env.VERSION }}-x86_64.AppImage
+          mv PrismLauncher-*.AppImage/PrismLauncher-*.AppImage PrismLauncher-Linux-x86_64.AppImage
+          mv PrismLauncher-*.AppImage.zsync/PrismLauncher-*.AppImage.zsync PrismLauncher-Linux-x86_64.AppImage.zsync
           mv PrismLauncher-macOS-Legacy*/PrismLauncher.tar.gz PrismLauncher-macOS-Legacy-${{ env.VERSION }}.tar.gz
           mv PrismLauncher-macOS*/PrismLauncher.tar.gz PrismLauncher-macOS-${{ env.VERSION }}.tar.gz
 
@@ -78,25 +80,22 @@ jobs:
       - name: Create release
         id: create_release
         uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ github.ref }}
           name: Prism Launcher ${{ env.VERSION }}
           draft: true
           prerelease: false
           files: |
-            PrismLauncher-Linux-${{ env.VERSION }}.tar.gz
+            PrismLauncher-Linux-Qt5-${{ env.VERSION }}.tar.gz
-            PrismLauncher-Linux-Portable-${{ env.VERSION }}.tar.gz
+            PrismLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
-            PrismLauncher-Linux-${{ env.VERSION }}-x86_64.AppImage
+            PrismLauncher-Linux-x86_64.AppImage
+            PrismLauncher-Linux-x86_64.AppImage.zsync
             PrismLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz
             PrismLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
             PrismLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe
-            PrismLauncher-Windows-MSVC-Legacy-${{ env.VERSION }}.zip
-            PrismLauncher-Windows-MSVC-Legacy-Portable-${{ env.VERSION }}.zip
-            PrismLauncher-Windows-MSVC-Legacy-Setup-${{ env.VERSION }}.exe
             PrismLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe

.github/workflows/update-flake.yml

@@ -7,20 +7,24 @@ on:
   workflow_dispatch:
 
 permissions:
+  contents: write
   pull-requests: write
 
 jobs:
   update-flake:
+    if: github.repository == 'PrismLauncher/PrismLauncher'
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
 
-      - uses: DeterminateSystems/update-flake-lock@v19
+      - uses: DeterminateSystems/update-flake-lock@v20
         with:
           commit-msg: "chore(nix): update lockfile"
           pr-title: "chore(nix): update lockfile"
           pr-labels: |
             Linux
+            packaging
             simple change
+            changelog:omit

.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

@@ -33,6 +33,13 @@ if(MSVC)
     # Use /W4 as /Wall includes unnesserey warnings such as added padding to structs
     set(CMAKE_CXX_FLAGS "/GS /permissive- /W4 ${CMAKE_CXX_FLAGS}")
 
+    # /EHs Enables stack unwind semantics for standard C++ exceptions to ensure stackframes are unwound
+    # and object deconstructors are called when an exception is caught.
+    # without it memory leaks and a warning is printed
+    # /EHc tells the compiler to assume that functions declared as extern "C" never throw a C++ exception
+    # This appears to not always be a defualt compiler option in CMAKE
+    set(CMAKE_CXX_FLAGS "/EHsc ${CMAKE_CXX_FLAGS}")
+
     # LINK accepts /SUBSYSTEM whics sets if we are a WINDOWS (gui) or a CONSOLE programs
     # This implicitly selects an entrypoint specific to the subsystem selected
     # qtmain/QtEntryPointLib provides the correct entrypoint (wWinMain) for gui programs
@@ -85,6 +92,39 @@ 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" OFF)
+
+# If this is a Debug build turn on address sanitiser
+if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") 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 /Oy-")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /Oy-")
+        else()
+            # AppleClang and Clang
+            message(STATUS "Address Sanitizer available on Clang")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -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 -fno-omit-frame-pointer")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -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 /Oy-")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /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,10 +186,13 @@ 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
+# Github repo URL with releases for updater
-set(Launcher_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
+set(Launcher_UPDATER_GITHUB_REPO "https://github.com/PrismLauncher/PrismLauncher" CACHE STRING "Base github URL for the updater.")
+
+# Name to help updater identify valid artifacts
+set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
 
 # The metadata server
 set(Launcher_META_URL "https://meta.prismlauncher.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.")
@@ -176,6 +219,18 @@ set(Launcher_SUBREDDIT_URL "https://prismlauncher.org/reddit" CACHE STRING "URL
 set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules")
 set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against")
 
+# Native libraries
+if(UNIX AND APPLE)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.dylib" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.dylib" CACHE STRING "Name of native openal library")
+elseif(UNIX)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.so" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.so" CACHE STRING "Name of native openal library")
+elseif(WIN32)
+    set(Launcher_GLFW_LIBRARY_NAME "glfw.dll" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "OpenAL.dll" CACHE STRING "Name of native openal library")
+endif()
+
 # API Keys
 # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service
 # of these platforms, please change these API keys beforehand.
@@ -193,6 +248,11 @@ set(Launcher_MSA_CLIENT_ID "c36a9fb6-4f2a-41ff-90bd-ae7cc92031eb" CACHE STRING "
 # This key was issued specifically for Prism Launcher
 set(Launcher_CURSEFORGE_API_KEY "$2a$10$wuAJuNZuted3NORVmpgUC.m8sI.pv1tOPKZyBgLFGjxFp/br0lZCC" CACHE STRING "API key for the CurseForge platform")
 
+set(Launcher_COMPILER_NAME ${CMAKE_CXX_COMPILER_ID})
+set(Launcher_COMPILER_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+set(Launcher_COMPILER_TARGET_SYSTEM ${CMAKE_SYSTEM_NAME})
+set(Launcher_COMPILER_TARGET_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION})
+set(Launcher_COMPILER_TARGET_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
 
 #### Check the current Git commit and branch
 include(GetGitRevisionDescription)
@@ -286,6 +346,13 @@ add_subdirectory(program_info)
 
 ####################################### Install layout #######################################
 
+set(Launcher_ENABLE_UPDATER NO)
+set(Launcher_BUILD_UPDATER NO)
+
+if (NOT APPLE AND (NOT Launcher_UPDATER_GITHUB_REPO STREQUAL "" AND NOT Launcher_BUILD_ARTIFACT STREQUAL ""))
+	set(Launcher_BUILD_UPDATER YES)
+endif()
+
 if(NOT (UNIX AND APPLE))
     # Install "portable.txt" if selected component is "portable"
     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_Portable_File}" DESTINATION "." COMPONENT portable EXCLUDE_FROM_ALL)
@@ -310,9 +377,9 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
-    set(MACOSX_BUNDLE_COPYRIGHT "© 2022 ${Launcher_Copyright_Mac}")
+    set(MACOSX_BUNDLE_COPYRIGHT "© 2022-2023 ${Launcher_Copyright_Mac}")
-    set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=")
+    set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=" CACHE STRING "Public key for Sparkle update feed")
-    set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml")
+    set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml" CACHE STRING "URL for Sparkle update feed")
 
     set(MACOSX_SPARKLE_DOWNLOAD_URL "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz" CACHE STRING "URL to Sparkle release archive")
     set(MACOSX_SPARKLE_SHA256 "bf6ac1caa9f8d321d5784859c88da874f28412f37fb327bc21b7b14c5d61ef94" CACHE STRING "SHA256 checksum for Sparkle release archive")
@@ -321,8 +388,12 @@ if(UNIX AND APPLE)
     # directories to look for dependencies
     set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${MACOSX_SPARKLE_DIR})
 
+    if(NOT MACOSX_SPARKLE_UPDATE_PUBLIC_KEY STREQUAL "" AND NOT MACOSX_SPARKLE_UPDATE_FEED_URL STREQUAL "")
+        set(Launcher_ENABLE_UPDATER YES)
+    endif()
+
     # install as bundle
-    set(INSTALL_BUNDLE "full")
+    set(INSTALL_BUNDLE "full" CACHE STRING "Use fixup_bundle to bundle dependencies")
 
     # Add the icon
     install(FILES ${Launcher_Branding_ICNS} DESTINATION ${RESOURCES_DEST_DIR} RENAME ${Launcher_Name}.icns)
@@ -332,10 +403,10 @@ 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")
+    set(INSTALL_BUNDLE "nodeps" CACHE STRING "Use fixup_bundle to bundle dependencies")
 
     # Set RPATH
     SET(Launcher_BINARY_RPATH "$ORIGIN/")
@@ -345,7 +416,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")
@@ -369,7 +440,7 @@ elseif(WIN32)
     set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
     # install as bundle
-    set(INSTALL_BUNDLE "full")
+    set(INSTALL_BUNDLE "full" CACHE STRING "Use fixup_bundle to bundle dependencies")
 else()
     message(FATAL_ERROR "Platform not supported")
 endif()

CONTRIBUTING.md

@@ -19,7 +19,7 @@ In an effort to ensure that the code you contribute is actually compatible with
 
 This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message:
 
-```
+```text
 <commit message>
 
 Signed-off-by: Author name <Author email>
@@ -27,7 +27,7 @@ Signed-off-by: Author name <Author email>
 
 By signing off your work, you agree to the terms below:
 
-```
+```text
 Developer's Certificate of Origin 1.1
 
 By making a contribution to this project, I certify that:
@@ -61,3 +61,9 @@ 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

@@ -18,11 +18,18 @@
 </a>
 
 - All downloads and instructions for Prism Launcher can be found on our [Website](https://prismlauncher.org/download).
-- Last build status can be found in the [GitHub Actions](https://github.com/PrismLauncher/PrismLauncher/actions).
+- Last build status can be found in the [GitHub Actions](https://github.com/PrismLauncher/PrismLauncher/actions) tab (this also includes the pull requests status).
 
 ### Development Builds
 
-There are development builds available [here](https://github.com/PrismLauncher/PrismLauncher/actions). These have debug information in the binaries, so their file sizes are relatively larger.
+Please understand that these builds are not intended for most users. There may be bugs, and other instabilities. You have been warned.
+
+There are development builds available through:
+
+- [GitHub Actions](https://github.com/PrismLauncher/PrismLauncher/actions) (includes builds from pull requests opened by contribuitors)
+- [nightly.link](https://nightly.link/PrismLauncher/PrismLauncher/workflows/trigger_builds/develop) (this will always point only to the latest version of develop)
+
+These have debug information in the binaries, so their file sizes are relatively larger.
 
 Prebuilt Development builds are provided for **Linux**, **Windows** and **macOS**.
 
@@ -30,7 +37,7 @@ For **Arch**, **Debian**, **Fedora**, **OpenSUSE (Tumbleweed)** and **Gentoo**,
 
 [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?label=MPR&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git)<br />[![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?label=COPR&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?label=Gentoo&logo=gentoo&logoColor=white)](https://packages.gentoo.org/packages/games-action/prismlauncher)
 
-These packages are also availiable to all the distributions based on the ones mentioned above.
+These packages are also available to all the distributions based on the ones mentioned above.
 
 ## Community & Support
 
@@ -50,7 +57,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 +89,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 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 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

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,6 +33,7 @@
  *      limitations under the License.
  */
 
+#include <qstringliteral.h>
 #include "BuildConfig.h"
 #include <QObject>
 
@@ -59,15 +60,25 @@ Config::Config()
     VERSION_MINOR = @Launcher_VERSION_MINOR@;
 
     BUILD_PLATFORM = "@Launcher_BUILD_PLATFORM@";
+    BUILD_ARTIFACT = "@Launcher_BUILD_ARTIFACT@";
     BUILD_DATE = "@Launcher_BUILD_TIMESTAMP@";
-    UPDATER_BASE = "@Launcher_UPDATER_BASE@";
+    UPDATER_GITHUB_REPO = "@Launcher_UPDATER_GITHUB_REPO@";
+
+    COMPILER_NAME = "@Launcher_COMPILER_NAME@";
+    COMPILER_VERSION = "@Launcher_COMPILER_VERSION@";
+
+    COMPILER_TARGET_SYSTEM = "@Launcher_COMPILER_TARGET_SYSTEM@";
+    COMPILER_TARGET_SYSTEM_VERSION = "@Launcher_COMPILER_TARGET_SYSTEM_VERSION@";
+    COMPILER_TARGET_SYSTEM_PROCESSOR = "@Launcher_COMPILER_TARGET_PROCESSOR@";
 
     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;
+    } else if(!UPDATER_GITHUB_REPO.isEmpty() && !BUILD_ARTIFACT.isEmpty()) {
+        UPDATER_ENABLED = true;
     }
 
     GIT_COMMIT = "@Launcher_GIT_COMMIT@";
@@ -89,9 +100,6 @@ Config::Config()
     {
         VERSION_CHANNEL = GIT_REFSPEC;
         VERSION_CHANNEL.remove("refs/heads/"); 
-        if(!UPDATER_BASE.isEmpty() && !BUILD_PLATFORM.isEmpty()) {
-            UPDATER_ENABLED = true;
-        }
     }
     else if (!GIT_COMMIT.isEmpty())
     {
@@ -110,6 +118,9 @@ Config::Config()
     FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
 
+    GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
+    OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
+
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
     TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
     MATRIX_URL = "@Launcher_MATRIX_URL@";
@@ -133,3 +144,16 @@ QString Config::printableVersionString() const
     }
     return vstr;
 }
+
+QString Config::compilerID() const
+{
+    if (COMPILER_VERSION.isEmpty())
+        return COMPILER_NAME;
+    return QStringLiteral("%1 - %2").arg(COMPILER_NAME).arg(COMPILER_VERSION);
+}
+
+QString Config::systemID() const
+{
+    return QStringLiteral("%1 %2 %3").arg(COMPILER_TARGET_SYSTEM, COMPILER_TARGET_SYSTEM_VERSION, COMPILER_TARGET_SYSTEM_PROCESSOR);
+}
+

buildconfig/BuildConfig.h

@@ -36,8 +36,8 @@
  */
 
 #pragma once
-#include <QString>
 #include <QList>
+#include <QString>
 
 /**
  * \brief The Config class holds all the build-time information passed from the build system.
@@ -68,14 +68,32 @@ 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 short string identifying this build's valid artifacts int he updater. For example, "lin64" or "win32".
+    QString BUILD_ARTIFACT;
+
     /// A string containing the build timestamp
     QString BUILD_DATE;
 
+    /// A string identifying the compiler use to build
+    QString COMPILER_NAME;
+
+    /// A string identifying the compiler version used to build
+    QString COMPILER_VERSION;
+
+    /// A string identifying the compiler target system os
+    QString COMPILER_TARGET_SYSTEM;
+
+    /// A String identifying the compiler target system version
+    QString COMPILER_TARGET_SYSTEM_VERSION;
+
+    /// A String identifying the compiler target processor
+    QString COMPILER_TARGET_SYSTEM_PROCESSOR;
+
     /// URL for the updater's channel
-    QString UPDATER_BASE;
+    QString UPDATER_GITHUB_REPO;
 
     /// The public key used to sign releases for the Sparkle updater appcast
     QString MAC_SPARKLE_PUB_KEY;
@@ -134,6 +152,9 @@ class Config {
      */
     QString META_URL;
 
+    QString GLFW_LIBRARY_NAME;
+    QString OPENAL_LIBRARY_NAME;
+
     QString BUG_TRACKER_URL;
     QString TRANSLATIONS_URL;
     QString MATRIX_URL;
@@ -172,6 +193,18 @@ class Config {
      * \return The version number in string format (major.minor.revision.build).
      */
     QString printableVersionString() const;
+
+    /**
+     * \brief Compiler ID String
+     * \return a string of the form "Name - Version"  of just "Name" if the version is empty
+     */
+    QString compilerID() const;
+
+    /**
+     * \brief System ID String
+     * \return a string of the form "OS Verison Processor"
+     */
+    QString systemID() const;
 };
 
 extern const Config BuildConfig;

cmake/CompilerWarnings.cmake

@@ -0,0 +1,155 @@
+# 
+# Function to set compiler warnings with reasonable defaults at the project level.
+# Taken from https://github.com/aminya/project_options/blob/main/src/CompilerWarnings.cmake
+# under the folowing license:
+# 
+# MIT License
+#
+# Copyright (c) 2022-2100 Amin Yahyaabadi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+include_guard()
+
+function(_set_project_warnings_add_target_link_option TARGET OPTIONS)
+  target_link_options(${_project_name} INTERFACE ${OPTIONS})
+endfunction()
+
+# Set the compiler warnings
+#
+# https://clang.llvm.org/docs/DiagnosticsReference.html
+# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
+function(
+  set_project_warnings
+  _project_name
+  MSVC_WARNINGS
+  CLANG_WARNINGS
+  GCC_WARNINGS
+)
+  if("${MSVC_WARNINGS}" STREQUAL "")
+    set(MSVC_WARNINGS
+        /W4 # Baseline reasonable warnings
+        /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
+        /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
+        /w14263 # 'function': member function does not override any base class virtual member function
+        /w14265 # 'classname': class has virtual functions, but destructor is not virtual instances of this class may not
+                # be destructed correctly
+        /w14287 # 'operator': unsigned/negative constant mismatch
+        /we4289 # nonstandard extension used: 'variable': loop control variable declared in the for-loop is used outside
+                # the for-loop scope
+        /w14296 # 'operator': expression is always 'boolean_value'
+        /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
+        /w14545 # expression before comma evaluates to a function which is missing an argument list
+        /w14546 # function call before comma missing argument list
+        /w14547 # 'operator': operator before comma has no effect; expected operator with side-effect
+        /w14549 # 'operator': operator before comma has no effect; did you intend 'operator'?
+        /w14555 # expression has no effect; expected expression with side- effect
+        /w14619 # pragma warning: there is no warning number 'number'
+        /w14640 # Enable warning on thread un-safe static member initialization
+        /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may cause unexpected runtime behavior.
+        /w14905 # wide string literal cast to 'LPSTR'
+        /w14906 # string literal cast to 'LPWSTR'
+        /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied
+        /permissive- # standards conformance mode for MSVC compiler.
+    )
+  endif()
+
+  if("${CLANG_WARNINGS}" STREQUAL "")
+    set(CLANG_WARNINGS
+        -Wall
+        -Wextra # reasonable and standard
+        -Wshadow # warn the user if a variable declaration shadows one from a parent context
+        -Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps
+        # catch hard to track down memory errors
+        -Wold-style-cast # warn for c-style casts
+        -Wcast-align # warn for potential performance problem casts
+        -Wunused # warn on anything being unused
+        -Woverloaded-virtual # warn if you overload (not override) a virtual function
+        -Wpedantic # warn if non-standard C++ is used
+        -Wconversion # warn on type conversions that may lose data
+        -Wsign-conversion # warn on sign conversions
+        -Wnull-dereference # warn if a null dereference is detected
+        -Wdouble-promotion # warn if float is implicit promoted to double
+        -Wformat=2 # warn on security issues around functions that format output (ie printf)
+        -Wimplicit-fallthrough # warn on statements that fallthrough without an explicit annotation
+        # -Wgnu-zero-variadic-macro-arguments (part of -pedantic) is triggered by every qCDebug() call and therefore results
+        # in a lot of noise. This warning is only notifying us that clang is emulating the GCC behaviour
+        # instead of the exact standard wording so we can safely ignore it
+        -Wno-gnu-zero-variadic-macro-arguments
+    )
+  endif()
+
+  if("${GCC_WARNINGS}" STREQUAL "")
+    set(GCC_WARNINGS
+        ${CLANG_WARNINGS}
+        -Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
+        -Wduplicated-cond # warn if if / else chain has duplicated conditions
+        -Wduplicated-branches # warn if if / else branches have duplicated code
+        -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
+        -Wuseless-cast # warn if you perform a cast to the same type
+    )
+  endif()
+
+  if(MSVC)
+    set(PROJECT_WARNINGS_CXX ${MSVC_WARNINGS})
+  elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+    set(PROJECT_WARNINGS_CXX ${CLANG_WARNINGS})
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(PROJECT_WARNINGS_CXX ${GCC_WARNINGS})
+  else()
+    message(AUTHOR_WARNING "No compiler warnings set for CXX compiler: '${CMAKE_CXX_COMPILER_ID}'")
+    # TODO support Intel compiler
+  endif()
+
+  # Add C warnings
+  set(PROJECT_WARNINGS_C "${PROJECT_WARNINGS_CXX}")
+  list(
+    REMOVE_ITEM
+    PROJECT_WARNINGS_C
+    -Wnon-virtual-dtor
+    -Wold-style-cast
+    -Woverloaded-virtual
+    -Wuseless-cast
+    -Wextra-semi
+  )
+
+  target_compile_options(
+    ${_project_name}
+    INTERFACE # C++ warnings
+              $<$<COMPILE_LANGUAGE:CXX>:${PROJECT_WARNINGS_CXX}>
+              # C warnings
+              $<$<COMPILE_LANGUAGE:C>:${PROJECT_WARNINGS_C}>
+   )
+
+  # If we are using the compiler as a linker driver pass the warnings to it
+  # (most useful when using LTO or warnings as errors)
+  if(CMAKE_CXX_LINK_EXECUTABLE MATCHES "^<CMAKE_CXX_COMPILER>")
+    _set_project_warnings_add_target_link_option(
+      ${_project_name} "$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_WARNINGS_CXX}>"
+    )
+  endif()
+
+  if(CMAKE_C_LINK_EXECUTABLE MATCHES "^<CMAKE_C_COMPILER>")
+    _set_project_warnings_add_target_link_option(
+      ${_project_name} "$<$<COMPILE_LANGUAGE:C>:${PROJECT_WARNINGS_C}>"
+    )
+  endif()
+
+ endfunction()

cmake/MacOSXBundleInfo.plist.in

@@ -67,5 +67,16 @@
             <string>Alternate</string>
         </dict>
     </array>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>Curseforge</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+            <string>curseforge</string>
+            </array>
+        </dict>
+    </array>
 </dict>
 </plist>

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1688254665,
+        "lastModified": 1698882062,
-        "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=",
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "267149c58a14d15f7f81b4d737308421de9d7152",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
         "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": {
@@ -89,13 +89,28 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1694857738,
+        "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688221086,
+        "lastModified": 1699094435,
-        "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
+        "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
+        "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
         "type": "github"
       },
       "original": {
@@ -108,11 +123,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1688049487,
+        "lastModified": 1698611440,
-        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
+        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
+        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
         "type": "github"
       },
       "original": {
@@ -138,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688386108,
+        "lastModified": 1698852633,
-        "narHash": "sha256-Vffto9QaVonzYAcPlAzd0soqWYpPpKk60dfNLSIXcFA=",
+        "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "42587d3414d1747999a5f71e92a83cf6547b62da",
+        "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0",
         "type": "github"
       },
       "original": {
@@ -156,6 +171,7 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "libnbtplusplus": "libnbtplusplus",
+        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks"
       }

flake.nix

@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    nix-filter.url = "github:numtide/nix-filter";
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -20,8 +21,24 @@
     };
   };
 
-  outputs = inputs:
+  outputs = {
-    inputs.flake-parts.lib.mkFlake
+    flake-parts,
-    {inherit inputs;}
+    pre-commit-hooks,
-    {imports = [./nix];};
+    ...
+  } @ inputs:
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      imports = [
+        pre-commit-hooks.flakeModule
+
+        ./nix/dev.nix
+        ./nix/distribution.nix
+      ];
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+    };
 }

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:
@@ -25,13 +18,25 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
     # Mod drag&drop
   - --filesystem=xdg-download:ro
+    # FTBApp import
+  - --filesystem=~/.ftba: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 +45,7 @@ modules:
     sources:
       - type: dir
         path: ../
-    builddir: true
+
   - name: openjdk
     buildsystem: simple
     build-commands:
@@ -49,14 +54,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 +103,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,6 @@
+builds:
+  exclude: []
+  include:
+    - "checks.x86_64-linux.*"
+    - "devShells.*.*"
+    - "packages.*.*"

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
@@ -38,16 +38,17 @@
 #pragma once
 
 #include <QApplication>
-#include <memory>
+#include <QDateTime>
 #include <QDebug>
 #include <QFlag>
 #include <QIcon>
-#include <QDateTime>
 #include <QUrl>
+#include <memory>
 
 #include <BaseInstance.h>
 
 #include "minecraft/launch/MinecraftServerTarget.h"
+#include "ui/themes/CatPack.h"
 
 class LaunchController;
 class LocalPeer;
@@ -70,6 +71,7 @@ class TranslationsModel;
 class ITheme;
 class MCEditTool;
 class ThemeManager;
+class IconTheme;
 
 namespace Meta {
 class Index;
@@ -80,17 +82,11 @@ namespace Meta {
 #endif
 #define APPLICATION (static_cast<Application*>(QCoreApplication::instance()))
 
-class Application : public QApplication
+class Application : public QApplication {
-{
     // friends for the purpose of limiting access to deprecated stuff
     Q_OBJECT
    public:
-    enum Status {
+    enum Status { StartingUp, Failed, Succeeded, Initialized };
-        StartingUp,
-        Failed,
-        Succeeded,
-        Initialized
-    };
 
     enum Capability {
         None = 0,
@@ -108,27 +104,15 @@ public:
 
     bool event(QEvent* event) override;
 
-    std::shared_ptr<SettingsObject> settings() const {
+    std::shared_ptr<SettingsObject> settings() const { return m_settings; }
-        return m_settings;
-    }
 
-    qint64 timeSinceStart() const {
+    qint64 timeSinceStart() const { return startTime.msecsTo(QDateTime::currentDateTime()); }
-        return startTime.msecsTo(QDateTime::currentDateTime());
-    }
 
     QIcon getThemedIcon(const QString& name);
 
-    void setIconTheme(const QString& name);
+    ThemeManager* themeManager() { return m_themeManager.get(); }
 
-    void applyCurrentlySelectedTheme(bool initial = false);
+    shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
-
-    QList<ITheme*> getValidApplicationThemes();
-
-    void setApplicationTheme(const QString& name);
-
-    shared_qobject_ptr<ExternalUpdater> updater() {
-        return m_updater;
-    }
 
     void triggerUpdateCheck();
 
@@ -136,29 +120,17 @@ public:
 
     std::shared_ptr<JavaInstallList> javalist();
 
-    std::shared_ptr<InstanceList> instances() const {
+    std::shared_ptr<InstanceList> instances() const { return m_instances; }
-        return m_instances;
-    }
 
-    std::shared_ptr<IconList> icons() const {
+    std::shared_ptr<IconList> icons() const { return m_icons; }
-        return m_icons;
-    }
 
-    MCEditTool *mcedit() const {
+    MCEditTool* mcedit() const { return m_mcedit.get(); }
-        return m_mcedit.get();
-    }
 
-    shared_qobject_ptr<AccountList> accounts() const {
+    shared_qobject_ptr<AccountList> accounts() const { return m_accounts; }
-        return m_accounts;
-    }
 
-    Status status() const {
+    Status status() const { return m_status; }
-        return m_status;
-    }
 
-    const QMap<QString, std::shared_ptr<BaseProfilerFactory>> &profilers() const {
+    const QMap<QString, std::shared_ptr<BaseProfilerFactory>>& profilers() const { return m_profilers; }
-        return m_profilers;
-    }
 
     void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);
 
@@ -170,6 +142,8 @@ public:
 
     void updateCapabilities();
 
+    void detectLibraries();
+
     /*!
      * Finds and returns the full path to a jar file.
      * Returns a null-string if it could not be found.
@@ -183,17 +157,14 @@ public:
     QString getUserAgentUncached();
 
     /// this is the root of the 'installation'. Used for automatic updates
-    const QString &root() {
+    const QString& root() { return m_rootPath; }
-        return m_rootPath;
-    }
 
-    bool isPortable() {
+    /// the data path the application is using
-        return m_portable;
+    const QString& dataRoot() { return m_dataPath; }
-    }
 
-    const Capabilities capabilities() {
+    bool isPortable() { return m_portable; }
-        return m_capabilities;
+
-    }
+    const Capabilities capabilities() { return m_capabilities; }
 
     /*!
      * Opens a json file using either a system default editor, or, if not empty, the editor
@@ -211,6 +182,11 @@ public:
 
     int suitableMaxMem();
 
+    bool updaterEnabled();
+    QString updaterBinaryName();
+
+    QUrl normalizeImportUrl(QString const& url);
+
    signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
@@ -222,14 +198,11 @@ signals:
 #endif
 
    public slots:
-    bool launch(
+    bool launch(InstancePtr instance,
-        InstancePtr instance,
                 bool online = true,
                 bool demo = false,
-        BaseProfilerFactory *profiler = nullptr,
                 MinecraftServerTargetPtr serverToJoin = nullptr,
-        MinecraftAccountPtr accountToUse = nullptr
+                MinecraftAccountPtr accountToUse = nullptr);
-    );
     bool kill(InstancePtr instance);
     void closeCurrentWindow();
 
@@ -277,6 +250,7 @@ private:
     QMap<QString, std::shared_ptr<BaseProfilerFactory>> m_profilers;
 
     QString m_rootPath;
+    QString m_dataPath;
     Status m_status = Application::StartingUp;
     Capabilities m_capabilities;
     bool m_portable = false;
@@ -309,12 +283,15 @@ private:
     LocalPeer* m_peerInstance = nullptr;
 
     SetupWizard* m_setupWizard = nullptr;
+
    public:
+    QString m_detectedGLFWPath;
+    QString m_detectedOpenALPath;
     QString m_instanceIdToLaunch;
     QString m_serverToJoin;
     QString m_profileToUse;
     bool m_liveCheck = false;
-    QList<QUrl> m_zipsToImport;
+    QList<QUrl> m_urlsToImport;
     QString m_instanceIdToShowWindowOf;
     std::unique_ptr<QFile> logFile;
 };

launcher/ApplicationMessage.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -39,7 +39,8 @@
 #include <QJsonObject>
 #include "Json.h"
 
-void ApplicationMessage::parse(const QByteArray & input) {
+void ApplicationMessage::parse(const QByteArray& input)
+{
     auto doc = Json::requireDocument(input, "ApplicationMessage");
     auto root = Json::requireObject(doc, "ApplicationMessage");
 
@@ -52,7 +53,8 @@ void ApplicationMessage::parse(const QByteArray & input) {
     }
 }
 
-QByteArray ApplicationMessage::serialize() {
+QByteArray ApplicationMessage::serialize()
+{
     QJsonObject root;
     root.insert("command", command);
     QJsonObject outArgs;

launcher/ApplicationMessage.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <QString>
-#include <QHash>
 #include <QByteArray>
+#include <QHash>
+#include <QString>
 
 struct ApplicationMessage {
     QString command;

launcher/BaseInstaller.cpp

@@ -18,10 +18,7 @@
 #include "BaseInstaller.h"
 #include "minecraft/MinecraftInstance.h"
 
-BaseInstaller::BaseInstaller()
+BaseInstaller::BaseInstaller() {}
-{
-
-}
 
 bool BaseInstaller::isApplied(MinecraftInstance* on)
 {
@@ -30,15 +27,12 @@ bool BaseInstaller::isApplied(MinecraftInstance *on)
 
 bool BaseInstaller::add(MinecraftInstance* to)
 {
-    if (!patchesDir(to->instanceRoot()).exists())
+    if (!patchesDir(to->instanceRoot()).exists()) {
-    {
         QDir(to->instanceRoot()).mkdir("patches");
     }
 
-    if (isApplied(to))
+    if (isApplied(to)) {
-    {
+        if (!remove(to)) {
-        if (!remove(to))
-        {
             return false;
         }
     }

launcher/BaseInstaller.h

@@ -26,8 +26,7 @@ class QObject;
 class Task;
 class BaseVersion;
 
-class BaseInstaller
+class BaseInstaller {
-{
    public:
     BaseInstaller();
     virtual ~BaseInstaller(){};

launcher/BaseInstance.cpp

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -36,23 +37,22 @@
 
 #include "BaseInstance.h"
 
-#include <QFileInfo>
-#include <QDir>
 #include <QDebug>
-#include <QRegularExpression>
+#include <QDir>
+#include <QFileInfo>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QRegularExpression>
 
 #include "settings/INISettingsObject.h"
-#include "settings/Setting.h"
 #include "settings/OverrideSetting.h"
+#include "settings/Setting.h"
 
-#include "FileSystem.h"
-#include "Commandline.h"
 #include "BuildConfig.h"
+#include "Commandline.h"
+#include "FileSystem.h"
 
-BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
+BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir) : QObject()
-    : QObject()
 {
     m_settings = settings;
     m_global_settings = globalSettings;
@@ -101,6 +101,8 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
     m_settings->registerSetting("ManagedPackName", "");
     m_settings->registerSetting("ManagedPackVersionID", "");
     m_settings->registerSetting("ManagedPackVersionName", "");
+
+    m_settings->registerSetting("Profiler", "");
 }
 
 QString BaseInstance::getPreLaunchCommand()
@@ -148,7 +150,11 @@ QString BaseInstance::getManagedPackVersionName() const
     return m_settings->get("ManagedPackVersionName").toString();
 }
 
-void BaseInstance::setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version)
+void BaseInstance::setManagedPack(const QString& type,
+                                  const QString& id,
+                                  const QString& name,
+                                  const QString& versionId,
+                                  const QString& version)
 {
     m_settings->set("ManagedPack", true);
     m_settings->set("ManagedPackType", type);
@@ -173,8 +179,7 @@ int BaseInstance::getConsoleMaxLines() const
     auto lineSetting = m_settings->getSetting("ConsoleMaxLines");
     bool conversionOk = false;
     int maxLines = lineSetting->get().toInt(&conversionOk);
-    if(!conversionOk)
+    if (!conversionOk) {
-    {
         maxLines = lineSetting->defValue().toInt();
         qWarning() << "ConsoleMaxLines has nonsensical value, defaulting to" << maxLines;
     }
@@ -220,8 +225,7 @@ bool BaseInstance::isLinkedToInstanceId(const QString& id) const
 
 void BaseInstance::iconUpdated(QString key)
 {
-    if(iconKey() == key)
+    if (iconKey() == key) {
-    {
         emit propertiesChanged(this);
     }
 }
@@ -235,8 +239,7 @@ void BaseInstance::invalidate()
 void BaseInstance::changeStatus(BaseInstance::Status newStatus)
 {
     Status status = currentStatus();
-    if(status != newStatus)
+    if (status != newStatus) {
-    {
         m_status = newStatus;
         emit statusChanged(status, newStatus);
     }
@@ -264,18 +267,14 @@ void BaseInstance::setRunning(bool running)
 
     m_isRunning = running;
 
-    if(!m_settings->get("RecordGameTime").toBool())
+    if (!m_settings->get("RecordGameTime").toBool()) {
-    {
         emit runningStatusChanged(running);
         return;
     }
 
-    if(running)
+    if (running) {
-    {
         m_timeStarted = QDateTime::currentDateTime();
-    }
+    } else {
-    else
-    {
         QDateTime timeEnded = QDateTime::currentDateTime();
 
         qint64 current = settings()->get("totalTimePlayed").toLongLong();
@@ -291,8 +290,7 @@ void BaseInstance::setRunning(bool running)
 int64_t BaseInstance::totalTimePlayed() const
 {
     qint64 current = m_settings->get("totalTimePlayed").toLongLong();
-    if(m_isRunning)
+    if (m_isRunning) {
-    {
         QDateTime timeNow = QDateTime::currentDateTime();
         return current + m_timeStarted.secsTo(timeNow);
     }
@@ -301,8 +299,7 @@ int64_t BaseInstance::totalTimePlayed() const
 
 int64_t BaseInstance::lastTimePlayed() const
 {
-    if(m_isRunning)
+    if (m_isRunning) {
-    {
         QDateTime timeNow = QDateTime::currentDateTime();
         return m_timeStarted.secsTo(timeNow);
     }
@@ -391,7 +388,7 @@ QString BaseInstance::name() const
 
 QString BaseInstance::windowTitle() const
 {
-    return BuildConfig.LAUNCHER_DISPLAYNAME + ": " + name().replace(QRegularExpression("\\s+"), " ");
+    return BuildConfig.LAUNCHER_DISPLAYNAME + ": " + name();
 }
 
 // FIXME: why is this here? move it to MinecraftInstance!!!

launcher/BaseInstance.h

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,24 +38,25 @@
 #pragma once
 #include <cassert>
 
-#include <QObject>
-#include "QObjectPtr.h"
 #include <QDateTime>
-#include <QSet>
+#include <QMenu>
+#include <QObject>
 #include <QProcess>
+#include <QSet>
+#include "QObjectPtr.h"
 
 #include "settings/SettingsObject.h"
 
-#include "settings/INIFile.h"
 #include "BaseVersionList.h"
-#include "minecraft/auth/MinecraftAccount.h"
 #include "MessageLevel.h"
+#include "minecraft/auth/MinecraftAccount.h"
 #include "pathmatcher/IPathMatcher.h"
+#include "settings/INIFile.h"
 
 #include "net/Mode.h"
 
-#include "minecraft/launch/MinecraftServerTarget.h"
 #include "RuntimeContext.h"
+#include "minecraft/launch/MinecraftServerTarget.h"
 
 class QDir;
 class Task;
@@ -62,7 +64,7 @@ class LaunchTask;
 class BaseInstance;
 
 // pointer for lazy people
-typedef std::shared_ptr<BaseInstance> InstancePtr;
+using InstancePtr = std::shared_ptr<BaseInstance>;
 
 /*!
  * \brief Base class for instances.
@@ -72,23 +74,21 @@ typedef std::shared_ptr<BaseInstance> InstancePtr;
  * To create a new instance type, create a new class inheriting from this class
  * and implement the pure virtual functions.
  */
-class BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance>
+class BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance> {
-{
     Q_OBJECT
    protected:
     /// no-touchy!
     BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);
 
    public: /* types */
-    enum class Status
+    enum class Status {
-    {
         Present,
         Gone  // either nuked or invalidated
     };
 
    public:
     /// virtual destructor to make sure the destruction is COMPLETE
-    virtual ~BaseInstance() {};
+    virtual ~BaseInstance() {}
 
     virtual void saveNow() = 0;
 
@@ -117,10 +117,7 @@ public:
     QString instanceRoot() const;
 
     /// Path to the instance's game root directory.
-    virtual QString gameRoot() const
+    virtual QString gameRoot() const { return instanceRoot(); }
-    {
-        return instanceRoot();
-    }
 
     /// Path to the instance's mods directory.
     virtual QString modsRoot() const = 0;
@@ -151,10 +148,7 @@ public:
     void copyManagedPack(BaseInstance& other);
 
     /// guess log level from a line of game log
-    virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString &line, MessageLevel::Enum level)
+    virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString& line, MessageLevel::Enum level) { return level; }
-    {
-        return level;
-    };
 
     virtual QStringList extraArguments();
 
@@ -189,8 +183,7 @@ public:
     virtual Task::Ptr createUpdateTask(Net::Mode mode) = 0;
 
     /// returns a valid launcher (task container)
-    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(
+    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0;
-            AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0;
 
     /// returns the current launch task (if any)
     shared_qobject_ptr<LaunchTask> getLaunchTask();
@@ -222,45 +215,30 @@ public:
     virtual QString typeName() const = 0;
 
     void updateRuntimeContext();
-    RuntimeContext runtimeContext() const
+    RuntimeContext runtimeContext() const { return m_runtimeContext; }
-    {
-        return m_runtimeContext;
-    }
 
-    bool hasVersionBroken() const
+    bool hasVersionBroken() const { return m_hasBrokenVersion; }
-    {
-        return m_hasBrokenVersion;
-    }
     void setVersionBroken(bool value)
     {
-        if(m_hasBrokenVersion != value)
+        if (m_hasBrokenVersion != value) {
-        {
             m_hasBrokenVersion = value;
             emit propertiesChanged(this);
         }
     }
 
-    bool hasUpdateAvailable() const
+    bool hasUpdateAvailable() const { return m_hasUpdate; }
-    {
-        return m_hasUpdate;
-    }
     void setUpdateAvailable(bool value)
     {
-        if(m_hasUpdate != value)
+        if (m_hasUpdate != value) {
-        {
             m_hasUpdate = value;
             emit propertiesChanged(this);
         }
     }
 
-    bool hasCrashed() const
+    bool hasCrashed() const { return m_crashed; }
-    {
-        return m_crashed;
-    }
     void setCrashed(bool value)
     {
-        if(m_crashed != value)
+        if (m_crashed != value) {
-        {
             m_crashed = value;
             emit propertiesChanged(this);
         }
@@ -270,6 +248,8 @@ public:
     virtual bool canEdit() const = 0;
     virtual bool canExport() const = 0;
 
+    virtual void populateLaunchMenu(QMenu* menu) = 0;
+
     bool reloadSettings();
 
     /**
@@ -291,7 +271,7 @@ public:
    protected:
     void changeStatus(Status newStatus);
 
-    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); };
+    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); }
 
     bool isSpecificSettingsLoaded() const { return m_specific_settings_loaded; }
     void setSpecificSettingsLoaded(bool loaded) { m_specific_settings_loaded = loaded; }
@@ -306,6 +286,8 @@ signals:
 
     void runningStatusChanged(bool running);
 
+    void profilerChanged();
+
     void statusChanged(Status from, Status to);
 
    protected slots:
@@ -328,7 +310,6 @@ private: /* data */
 
     SettingsObjectWeakPtr m_global_settings;
     bool m_specific_settings_loaded = false;
-
 };
 
 Q_DECLARE_METATYPE(shared_qobject_ptr<BaseInstance>)

launcher/BaseVersion.h

@@ -15,15 +15,14 @@
 
 #pragma once
 
-#include <memory>
-#include <QString>
 #include <QMetaType>
+#include <QString>
+#include <memory>
 
 /*!
  * An abstract base class for versions.
  */
-class BaseVersion
+class BaseVersion {
-{
    public:
     using Ptr = std::shared_ptr<BaseVersion>;
     virtual ~BaseVersion() {}
@@ -44,15 +43,8 @@ public:
      * the kind of version this is (Stable, Beta, Snapshot, whatever)
      */
     virtual QString typeString() const = 0;
-
+    virtual bool operator<(BaseVersion& a) { return name() < a.name(); }
-    virtual bool operator<(BaseVersion &a)
+    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/BaseVersionList.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -36,14 +36,11 @@
 #include "BaseVersionList.h"
 #include "BaseVersion.h"
 
-BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
+BaseVersionList::BaseVersionList(QObject* parent) : QAbstractListModel(parent) {}
-{
-}
 
 BaseVersion::Ptr BaseVersionList::findVersion(const QString& descriptor)
 {
-    for (int i = 0; i < count(); i++)
+    for (int i = 0; i < count(); i++) {
-    {
         if (at(i)->descriptor() == descriptor)
             return at(i);
     }
@@ -68,8 +65,7 @@ QVariant BaseVersionList::data(const QModelIndex &index, int role) const
 
     BaseVersion::Ptr version = at(index.row());
 
-    switch (role)
+    switch (role) {
-    {
         case VersionPointerRole:
             return QVariant::fromValue(version);
 

launcher/BaseVersionList.h

@@ -15,13 +15,13 @@
 
 #pragma once
 
+#include <QAbstractListModel>
 #include <QObject>
 #include <QVariant>
-#include <QAbstractListModel>
 
 #include "BaseVersion.h"
-#include "tasks/Task.h"
 #include "QObjectPtr.h"
+#include "tasks/Task.h"
 
 /*!
  * \brief Class that each instance type's version list derives from.
@@ -35,12 +35,10 @@
  * all have a default implementation, but they can be overridden by plugins to
  * change the behavior of the list.
  */
-class BaseVersionList : public QAbstractListModel
+class BaseVersionList : public QAbstractListModel {
-{
     Q_OBJECT
    public:
-    enum ModelRoles
+    enum ModelRoles {
-    {
         VersionPointerRole = Qt::UserRole,
         VersionRole,
         VersionIdRole,
@@ -53,7 +51,7 @@ public:
         ArchitectureRole,
         SortRole
     };
-    typedef QList<int> RoleList;
+    using RoleList = QList<int>;
 
     explicit BaseVersionList(QObject* parent = 0);
 
@@ -103,8 +101,7 @@ public:
      */
     virtual void sortVersions() = 0;
 
-protected
+   protected slots:
-slots:
     /*!
      * Updates this list with the given list of versions.
      * This is done by copying each version in the given list and inserting it

launcher/CMakeLists.txt

@@ -136,6 +136,16 @@ set(NET_SOURCES
     net/Validator.h
     net/Upload.cpp
     net/Upload.h
+    net/HeaderProxy.h
+    net/RawHeaderProxy.h
+    net/ApiHeaderProxy.h
+    net/StaticHeaderProxy.h
+    net/ApiDownload.h
+    net/ApiDownload.cpp
+    net/ApiUpload.cpp
+    net/ApiUpload.h
+    net/NetRequest.cpp
+    net/NetRequest.h
 )
 
 # Game launch logic
@@ -172,6 +182,11 @@ set(MAC_UPDATE_SOURCES
     updater/MacSparkleUpdater.mm
 )
 
+set(PRISM_UPDATE_SOURCES
+    updater/PrismExternalUpdater.h
+    updater/PrismExternalUpdater.cpp
+)
+
 # Backend for the news bar... there's usually no news.
 set(NEWS_SOURCES
     # News System
@@ -207,13 +222,9 @@ set(MINECRAFT_SOURCES
     minecraft/auth/MinecraftAccount.h
     minecraft/auth/Parsers.cpp
     minecraft/auth/Parsers.h
-    minecraft/auth/Yggdrasil.cpp
-    minecraft/auth/Yggdrasil.h
 
     minecraft/auth/flows/AuthFlow.cpp
     minecraft/auth/flows/AuthFlow.h
-    minecraft/auth/flows/Mojang.cpp
-    minecraft/auth/flows/Mojang.h
     minecraft/auth/flows/MSA.cpp
     minecraft/auth/flows/MSA.h
     minecraft/auth/flows/Offline.cpp
@@ -227,12 +238,8 @@ set(MINECRAFT_SOURCES
     minecraft/auth/steps/GetSkinStep.h
     minecraft/auth/steps/LauncherLoginStep.cpp
     minecraft/auth/steps/LauncherLoginStep.h
-    minecraft/auth/steps/MigrationEligibilityStep.cpp
-    minecraft/auth/steps/MigrationEligibilityStep.h
     minecraft/auth/steps/MinecraftProfileStep.cpp
     minecraft/auth/steps/MinecraftProfileStep.h
-    minecraft/auth/steps/MinecraftProfileStepMojang.cpp
-    minecraft/auth/steps/MinecraftProfileStepMojang.h
     minecraft/auth/steps/MSAStep.cpp
     minecraft/auth/steps/MSAStep.h
     minecraft/auth/steps/XboxAuthorizationStep.cpp
@@ -241,8 +248,6 @@ set(MINECRAFT_SOURCES
     minecraft/auth/steps/XboxProfileStep.h
     minecraft/auth/steps/XboxUserStep.cpp
     minecraft/auth/steps/XboxUserStep.h
-    minecraft/auth/steps/YggdrasilStep.cpp
-    minecraft/auth/steps/YggdrasilStep.h
 
     minecraft/gameoptions/GameOptions.h
     minecraft/gameoptions/GameOptions.cpp
@@ -262,8 +267,6 @@ set(MINECRAFT_SOURCES
     minecraft/launch/CreateGameFolders.h
     minecraft/launch/ModMinecraftJar.cpp
     minecraft/launch/ModMinecraftJar.h
-    minecraft/launch/DirectJavaLaunch.cpp
-    minecraft/launch/DirectJavaLaunch.h
     minecraft/launch/ExtractNatives.cpp
     minecraft/launch/ExtractNatives.h
     minecraft/launch/LauncherPartLaunch.cpp
@@ -487,6 +490,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
@@ -498,6 +504,11 @@ set(FTB_SOURCES
     modplatform/legacy_ftb/PrivatePackManager.cpp
 
     modplatform/legacy_ftb/PackHelpers.h
+
+    modplatform/import_ftb/PackInstallTask.h
+    modplatform/import_ftb/PackInstallTask.cpp
+    modplatform/import_ftb/PackHelpers.h
+    modplatform/import_ftb/PackHelpers.cpp
 )
 
 set(FLAME_SOURCES
@@ -514,6 +525,8 @@ set(FLAME_SOURCES
     modplatform/flame/FlameCheckUpdate.h
     modplatform/flame/FlameInstanceCreationTask.h
     modplatform/flame/FlameInstanceCreationTask.cpp
+    modplatform/flame/FlamePackExportTask.h
+    modplatform/flame/FlamePackExportTask.cpp
 )
 
 set(MODRINTH_SOURCES
@@ -558,6 +571,9 @@ set(ATLAUNCHER_SOURCES
 )
 
 set(LINKEXE_SOURCES
+    WindowsConsole.cpp
+    WindowsConsole.h
+
     filelink/FileLink.h
     filelink/FileLink.cpp
     FileSystem.h
@@ -569,6 +585,63 @@ set(LINKEXE_SOURCES
     DesktopServices.cpp
 )
 
+set(PRISMUPDATER_SOURCES
+    updater/prismupdater/PrismUpdater.h
+    updater/prismupdater/PrismUpdater.cpp
+    updater/prismupdater/UpdaterDialogs.h
+    updater/prismupdater/UpdaterDialogs.cpp
+    updater/prismupdater/GitHubRelease.h
+    updater/prismupdater/GitHubRelease.cpp
+   
+    Json.h
+    Json.cpp
+    FileSystem.h
+    FileSystem.cpp
+    StringUtils.h
+    StringUtils.cpp
+    DesktopServices.h
+    DesktopServices.cpp
+    Version.h
+    Version.cpp
+    Markdown.h
+    Markdown.cpp
+
+    # Zip
+    MMCZip.h
+    MMCZip.cpp
+    
+    # Time
+    MMCTime.h
+    MMCTime.cpp
+
+    net/ByteArraySink.h
+    net/ChecksumValidator.h
+    net/Download.cpp
+    net/Download.h
+    net/FileSink.cpp
+    net/FileSink.h
+    net/HttpMetaCache.cpp
+    net/HttpMetaCache.h
+    net/Logging.h
+    net/Logging.cpp
+    net/NetAction.h
+    net/NetRequest.cpp
+    net/NetRequest.h
+    net/NetJob.cpp
+    net/NetJob.h
+    net/NetUtils.h
+    net/Sink.h
+    net/Validator.h
+    net/HeaderProxy.h
+    net/RawHeaderProxy.h
+
+    ui/dialogs/ProgressDialog.cpp
+    ui/dialogs/ProgressDialog.h
+    ui/widgets/SubTaskProgressBar.h
+    ui/widgets/SubTaskProgressBar.cpp
+
+)
+
 ######## Logging categories ########
 
 ecm_qt_declare_logging_category(CORE_SOURCES
@@ -663,8 +736,10 @@ set(LOGIC_SOURCES
     ${ATLAUNCHER_SOURCES}
 )
 
-if(APPLE)
+if(APPLE AND Launcher_ENABLE_UPDATER)
     set (LOGIC_SOURCES ${LOGIC_SOURCES} ${MAC_UPDATE_SOURCES})
+else()
+    set (LOGIC_SOURCES ${LOGIC_SOURCES} ${PRISM_UPDATE_SOURCES})
 endif()
 
 SET(LAUNCHER_SOURCES
@@ -754,8 +829,12 @@ SET(LAUNCHER_SOURCES
     ui/themes/ITheme.h
     ui/themes/SystemTheme.cpp
     ui/themes/SystemTheme.h
+    ui/themes/IconTheme.cpp
+    ui/themes/IconTheme.h
     ui/themes/ThemeManager.cpp
     ui/themes/ThemeManager.h
+    ui/themes/CatPack.cpp
+    ui/themes/CatPack.h
 
     # Processes
     LaunchController.h
@@ -810,6 +889,8 @@ SET(LAUNCHER_SOURCES
     ui/pages/global/AccountListPage.h
     ui/pages/global/CustomCommandsPage.cpp
     ui/pages/global/CustomCommandsPage.h
+    ui/pages/global/EnvironmentVariablesPage.cpp
+    ui/pages/global/EnvironmentVariablesPage.h
     ui/pages/global/ExternalToolsPage.cpp
     ui/pages/global/ExternalToolsPage.h
     ui/pages/global/JavaPage.cpp
@@ -865,6 +946,11 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/legacy_ftb/ListModel.h
     ui/pages/modplatform/legacy_ftb/ListModel.cpp
 
+    ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
+    ui/pages/modplatform/import_ftb/ImportFTBPage.h
+    ui/pages/modplatform/import_ftb/ListModel.h
+    ui/pages/modplatform/import_ftb/ListModel.cpp
+
     ui/pages/modplatform/flame/FlameModel.cpp
     ui/pages/modplatform/flame/FlameModel.h
     ui/pages/modplatform/flame/FlamePage.cpp
@@ -887,6 +973,9 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/ImportPage.cpp
     ui/pages/modplatform/ImportPage.h
 
+    ui/pages/modplatform/OptionalModDialog.cpp
+    ui/pages/modplatform/OptionalModDialog.h
+
     ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
     ui/pages/modplatform/modrinth/ModrinthResourceModels.h
     ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
@@ -907,14 +996,14 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/EditAccountDialog.h
     ui/dialogs/ExportInstanceDialog.cpp
     ui/dialogs/ExportInstanceDialog.h
-    ui/dialogs/ExportMrPackDialog.cpp
+    ui/dialogs/ExportPackDialog.cpp
-    ui/dialogs/ExportMrPackDialog.h
+    ui/dialogs/ExportPackDialog.h
+    ui/dialogs/ExportToModListDialog.cpp
+    ui/dialogs/ExportToModListDialog.h
     ui/dialogs/IconPickerDialog.cpp
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
     ui/dialogs/ImportResourceDialog.h
-    ui/dialogs/LoginDialog.cpp
-    ui/dialogs/LoginDialog.h
     ui/dialogs/MSALoginDialog.cpp
     ui/dialogs/MSALoginDialog.h
     ui/dialogs/OfflineLoginDialog.cpp
@@ -945,12 +1034,16 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ChooseProviderDialog.cpp
     ui/dialogs/ModUpdateDialog.cpp
     ui/dialogs/ModUpdateDialog.h
+    ui/dialogs/InstallLoaderDialog.cpp
+    ui/dialogs/InstallLoaderDialog.h
 
     # GUI - widgets
     ui/widgets/Common.cpp
     ui/widgets/Common.h
     ui/widgets/CustomCommands.cpp
     ui/widgets/CustomCommands.h
+    ui/widgets/EnvironmentVariables.cpp
+    ui/widgets/EnvironmentVariables.h
     ui/widgets/DropLabel.cpp
     ui/widgets/DropLabel.h
     ui/widgets/FocusLineEdit.cpp
@@ -1009,6 +1102,23 @@ SET(LAUNCHER_SOURCES
     ui/instanceview/VisualGroup.h
 )
 
+if (NOT Apple)
+set(LAUNCHER_SOURCES
+    ${LAUNCHER_SOURCES}
+
+    ui/dialogs/UpdateAvailableDialog.h
+    ui/dialogs/UpdateAvailableDialog.cpp
+)
+endif()
+
+if(WIN32)
+    set(LAUNCHER_SOURCES
+        WindowsConsole.cpp
+        WindowsConsole.h
+        ${LAUNCHER_SOURCES}
+    )
+endif()
+
 qt_wrap_ui(LAUNCHER_UI
     ui/MainWindow.ui
     ui/setupwizard/PasteWizardPage.ui
@@ -1037,11 +1147,14 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/modplatform/ResourcePage.ui
     ui/pages/modplatform/flame/FlamePage.ui
     ui/pages/modplatform/legacy_ftb/Page.ui
+    ui/pages/modplatform/import_ftb/ImportFTBPage.ui
     ui/pages/modplatform/ImportPage.ui
+    ui/pages/modplatform/OptionalModDialog.ui
     ui/pages/modplatform/modrinth/ModrinthPage.ui
     ui/pages/modplatform/technic/TechnicPage.ui
     ui/widgets/InstanceCardWidget.ui
     ui/widgets/CustomCommands.ui
+    ui/widgets/EnvironmentVariables.ui
     ui/widgets/InfoFrame.ui
     ui/widgets/ModFilterWidget.ui
     ui/widgets/SubTaskProgressBar.ui
@@ -1055,13 +1168,13 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/ProfileSelectDialog.ui
     ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
-    ui/dialogs/ExportMrPackDialog.ui
+    ui/dialogs/ExportPackDialog.ui
+    ui/dialogs/ExportToModListDialog.ui
     ui/dialogs/IconPickerDialog.ui
     ui/dialogs/ImportResourceDialog.ui
     ui/dialogs/MSALoginDialog.ui
     ui/dialogs/OfflineLoginDialog.ui
     ui/dialogs/AboutDialog.ui
-    ui/dialogs/LoginDialog.ui
     ui/dialogs/EditAccountDialog.ui
     ui/dialogs/ReviewMessageBox.ui
     ui/dialogs/ScrollMessageBox.ui
@@ -1069,6 +1182,14 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/ChooseProviderDialog.ui
 )
 
+qt_wrap_ui(PRISM_UPDATE_UI
+    ui/dialogs/UpdateAvailableDialog.ui
+)
+
+if (NOT Apple)
+    set (LAUNCHER_UI ${LAUNCHER_UI} ${PRISM_UPDATE_UI})
+endif()
+
 qt_add_resources(LAUNCHER_RESOURCES
     resources/backgrounds/backgrounds.qrc
     resources/multimc/multimc.qrc
@@ -1085,14 +1206,31 @@ qt_add_resources(LAUNCHER_RESOURCES
     ../${Launcher_Branding_LogoQRC}
 )
 
+qt_wrap_ui(PRISMUPDATER_UI
+    updater/prismupdater/SelectReleaseDialog.ui
+    ui/widgets/SubTaskProgressBar.ui
+    ui/dialogs/ProgressDialog.ui
+)
+
 ######## Windows resource files ########
 if(WIN32)
     set(LAUNCHER_RCS ${CMAKE_CURRENT_BINARY_DIR}/../${Launcher_Branding_WindowsRC})
 endif()
 
+include(CompilerWarnings)
+
 # Add executable
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
+if(BUILD_TESTING)
+target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_TEST)
+endif()
+set_project_warnings(Launcher_logic
+    "${Launcher_MSVC_WARNINGS}"
+    "${Launcher_CLANG_WARNINGS}"
+    "${Launcher_GCC_WARNINGS}")
+target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
 target_include_directories(Launcher_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
 target_link_libraries(Launcher_logic
     systeminfo
     Launcher_murmur2
@@ -1131,18 +1269,24 @@ if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
     set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
 
+    if(Launcher_ENABLE_UPDATER)
       file(DOWNLOAD ${MACOSX_SPARKLE_DOWNLOAD_URL} ${CMAKE_BINARY_DIR}/Sparkle.tar.xz EXPECTED_HASH SHA256=${MACOSX_SPARKLE_SHA256})
       file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
 
       find_library(SPARKLE_FRAMEWORK Sparkle "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
+      add_compile_definitions(SPARKLE_ENABLED)
+    endif()
+
     target_link_libraries(Launcher_logic
         "-framework AppKit"
         "-framework Carbon"
         "-framework Foundation"
         "-framework ApplicationServices"
     )
+    if(Launcher_ENABLE_UPDATER)
       target_link_libraries(Launcher_logic ${SPARKLE_FRAMEWORK})
     endif()
+endif()
 
 target_link_libraries(Launcher_logic)
 
@@ -1168,8 +1312,51 @@ install(TARGETS ${Launcher_Name}
     FRAMEWORK DESTINATION ${FRAMEWORK_DEST_DIR} COMPONENT Runtime
 )
 
-if(WIN32)
+if(Launcher_BUILD_UPDATER)
+    # Updater
+    add_library(prism_updater_logic STATIC ${PRISMUPDATER_SOURCES} ${TASKS_SOURCES} ${PRISMUPDATER_UI})
+    target_include_directories(prism_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_link_libraries(prism_updater_logic
+        QuaZip::QuaZip
+        ${ZLIB_LIBRARIES}
+        systeminfo
+        BuildConfig
+        ghcFilesystem::ghc_filesystem
+        Qt${QT_VERSION_MAJOR}::Widgets
+        Qt${QT_VERSION_MAJOR}::Core
+        Qt${QT_VERSION_MAJOR}::Network
+        ${Launcher_QT_LIBS}
+        cmark::cmark
+        Katabasis
+    )
+
+    add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp)
+    target_sources("${Launcher_Name}_updater" PRIVATE updater/prismupdater/updater.exe.manifest)
+    target_link_libraries("${Launcher_Name}_updater" prism_updater_logic)
+    
+    if(DEFINED Launcher_APP_BINARY_NAME)
+        set_target_properties("${Launcher_Name}_updater" PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}_updater")
+    endif()
+    if(DEFINED Launcher_BINARY_RPATH)
+        SET_TARGET_PROPERTIES("${Launcher_Name}_updater" PROPERTIES INSTALL_RPATH "${Launcher_BINARY_RPATH}")
+    endif()
+
+    install(TARGETS "${Launcher_Name}_updater"
+        BUNDLE DESTINATION "." COMPONENT Runtime
+        LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
+        RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
+        FRAMEWORK DESTINATION ${FRAMEWORK_DEST_DIR} COMPONENT Runtime
+    )
+endif()
+
+if(WIN32 OR (DEFINED Launcher_BUILD_FILELINKER AND Launcher_BUILD_FILELINKER))
+    # File link
     add_library(filelink_logic STATIC ${LINKEXE_SOURCES})
+    set_project_warnings(filelink_logic
+    "${Launcher_MSVC_WARNINGS}"
+    "${Launcher_CLANG_WARNINGS}"
+    "${Launcher_GCC_WARNINGS}")
+
     target_include_directories(filelink_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
     target_link_libraries(filelink_logic
         systeminfo
@@ -1182,7 +1369,7 @@ if(WIN32)
         ${Launcher_QT_LIBS}
     )
 
-    add_executable("${Launcher_Name}_filelink" WIN32 filelink/main.cpp)
+    add_executable("${Launcher_Name}_filelink" WIN32 filelink/filelink_main.cpp)
 
     target_sources("${Launcher_Name}_filelink" PRIVATE filelink/filelink.exe.manifest)
 
@@ -1203,7 +1390,7 @@ if(WIN32)
     )
 endif()
 
-if (UNIX AND APPLE)
+if (UNIX AND APPLE AND Launcher_ENABLE_UPDATER)
     # Add Sparkle updater
     # It has to be copied here instead of just allowing fixup_bundle to install it, otherwise essential parts of
     # the framework aren't installed

launcher/Commandline.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -41,8 +41,7 @@
  * @file libutil/src/cmdutils.cpp
  */
 
-namespace Commandline
+namespace Commandline {
-{
 
 // commandline splitter
 QStringList splitArgs(QString args)
@@ -51,19 +50,15 @@ QStringList splitArgs(QString args)
     QString current;
     bool escape = false;
     QChar inquotes;
-    for (int i = 0; i < args.length(); i++)
+    for (int i = 0; i < args.length(); i++) {
-    {
         QChar cchar = args.at(i);
 
         // \ escaped
-        if (escape)
+        if (escape) {
-        {
             current += cchar;
             escape = false;
             // in "quotes"
-        }
+        } else if (!inquotes.isNull()) {
-        else if (!inquotes.isNull())
-        {
             if (cchar == '\\')
                 escape = true;
             else if (cchar == inquotes)
@@ -71,18 +66,13 @@ QStringList splitArgs(QString args)
             else
                 current += cchar;
             // otherwise
-        }
+        } else {
-        else
+            if (cchar == ' ') {
-        {
+                if (!current.isEmpty()) {
-            if (cchar == ' ')
-            {
-                if (!current.isEmpty())
-                {
                     argv << current;
                     current.clear();
                 }
-            }
+            } else if (cchar == '"' || cchar == '\'')
-            else if (cchar == '"' || cchar == '\'')
                 inquotes = cchar;
             else
                 current += cchar;
@@ -92,4 +82,4 @@ QStringList splitArgs(QString args)
         argv << current;
     return argv;
 }
-}
+}  // namespace Commandline

launcher/Commandline.h

@@ -25,8 +25,7 @@
  * @brief commandline parsing and processing utilities
  */
 
-namespace Commandline
+namespace Commandline {
-{
 
 /**
  * @brief split a string into argv items like a shell would do
@@ -34,4 +33,4 @@ namespace Commandline
  * @return a QStringList containing all arguments
  */
 QStringList splitArgs(QString args);
-}
+}  // namespace Commandline

launcher/DefaultVariable.h

@@ -1,13 +1,9 @@
 #pragma once
 
 template <typename T>
-class DefaultVariable
+class DefaultVariable {
-{
    public:
-    DefaultVariable(const T & value)
+    DefaultVariable(const T& value) { defaultValue = value; }
-    {
-        defaultValue = value;
-    }
     DefaultVariable<T>& operator=(const T& value)
     {
         currentValue = value;
@@ -15,18 +11,10 @@ public:
         is_explicit = true;
         return *this;
     }
-    operator const T &() const
+    operator const T&() const { return is_default ? defaultValue : currentValue; }
-    {
+    bool isDefault() const { return is_default; }
-        return is_default ? defaultValue : currentValue;
+    bool isExplicit() const { return is_explicit; }
-    }
+
-    bool isDefault() const
-    {
-        return is_default;
-    }
-    bool isExplicit() const
-    {
-        return is_explicit;
-    }
    private:
     T currentValue;
     T defaultValue;

launcher/DesktopServices.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 dada513 <dada513@protonmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,40 +33,37 @@
  *      limitations under the License.
  */
 #include "DesktopServices.h"
-#include <QDir>
-#include <QDesktopServices>
-#include <QProcess>
 #include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QProcess>
 
 /**
  * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
  */
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 
-#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 template <typename T>
 bool IndirectOpen(T callable, qint64* pid_forked = nullptr)
 {
     auto pid = fork();
-    if(pid_forked)
+    if (pid_forked) {
-    {
         if (pid > 0)
             *pid_forked = pid;
         else
             *pid_forked = 0;
     }
-    if(pid == -1)
+    if (pid == -1) {
-    {
         qWarning() << "IndirectOpen failed to fork: " << errno;
         return false;
     }
     // child - do the stuff
-    if(pid == 0)
+    if (pid == 0) {
-    {
         // unset all this garbage so it doesn't get passed to the child process
         qunsetenv("LD_PRELOAD");
         qunsetenv("LD_LIBRARY_PATH");
@@ -82,19 +79,14 @@ bool IndirectOpen(T callable, qint64 *pid_forked = nullptr)
 
         // die. now. do not clean up anything, it would just hang forever.
         _exit(status ? 0 : 1);
-    }
+    } else {
-    else
-    {
         // parent - assume it worked.
         int status;
-        while (waitpid(pid, &status, 0))
+        while (waitpid(pid, &status, 0)) {
-        {
+            if (WIFEXITED(status)) {
-            if(WIFEXITED(status))
-            {
                 return WEXITSTATUS(status) == 0;
             }
-            if(WIFSIGNALED(status))
+            if (WIFSIGNALED(status)) {
-            {
                 return false;
             }
         }
@@ -104,26 +96,19 @@ bool IndirectOpen(T callable, qint64 *pid_forked = nullptr)
 #endif
 
 namespace DesktopServices {
-bool openDirectory(const QString &path, bool ensureExists)
+bool openDirectory(const QString& path, [[maybe_unused]] bool ensureExists)
 {
     qDebug() << "Opening directory" << path;
     QDir parentPath;
     QDir dir(path);
-    if (!dir.exists())
+    if (ensureExists && !dir.exists()) {
-    {
         parentPath.mkpath(dir.absolutePath());
     }
-    auto f = [&]()
+    auto f = [&]() { return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); };
-    {
-        return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
-    };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if (!isSandbox()) {
-    {
         return IndirectOpen(f);
-    }
+    } else {
-    else
-    {
         return f();
     }
 #else
@@ -134,17 +119,11 @@ bool openDirectory(const QString &path, bool ensureExists)
 bool openFile(const QString& path)
 {
     qDebug() << "Opening file" << path;
-    auto f = [&]()
+    auto f = [&]() { return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); };
-    {
-        return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-    };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if (!isSandbox()) {
-    {
         return IndirectOpen(f);
-    }
+    } else {
-    else
-    {
         return f();
     }
 #else
@@ -157,15 +136,9 @@ bool openFile(const QString &application, const QString &path, const QString &wo
     qDebug() << "Opening file" << path << "using" << application;
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-    if(!isFlatpak())
+    if (!isSandbox()) {
-    {
+        return IndirectOpen([&]() { return QProcess::startDetached(application, QStringList() << path, workingDirectory); }, pid);
-        return IndirectOpen([&]()
+    } else {
-        {
-            return QProcess::startDetached(application, QStringList() << path, workingDirectory);
-        }, pid);
-    }
-    else
-    {
         return QProcess::startDetached(application, QStringList() << path, workingDirectory, pid);
     }
 #else
@@ -177,16 +150,10 @@ bool run(const QString &application, const QStringList &args, const QString &wor
 {
     qDebug() << "Running" << application << "with args" << args.join(' ');
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if (!isSandbox()) {
-    {
         // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-    return IndirectOpen([&]()
+        return IndirectOpen([&]() { return QProcess::startDetached(application, args, workingDirectory); }, pid);
-    {
+    } else {
-        return QProcess::startDetached(application, args, workingDirectory);
-    }, pid);
-    }
-    else
-    {
         return QProcess::startDetached(application, args, workingDirectory, pid);
     }
 #else
@@ -197,17 +164,11 @@ bool run(const QString &application, const QStringList &args, const QString &wor
 bool openUrl(const QUrl& url)
 {
     qDebug() << "Opening URL" << url.toString();
-    auto f = [&]()
+    auto f = [&]() { return QDesktopServices::openUrl(url); };
-    {
-        return QDesktopServices::openUrl(url);
-    };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if (!isSandbox()) {
-    {
         return IndirectOpen(f);
-    }
+    } else {
-    else
-    {
         return f();
     }
 #else
@@ -224,4 +185,18 @@ bool isFlatpak()
 #endif
 }
 
+bool isSnap()
+{
+#ifdef Q_OS_LINUX
+    return getenv("SNAP");
+#else
+    return false;
+#endif
 }
+
+bool isSandbox()
+{
+    return isSnap() || isFlatpak();
+}
+
+}  // namespace DesktopServices

launcher/DesktopServices.h

@@ -1,14 +1,13 @@
 #pragma once
 
-#include <QUrl>
 #include <QString>
+#include <QUrl>
 
 /**
  * This wraps around QDesktopServices and adds workarounds where needed
  * Use this instead of QDesktopServices!
  */
-namespace DesktopServices
+namespace DesktopServices {
-{
 /**
  * Open a file in whatever application is applicable
  */
@@ -34,5 +33,18 @@ namespace DesktopServices
  */
 bool openUrl(const QUrl& url);
 
+/**
+ * Determine whether the launcher is running in a Flatpak environment
+ */
 bool isFlatpak();
-}
+
+/**
+ * Determine whether the launcher is running in a Snap environment
+ */
+bool isSnap();
+
+/**
+ * Determine whether the launcher is running in a sandboxed (Flatpak or Snap) environment
+ */
+bool isSandbox();
+}  // namespace DesktopServices

launcher/Exception.h

@@ -2,30 +2,17 @@
 
 #pragma once
 
-#include <QString>
 #include <QDebug>
+#include <QString>
 #include <exception>
 
-class Exception : public std::exception
+class Exception : public std::exception {
-{
    public:
-    Exception(const QString &message) : std::exception(), m_message(message)
+    Exception(const QString& message) : std::exception(), m_message(message) { qCritical() << "Exception:" << message; }
-    {
+    Exception(const Exception& other) : std::exception(), m_message(other.cause()) {}
-        qCritical() << "Exception:" << message;
-    }
-    Exception(const Exception &other)
-        : std::exception(), m_message(other.cause())
-    {
-    }
     virtual ~Exception() noexcept {}
-    const char *what() const noexcept
+    const char* what() const noexcept { return m_message.toLatin1().constData(); }
-    {
+    QString cause() const { return m_message; }
-        return m_message.toLatin1().constData();
-    }
-    QString cause() const
-    {
-        return m_message;
-    }
 
    private:
     QString m_message;

launcher/ExponentialSeries.h

@@ -4,20 +4,16 @@
 template <typename T>
 inline void clamp(T& current, T min, T max)
 {
-    if (current < min)
+    if (current < min) {
-    {
         current = min;
-    }
+    } else if (current > max) {
-    else if(current > max)
-    {
         current = max;
     }
 }
 
 // List of numbers from min to max. Next is exponent times bigger than previous.
 
-class ExponentialSeries
+class ExponentialSeries {
-{
    public:
     ExponentialSeries(unsigned min, unsigned max, unsigned exponent = 2)
     {
@@ -25,10 +21,7 @@ public:
         m_max = max;
         m_exponent = exponent;
     }
-    void reset()
+    void reset() { m_current = m_min; }
-    {
-        m_current = m_min;
-    }
     unsigned operator()()
     {
         unsigned retval = m_current;

launcher/FileIgnoreProxy.cpp

@@ -267,10 +267,7 @@ bool FileIgnoreProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceP
 
 bool FileIgnoreProxy::ignoreFile(QFileInfo fileInfo) const
 {
-    auto fileName = fileInfo.fileName();
+    return m_ignoreFiles.contains(fileInfo.fileName()) || m_ignoreFilePaths.covers(relPath(fileInfo.absoluteFilePath()));
-    auto path = relPath(fileInfo.absoluteFilePath());
-    return std::any_of(m_ignoreFiles.cbegin(), m_ignoreFiles.cend(), [fileName](auto iFileName) { return fileName == iFileName; }) ||
-           m_ignoreFilePaths.covers(path);
 }
 
 bool FileIgnoreProxy::filterFile(const QString& fileName) const

launcher/FileSystem.cpp

@@ -123,26 +123,35 @@ namespace fs = ghc::filesystem;
 
 #if defined(__MINGW32__)
 
-typedef struct _DUPLICATE_EXTENTS_DATA {
+struct _DUPLICATE_EXTENTS_DATA {
     HANDLE FileHandle;
     LARGE_INTEGER SourceFileOffset;
     LARGE_INTEGER TargetFileOffset;
     LARGE_INTEGER ByteCount;
-} DUPLICATE_EXTENTS_DATA, *PDUPLICATE_EXTENTS_DATA;
+};
 
-typedef struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {
+using DUPLICATE_EXTENTS_DATA = _DUPLICATE_EXTENTS_DATA;
+using PDUPLICATE_EXTENTS_DATA = _DUPLICATE_EXTENTS_DATA*;
+
+struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {
     WORD ChecksumAlgorithm;  // Checksum algorithm. e.g. CHECKSUM_TYPE_UNCHANGED, CHECKSUM_TYPE_NONE, CHECKSUM_TYPE_CRC32
     WORD Reserved;           // Must be 0
     DWORD Flags;             // FSCTL_INTEGRITY_FLAG_xxx
     DWORD ChecksumChunkSizeInBytes;
     DWORD ClusterSizeInBytes;
-} FSCTL_GET_INTEGRITY_INFORMATION_BUFFER, *PFSCTL_GET_INTEGRITY_INFORMATION_BUFFER;
+};
 
-typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER {
+using FSCTL_GET_INTEGRITY_INFORMATION_BUFFER = _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER;
+using PFSCTL_GET_INTEGRITY_INFORMATION_BUFFER = _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER*;
+
+struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER {
     WORD ChecksumAlgorithm;  // Checksum algorithm. e.g. CHECKSUM_TYPE_UNCHANGED, CHECKSUM_TYPE_NONE, CHECKSUM_TYPE_CRC32
     WORD Reserved;           // Must be 0
     DWORD Flags;             // FSCTL_INTEGRITY_FLAG_xxx
-} FSCTL_SET_INTEGRITY_INFORMATION_BUFFER, *PFSCTL_SET_INTEGRITY_INFORMATION_BUFFER;
+};
+
+using FSCTL_SET_INTEGRITY_INFORMATION_BUFFER = _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER;
+using PFSCTL_SET_INTEGRITY_INFORMATION_BUFFER = _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER*;
 
 #endif
 
@@ -194,6 +203,40 @@ void write(const QString& filename, const QByteArray& data)
     }
 }
 
+void appendSafe(const QString& filename, const QByteArray& data)
+{
+    ensureExists(QFileInfo(filename).dir());
+    QByteArray buffer;
+    try {
+        buffer = read(filename);
+    } catch (FileSystemException&) {
+        buffer = QByteArray();
+    }
+    buffer.append(data);
+    QSaveFile file(filename);
+    if (!file.open(QSaveFile::WriteOnly)) {
+        throw FileSystemException("Couldn't open " + filename + " for writing: " + file.errorString());
+    }
+    if (buffer.size() != file.write(buffer)) {
+        throw FileSystemException("Error writing data to " + filename + ": " + file.errorString());
+    }
+    if (!file.commit()) {
+        throw FileSystemException("Error while committing data to " + filename + ": " + file.errorString());
+    }
+}
+
+void append(const QString& filename, const QByteArray& data)
+{
+    ensureExists(QFileInfo(filename).dir());
+    QFile file(filename);
+    if (!file.open(QFile::Append)) {
+        throw FileSystemException("Couldn't open " + filename + " for writing: " + file.errorString());
+    }
+    if (data.size() != file.write(data)) {
+        throw FileSystemException("Error writing data to " + filename + ": " + file.errorString());
+    }
+}
+
 QByteArray read(const QString& filename)
 {
     QFile file(filename);
@@ -238,6 +281,28 @@ bool ensureFolderPathExists(QString foldernamepath)
     return success;
 }
 
+bool copyFileAttributes(QString src, QString dst)
+{
+#ifdef Q_OS_WIN32
+    auto attrs = GetFileAttributesW(src.toStdWString().c_str());
+    if (attrs == INVALID_FILE_ATTRIBUTES)
+        return false;
+    return SetFileAttributesW(dst.toStdWString().c_str(), attrs);
+#endif
+    return true;
+}
+
+// needs folders to exists
+void copyFolderAttributes(QString src, QString dst, QString relative)
+{
+    auto path = PathCombine(src, relative);
+    QDir dsrc(src);
+    while ((path = QFileInfo(path).path()).length() >= src.length()) {
+        auto dst_path = PathCombine(dst, dsrc.relativeFilePath(path));
+        copyFileAttributes(path, dst_path);
+    }
+}
+
 /**
  * @brief Copies a directory and it's contents from src to dest
  * @param offset subdirectory form src to copy to dest
@@ -265,6 +330,9 @@ bool copy::operator()(const QString& offset, bool dryRun)
     if (!m_followSymlinks)
         opt |= copy_opts::copy_symlinks;
 
+    if (m_overwrite)
+        opt |= copy_opts::overwrite_existing;
+
     // Function that'll do the actual copying
     auto copy_file = [&](QString src_path, QString relative_dst_path) {
         if (m_matcher && (m_matcher->matches(relative_dst_path) != m_whitelist))
@@ -273,6 +341,9 @@ bool copy::operator()(const QString& offset, bool dryRun)
         auto dst_path = PathCombine(dst, relative_dst_path);
         if (!dryRun) {
             ensureFilePathExists(dst_path);
+#ifdef Q_OS_WIN32
+            copyFolderAttributes(src, dst, relative_dst_path);
+#endif
             fs::copy(StringUtils::toStdString(src_path), StringUtils::toStdString(dst_path), opt, err);
         }
         if (err) {
@@ -778,9 +849,44 @@ 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 +903,30 @@ 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/FileSystem.h

@@ -43,10 +43,10 @@
 #include <system_error>
 
 #include <QDir>
-#include <QPair>
 #include <QFlags>
 #include <QLocalServer>
 #include <QObject>
+#include <QPair>
 #include <QThread>
 
 namespace FS {
@@ -61,6 +61,16 @@ class FileSystemException : public ::Exception {
  */
 void write(const QString& filename, const QByteArray& data);
 
+/**
+ * append data to a file safely
+ */
+void appendSafe(const QString& filename, const QByteArray& data);
+
+/**
+ * append data to a file
+ */
+void append(const QString& filename, const QByteArray& data);
+
 /**
  * read data from a file safely\
  */
@@ -109,11 +119,16 @@ class copy : public QObject {
         m_whitelist = whitelist;
         return *this;
     }
+    copy& overwrite(const bool overwrite)
+    {
+        m_overwrite = overwrite;
+        return *this;
+    }
 
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
-    int totalCopied() { return m_copied; }
+    qsizetype totalCopied() { return m_copied; }
-    int totalFailed() { return m_failedPaths.length(); }
+    qsizetype totalFailed() { return m_failedPaths.length(); }
     QStringList failed() { return m_failedPaths; }
 
    signals:
@@ -128,9 +143,10 @@ class copy : public QObject {
     bool m_followSymlinks = true;
     const IPathMatcher* m_matcher = nullptr;
     bool m_whitelist = false;
+    bool m_overwrite = false;
     QDir m_src;
     QDir m_dst;
-    int m_copied;
+    qsizetype m_copied;
     QStringList m_failedPaths;
 };
 
@@ -365,12 +381,12 @@ enum class FilesystemType {
  * QMap is ordered
  *
  */
-static const QMap<FilesystemType, QStringList> s_filesystem_type_names = {
+static const QMap<FilesystemType, QStringList> s_filesystem_type_names = { { FilesystemType::FAT, { "FAT" } },
-    {FilesystemType::FAT,        { "FAT" }},
                                                                            { FilesystemType::NTFS, { "NTFS" } },
                                                                            { FilesystemType::REFS, { "REFS" } },
                                                                            { FilesystemType::EXT_2_OLD, { "EXT_2_OLD", "EXT2_OLD" } },
-    {FilesystemType::EXT_2_3_4,  { "EXT2/3/4", "EXT_2_3_4", "EXT2", "EXT3", "EXT4" }},
+                                                                           { FilesystemType::EXT_2_3_4,
+                                                                             { "EXT2/3/4", "EXT_2_3_4", "EXT2", "EXT3", "EXT4" } },
                                                                            { FilesystemType::EXT, { "EXT" } },
                                                                            { FilesystemType::XFS, { "XFS" } },
                                                                            { FilesystemType::BTRFS, { "BTRFS" } },
@@ -382,8 +398,7 @@ static const QMap<FilesystemType, QStringList> s_filesystem_type_names = {
                                                                            { FilesystemType::HFSX, { "HFSX" } },
                                                                            { FilesystemType::FUSEBLK, { "FUSEBLK" } },
                                                                            { FilesystemType::F2FS, { "F2FS" } },
-    {FilesystemType::UNKNOWN,    { "UNKNOWN" }}
+                                                                           { FilesystemType::UNKNOWN, { "UNKNOWN" } } };
-};
 
 /**
  * @brief Get the string name of Filesystem enum object
@@ -475,8 +490,8 @@ class clone : public QObject {
 
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
-    int totalCloned() { return m_cloned; }
+    qsizetype totalCloned() { return m_cloned; }
-    int totalFailed() { return m_failedClones.length(); }
+    qsizetype totalFailed() { return m_failedClones.length(); }
 
     QList<QPair<QString, QString>> failed() { return m_failedClones; }
 
@@ -492,7 +507,7 @@ class clone : public QObject {
     bool m_whitelist = false;
     QDir m_src;
     QDir m_dst;
-    int m_cloned;
+    qsizetype m_cloned;
     QList<QPair<QString, QString>> m_failedClones;
 };
 

launcher/Filter.cpp

@@ -16,8 +16,13 @@ bool ExactFilter::accepts(const QString& value)
     return value == pattern;
 }
 
-RegexpFilter::RegexpFilter(const QString& regexp, bool invert)
+ExactIfPresentFilter::ExactIfPresentFilter(const QString& pattern) : pattern(pattern) {}
-    :invert(invert)
+bool ExactIfPresentFilter::accepts(const QString& value)
+{
+    return value.isEmpty() || value == pattern;
+}
+
+RegexpFilter::RegexpFilter(const QString& regexp, bool invert) : invert(invert)
 {
     pattern.setPattern(regexp);
     pattern.optimize();

launcher/Filter.h

@@ -1,41 +1,50 @@
 #pragma once
 
-#include <QString>
 #include <QRegularExpression>
+#include <QString>
 
-class Filter
+class Filter {
-{
    public:
     virtual ~Filter();
     virtual bool accepts(const QString& value) = 0;
 };
 
-class ContainsFilter: public Filter
+class ContainsFilter : public Filter {
-{
    public:
     ContainsFilter(const QString& pattern);
     virtual ~ContainsFilter();
     bool accepts(const QString& value) override;
+
    private:
     QString pattern;
 };
 
-class ExactFilter: public Filter
+class ExactFilter : public Filter {
-{
    public:
     ExactFilter(const QString& pattern);
     virtual ~ExactFilter();
     bool accepts(const QString& value) override;
+
    private:
     QString pattern;
 };
 
-class RegexpFilter: public Filter
+class ExactIfPresentFilter : public Filter {
-{
+   public:
+    ExactIfPresentFilter(const QString& pattern);
+    ~ExactIfPresentFilter() override = default;
+    bool accepts(const QString& value) override;
+
+   private:
+    QString pattern;
+};
+
+class RegexpFilter : public Filter {
    public:
     RegexpFilter(const QString& regexp, bool invert);
     virtual ~RegexpFilter();
     bool accepts(const QString& value) override;
+
    private:
     QRegularExpression pattern;
     bool invert = false;

launcher/GZip.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -39,8 +39,7 @@
 
 bool GZip::unzip(const QByteArray& compressedBytes, QByteArray& uncompressedBytes)
 {
-    if (compressedBytes.size() == 0)
+    if (compressedBytes.size() == 0) {
-    {
         uncompressedBytes = compressedBytes;
         return true;
     }
@@ -56,18 +55,15 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte
 
     bool done = false;
 
-    if (inflateInit2(&strm, (16 + MAX_WBITS)) != Z_OK)
+    if (inflateInit2(&strm, (16 + MAX_WBITS)) != Z_OK) {
-    {
         return false;
     }
 
     int err = Z_OK;
 
-    while (!done)
+    while (!done) {
-    {
         // If our output buffer is too small
-        if (strm.total_out >= uncompLength)
+        if (strm.total_out >= uncompLength) {
-        {
             uncompressedBytes.resize(uncompLength * 2);
             uncompLength *= 2;
         }
@@ -79,14 +75,12 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte
         err = inflate(&strm, Z_SYNC_FLUSH);
         if (err == Z_STREAM_END)
             done = true;
-        else if (err != Z_OK)
+        else if (err != Z_OK) {
-        {
             break;
         }
     }
 
-    if (inflateEnd(&strm) != Z_OK || !done)
+    if (inflateEnd(&strm) != Z_OK || !done) {
-    {
         return false;
     }
 
@@ -96,8 +90,7 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte
 
 bool GZip::zip(const QByteArray& uncompressedBytes, QByteArray& compressedBytes)
 {
-    if (uncompressedBytes.size() == 0)
+    if (uncompressedBytes.size() == 0) {
-    {
         compressedBytes = uncompressedBytes;
         return true;
     }
@@ -109,8 +102,7 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
     z_stream zs;
     memset(&zs, 0, sizeof(zs));
 
-    if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (16 + MAX_WBITS), 8, Z_DEFAULT_STRATEGY) != Z_OK)
+    if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (16 + MAX_WBITS), 8, Z_DEFAULT_STRATEGY) != Z_OK) {
-    {
         return false;
     }
 
@@ -122,11 +114,9 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
 
     unsigned offset = 0;
     unsigned temp = 0;
-    do
+    do {
-    {
         auto remaining = compressedBytes.size() - offset;
-        if(remaining < 1)
+        if (remaining < 1) {
-        {
             compressedBytes.resize(compressedBytes.size() * 2);
         }
         zs.next_out = reinterpret_cast<Bytef*>((compressedBytes.data() + offset));
@@ -137,13 +127,11 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
 
     compressedBytes.resize(offset);
 
-    if (deflateEnd(&zs) != Z_OK)
+    if (deflateEnd(&zs) != Z_OK) {
-    {
         return false;
     }
 
-    if (ret != Z_STREAM_END)
+    if (ret != Z_STREAM_END) {
-    {
         return false;
     }
     return true;

launcher/GZip.h

@@ -1,10 +1,8 @@
 #pragma once
 #include <QByteArray>
 
-class GZip
+class GZip {
-{
    public:
     static bool unzip(const QByteArray& compressedBytes, QByteArray& uncompressedBytes);
     static bool zip(const QByteArray& uncompressedBytes, QByteArray& compressedBytes);
 };
-

launcher/InstanceCopyPrefs.cpp

@@ -6,17 +6,10 @@
 
 bool InstanceCopyPrefs::allTrue() const
 {
-    return copySaves &&
+    return copySaves && keepPlaytime && copyGameOptions && copyResourcePacks && copyShaderPacks && copyServers && copyMods &&
-        keepPlaytime &&
-        copyGameOptions &&
-        copyResourcePacks &&
-        copyShaderPacks &&
-        copyServers &&
-        copyMods &&
            copyScreenshots;
 }
 
-
 // Returns a single RegEx string of the selected folders/files to filter out (ex: ".minecraft/saves|.minecraft/server.dat")
 QString InstanceCopyPrefs::getSelectedFiltersAsRegex() const
 {
@@ -33,16 +26,21 @@ QString InstanceCopyPrefs::getSelectedFiltersAsRegex(const QStringList& addition
         filters << "options.txt";
 
     if (!copyResourcePacks)
-        filters << "resourcepacks" << "texturepacks";
+        filters << "resourcepacks"
+                << "texturepacks";
 
     if (!copyShaderPacks)
         filters << "shaderpacks";
 
     if (!copyServers)
-        filters << "servers.dat" << "servers.dat_old" << "server-resource-packs";
+        filters << "servers.dat"
+                << "servers.dat_old"
+                << "server-resource-packs";
 
     if (!copyMods)
-        filters << "coremods" << "mods" << "config";
+        filters << "coremods"
+                << "mods"
+                << "config";
 
     if (!copyScreenshots)
         filters << "screenshots";

launcher/InstanceCopyTask.cpp

@@ -156,7 +156,8 @@ void InstanceCopyTask::copyFinished()
         allowed_symlinks.append(m_origInstance->gameRoot().toUtf8());
         allowed_symlinks.append("\n");
         if (allowed_symlinks_file.isSymLink())
-            FS::deletePath(allowed_symlinks_file
+            FS::deletePath(
+                allowed_symlinks_file
                     .filePath());  // we dont want to modify the original. also make sure the resulting file is not itself a link.
 
         FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);

launcher/InstanceCopyTask.h

@@ -11,8 +11,7 @@
 #include "settings/SettingsObject.h"
 #include "tasks/Task.h"
 
-class InstanceCopyTask : public InstanceTask
+class InstanceCopyTask : public InstanceTask {
-{
     Q_OBJECT
    public:
     explicit InstanceCopyTask(InstancePtr origInstance, const InstanceCopyPrefs& prefs);

launcher/InstanceImportTask.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
@@ -45,11 +45,14 @@
 #include "icons/IconList.h"
 #include "icons/IconUtils.h"
 
-#include "modplatform/technic/TechnicPackProcessor.h"
-#include "modplatform/modrinth/ModrinthInstanceCreationTask.h"
 #include "modplatform/flame/FlameInstanceCreationTask.h"
+#include "modplatform/modrinth/ModrinthInstanceCreationTask.h"
+#include "modplatform/technic/TechnicPackProcessor.h"
 
 #include "settings/INISettingsObject.h"
+#include "tasks/Task.h"
+
+#include "net/ApiDownload.h"
 
 #include <QtConcurrentRun>
 #include <algorithm>
@@ -88,24 +91,26 @@ void InstanceImportTask::executeTask()
         setStatus(tr("Downloading modpack:\n%1").arg(m_sourceUrl.toString()));
         m_downloadRequired = true;
 
-        const QString path(m_sourceUrl.host() + '/' + m_sourceUrl.path());
+        downloadFromUrl();
+    }
+}
 
+void InstanceImportTask::downloadFromUrl()
+{
+    const QString path = m_sourceUrl.host() + '/' + m_sourceUrl.path();
     auto entry = APPLICATION->metacache()->resolveEntry("general", path);
     entry->setStale(true);
-        m_archivePath = entry->getFullPath();
-
     m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
-        m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
+    m_archivePath = entry->getFullPath();
 
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
-        connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propagateStepProgress);
     connect(m_filesNetJob.get(), &NetJob::failed, this, &InstanceImportTask::downloadFailed);
     connect(m_filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::downloadAborted);
-
     m_filesNetJob->start();
 }
-}
 
 void InstanceImportTask::downloadSucceeded()
 {
@@ -138,8 +143,7 @@ void InstanceImportTask::processZipPack()
 
     // open the zip and find relevant files in it
     m_packZip.reset(new QuaZip(m_archivePath));
-    if (!m_packZip->open(QuaZip::mdUnzip))
+    if (!m_packZip->open(QuaZip::mdUnzip)) {
-    {
         emitFailed(tr("Unable to open supplied modpack zip file."));
         return;
     }
@@ -153,22 +157,17 @@ void InstanceImportTask::processZipPack()
 
     // NOTE: Prioritize modpack platforms that aren't searched for recursively.
     // Especially Flame has a very common filename for its manifest, which may appear inside overrides for example
-    if(modrinthFound)
+    if (modrinthFound) {
-    {
         // process as Modrinth pack
         qDebug() << "Modrinth:" << modrinthFound;
         m_modpackType = ModpackType::Modrinth;
-    }
+    } else if (technicFound) {
-    else if (technicFound)
-    {
         // process as Technic pack
         qDebug() << "Technic:" << technicFound;
         extractDir.mkpath(".minecraft");
         extractDir.cd(".minecraft");
         m_modpackType = ModpackType::Technic;
-    }
+    } else {
-    else
-    {
         QStringList paths_to_ignore{ "overrides/" };
 
         if (QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg", paths_to_ignore); !mmcRoot.isNull()) {
@@ -176,21 +175,22 @@ void InstanceImportTask::processZipPack()
             qDebug() << "MultiMC:" << mmcRoot;
             root = mmcRoot;
             m_modpackType = ModpackType::MultiMC;
-        } else if (QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json", paths_to_ignore); !flameRoot.isNull()) {
+        } else if (QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json", paths_to_ignore);
+                   !flameRoot.isNull()) {
             // process as Flame pack
             qDebug() << "Flame:" << flameRoot;
             root = flameRoot;
             m_modpackType = ModpackType::Flame;
         }
     }
-    if(m_modpackType == ModpackType::Unknown)
+    if (m_modpackType == ModpackType::Unknown) {
-    {
         emitFailed(tr("Archive does not contain a recognized modpack type."));
         return;
     }
 
     // make sure we extract just the pack
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
+    m_extractFuture =
+        QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &InstanceImportTask::extractFinished);
     m_extractFutureWatcher.setFuture(m_extractFuture);
 }
@@ -210,37 +210,28 @@ void InstanceImportTask::extractFinished()
 
     qDebug() << "Fixing permissions for extracted pack files...";
     QDirIterator it(extractDir, QDirIterator::Subdirectories);
-    while (it.hasNext())
+    while (it.hasNext()) {
-    {
         auto filepath = it.next();
         QFileInfo file(filepath);
         auto permissions = QFile::permissions(filepath);
         auto origPermissions = permissions;
-        if(file.isDir())
+        if (file.isDir()) {
-        {
             // Folder +rwx for current user
             permissions |= QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser;
-        }
+        } else {
-        else
-        {
             // File +rw for current user
             permissions |= QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser;
         }
-        if(origPermissions != permissions)
+        if (origPermissions != permissions) {
-        {
+            if (!QFile::setPermissions(filepath, permissions)) {
-            if(!QFile::setPermissions(filepath, permissions))
-            {
                 logWarning(tr("Could not fix permissions for %1").arg(filepath));
-            }
+            } else {
-            else
-            {
                 qDebug() << "Fixed" << filepath;
             }
         }
     }
 
-    switch(m_modpackType)
+    switch (m_modpackType) {
-    {
         case ModpackType::MultiMC:
             processMultiMC();
             return;
@@ -276,7 +267,8 @@ void InstanceImportTask::processFlame()
         if (original_instance_id_it != m_extra_info.constEnd())
             original_instance_id = original_instance_id_it.value();
 
-        inst_creation_task = makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+        inst_creation_task =
+            makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
     } else {
         // FIXME: Find a way to get IDs in directly imported ZIPs
         inst_creation_task = makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, QString(), QString());
@@ -293,7 +285,7 @@ void InstanceImportTask::processFlame()
     });
     connect(inst_creation_task.get(), &Task::failed, this, &InstanceImportTask::emitFailed);
     connect(inst_creation_task.get(), &Task::progress, this, &InstanceImportTask::setProgress);
-    connect(inst_creation_task.get(), &Task::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(inst_creation_task.get(), &Task::stepProgress, this, &InstanceImportTask::propagateStepProgress);
     connect(inst_creation_task.get(), &Task::status, this, &InstanceImportTask::setStatus);
     connect(inst_creation_task.get(), &Task::details, this, &InstanceImportTask::setDetails);
 
@@ -362,7 +354,8 @@ void InstanceImportTask::processModrinth()
         if (original_instance_id_it != m_extra_info.constEnd())
             original_instance_id = original_instance_id_it.value();
 
-        inst_creation_task = new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+        inst_creation_task =
+            new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
     } else {
         QString pack_id;
         if (!m_sourceUrl.isEmpty()) {
@@ -385,7 +378,7 @@ void InstanceImportTask::processModrinth()
     });
     connect(inst_creation_task, &Task::failed, this, &InstanceImportTask::emitFailed);
     connect(inst_creation_task, &Task::progress, this, &InstanceImportTask::setProgress);
-    connect(inst_creation_task, &Task::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(inst_creation_task, &Task::stepProgress, this, &InstanceImportTask::propagateStepProgress);
     connect(inst_creation_task, &Task::status, this, &InstanceImportTask::setStatus);
     connect(inst_creation_task, &Task::details, this, &InstanceImportTask::setDetails);
     connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);

launcher/InstanceImportTask.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,34 +35,29 @@
 
 #pragma once
 
-#include "InstanceTask.h"
-#include "net/NetJob.h"
-#include <QUrl>
 #include <QFuture>
 #include <QFutureWatcher>
-#include "settings/SettingsObject.h"
+#include <QUrl>
+#include "InstanceTask.h"
 #include "QObjectPtr.h"
 #include "modplatform/flame/PackManifest.h"
+#include "net/NetJob.h"
+#include "settings/SettingsObject.h"
 
 #include <optional>
 
 class QuaZip;
-namespace Flame
+namespace Flame {
-{
 class FileResolvingTask;
 }
 
-class InstanceImportTask : public InstanceTask
+class InstanceImportTask : public InstanceTask {
-{
     Q_OBJECT
    public:
     explicit InstanceImportTask(const QUrl sourceUrl, QWidget* parent = nullptr, QMap<QString, QString>&& extra_info = {});
 
     bool abort() override;
-    const QVector<Flame::File> &getBlockedFiles() const
+    const QVector<Flame::File>& getBlockedFiles() const { return m_blockedMods; }
-    {
-        return m_blockedMods;
-    }
 
    protected:
     //! Entry point for tasks.
@@ -106,4 +101,5 @@ private: /* data */
 
     // FIXME: nuke
     QWidget* m_parent;
+    void downloadFromUrl();
 };

launcher/InstanceList.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 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -41,9 +42,9 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QMimeData>
+#include <QPair>
 #include <QSet>
 #include <QStack>
-#include <QPair>
 #include <QTextStream>
 #include <QThread>
 #include <QTimer>
@@ -96,7 +97,11 @@ Qt::DropActions InstanceList::supportedDropActions() const
     return Qt::MoveAction;
 }
 
-bool InstanceList::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+bool InstanceList::canDropMimeData(const QMimeData* data,
+                                   [[maybe_unused]] Qt::DropAction action,
+                                   [[maybe_unused]] int row,
+                                   [[maybe_unused]] int column,
+                                   [[maybe_unused]] const QModelIndex& parent) const
 {
     if (data && data->hasFormat("application/x-instanceid")) {
         return true;
@@ -104,7 +109,11 @@ bool InstanceList::canDropMimeData(const QMimeData* data, Qt::DropAction action,
     return false;
 }
 
-bool InstanceList::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+bool InstanceList::dropMimeData(const QMimeData* data,
+                                [[maybe_unused]] Qt::DropAction action,
+                                [[maybe_unused]] int row,
+                                [[maybe_unused]] int column,
+                                [[maybe_unused]] const QModelIndex& parent)
 {
     if (data && data->hasFormat("application/x-instanceid")) {
         return true;
@@ -159,37 +168,29 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const
         return QVariant();
     }
     BaseInstance* pdata = static_cast<BaseInstance*>(index.internalPointer());
-    switch (role)
+    switch (role) {
-    {
+        case InstancePointerRole: {
-    case InstancePointerRole:
-    {
             QVariant v = QVariant::fromValue((void*)pdata);
             return v;
         }
-    case InstanceIDRole:
+        case InstanceIDRole: {
-    {
             return pdata->id();
         }
         case Qt::EditRole:
-    case Qt::DisplayRole:
+        case Qt::DisplayRole: {
-    {
             return pdata->name();
         }
-    case Qt::AccessibleTextRole:
+        case Qt::AccessibleTextRole: {
-    {
             return tr("%1 Instance").arg(pdata->name());
         }
-    case Qt::ToolTipRole:
+        case Qt::ToolTipRole: {
-    {
             return pdata->instanceRoot();
         }
-    case Qt::DecorationRole:
+        case Qt::DecorationRole: {
-    {
             return pdata->iconKey();
         }
         // HACK: see InstanceView.h in gui!
-    case GroupRole:
+        case GroupRole: {
-    {
             return getInstanceGroup(pdata->id());
         }
         default:
@@ -237,8 +238,11 @@ GroupId InstanceList::getInstanceGroup(const InstanceId& id) const
     return GroupId();
 }
 
-void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
+void InstanceList::setInstanceGroup(const InstanceId& id, GroupId name)
 {
+    if (name.isEmpty() && !name.isNull())
+        name = QString();
+
     auto inst = getInstanceById(id);
     if (!inst) {
         qDebug() << "Attempt to set a null instance's group";
@@ -249,6 +253,7 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
     auto iter = m_instanceGroupIndex.find(inst->id());
     if (iter != m_instanceGroupIndex.end()) {
         if (*iter != name) {
+            decreaseGroupCount(*iter);
             *iter = name;
             changed = true;
         }
@@ -258,7 +263,7 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
     }
 
     if (changed) {
-        m_groupNameCache.insert(name);
+        increaseGroupCount(name);
         auto idx = getInstIndex(inst.get());
         emit dataChanged(index(idx), index(idx), { GroupRole });
         saveGroupList();
@@ -267,29 +272,55 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
 
 QStringList InstanceList::getGroups()
 {
-    return m_groupNameCache.values();
+    return m_groupNameCache.keys();
 }
 
-void InstanceList::deleteGroup(const QString& name)
+void InstanceList::deleteGroup(const GroupId& name)
 {
+    m_groupNameCache.remove(name);
+    m_collapsedGroups.remove(name);
+
     bool removed = false;
     qDebug() << "Delete group" << name;
     for (auto& instance : m_instances) {
-        const auto& instID = instance->id();
+        const QString& instID = instance->id();
-        auto instGroupName = getInstanceGroup(instID);
+        const QString instGroupName = getInstanceGroup(instID);
         if (instGroupName == name) {
             m_instanceGroupIndex.remove(instID);
             qDebug() << "Remove" << instID << "from group" << name;
             removed = true;
             auto idx = getInstIndex(instance.get());
-            if (idx > 0) {
+            if (idx >= 0)
                 emit dataChanged(index(idx), index(idx), { GroupRole });
         }
     }
-    }
+    if (removed)
-    if (removed) {
         saveGroupList();
 }
+
+void InstanceList::renameGroup(const QString& src, const QString& dst)
+{
+    m_groupNameCache.remove(src);
+    if (m_collapsedGroups.remove(src))
+        m_collapsedGroups.insert(dst);
+
+    bool modified = false;
+    qDebug() << "Rename group" << src << "to" << dst;
+    for (auto& instance : m_instances) {
+        const QString& instID = instance->id();
+        const QString instGroupName = getInstanceGroup(instID);
+        if (instGroupName == src) {
+            m_instanceGroupIndex[instID] = dst;
+            increaseGroupCount(dst);
+            qDebug() << "Set" << instID << "group to" << dst;
+            modified = true;
+            auto idx = getInstIndex(instance.get());
+            if (idx >= 0)
+                emit dataChanged(index(idx), index(idx), { GroupRole });
+        }
+    }
+    if (modified)
+        saveGroupList();
 }
 
 bool InstanceList::isGroupCollapsed(const QString& group)
@@ -305,12 +336,13 @@ bool InstanceList::trashInstance(const InstanceId& id)
         return false;
     }
 
-    auto cachedGroupId = m_instanceGroupIndex[id];
+    QString cachedGroupId = m_instanceGroupIndex[id];
 
     qDebug() << "Will trash instance" << id;
     QString trashedLoc;
 
     if (m_instanceGroupIndex.remove(id)) {
+        decreaseGroupCount(cachedGroupId);
         saveGroupList();
     }
 
@@ -325,11 +357,13 @@ bool InstanceList::trashInstance(const InstanceId& id)
     return true;
 }
 
-bool InstanceList::trashedSomething() {
+bool InstanceList::trashedSomething()
+{
     return !m_trashHistory.empty();
 }
 
-void InstanceList::undoTrashInstance() {
+void InstanceList::undoTrashInstance()
+{
     if (m_trashHistory.empty()) {
         qWarning() << "Nothing to recover from trash.";
         return;
@@ -346,7 +380,7 @@ void InstanceList::undoTrashInstance() {
     QFile(top.trashPath).rename(top.polyPath);
 
     m_instanceGroupIndex[top.id] = top.groupName;
-    m_groupNameCache.insert(top.groupName);
+    increaseGroupCount(top.groupName);
 
     saveGroupList();
     emit instancesChanged();
@@ -360,7 +394,10 @@ void InstanceList::deleteInstance(const InstanceId& id)
         return;
     }
 
+    QString cachedGroupId = m_instanceGroupIndex[id];
+
     if (m_instanceGroupIndex.remove(id)) {
+        decreaseGroupCount(cachedGroupId);
         saveGroupList();
     }
 
@@ -597,19 +634,36 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id)
 
     QString inst_type = instanceSettings->get("InstanceType").toString();
 
-    // NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix instance
+    // NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix
-    if (inst_type == "OneSix" || inst_type.isEmpty())
+    // instance
-    {
+    if (inst_type == "OneSix" || inst_type.isEmpty()) {
         inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot));
-    }
+    } else {
-    else
-    {
         inst.reset(new NullInstance(m_globalSettings, instanceSettings, instanceRoot));
     }
     qDebug() << "Loaded instance " << inst->name() << " from " << inst->instanceRoot();
     return inst;
 }
 
+void InstanceList::increaseGroupCount(const QString& group)
+{
+    if (group.isEmpty())
+        return;
+
+    ++m_groupNameCache[group];
+}
+
+void InstanceList::decreaseGroupCount(const QString& group)
+{
+    if (group.isEmpty())
+        return;
+
+    if (--m_groupNameCache[group] < 1) {
+        m_groupNameCache.remove(group);
+        m_collapsedGroups.remove(group);
+    }
+}
+
 void InstanceList::saveGroupList()
 {
     qDebug() << "Will save group list now.";
@@ -621,7 +675,7 @@ void InstanceList::saveGroupList()
     QString groupFileName = m_instDir + "/instgroups.json";
     QMap<QString, QSet<QString>> reverseGroupMap;
     for (auto iter = m_instanceGroupIndex.begin(); iter != m_instanceGroupIndex.end(); iter++) {
-        QString id = iter.key();
+        const QString& id = iter.key();
         QString group = iter.value();
         if (group.isEmpty())
             continue;
@@ -711,17 +765,22 @@ void InstanceList::loadGroupList()
         return;
     }
 
-    QSet<QString> groupSet;
     m_instanceGroupIndex.clear();
+    m_groupNameCache.clear();
 
     // Iterate through all the groups.
     QJsonObject groupMapping = rootObj.value("groups").toObject();
     for (QJsonObject::iterator iter = groupMapping.begin(); iter != groupMapping.end(); iter++) {
         QString groupName = iter.key();
 
+        if (iter.key().isEmpty()) {
+            qWarning() << "Redundant empty group found";
+            continue;
+        }
+
         // If not an object, complain and skip to the next one.
         if (!iter.value().isObject()) {
-            qWarning() << QString("Group '%1' in the group list should be an object.").arg(groupName).toUtf8();
+            qWarning() << QString("Group '%1' in the group list should be an object").arg(groupName).toUtf8();
             continue;
         }
 
@@ -733,23 +792,19 @@ void InstanceList::loadGroupList()
             continue;
         }
 
-        // keep a list/set of groups for choosing
-        groupSet.insert(groupName);
-
         auto hidden = groupObj.value("hidden").toBool(false);
-        if (hidden) {
+        if (hidden)
             m_collapsedGroups.insert(groupName);
-        }
 
         // Iterate through the list of instances in the group.
         QJsonArray instancesArray = groupObj.value("instances").toArray();
 
-        for (QJsonArray::iterator iter2 = instancesArray.begin(); iter2 != instancesArray.end(); iter2++) {
+        for (auto value : instancesArray) {
-            m_instanceGroupIndex[(*iter2).toString()] = groupName;
+            m_instanceGroupIndex[value.toString()] = groupName;
+            increaseGroupCount(groupName);
         }
     }
     m_groupsLoaded = true;
-    m_groupNameCache.unite(groupSet);
     qDebug() << "Group list loaded.";
 }
 
@@ -759,7 +814,7 @@ void InstanceList::instanceDirContentsChanged(const QString& path)
     emit instancesChanged();
 }
 
-void InstanceList::on_InstFolderChanged(const Setting& setting, QVariant value)
+void InstanceList::on_InstFolderChanged([[maybe_unused]] const Setting& setting, QVariant value)
 {
     QString newInstDir = QDir(value.toString()).canonicalPath();
     if (newInstDir != m_instDir) {
@@ -787,20 +842,25 @@ class InstanceStaging : public Task {
     Q_OBJECT
     const unsigned minBackoff = 1;
     const unsigned maxBackoff = 16;
+
    public:
     InstanceStaging(InstanceList* parent, InstanceTask* child, QString stagingPath, InstanceName const& instanceName, QString groupName)
-        : m_parent(parent), backoff(minBackoff, maxBackoff), m_stagingPath(std::move(stagingPath)), m_instance_name(std::move(instanceName)), m_groupName(std::move(groupName))
+        : m_parent(parent)
+        , backoff(minBackoff, maxBackoff)
+        , m_stagingPath(std::move(stagingPath))
+        , m_instance_name(std::move(instanceName))
+        , m_groupName(std::move(groupName))
     {
         m_child.reset(child);
-        connect(child, &Task::succeeded, this, &InstanceStaging::childSucceded);
+        connect(child, &Task::succeeded, this, &InstanceStaging::childSucceeded);
         connect(child, &Task::failed, this, &InstanceStaging::childFailed);
         connect(child, &Task::aborted, this, &InstanceStaging::childAborted);
         connect(child, &Task::abortStatusChanged, this, &InstanceStaging::setAbortable);
         connect(child, &Task::status, this, &InstanceStaging::setStatus);
         connect(child, &Task::details, this, &InstanceStaging::setDetails);
         connect(child, &Task::progress, this, &InstanceStaging::setProgress);
-        connect(child, &Task::stepProgress, this, &InstanceStaging::propogateStepProgress);
+        connect(child, &Task::stepProgress, this, &InstanceStaging::propagateStepProgress);
-        connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceded);
+        connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceeded);
     }
 
     virtual ~InstanceStaging(){};
@@ -815,21 +875,17 @@ class InstanceStaging : public Task {
 
         return Task::abort();
     }
-    bool canAbort() const override
+    bool canAbort() const override { return (m_child && m_child->canAbort()); }
-    {
-        return (m_child && m_child->canAbort());
-    }
 
    protected:
     virtual void executeTask() override { m_child->start(); }
     QStringList warnings() const override { return m_child->warnings(); }
 
    private slots:
-    void childSucceded()
+    void childSucceeded()
     {
         unsigned sleepTime = backoff();
-        if (m_parent->commitStagedInstance(m_stagingPath, m_instance_name, m_groupName, *m_child.get()))
+        if (m_parent->commitStagedInstance(m_stagingPath, m_instance_name, m_groupName, *m_child.get())) {
-        {
             emitSucceeded();
             return;
         }
@@ -847,10 +903,7 @@ class InstanceStaging : public Task {
         emitFailed(reason);
     }
 
-    void childAborted()
+    void childAborted() { emitAborted(); }
-    {
-        emitAborted();
-    }
 
    private:
     InstanceList* m_parent;
@@ -892,8 +945,14 @@ QString InstanceList::getStagedInstancePath()
     return path;
 }
 
-bool InstanceList::commitStagedInstance(const QString& path, InstanceName const& instanceName, const QString& groupName, InstanceTask const& commiting)
+bool InstanceList::commitStagedInstance(const QString& path,
+                                        InstanceName const& instanceName,
+                                        QString groupName,
+                                        InstanceTask const& commiting)
 {
+    if (groupName.isEmpty() && !groupName.isNull())
+        groupName = QString();
+
     QDir dir;
     QString instID;
     InstancePtr inst;
@@ -924,7 +983,7 @@ bool InstanceList::commitStagedInstance(const QString& path, InstanceName const&
             }
 
             m_instanceGroupIndex[instID] = groupName;
-            m_groupNameCache.insert(groupName);
+            increaseGroupCount(groupName);
         }
 
         instanceSet.insert(instID);

launcher/InstanceList.h

@@ -1,4 +1,24 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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.
@@ -15,12 +35,12 @@
 
 #pragma once
 
-#include <QObject>
 #include <QAbstractListModel>
-#include <QSet>
 #include <QList>
-#include <QStack>
+#include <QObject>
 #include <QPair>
+#include <QSet>
+#include <QStack>
 
 #include "BaseInstance.h"
 
@@ -32,21 +52,9 @@ using InstanceId = QString;
 using GroupId = QString;
 using InstanceLocator = std::pair<InstancePtr, int>;
 
-enum class InstCreateError
+enum class InstCreateError { NoCreateError = 0, NoSuchVersion, UnknownCreateError, InstExists, CantCreateDir };
-{
-    NoCreateError = 0,
-    NoSuchVersion,
-    UnknownCreateError,
-    InstExists,
-    CantCreateDir
-};
 
-enum class GroupsState
+enum class GroupsState { NotLoaded, Steady, Dirty };
-{
-    NotLoaded,
-    Steady,
-    Dirty
-};
 
 struct TrashHistoryItem {
     QString id;
@@ -55,8 +63,7 @@ struct TrashHistoryItem {
     QString groupName;
 };
 
-class InstanceList : public QAbstractListModel
+class InstanceList : public QAbstractListModel {
-{
     Q_OBJECT
 
    public:
@@ -71,8 +78,7 @@ public:
 
     bool setData(const QModelIndex& index, const QVariant& value, int role) override;
 
-    enum AdditionalRoles
+    enum AdditionalRoles {
-    {
         GroupRole = Qt::UserRole,
         InstancePointerRole = 0x34B1CB48,  ///< Return pointer to real instance
         InstanceIDRole = 0x34B1CB49        ///< Return id if the instance
@@ -82,21 +88,11 @@ public:
      * NoError Indicates that no error occurred.
      * UnknownError indicates that an unspecified error occurred.
      */
-    enum InstListError
+    enum InstListError { NoError = 0, UnknownError };
-    {
-        NoError = 0,
-        UnknownError
-    };
 
-    InstancePtr at(int i) const
+    InstancePtr at(int i) const { return m_instances.at(i); }
-    {
-        return m_instances.at(i);
-    }
 
-    int count() const
+    int count() const { return m_instances.count(); }
-    {
-        return m_instances.count();
-    }
 
     InstListError loadList();
     void saveNow();
@@ -110,9 +106,10 @@ public:
     bool isGroupCollapsed(const QString& groupName);
 
     GroupId getInstanceGroup(const InstanceId& id) const;
-    void setInstanceGroup(const InstanceId & id, const GroupId& name);
+    void setInstanceGroup(const InstanceId& id, GroupId name);
 
     void deleteGroup(const GroupId& name);
+    void renameGroup(const GroupId& src, const GroupId& dst);
     bool trashInstance(const InstanceId& id);
     bool trashedSomething();
     void undoTrashInstance();
@@ -133,7 +130,7 @@ public:
      * should_override is used when another similar instance already exists, and we want to override it
      * - for instance, when updating it.
      */
-    bool commitStagedInstance(const QString& keyPath, const InstanceName& instanceName, const QString& groupName, const InstanceTask&);
+    bool commitStagedInstance(const QString& keyPath, const InstanceName& instanceName, QString groupName, const InstanceTask&);
 
     /**
      * Destroy a previously created staging area given by @keyPath - used when creation fails.
@@ -182,12 +179,16 @@ private:
     QList<InstanceId> discoverInstances();
     InstancePtr loadInstance(const InstanceId& id);
 
+    void increaseGroupCount(const QString& group);
+    void decreaseGroupCount(const QString& group);
+
    private:
     int m_watchLevel = 0;
     int totalPlayTime = 0;
     bool m_dirty = false;
     QList<InstancePtr> m_instances;
-    QSet<QString> m_groupNameCache;
+    // id -> refs
+    QMap<QString, int> m_groupNameCache;
 
     SettingsObjectPtr m_globalSettings;
     QString m_instDir;

launcher/InstancePageProvider.h

@@ -1,31 +1,26 @@
 #pragma once
-#include "minecraft/MinecraftInstance.h"
 #include <FileSystem.h>
+#include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
 #include "ui/pages/BasePageProvider.h"
+#include "ui/pages/instance/InstanceSettingsPage.h"
 #include "ui/pages/instance/LogPage.h"
-#include "ui/pages/instance/VersionPage.h"
 #include "ui/pages/instance/ManagedPackPage.h"
 #include "ui/pages/instance/ModFolderPage.h"
-#include "ui/pages/instance/ResourcePackPage.h"
-#include "ui/pages/instance/TexturePackPage.h"
-#include "ui/pages/instance/ShaderPackPage.h"
 #include "ui/pages/instance/NotesPage.h"
-#include "ui/pages/instance/ScreenshotsPage.h"
-#include "ui/pages/instance/InstanceSettingsPage.h"
 #include "ui/pages/instance/OtherLogsPage.h"
-#include "ui/pages/instance/WorldListPage.h"
+#include "ui/pages/instance/ResourcePackPage.h"
+#include "ui/pages/instance/ScreenshotsPage.h"
 #include "ui/pages/instance/ServersPage.h"
-#include "ui/pages/instance/GameOptionsPage.h"
+#include "ui/pages/instance/ShaderPackPage.h"
+#include "ui/pages/instance/TexturePackPage.h"
+#include "ui/pages/instance/VersionPage.h"
+#include "ui/pages/instance/WorldListPage.h"
 
-class InstancePageProvider : public QObject, public BasePageProvider
+class InstancePageProvider : protected QObject, public BasePageProvider {
-{
     Q_OBJECT
    public:
-    explicit InstancePageProvider(InstancePtr parent)
+    explicit InstancePageProvider(InstancePtr parent) { inst = parent; }
-    {
-        inst = parent;
-    }
 
     virtual ~InstancePageProvider(){};
     virtual QList<BasePage*> getPages() override
@@ -50,18 +45,14 @@ public:
         values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
         values.append(new InstanceSettingsPage(onesix.get()));
         auto logMatcher = inst->getLogFileMatcher();
-        if(logMatcher)
+        if (logMatcher) {
-        {
             values.append(new OtherLogsPage(inst->getLogFileRoot(), logMatcher));
         }
         return values;
     }
 
-    virtual QString dialogTitle() override
+    virtual QString dialogTitle() override { return tr("Edit Instance (%1)").arg(inst->name()); }
-    {
+
-        return tr("Edit Instance (%1)").arg(inst->name());
-    }
    protected:
     InstancePtr inst;
 };
-

launcher/InstanceTask.cpp

@@ -22,7 +22,8 @@ ShouldUpdate askIfShouldUpdate(QWidget *parent, QString original_version_name)
 {
     auto info = CustomMessageBox::selectable(
         parent, QObject::tr("Similar modpack was found!"),
-        QObject::tr("One or more of your instances are from this same modpack%1. Do you want to create a "
+        QObject::tr(
+            "One or more of your instances are from this same modpack%1. Do you want to create a "
             "separate instance, or update the existing one?\n\nNOTE: Make sure you made a backup of your important instance data before "
             "updating, as worlds can be corrupted and some configuration may be lost (due to pack overrides).")
             .arg(original_version_name),
@@ -38,7 +39,6 @@ ShouldUpdate askIfShouldUpdate(QWidget *parent, QString original_version_name)
     if (info->clickedButton() == info->button(QMessageBox::Abort))
         return ShouldUpdate::SkipUpdating;
     return ShouldUpdate::Cancel;
-
 }
 
 QString InstanceName::name() const

launcher/JavaCommon.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -41,41 +41,37 @@
 
 bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget* parent)
 {
-    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegularExpression("-Xm[sx]"))
+    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegularExpression("-Xm[sx]")) || jvmargs.contains("-XX-MaxHeapSize") ||
-        || jvmargs.contains("-XX-MaxHeapSize") || jvmargs.contains("-XX:InitialHeapSize"))
+        jvmargs.contains("-XX:InitialHeapSize")) {
-    {
         auto warnStr = QObject::tr(
-            "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" or \"-Xms\").\n"
+            "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" "
+            "or \"-Xms\").\n"
             "There are dedicated boxes for these in the settings (Java tab, in the Memory group at the top).\n"
             "This message will be displayed until you remove them from the JVM arguments.");
-        CustomMessageBox::selectable(
+        CustomMessageBox::selectable(parent, QObject::tr("JVM arguments warning"), warnStr, QMessageBox::Warning)->exec();
-            parent, QObject::tr("JVM arguments warning"),
-            warnStr,
-            QMessageBox::Warning)->exec();
         return false;
     }
     // block lunacy with passing required version to the JVM
     if (jvmargs.contains(QRegularExpression("-version:.*"))) {
         auto warnStr = QObject::tr(
-            "You tried to pass required Java version argument to the JVM (using \"-version:xxx\"). This is not safe and will not be allowed.\n"
+            "You tried to pass required Java version argument to the JVM (using \"-version:xxx\"). This is not safe and will not be "
+            "allowed.\n"
             "This message will be displayed until you remove this from the JVM arguments.");
-        CustomMessageBox::selectable(
+        CustomMessageBox::selectable(parent, QObject::tr("JVM arguments warning"), warnStr, QMessageBox::Warning)->exec();
-            parent, QObject::tr("JVM arguments warning"),
-            warnStr,
-            QMessageBox::Warning)->exec();
         return false;
     }
     return true;
 }
 
-void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaWasOk(QWidget* parent, const JavaCheckResult& result)
 {
     QString text;
-    text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
+    text += QObject::tr(
+                "Java test succeeded!<br />Platform reported: %1<br />Java version "
                 "reported: %2<br />Java vendor "
-        "reported: %3<br />").arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
+                "reported: %3<br />")
-    if (result.errorLog.size())
+                .arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
-    {
+    if (result.errorLog.size()) {
         auto htmlError = result.errorLog;
         htmlError.replace('\n', "<br />");
         text += QObject::tr("<br />Warnings:<br /><font color=\"orange\">%1</font>").arg(htmlError);
@@ -83,7 +79,7 @@ void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show();
 }
 
-void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaArgsWereBad(QWidget* parent, const JavaCheckResult& result)
 {
     auto htmlError = result.errorLog;
     QString text;
@@ -93,7 +89,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
 }
 
-void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result)
 {
     QString text;
     text += QObject::tr(
@@ -111,8 +107,7 @@ void JavaCommon::javaCheckNotFound(QWidget *parent)
 
 void JavaCommon::TestCheck::run()
 {
-    if (!JavaCommon::checkJVMArgs(m_args, m_parent))
+    if (!JavaCommon::checkJVMArgs(m_args, m_parent)) {
-    {
         emit finished();
         return;
     }
@@ -129,8 +124,7 @@ void JavaCommon::TestCheck::run()
 
 void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
 {
-    if (result.validity != JavaCheckResult::Validity::Valid)
+    if (result.validity != JavaCheckResult::Validity::Valid) {
-    {
         javaBinaryWasBad(m_parent, result);
         emit finished();
         return;
@@ -141,8 +135,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
     checker->m_args = m_args;
     checker->m_minMem = m_minMem;
     checker->m_maxMem = m_maxMem;
-    if (result.javaVersion.requiresPermGen())
+    if (result.javaVersion.requiresPermGen()) {
-    {
         checker->m_permGen = m_permGen;
     }
     checker->performCheck();
@@ -150,8 +143,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
 
 void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
 {
-    if (result.validity == JavaCheckResult::Validity::Valid)
+    if (result.validity == JavaCheckResult::Validity::Valid) {
-    {
         javaWasOk(m_parent, result);
         emit finished();
         return;
@@ -159,4 +151,3 @@ void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
     javaArgsWereBad(m_parent, result);
     emit finished();
 }
-

launcher/JavaCommon.h

@@ -6,27 +6,24 @@ class QWidget;
 /**
  * Common UI bits for the java pages to use.
  */
-namespace JavaCommon
+namespace JavaCommon {
-{
 bool checkJVMArgs(QString args, QWidget* parent);
 
 // Show a dialog saying that the Java binary was usable
-    void javaWasOk(QWidget *parent, JavaCheckResult result);
+void javaWasOk(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
+void javaArgsWereBad(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog saying that the Java binary was not usable
-    void javaBinaryWasBad(QWidget *parent, JavaCheckResult result);
+void javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog if we couldn't find Java Checker
 void javaCheckNotFound(QWidget* parent);
 
-    class TestCheck : public QObject
+class TestCheck : public QObject {
-    {
     Q_OBJECT
    public:
     TestCheck(QWidget* parent, QString path, QString args, int minMem, int maxMem, int permGen)
         : m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
-        {
+    {}
-        }
     virtual ~TestCheck(){};
 
     void run();
@@ -47,4 +44,4 @@ namespace JavaCommon
     int m_maxMem = 0;
     int m_permGen = 64;
 };
-}
+}  // namespace JavaCommon

launcher/Json.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,11 +37,10 @@
 
 #include <QFile>
 
-#include "FileSystem.h"
 #include <math.h>
+#include "FileSystem.h"
 
-namespace Json
+namespace Json {
-{
 void write(const QJsonDocument& doc, const QString& filename)
 {
     FS::write(filename, doc.toJson());
@@ -71,17 +70,13 @@ static bool isBinaryJson(const QByteArray &data)
 }
 QJsonDocument requireDocument(const QByteArray& data, const QString& what)
 {
-    if (isBinaryJson(data))
+    if (isBinaryJson(data)) {
-    {
         // FIXME: Is this needed?
         throw JsonException(what + ": Invalid JSON. Binary JSON unsupported");
-    }
+    } else {
-    else
-    {
         QJsonParseError error;
         QJsonDocument doc = QJsonDocument::fromJson(data, &error);
-        if (error.error != QJsonParseError::NoError)
+        if (error.error != QJsonParseError::NoError) {
-        {
             throw JsonException(what + ": Error parsing JSON: " + error.errorString());
         }
         return doc;
@@ -93,16 +88,14 @@ QJsonDocument requireDocument(const QString &filename, const QString &what)
 }
 QJsonObject requireObject(const QJsonDocument& doc, const QString& what)
 {
-    if (!doc.isObject())
+    if (!doc.isObject()) {
-    {
         throw JsonException(what + " is not an object");
     }
     return doc.object();
 }
 QJsonArray requireArray(const QJsonDocument& doc, const QString& what)
 {
-    if (!doc.isArray())
+    if (!doc.isArray()) {
-    {
         throw JsonException(what + " is not an array");
     }
     return doc.array();
@@ -110,19 +103,16 @@ QJsonArray requireArray(const QJsonDocument &doc, const QString &what)
 
 void writeString(QJsonObject& to, const QString& key, const QString& value)
 {
-    if (!value.isEmpty())
+    if (!value.isEmpty()) {
-    {
         to.insert(key, value);
     }
 }
 
 void writeStringList(QJsonObject& to, const QString& key, const QStringList& values)
 {
-    if (!values.isEmpty())
+    if (!values.isEmpty()) {
-    {
         QJsonArray array;
-        for(auto value: values)
+        for (auto value : values) {
-        {
             array.append(value);
         }
         to.insert(key, array);
@@ -160,99 +150,98 @@ QJsonValue toJson<QVariant>(const QVariant &variant)
     return QJsonValue::fromVariant(variant);
 }
 
-
+template <>
-template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what)
+QByteArray requireIsType<QByteArray>(const QJsonValue& value, const QString& what)
 {
     const QString string = ensureIsType<QString>(value, what);
     // ensure that the string can be safely cast to Latin1
-    if (string != QString::fromLatin1(string.toLatin1()))
+    if (string != QString::fromLatin1(string.toLatin1())) {
-    {
         throw JsonException(what + " is not encodable as Latin1");
     }
     return QByteArray::fromHex(string.toLatin1());
 }
 
-template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what)
+template <>
-{
+QJsonArray requireIsType<QJsonArray>(const QJsonValue& value, const QString& what)
-    if (!value.isArray())
 {
+    if (!value.isArray()) {
         throw JsonException(what + " is not an array");
     }
     return value.toArray();
 }
 
-
+template <>
-template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what)
+QString requireIsType<QString>(const QJsonValue& value, const QString& what)
-{
-    if (!value.isString())
 {
+    if (!value.isString()) {
         throw JsonException(what + " is not a string");
     }
     return value.toString();
 }
 
-template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what)
+template <>
-{
+bool requireIsType<bool>(const QJsonValue& value, const QString& what)
-    if (!value.isBool())
 {
+    if (!value.isBool()) {
         throw JsonException(what + " is not a bool");
     }
     return value.toBool();
 }
 
-template<> double requireIsType<double>(const QJsonValue &value, const QString &what)
+template <>
-{
+double requireIsType<double>(const QJsonValue& value, const QString& what)
-    if (!value.isDouble())
 {
+    if (!value.isDouble()) {
         throw JsonException(what + " is not a double");
     }
     return value.toDouble();
 }
 
-template<> int requireIsType<int>(const QJsonValue &value, const QString &what)
+template <>
+int requireIsType<int>(const QJsonValue& value, const QString& what)
 {
     const double doubl = requireIsType<double>(value, what);
-    if (fmod(doubl, 1) != 0)
+    if (fmod(doubl, 1) != 0) {
-    {
         throw JsonException(what + " is not an integer");
     }
     return int(doubl);
 }
 
-template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what)
+template <>
+QDateTime requireIsType<QDateTime>(const QJsonValue& value, const QString& what)
 {
     const QString string = requireIsType<QString>(value, what);
     const QDateTime datetime = QDateTime::fromString(string, Qt::ISODate);
-    if (!datetime.isValid())
+    if (!datetime.isValid()) {
-    {
         throw JsonException(what + " is not a ISO formatted date/time value");
     }
     return datetime;
 }
 
-template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what)
+template <>
+QUrl requireIsType<QUrl>(const QJsonValue& value, const QString& what)
 {
     const QString string = ensureIsType<QString>(value, what);
-    if (string.isEmpty())
+    if (string.isEmpty()) {
-    {
         return QUrl();
     }
     const QUrl url = QUrl(string, QUrl::StrictMode);
-    if (!url.isValid())
+    if (!url.isValid()) {
-    {
         throw JsonException(what + " is not a correctly formatted URL");
     }
     return url;
 }
 
-template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what)
+template <>
+QDir requireIsType<QDir>(const QJsonValue& value, const QString& what)
 {
     const QString string = requireIsType<QString>(value, what);
     // FIXME: does not handle invalid characters!
     return QDir::current().absoluteFilePath(string);
 }
 
-template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what)
+template <>
+QUuid requireIsType<QUuid>(const QJsonValue& value, const QString& what)
 {
     const QString string = requireIsType<QString>(value, what);
     const QUuid uuid = QUuid(string);
@@ -263,31 +252,31 @@ template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &wh
     return uuid;
 }
 
-template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what)
+template <>
-{
+QJsonObject requireIsType<QJsonObject>(const QJsonValue& value, const QString& what)
-    if (!value.isObject())
 {
+    if (!value.isObject()) {
         throw JsonException(what + " is not an object");
     }
     return value.toObject();
 }
 
-template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what)
+template <>
-{
+QVariant requireIsType<QVariant>(const QJsonValue& value, const QString& what)
-    if (value.isNull() || value.isUndefined())
 {
+    if (value.isNull() || value.isUndefined()) {
         throw JsonException(what + " is null or undefined");
     }
     return value.toVariant();
 }
 
-template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what)
+template <>
-{
+QJsonValue requireIsType<QJsonValue>(const QJsonValue& value, const QString& what)
-    if (value.isNull() || value.isUndefined())
 {
+    if (value.isNull() || value.isUndefined()) {
         throw JsonException(what + " is null or undefined");
     }
     return value;
 }
 
-}
+}  // namespace Json

launcher/Json.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,22 +35,20 @@
 
 #pragma once
 
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
 #include <QDateTime>
-#include <QUrl>
 #include <QDir>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QUrl>
 #include <QUuid>
 #include <QVariant>
 #include <memory>
 
 #include "Exception.h"
 
-namespace Json
+namespace Json {
-{
+class JsonException : public ::Exception {
-class JsonException : public ::Exception
-{
    public:
     JsonException(const QString& message) : Exception(message) {}
 };
@@ -101,8 +99,7 @@ template<typename T>
 QJsonArray toJsonArray(const QList<T>& container)
 {
     QJsonArray array;
-    for (const T item : container)
+    for (const T item : container) {
-    {
         array.append(toJson<T>(item));
     }
     return array;
@@ -115,47 +112,56 @@ template <typename T>
 T requireIsType(const QJsonValue& value, const QString& what = "Value");
 
 /// @throw JsonException
-template<> double requireIsType<double>(const QJsonValue &value, const QString &what);
+template <>
+double requireIsType<double>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what);
+template <>
+bool requireIsType<bool>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> int requireIsType<int>(const QJsonValue &value, const QString &what);
+template <>
+int requireIsType<int>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what);
+template <>
+QJsonObject requireIsType<QJsonObject>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what);
+template <>
+QJsonArray requireIsType<QJsonArray>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what);
+template <>
+QJsonValue requireIsType<QJsonValue>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what);
+template <>
+QByteArray requireIsType<QByteArray>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what);
+template <>
+QDateTime requireIsType<QDateTime>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what);
+template <>
+QVariant requireIsType<QVariant>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what);
+template <>
+QString requireIsType<QString>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what);
+template <>
+QUuid requireIsType<QUuid>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what);
+template <>
+QDir requireIsType<QDir>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what);
+template <>
+QUrl requireIsType<QUrl>(const QJsonValue& value, const QString& what);
 
 // the following functions are higher level functions, that make use of the above functions for
 // type conversion
 template <typename T>
 T ensureIsType(const QJsonValue& value, const T default_ = T(), const QString& what = "Value")
 {
-    if (value.isUndefined() || value.isNull())
+    if (value.isUndefined() || value.isNull()) {
-    {
         return default_;
     }
-    try
+    try {
-    {
         return requireIsType<T>(value, what);
-    }
+    } catch (const JsonException&) {
-    catch (const JsonException &)
-    {
         return default_;
     }
 }
@@ -165,8 +171,7 @@ template <typename T>
 T requireIsType(const QJsonObject& parent, const QString& key, const QString& what = "__placeholder__")
 {
     const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
+    if (!parent.contains(key)) {
-    {
         throw JsonException(localWhat + "s parent does not contain " + localWhat);
     }
     return requireIsType<T>(parent.value(key), localWhat);
@@ -176,8 +181,7 @@ template <typename T>
 T ensureIsType(const QJsonObject& parent, const QString& key, const T default_ = T(), const QString& what = "__placeholder__")
 {
     const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
+    if (!parent.contains(key)) {
-    {
         return default_;
     }
     return ensureIsType<T>(parent.value(key), default_, localWhat);
@@ -188,8 +192,7 @@ QVector<T> requireIsArrayOf(const QJsonDocument &doc)
 {
     const QJsonArray array = requireArray(doc);
     QVector<T> out;
-    for (const QJsonValue val : array)
+    for (const QJsonValue val : array) {
-    {
         out.append(requireIsType<T>(val, "Document"));
     }
     return out;
@@ -200,8 +203,7 @@ QVector<T> ensureIsArrayOf(const QJsonValue &value, const QString &what = "Value
 {
     const QJsonArray array = ensureIsType<QJsonArray>(value, QJsonArray(), what);
     QVector<T> out;
-    for (const QJsonValue val : array)
+    for (const QJsonValue val : array) {
-    {
         out.append(requireIsType<T>(val, what));
     }
     return out;
@@ -210,8 +212,7 @@ QVector<T> ensureIsArrayOf(const QJsonValue &value, const QString &what = "Value
 template <typename T>
 QVector<T> ensureIsArrayOf(const QJsonValue& value, const QVector<T> default_, const QString& what = "Value")
 {
-    if (value.isUndefined())
+    if (value.isUndefined()) {
-    {
         return default_;
     }
     return ensureIsArrayOf<T>(value, what);
@@ -222,20 +223,20 @@ template <typename T>
 QVector<T> requireIsArrayOf(const QJsonObject& parent, const QString& key, const QString& what = "__placeholder__")
 {
     const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
+    if (!parent.contains(key)) {
-    {
         throw JsonException(localWhat + "s parent does not contain " + localWhat);
     }
     return ensureIsArrayOf<T>(parent.value(key), localWhat);
 }
 
 template <typename T>
-QVector<T> ensureIsArrayOf(const QJsonObject &parent, const QString &key,
+QVector<T> ensureIsArrayOf(const QJsonObject& parent,
-                         const QVector<T> &default_ = QVector<T>(), const QString &what = "__placeholder__")
+                           const QString& key,
+                           const QVector<T>& default_ = QVector<T>(),
+                           const QString& what = "__placeholder__")
 {
     const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
+    if (!parent.contains(key)) {
-    {
         return default_;
     }
     return ensureIsArrayOf<T>(parent.value(key), default_, localWhat);
@@ -255,7 +256,8 @@ QVector<T> ensureIsArrayOf(const QJsonObject &parent, const QString &key,
     {                                                                                                                 \
         return requireIsType<TYPE>(parent, key, what);                                                                \
     }                                                                                                                 \
-    inline TYPE ensure##NAME(const QJsonObject &parent, const QString &key, const TYPE default_ = TYPE(), const QString &what = "__placeholder") \
+    inline TYPE ensure##NAME(const QJsonObject& parent, const QString& key, const TYPE default_ = TYPE(),             \
+                             const QString& what = "__placeholder")                                                   \
     {                                                                                                                 \
         return ensureIsType<TYPE>(parent, key, default_, what);                                                       \
     }
@@ -276,5 +278,5 @@ JSON_HELPERFUNCTIONS(Variant, QVariant)
 
 #undef JSON_HELPERFUNCTIONS
 
-}
+}  // namespace Json
 using JSONValidationError = Json::JsonException;

launcher/KonamiCode.cpp

@@ -1,42 +1,26 @@
 #include "KonamiCode.h"
 
-#include <array>
 #include <QDebug>
+#include <array>
 
 namespace {
-const std::array<Qt::Key, 10> konamiCode =
+const std::array<Qt::Key, 10> konamiCode = { { Qt::Key_Up, Qt::Key_Up, Qt::Key_Down, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
-{
+                                               Qt::Key_Left, Qt::Key_Right, Qt::Key_B, Qt::Key_A } };
-    {
-        Qt::Key_Up, Qt::Key_Up,
-        Qt::Key_Down, Qt::Key_Down,
-        Qt::Key_Left, Qt::Key_Right,
-        Qt::Key_Left, Qt::Key_Right,
-        Qt::Key_B, Qt::Key_A
-    }
-};
-}
-
-KonamiCode::KonamiCode(QObject* parent) : QObject(parent)
-{
 }
 
+KonamiCode::KonamiCode(QObject* parent) : QObject(parent) {}
 
 void KonamiCode::input(QEvent* event)
 {
-    if( event->type() == QEvent::KeyPress )
+    if (event->type() == QEvent::KeyPress) {
-    {
         QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
         auto key = Qt::Key(keyEvent->key());
-        if(key == konamiCode[m_progress])
+        if (key == konamiCode[m_progress]) {
-        {
             m_progress++;
-        }
+        } else {
-        else
-        {
             m_progress = 0;
         }
-        if(m_progress == static_cast<int>(konamiCode.size()))
+        if (m_progress == static_cast<int>(konamiCode.size())) {
-        {
             m_progress = 0;
             emit triggered();
         }

launcher/KonamiCode.h

@@ -2,8 +2,7 @@
 
 #include <QKeyEvent>
 
-class KonamiCode : public QObject
+class KonamiCode : public QObject {
-{
     Q_OBJECT
    public:
     KonamiCode(QObject* parent = 0);

launcher/LaunchController.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 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,39 +35,36 @@
  */
 
 #include "LaunchController.h"
-#include "minecraft/auth/AccountList.h"
 #include "Application.h"
+#include "minecraft/auth/AccountList.h"
 
-#include "ui/MainWindow.h"
 #include "ui/InstanceWindow.h"
+#include "ui/MainWindow.h"
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ProfileSelectDialog.h"
-#include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/EditAccountDialog.h"
+#include "ui/dialogs/ProfileSelectDialog.h"
 #include "ui/dialogs/ProfileSetupDialog.h"
+#include "ui/dialogs/ProgressDialog.h"
 
-#include <QLineEdit>
-#include <QInputDialog>
-#include <QStringList>
-#include <QHostInfo>
-#include <QList>
 #include <QHostAddress>
+#include <QHostInfo>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QList>
 #include <QPushButton>
+#include <QStringList>
 
 #include "BuildConfig.h"
 #include "JavaCommon.h"
-#include "tasks/Task.h"
-#include "minecraft/auth/AccountTask.h"
 #include "launch/steps/TextPrint.h"
+#include "minecraft/auth/AccountTask.h"
+#include "tasks/Task.h"
 
-LaunchController::LaunchController(QObject *parent) : Task(parent)
+LaunchController::LaunchController(QObject* parent) : Task(parent) {}
-{
-}
 
 void LaunchController::executeTask()
 {
-    if (!m_instance)
+    if (!m_instance) {
-    {
         emitFailed(tr("No instance specified!"));
         return;
     }
@@ -87,26 +85,19 @@ void LaunchController::decideAccount()
 
     // Find an account to use.
     auto accounts = APPLICATION->accounts();
-    if (accounts->count() <= 0)
+    if (accounts->count() <= 0) {
-    {
         // Tell the user they need to log in at least one account in order to play.
-        auto reply = CustomMessageBox::selectable(
+        auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
-            m_parentWidget,
+                                                  tr("In order to play Minecraft, you must have at least one Microsoft "
-            tr("No Accounts"),
+                                                     "account which owns Minecraft logged in. "
-            tr("In order to play Minecraft, you must have at least one Microsoft or Mojang "
-               "account logged in. Mojang accounts can only be used offline. "
                                                      "Would you like to open the account manager to add an account now?"),
-            QMessageBox::Information,
+                                                  QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
-            QMessageBox::Yes | QMessageBox::No
+                         ->exec();
-        )->exec();
 
-        if (reply == QMessageBox::Yes)
+        if (reply == QMessageBox::Yes) {
-        {
             // Open the account manager.
             APPLICATION->ShowGlobalSettings(m_parentWidget, "accounts");
-        }
+        } else if (reply == QMessageBox::No) {
-        else if (reply == QMessageBox::No)
-        {
             // Do not open "profile select" dialog.
             return;
         }
@@ -115,20 +106,16 @@ void LaunchController::decideAccount()
     // Select the account to use. If the instance has a specific account set, that will be used. Otherwise, the default account will be used
     auto instanceAccountId = m_instance->settings()->get("InstanceAccountId").toString();
     auto instanceAccountIndex = accounts->findAccountByProfileId(instanceAccountId);
-    if (instanceAccountIndex == -1) {
+    if (instanceAccountIndex == -1 || instanceAccountId.isEmpty()) {
         m_accountToUse = accounts->defaultAccount();
     } else {
         m_accountToUse = accounts->at(instanceAccountIndex);
     }
 
-    if (!m_accountToUse)
+    if (!m_accountToUse) {
-    {
         // If no default account is set, ask the user which one to use.
-        ProfileSelectDialog selectDialog(
+        ProfileSelectDialog selectDialog(tr("Which account would you like to use?"), ProfileSelectDialog::GlobalDefaultCheckbox,
-            tr("Which account would you like to use?"),
+                                         m_parentWidget);
-            ProfileSelectDialog::GlobalDefaultCheckbox,
-            m_parentWidget
-        );
 
         selectDialog.exec();
 
@@ -142,13 +129,12 @@ void LaunchController::decideAccount()
     }
 }
 
-
+void LaunchController::login()
-void LaunchController::login() {
+{
     decideAccount();
 
     // if no account is selected, we bail
-    if (!m_accountToUse)
+    if (!m_accountToUse) {
-    {
         emitFailed(tr("No account selected for launch."));
         return;
     }
@@ -157,15 +143,11 @@ void LaunchController::login() {
     bool tryagain = true;
     unsigned int tries = 0;
 
-    while (tryagain)
+    while (tryagain) {
-    {
         if (tries > 0 && tries % 3 == 0) {
-            auto result = QMessageBox::question(
+            auto result =
-                m_parentWidget,
+                QMessageBox::question(m_parentWidget, tr("Continue launch?"),
-                tr("Continue launch?"),
+                                      tr("It looks like we couldn't launch after %1 tries. Do you want to continue trying?").arg(tries));
-                tr("It looks like we couldn't launch after %1 tries. Do you want to continue trying?")
-                    .arg(tries)
-            );
 
             if (result == QMessageBox::No) {
                 emitAborted();
@@ -187,8 +169,8 @@ void LaunchController::login() {
         switch (m_accountToUse->accountState()) {
             case AccountState::Offline: {
                 m_session->wants_online = false;
-                // NOTE: fallthrough is intentional
             }
+            /* fallthrough */
             case AccountState::Online: {
                 if (!m_session->wants_online) {
                     // we ask the user for a player name
@@ -201,21 +183,12 @@ void LaunchController::login() {
 
                     QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
                     QString usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
-                    QString name = QInputDialog::getText(
+                    QString name = QInputDialog::getText(m_parentWidget, tr("Player name"), message, QLineEdit::Normal, usedname, &ok);
-                        m_parentWidget,
+                    if (!ok) {
-                        tr("Player name"),
-                        message,
-                        QLineEdit::Normal,
-                        usedname,
-                        &ok
-                    );
-                    if (!ok)
-                    {
                         tryagain = false;
                         break;
                     }
-                    if (name.length())
+                    if (name.length()) {
-                    {
                         usedname = name;
                         APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
                     }
@@ -226,13 +199,10 @@ void LaunchController::login() {
                     if (!m_accountToUse->hasProfile()) {
                         // Now handle setting up a profile name here...
                         ProfileSetupDialog dialog(m_accountToUse, m_parentWidget);
-                        if (dialog.exec() == QDialog::Accepted)
+                        if (dialog.exec() == QDialog::Accepted) {
-                        {
                             tryagain = true;
                             continue;
-                        }
+                        } else {
-                        else
-                        {
                             emitFailed(tr("Received undetermined session status during login."));
                             return;
                         }
@@ -240,12 +210,13 @@ void LaunchController::login() {
                     // we own Minecraft, there is a profile, it's all ready to go!
                     launchInstance();
                     return;
-                }
+                } else {
-                else {
                     // play demo ?
                     QMessageBox box(m_parentWidget);
                     box.setWindowTitle(tr("Play demo?"));
-                    box.setText(tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play the demo?"));
+                    box.setText(
+                        tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play "
+                           "the demo?"));
                     box.setIcon(QMessageBox::Warning);
                     auto demoButton = box.addButton(tr("Play Demo"), QMessageBox::ButtonRole::YesRole);
                     auto cancelButton = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::NoRole);
@@ -256,8 +227,7 @@ void LaunchController::login() {
                         // play demo here
                         m_session->MakeDemo();
                         launchInstance();
-                    }
+                    } else {
-                    else {
                         emitFailed(tr("Launch cancelled - account does not own Minecraft."));
                     }
                 }
@@ -267,13 +237,12 @@ void LaunchController::login() {
                 // This means some sort of soft error that we can fix with a refresh ... so let's refresh.
             case AccountState::Unchecked: {
                 m_accountToUse->refresh();
-                // NOTE: fallthrough intentional
             }
+            /* fallthrough */
             case AccountState::Working: {
                 // refresh is in progress, we need to wait for it to finish to proceed.
                 ProgressDialog progDialog(m_parentWidget);
-                if (m_online)
+                if (m_online) {
-                {
                     progDialog.setSkipButton(true, tr("Play Offline"));
                 }
                 auto task = m_accountToUse->currentTask();
@@ -288,37 +257,24 @@ void LaunchController::login() {
             */
             case AccountState::Expired: {
                 auto errorString = tr("The account has expired and needs to be logged into manually again.");
-                QMessageBox::warning(
+                QMessageBox::warning(m_parentWidget, tr("Account refresh failed"), errorString, QMessageBox::StandardButton::Ok,
-                    m_parentWidget,
+                                     QMessageBox::StandardButton::Ok);
-                    tr("Account refresh failed"),
-                    errorString,
-                    QMessageBox::StandardButton::Ok,
-                    QMessageBox::StandardButton::Ok
-                );
                 emitFailed(errorString);
                 return;
             }
             case AccountState::Disabled: {
                 auto errorString = tr("The launcher's client identification has changed. Please remove this account and add it again.");
-                QMessageBox::warning(
+                QMessageBox::warning(m_parentWidget, tr("Client identification changed"), errorString, QMessageBox::StandardButton::Ok,
-                        m_parentWidget,
+                                     QMessageBox::StandardButton::Ok);
-                        tr("Client identification changed"),
-                        errorString,
-                        QMessageBox::StandardButton::Ok,
-                        QMessageBox::StandardButton::Ok
-                );
                 emitFailed(errorString);
                 return;
             }
             case AccountState::Gone: {
-                auto errorString = tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account you migrated this one to.");
+                auto errorString =
-                QMessageBox::warning(
+                    tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account "
-                    m_parentWidget,
+                       "you migrated this one to.");
-                    tr("Account gone"),
+                QMessageBox::warning(m_parentWidget, tr("Account gone"), errorString, QMessageBox::StandardButton::Ok,
-                    errorString,
+                                     QMessageBox::StandardButton::Ok);
-                    QMessageBox::StandardButton::Ok,
-                    QMessageBox::StandardButton::Ok
-                );
                 emitFailed(errorString);
                 return;
             }
@@ -332,24 +288,21 @@ void LaunchController::launchInstance()
     Q_ASSERT_X(m_instance != NULL, "launchInstance", "instance is NULL");
     Q_ASSERT_X(m_session.get() != nullptr, "launchInstance", "session is NULL");
 
-    if(!m_instance->reloadSettings())
+    if (!m_instance->reloadSettings()) {
-    {
         QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't load the instance profile."));
         emitFailed(tr("Couldn't load the instance profile."));
         return;
     }
 
     m_launcher = m_instance->createLaunchTask(m_session, m_serverToJoin);
-    if (!m_launcher)
+    if (!m_launcher) {
-    {
         emitFailed(tr("Couldn't instantiate a launcher."));
         return;
     }
 
     auto console = qobject_cast<InstanceWindow*>(m_parentWidget);
     auto showConsole = m_instance->settings()->get("ShowConsole").toBool();
-    if(!console && showConsole)
+    if (!console && showConsole) {
-    {
         APPLICATION->showInstanceWindow(m_instance);
     }
     connect(m_launcher.get(), &LaunchTask::readyForLaunch, this, &LaunchController::readyForLaunch);
@@ -387,46 +340,47 @@ void LaunchController::launchInstance()
         online_mode = m_demo ? "demo" : "offline";
     }
 
-    m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher));
+    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();
 }
 
 void LaunchController::readyForLaunch()
 {
-    if (!m_profiler)
+    if (!m_profiler) {
-    {
         m_launcher->proceed();
         return;
     }
 
     QString error;
-    if (!m_profiler->check(&error))
+    if (!m_profiler->check(&error)) {
-    {
         m_launcher->abort();
-        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't start profiler: %1").arg(error));
         emitFailed("Profiler startup failed!");
+        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Profiler check for %1 failed: %2").arg(m_profiler->name(), error));
         return;
     }
     BaseProfiler* profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);
 
-    connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message)
+    connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString& message) {
-    {
+        QMessageBox msg(m_parentWidget);
-        QMessageBox msg;
         msg.setText(tr("The game launch is delayed until you press the "
                        "button. This is the right time to setup the profiler, as the "
-                        "profiler server is running now.\n\n%1").arg(message));
+                       "profiler server is running now.\n\n%1")
+                        .arg(message));
         msg.setWindowTitle(tr("Waiting."));
         msg.setIcon(QMessageBox::Information);
-        msg.addButton(tr("Launch"), QMessageBox::AcceptRole);
+        msg.addButton(tr("&Launch"), QMessageBox::AcceptRole);
-        msg.setModal(true);
         msg.exec();
         m_launcher->proceed();
     });
-    connect(profilerInstance, &BaseProfiler::abortLaunch, [this](const QString & message)
+    connect(profilerInstance, &BaseProfiler::abortLaunch, [this](const QString& message) {
-    {
         QMessageBox msg;
         msg.setText(tr("Couldn't start the profiler: %1").arg(message));
         msg.setWindowTitle(tr("Error"));
@@ -447,8 +401,7 @@ void LaunchController::onSucceeded()
 
 void LaunchController::onFailed(QString reason)
 {
-    if(m_instance->settings()->get("ShowConsoleOnError").toBool())
+    if (m_instance->settings()->get("ShowConsoleOnError").toBool()) {
-    {
         APPLICATION->showInstanceWindow(m_instance, "console");
     }
     emitFailed(reason);
@@ -464,21 +417,18 @@ void LaunchController::onProgressRequested(Task* task)
 
 bool LaunchController::abort()
 {
-    if(!m_launcher)
+    if (!m_launcher) {
-    {
         return true;
     }
-    if(!m_launcher->canAbort())
+    if (!m_launcher->canAbort()) {
-    {
         return false;
     }
-    auto response = CustomMessageBox::selectable(
+    auto response = CustomMessageBox::selectable(m_parentWidget, tr("Kill Minecraft?"),
-            m_parentWidget, tr("Kill Minecraft?"),
                                                  tr("This can cause the instance to get corrupted and should only be used if Minecraft "
                                                     "is frozen for some reason"),
-            QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)->exec();
+                                                 QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)
-    if (response == QMessageBox::Yes)
+                        ->exec();
-    {
+    if (response == QMessageBox::Yes) {
         return m_launcher->abort();
     }
     return false;

launcher/LaunchController.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,16 +34,15 @@
  */
 
 #pragma once
-#include <QObject>
 #include <BaseInstance.h>
 #include <tools/BaseProfiler.h>
+#include <QObject>
 
-#include "minecraft/launch/MinecraftServerTarget.h"
 #include "minecraft/auth/MinecraftAccount.h"
+#include "minecraft/launch/MinecraftServerTarget.h"
 
 class InstanceWindow;
-class LaunchController: public Task
+class LaunchController : public Task {
-{
     Q_OBJECT
    public:
     void executeTask() override;
@@ -51,42 +50,23 @@ public:
     LaunchController(QObject* parent = nullptr);
     virtual ~LaunchController(){};
 
-    void setInstance(InstancePtr instance) {
+    void setInstance(InstancePtr instance) { m_instance = instance; }
-        m_instance = instance;
-    }
 
-    InstancePtr instance() {
+    InstancePtr instance() { return m_instance; }
-        return m_instance;
-    }
 
-    void setOnline(bool online) {
+    void setOnline(bool online) { m_online = online; }
-        m_online = online;
-    }
 
-    void setDemo(bool demo) {
+    void setDemo(bool demo) { m_demo = demo; }
-        m_demo = demo;
-    }
 
-    void setProfiler(BaseProfilerFactory *profiler) {
+    void setProfiler(BaseProfilerFactory* profiler) { m_profiler = profiler; }
-        m_profiler = profiler;
-    }
 
-    void setParentWidget(QWidget * widget) {
+    void setParentWidget(QWidget* widget) { m_parentWidget = widget; }
-        m_parentWidget = widget;
-    }
 
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) {
+    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }
-        m_serverToJoin = std::move(serverToJoin);
-    }
 
-    void setAccountToUse(MinecraftAccountPtr accountToUse) {
+    void setAccountToUse(MinecraftAccountPtr accountToUse) { m_accountToUse = std::move(accountToUse); }
-        m_accountToUse = std::move(accountToUse);
-    }
 
-    QString id()
+    QString id() { return m_instance->id(); }
-    {
-        return m_instance->id();
-    }
 
     bool abort() override;
 

launcher/LoggedProcess.cpp

@@ -51,8 +51,7 @@ LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)
 
 LoggedProcess::~LoggedProcess()
 {
-    if(m_is_detachable)
+    if (m_is_detachable) {
-    {
         setProcessState(QProcess::NotRunning);
     }
 }
@@ -66,13 +65,8 @@ QStringList LoggedProcess::reprocess(const QByteArray& data, QTextDecoder& decod
         m_leftover_line = "";
     }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed);
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, QString::SkipEmptyParts);
-#else
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, Qt::SkipEmptyParts);
-#endif
 
-    if (!str.endsWith(QChar::LineFeed))
     m_leftover_line = lines.takeLast();
     return lines;
 }
@@ -95,16 +89,12 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
     m_exit_code = exit_code;
 
     // based on state, send signals
-    if (!m_is_aborting)
+    if (!m_is_aborting) {
-    {
+        if (status == QProcess::NormalExit) {
-        if (status == QProcess::NormalExit)
-        {
             //: Message displayed on instance exit
             emit log({ tr("Process exited with code %1.").arg(exit_code) }, MessageLevel::Launcher);
             changeState(LoggedProcess::Finished);
-        }
+        } else {
-        else
-        {
             //: Message displayed on instance crashed
             if (exit_code == -1)
                 emit log({ tr("Process crashed.") }, MessageLevel::Launcher);
@@ -112,9 +102,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
                 emit log({ tr("Process crashed with exitcode %1.").arg(exit_code) }, MessageLevel::Launcher);
             changeState(LoggedProcess::Crashed);
         }
-    }
+    } else {
-    else
-    {
         //: Message displayed after the instance exits due to kill request
         emit log({ tr("Process was killed by user.") }, MessageLevel::Error);
         changeState(LoggedProcess::Aborted);
@@ -123,10 +111,8 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
 
 void LoggedProcess::on_error(QProcess::ProcessError error)
 {
-    switch(error)
+    switch (error) {
-    {
+        case QProcess::FailedToStart: {
-        case QProcess::FailedToStart:
-        {
             emit log({ tr("The process failed to start.") }, MessageLevel::Fatal);
             changeState(LoggedProcess::FailedToStart);
             break;
@@ -167,23 +153,18 @@ LoggedProcess::State LoggedProcess::state() const
 
 void LoggedProcess::on_stateChange(QProcess::ProcessState state)
 {
-    switch(state)
+    switch (state) {
-    {
         case QProcess::NotRunning:
             break;  // let's not - there are too many that handle this already.
-        case QProcess::Starting:
+        case QProcess::Starting: {
-        {
+            if (m_state != LoggedProcess::NotRunning) {
-            if(m_state != LoggedProcess::NotRunning)
-            {
                 qWarning() << "Wrong state change for process from state" << m_state << "to" << (int)LoggedProcess::Starting;
             }
             changeState(LoggedProcess::Starting);
             return;
         }
-        case QProcess::Running:
+        case QProcess::Running: {
-        {
+            if (m_state != LoggedProcess::Starting) {
-            if(m_state != LoggedProcess::Starting)
-            {
                 qWarning() << "Wrong state change for process from state" << m_state << "to" << (int)LoggedProcess::Running;
             }
             changeState(LoggedProcess::Running);

launcher/LoggedProcess.h

@@ -43,20 +43,10 @@
  * This is a basic process.
  * It has line-based logging support and hides some of the nasty bits.
  */
-class LoggedProcess : public QProcess
+class LoggedProcess : public QProcess {
-{
     Q_OBJECT
    public:
-    enum State
+    enum State { NotRunning, Starting, FailedToStart, Running, Finished, Crashed, Aborted };
-    {
-        NotRunning,
-        Starting,
-        FailedToStart,
-        Running,
-        Finished,
-        Crashed,
-        Aborted
-    };
 
    public:
     explicit LoggedProcess(QObject* parent = 0);
@@ -77,7 +67,6 @@ public slots:
      */
     void kill();
 
-
    private slots:
     void on_stdErr();
     void on_stdOut();

launcher/MMCTime.cpp

@@ -16,31 +16,31 @@
  */
 
 #include <MMCTime.h>
+#include <qobject.h>
 
-#include <QObject>
 #include <QDateTime>
+#include <QObject>
 #include <QTextStream>
 
-QString Time::prettifyDuration(int64_t duration) {
+QString Time::prettifyDuration(int64_t duration, bool noDays)
+{
     int seconds = (int)(duration % 60);
     duration /= 60;
     int minutes = (int)(duration % 60);
     duration /= 60;
-    int hours = (int) (duration % 24);
+    int hours = (int)(noDays ? duration : (duration % 24));
-    int days = (int) (duration / 24);
+    int days = (int)(noDays ? 0 : (duration / 24));
-    if((hours == 0)&&(days == 0))
+    if ((hours == 0) && (days == 0)) {
-    {
         return QObject::tr("%1min %2s").arg(minutes).arg(seconds);
     }
-    if (days == 0)
+    if (days == 0) {
-    {
         return QObject::tr("%1h %2min").arg(hours).arg(minutes);
     }
     return QObject::tr("%1d %2h %3min").arg(days).arg(hours).arg(minutes);
 }
 
-QString Time::humanReadableDuration(double duration, int precision) {
+QString Time::humanReadableDuration(double duration, int precision)
-
+{
     using days = std::chrono::duration<int, std::ratio<86400>>;
 
     QString outStr;

launcher/MMCTime.h

@@ -20,7 +20,7 @@
 
 namespace Time {
 
-QString prettifyDuration(int64_t duration);
+QString prettifyDuration(int64_t duration, bool noDays = false);
 
 /**
  * @brief Returns a string with short form time duration ie. `2days 1h3m4s56.0ms`.
@@ -31,4 +31,4 @@ QString prettifyDuration(int64_t duration);
  * @return QString
  */
 QString humanReadableDuration(double duration, int precision = 0);
-}
+}  // namespace Time

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,54 @@
  *      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 <QUrl>
 
+#if defined(LAUNCHER_APPLICATION)
+#include <QtConcurrentRun>
+#endif
+
+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 +93,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,13 +109,14 @@ 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());
@@ -135,12 +136,12 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
     return result;
 }
 
+#if defined(LAUNCHER_APPLICATION)
 // 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 +152,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 +183,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 +206,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,17 +215,17 @@ 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;
     }
     return true;
 }
+#endif
 
 // 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 +249,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);
 
@@ -292,13 +276,10 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
     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 +315,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 +327,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,51 +337,50 @@ 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) {
             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) {
             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) {
@@ -407,13 +389,14 @@ bool MMCZip::extractFile(QString fileCompressed, QString file, QString target)
         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,7 +404,8 @@ 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);
@@ -439,7 +423,90 @@ bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& s
             continue;
         }
 
-        files->append(e);  // we want the original paths for MMCZip::compressDirFiles
+        files->append(e);  // we want the original paths for compressDirFiles
     }
     return true;
 }
+
+#if defined(LAUNCHER_APPLICATION)
+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;
+}
+#endif
+
+}  // 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,24 +36,31 @@
 
 #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>
 
-namespace MMCZip
+#if defined(LAUNCHER_APPLICATION)
-{
+#include "minecraft/mod/Mod.h"
+#endif
+#include "tasks/Task.h"
+
+namespace MMCZip {
 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
@@ -74,11 +82,12 @@ namespace MMCZip
  */
 bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks = false);
 
+#if defined(LAUNCHER_APPLICATION)
 /**
  * take a source jar, add mods to it, resulting in target jar
  */
 bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods);
-
+#endif
 /**
  * Find a single file in archive by file name (not path)
  *
@@ -141,4 +150,49 @@ namespace MMCZip
  * \return true for success or false for failure
  */
 bool collectFileListRecursively(const QString& rootDir, const QString& subDir, QFileInfoList* files, FilterFunction excludeFilter);
-}
+
+#if defined(LAUNCHER_APPLICATION)
+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); }
+
+    using ZipResult = std::optional<QString>;
+
+   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;
+};
+#endif
+}  // namespace MMCZip

launcher/MTPixmapCache.h

@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QCoreApplication>
+#include <QDebug>
 #include <QPixmapCache>
 #include <QThread>
 #include <QTime>
-#include <QDebug>
+#include <limits>
 
 #define GET_TYPE()                                                          \
     Qt::ConnectionType type;                                                \
@@ -100,10 +101,14 @@ class PixmapCache final : public QObject {
      */
     bool _markCacheMissByEviciton()
     {
+        static constexpr uint maxInt = static_cast<uint>(std::numeric_limits<int>::max());
+        static constexpr uint step = 10240;
+        static constexpr int oneSecond = 1000;
+
         auto now = QTime::currentTime();
         if (!m_last_cache_miss_by_eviciton.isNull()) {
             auto diff = m_last_cache_miss_by_eviciton.msecsTo(now);
-            if (diff < 1000) {  // less than a second ago
+            if (diff < oneSecond) {  // less than a second ago
                 ++m_consecutive_fast_evicitons;
             } else {
                 m_consecutive_fast_evicitons = 0;
@@ -111,11 +116,17 @@ class PixmapCache final : public QObject {
         }
         m_last_cache_miss_by_eviciton = now;
         if (m_consecutive_fast_evicitons >= m_consecutive_fast_evicitons_threshold) {
-            // double the cache size
+            // increase the cache size
-            auto newSize = _cacheLimit() * 2;
+            uint newSize = _cacheLimit() + step;
-            qDebug() << m_consecutive_fast_evicitons << "pixmap cache misses by eviction happened too fast, doubling cache size to"
+            if (newSize >= maxInt) {  // increase it until you overflow :D
-                     << newSize;
+                newSize = maxInt;
-            _setCacheLimit(newSize);
+                qDebug() << m_consecutive_fast_evicitons
+                         << tr("pixmap cache misses by eviction happened too fast, doing nothing as the cache size reached it's limit");
+            } else {
+                qDebug() << m_consecutive_fast_evicitons
+                         << tr("pixmap cache misses by eviction happened too fast, increasing cache size to") << static_cast<int>(newSize);
+            }
+            _setCacheLimit(static_cast<int>(newSize));
             m_consecutive_fast_evicitons = 0;
             return true;
         }

launcher/MangoHud.cpp

@@ -16,15 +16,25 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <QStringList>
+#include <QDebug>
 #include <QDir>
 #include <QString>
+#include <QStringList>
 #include <QSysInfo>
 #include <QtGlobal>
 
-#include "MangoHud.h"
 #include "FileSystem.h"
 #include "Json.h"
+#include "MangoHud.h"
+
+#ifdef __GLIBC__
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#define UNDEF_GNU_SOURCE
+#endif
+#include <dlfcn.h>
+#include <linux/limits.h>
+#endif
 
 namespace MangoHud {
 
@@ -106,4 +116,37 @@ QString getLibraryString()
 
     return QString();
 }
+
+QString findLibrary(QString libName)
+{
+#ifdef __GLIBC__
+    const char* library = libName.toLocal8Bit().constData();
+
+    void* handle = dlopen(library, RTLD_NOW);
+    if (!handle) {
+        qCritical() << "dlopen() failed:" << dlerror();
+        return {};
+    }
+
+    char path[PATH_MAX];
+    if (dlinfo(handle, RTLD_DI_ORIGIN, path) == -1) {
+        qCritical() << "dlinfo() failed:" << dlerror();
+        dlclose(handle);
+        return {};
+    }
+
+    auto fullPath = FS::PathCombine(QString(path), libName);
+
+    dlclose(handle);
+    return fullPath;
+#else
+    qWarning() << "MangoHud::findLibrary is not implemented on this platform";
+    return {};
+#endif
+}
 }  // namespace MangoHud
+
+#ifdef UNDEF_GNU_SOURCE
+#undef _GNU_SOURCE
+#undef UNDEF_GNU_SOURCE
+#endif

launcher/MangoHud.h

@@ -24,4 +24,6 @@
 namespace MangoHud {
 
 QString getLibraryString();
-}
+
+QString findLibrary(QString libName);
+}  // namespace MangoHud

launcher/Markdown.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <QString>
 #include <cmark.h>
+#include <QString>
 
 QString markdownToHTML(const QString& markdown);

launcher/MessageLevel.cpp

@@ -26,8 +26,7 @@ MessageLevel::Enum MessageLevel::fromLine(QString &line)
 {
     // Level prefix
     int endmark = line.indexOf("]!");
-    if (line.startsWith("!![") && endmark != -1)
+    if (line.startsWith("!![") && endmark != -1) {
-    {
         auto level = MessageLevel::getLevel(line.left(endmark).mid(3));
         line = line.mid(endmark + 2);
         return level;

launcher/MessageLevel.h

@@ -6,10 +6,8 @@
  * @brief the MessageLevel Enum
  * defines what level a log message is
  */
-namespace MessageLevel
+namespace MessageLevel {
-{
+enum Enum {
-enum Enum
-{
     Unknown,  /**< No idea what this is or where it came from */
     StdOut,   /**< Undetermined stderr messages */
     StdErr,   /**< Undetermined stdout messages */
@@ -25,4 +23,4 @@ MessageLevel::Enum getLevel(const QString &levelName);
 
 /* Get message level from a line. Line is modified if it was successful. */
 MessageLevel::Enum fromLine(QString& line);
-}
+}  // namespace MessageLevel

launcher/NullInstance.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 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,8 +38,7 @@
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 
-class NullInstance: public BaseInstance
+class NullInstance : public BaseInstance {
-{
     Q_OBJECT
    public:
     NullInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir)
@@ -47,78 +47,30 @@ public:
         setVersionBroken(true);
     }
     virtual ~NullInstance(){};
-    void saveNow() override
+    void saveNow() override {}
-    {
+    void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
-    }
+    QString getStatusbarDescription() override { return tr("Unknown instance type"); };
-    void loadSpecificSettings() override
+    QSet<QString> traits() const override { return {}; };
-    {
+    QString instanceConfigFolder() const override { return instanceRoot(); };
-        setSpecificSettingsLoaded(true);
+    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override { return nullptr; }
-    }
+    shared_qobject_ptr<Task> createUpdateTask([[maybe_unused]] Net::Mode mode) override { return nullptr; }
-    QString getStatusbarDescription() override
+    QProcessEnvironment createEnvironment() override { return QProcessEnvironment(); }
-    {
+    QProcessEnvironment createLaunchEnvironment() override { return QProcessEnvironment(); }
-        return tr("Unknown instance type");
+    QMap<QString, QString> getVariables() override { return QMap<QString, QString>(); }
-    };
+    IPathMatcher::Ptr getLogFileMatcher() override { return nullptr; }
-    QSet< QString > traits() const override
+    QString getLogFileRoot() override { return instanceRoot(); }
-    {
+    QString typeName() const override { return "Null"; }
-        return {};
+    bool canExport() const override { return false; }
-    };
+    bool canEdit() const override { return false; }
-    QString instanceConfigFolder() const override
+    bool canLaunch() const override { return false; }
-    {
+    void populateLaunchMenu(QMenu* menu) override {}
-        return instanceRoot();
-    };
-    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override
-    {
-        return nullptr;
-    }
-    shared_qobject_ptr< Task > createUpdateTask(Net::Mode mode) override
-    {
-        return nullptr;
-    }
-    QProcessEnvironment createEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QProcessEnvironment createLaunchEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QMap<QString, QString> getVariables() override
-    {
-        return QMap<QString, QString>();
-    }
-    IPathMatcher::Ptr getLogFileMatcher() override
-    {
-        return nullptr;
-    }
-    QString getLogFileRoot() override
-    {
-        return instanceRoot();
-    }
-    QString typeName() const override
-    {
-        return "Null";
-    }
-    bool canExport() const override
-    {
-        return false;
-    }
-    bool canEdit() const override
-    {
-        return false;
-    }
-    bool canLaunch() const override
-    {
-        return false;
-    }
     QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override
     {
         QStringList out;
         out << "Null instance - placeholder.";
         return out;
     }
-    QString modsRoot() const override {
+    QString modsRoot() const override { return QString(); }
-        return QString();
-    }
     void updateRuntimeContext()
     {
         // NOOP

launcher/ProblemProvider.h

@@ -1,41 +1,29 @@
 #pragma once
 
-enum class ProblemSeverity
+#include <QList>
-{
+#include <QString>
-    None,
-    Warning,
-    Error
-};
 
-struct PatchProblem
+enum class ProblemSeverity { None, Warning, Error };
-{
+
+struct PatchProblem {
     ProblemSeverity m_severity;
     QString m_description;
 };
 
-class ProblemProvider
+class ProblemProvider {
-{
    public:
-    virtual ~ProblemProvider() {};
+    virtual ~ProblemProvider() {}
     virtual const QList<PatchProblem> getProblems() const = 0;
     virtual ProblemSeverity getProblemSeverity() const = 0;
 };
 
-class ProblemContainer : public ProblemProvider
+class ProblemContainer : public ProblemProvider {
-{
    public:
-    const QList<PatchProblem> getProblems() const override
+    const QList<PatchProblem> getProblems() const override { return m_problems; }
-    {
+    ProblemSeverity getProblemSeverity() const override { return m_problemSeverity; }
-        return m_problems;
-    }
-    ProblemSeverity getProblemSeverity() const override
-    {
-        return m_problemSeverity;
-    }
     virtual void addProblem(ProblemSeverity severity, const QString& description)
     {
-        if(severity > m_problemSeverity)
+        if (severity > m_problemSeverity) {
-        {
             m_problemSeverity = severity;
         }
         m_problems.append({ severity, description });

launcher/QVariantUtils.h

@@ -36,35 +36,34 @@
 
 #pragma once
 
-
-#include <QVariant>
 #include <QList>
+#include <QVariant>
 
 namespace QVariantUtils {
 
 template <typename T>
-inline QList<T> toList(QVariant src) {
+inline QList<T> toList(QVariant src)
+{
     QVariantList variantList = src.toList();
 
     QList<T> list_t;
     list_t.reserve(variantList.size());
-    for (const QVariant& v : variantList)
+    for (const QVariant& v : variantList) {
-    {
         list_t.append(v.value<T>());
     }
     return list_t;
 }
 
 template <typename T>
-inline QVariant fromList(QList<T> val) {
+inline QVariant fromList(QList<T> val)
+{
     QVariantList variantList;
     variantList.reserve(val.size());
-    for (const T& v : val)
+    for (const T& v : val) {
-    {
         variantList.append(v);
     }
 
     return variantList;
 }
 
-}
+}  // namespace QVariantUtils

launcher/RWStorage.h

@@ -1,12 +1,11 @@
 #pragma once
-#include <QWriteLocker>
-#include <QReadLocker>
 #include <QMap>
+#include <QReadLocker>
 #include <QSet>
+#include <QWriteLocker>
 
 template <typename K, typename V>
-class RWStorage
+class RWStorage {
-{
    public:
     void add(K key, V value)
     {
@@ -17,21 +16,19 @@ public:
     V get(K key)
     {
         QReadLocker l(&lock);
-        if(cache.contains(key))
+        if (cache.contains(key)) {
-        {
             return cache[key];
-        }
+        } else
-        else return V();
+            return V();
     }
     bool get(K key, V& value)
     {
         QReadLocker l(&lock);
-        if(cache.contains(key))
+        if (cache.contains(key)) {
-        {
             value = cache[key];
             return true;
-        }
+        } else
-        else return false;
+            return false;
     }
     bool has(K key)
     {
@@ -48,8 +45,7 @@ public:
     void setStale(K key)
     {
         QWriteLocker l(&lock);
-        if(cache.contains(key))
+        if (cache.contains(key)) {
-        {
             stale_entries.insert(key);
         }
     }
@@ -59,6 +55,7 @@ public:
         cache.clear();
         stale_entries.clear();
     }
+
    private:
     QReadWriteLock lock;
     QMap<K, V> cache;

launcher/RecursiveFileSystemWatcher.cpp

@@ -1,15 +1,12 @@
 #include "RecursiveFileSystemWatcher.h"
 
-#include <QRegularExpression>
 #include <QDebug>
+#include <QRegularExpression>
 
-RecursiveFileSystemWatcher::RecursiveFileSystemWatcher(QObject *parent)
+RecursiveFileSystemWatcher::RecursiveFileSystemWatcher(QObject* parent) : QObject(parent), m_watcher(new QFileSystemWatcher(this))
-    : QObject(parent), m_watcher(new QFileSystemWatcher(this))
 {
-    connect(m_watcher, &QFileSystemWatcher::fileChanged, this,
+    connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &RecursiveFileSystemWatcher::fileChange);
-            &RecursiveFileSystemWatcher::fileChange);
+    connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &RecursiveFileSystemWatcher::directoryChange);
-    connect(m_watcher, &QFileSystemWatcher::directoryChanged, this,
-            &RecursiveFileSystemWatcher::directoryChange);
 }
 
 void RecursiveFileSystemWatcher::setRootDir(const QDir& root)
@@ -18,8 +15,7 @@ void RecursiveFileSystemWatcher::setRootDir(const QDir &root)
     disable();
     m_root = root;
     setFiles(scanRecursive(m_root));
-    if (wasEnabled)
+    if (wasEnabled) {
-    {
         enable();
     }
 }
@@ -28,16 +24,14 @@ void RecursiveFileSystemWatcher::setWatchFiles(const bool watchFiles)
     bool wasEnabled = m_isEnabled;
     disable();
     m_watchFiles = watchFiles;
-    if (wasEnabled)
+    if (wasEnabled) {
-    {
         enable();
     }
 }
 
 void RecursiveFileSystemWatcher::enable()
 {
-    if (m_isEnabled)
+    if (m_isEnabled) {
-    {
         return;
     }
     Q_ASSERT(m_root != QDir::root());
@@ -46,8 +40,7 @@ void RecursiveFileSystemWatcher::enable()
 }
 void RecursiveFileSystemWatcher::disable()
 {
-    if (!m_isEnabled)
+    if (!m_isEnabled) {
-    {
         return;
     }
     m_isEnabled = false;
@@ -57,8 +50,7 @@ void RecursiveFileSystemWatcher::disable()
 
 void RecursiveFileSystemWatcher::setFiles(const QStringList& files)
 {
-    if (files != m_files)
+    if (files != m_files) {
-    {
         m_files = files;
         emit filesChanged();
     }
@@ -67,14 +59,11 @@ void RecursiveFileSystemWatcher::setFiles(const QStringList &files)
 void RecursiveFileSystemWatcher::addFilesToWatcherRecursive(const QDir& dir)
 {
     m_watcher->addPath(dir.absolutePath());
-    for (const QString &directory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+    for (const QString& directory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
-    {
         addFilesToWatcherRecursive(dir.absoluteFilePath(directory));
     }
-    if (m_watchFiles)
+    if (m_watchFiles) {
-    {
+        for (const QFileInfo& info : dir.entryInfoList(QDir::Files)) {
-        for (const QFileInfo &info : dir.entryInfoList(QDir::Files))
-        {
             m_watcher->addPath(info.absoluteFilePath());
         }
     }
@@ -82,19 +71,15 @@ void RecursiveFileSystemWatcher::addFilesToWatcherRecursive(const QDir &dir)
 QStringList RecursiveFileSystemWatcher::scanRecursive(const QDir& directory)
 {
     QStringList ret;
-    if(!m_matcher)
+    if (!m_matcher) {
-    {
         return {};
     }
-    for (const QString &dir : directory.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden))
+    for (const QString& dir : directory.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden)) {
-    {
         ret.append(scanRecursive(directory.absoluteFilePath(dir)));
     }
-    for (const QString &file : directory.entryList(QDir::Files | QDir::Hidden))
+    for (const QString& file : directory.entryList(QDir::Files | QDir::Hidden)) {
-    {
         auto relPath = m_root.relativeFilePath(directory.absoluteFilePath(file));
-        if (m_matcher->matches(relPath))
+        if (m_matcher->matches(relPath)) {
-        {
             ret.append(relPath);
         }
     }
@@ -105,7 +90,7 @@ void RecursiveFileSystemWatcher::fileChange(const QString &path)
 {
     emit fileChanged(path);
 }
-void RecursiveFileSystemWatcher::directoryChange(const QString &path)
+void RecursiveFileSystemWatcher::directoryChange([[maybe_unused]] const QString& path)
 {
     setFiles(scanRecursive(m_root));
 }

launcher/RecursiveFileSystemWatcher.h

@@ -1,37 +1,24 @@
 #pragma once
 
-#include <QFileSystemWatcher>
 #include <QDir>
+#include <QFileSystemWatcher>
 #include "pathmatcher/IPathMatcher.h"
 
-class RecursiveFileSystemWatcher : public QObject
+class RecursiveFileSystemWatcher : public QObject {
-{
     Q_OBJECT
    public:
     RecursiveFileSystemWatcher(QObject* parent);
 
     void setRootDir(const QDir& root);
-    QDir rootDir() const
+    QDir rootDir() const { return m_root; }
-    {
-        return m_root;
-    }
 
     // WARNING: setting this to true may be bad for performance
     void setWatchFiles(const bool watchFiles);
-    bool watchFiles() const
+    bool watchFiles() const { return m_watchFiles; }
-    {
-        return m_watchFiles;
-    }
 
-    void setMatcher(IPathMatcher::Ptr matcher)
+    void setMatcher(IPathMatcher::Ptr matcher) { m_matcher = matcher; }
-    {
-        m_matcher = matcher;
-    }
 
-    QStringList files() const
+    QStringList files() const { return m_files; }
-    {
-        return m_files;
-    }
 
    signals:
     void filesChanged();

launcher/ResourceDownloadTask.cpp

@@ -24,6 +24,8 @@
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"
 
+#include "net/ApiDownload.h"
+
 ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
                                            ModPlatform::IndexedVersion version,
                                            const std::shared_ptr<ResourceFolderModel> packs,
@@ -51,10 +53,10 @@ ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
         }
     }
 
-    m_filesNetJob->addNetAction(Net::Download::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &ResourceDownloadTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &ResourceDownloadTask::downloadProgressChanged);
-    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propogateStepProgress);
+    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propagateStepProgress);
     connect(m_filesNetJob.get(), &NetJob::failed, this, &ResourceDownloadTask::downloadFailed);
 
     addTask(m_filesNetJob);

launcher/RuntimeContext.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify

launcher/SeparatorPrefixTree.h

@@ -1,26 +1,18 @@
 #pragma once
-#include <QString>
 #include <QMap>
+#include <QString>
 #include <QStringList>
 
 template <char Tseparator>
-class SeparatorPrefixTree
+class SeparatorPrefixTree {
-{
    public:
-    SeparatorPrefixTree(QStringList paths)
+    SeparatorPrefixTree(QStringList paths) { insert(paths); }
-    {
-        insert(paths);
-    }
 
-    SeparatorPrefixTree(bool contained = false)
+    SeparatorPrefixTree(bool contained = false) { m_contained = contained; }
-    {
-        m_contained = contained;
-    }
 
     void insert(QStringList paths)
     {
-        for(auto &path: paths)
+        for (auto& path : paths) {
-        {
             insert(path);
         }
     }
@@ -29,16 +21,12 @@ public:
     SeparatorPrefixTree& insert(QString path)
     {
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             children[path] = SeparatorPrefixTree(true);
             return children[path];
-        }
+        } else {
-        else
-        {
             auto prefix = path.left(sepIndex);
-            if(!children.contains(prefix))
+            if (!children.contains(prefix)) {
-            {
                 children[prefix] = SeparatorPrefixTree(false);
             }
             return children[prefix].insert(path.mid(sepIndex + 1));
@@ -56,26 +44,20 @@ public:
     bool covers(QString path) const
     {
         // if we found some valid node, it's good enough. the tree covers the path
-        if(m_contained)
+        if (m_contained) {
-        {
             return true;
         }
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             auto found = children.find(path);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return false;
             }
             return (*found).covers(QString());
-        }
+        } else {
-        else
-        {
             auto prefix = path.left(sepIndex);
             auto found = children.find(prefix);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return false;
             }
             return (*found).covers(path.mid(sepIndex + 1));
@@ -86,38 +68,30 @@ public:
     QString cover(QString path) const
     {
         // if we found some valid node, it's good enough. the tree covers the path
-        if(m_contained)
+        if (m_contained) {
-        {
             return QString("");
         }
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             auto found = children.find(path);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return QString();
             }
             auto nested = (*found).cover(QString());
-            if(nested.isNull())
+            if (nested.isNull()) {
-            {
                 return nested;
             }
             if (nested.isEmpty())
                 return path;
             return path + Tseparator + nested;
-        }
+        } else {
-        else
-        {
             auto prefix = path.left(sepIndex);
             auto found = children.find(prefix);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return QString();
             }
             auto nested = (*found).cover(path.mid(sepIndex + 1));
-            if(nested.isNull())
+            if (nested.isNull()) {
-            {
                 return nested;
             }
             if (nested.isEmpty())
@@ -130,21 +104,16 @@ public:
     bool exists(QString path) const
     {
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             auto found = children.find(path);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return false;
             }
             return true;
-        }
+        } else {
-        else
-        {
             auto prefix = path.left(sepIndex);
             auto found = children.find(prefix);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return false;
             }
             return (*found).exists(path.mid(sepIndex + 1));
@@ -155,21 +124,16 @@ public:
     const SeparatorPrefixTree* find(QString path) const
     {
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             auto found = children.find(path);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return nullptr;
             }
             return &(*found);
-        }
+        } else {
-        else
-        {
             auto prefix = path.left(sepIndex);
             auto found = children.find(prefix);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return nullptr;
             }
             return (*found).find(path.mid(sepIndex + 1));
@@ -177,70 +141,48 @@ public:
     }
 
     /// is this a leaf node?
-    bool leaf() const
+    bool leaf() const { return children.isEmpty(); }
-    {
-        return children.isEmpty();
-    }
 
     /// is this node actually contained in the tree, or is it purely structural?
-    bool contained() const
+    bool contained() const { return m_contained; }
-    {
-        return m_contained;
-    }
 
     /// Remove a path from the tree
-    bool remove(QString path)
+    bool remove(QString path) { return removeInternal(path) != Failed; }
-    {
-        return removeInternal(path) != Failed;
-    }
 
     /// Clear all children of this node tree node
-    void clear()
+    void clear() { children.clear(); }
-    {
-        children.clear();
-    }
 
     QStringList toStringList() const
     {
         QStringList collected;
         // collecting these is more expensive.
         auto iter = children.begin();
-        while(iter != children.end())
+        while (iter != children.end()) {
-        {
             QStringList list = iter.value().toStringList();
-            for(int i = 0; i < list.size(); i++)
+            for (int i = 0; i < list.size(); i++) {
-            {
                 list[i] = iter.key() + Tseparator + list[i];
             }
             collected.append(list);
-            if((*iter).m_contained)
+            if ((*iter).m_contained) {
-            {
                 collected.append(iter.key());
             }
             iter++;
         }
         return collected;
     }
+
    private:
-    enum Removal
+    enum Removal { Failed, Succeeded, HasChildren };
-    {
-        Failed,
-        Succeeded,
-        HasChildren
-    };
     Removal removeInternal(QString path = QString())
     {
-        if(path.isEmpty())
+        if (path.isEmpty()) {
-        {
+            if (!m_contained) {
-            if(!m_contained)
-            {
                 // remove all children - we are removing a prefix
                 clear();
                 return Succeeded;
             }
             m_contained = false;
-            if(children.size())
+            if (children.size()) {
-            {
                 return HasChildren;
             }
             return Succeeded;
@@ -248,42 +190,32 @@ private:
         Removal remStatus = Failed;
         QString childToRemove;
         auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
+        if (sepIndex == -1) {
-        {
             childToRemove = path;
             auto found = children.find(childToRemove);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return Failed;
             }
             remStatus = (*found).removeInternal();
-        }
+        } else {
-        else
-        {
             childToRemove = path.left(sepIndex);
             auto found = children.find(childToRemove);
-            if(found == children.end())
+            if (found == children.end()) {
-            {
                 return Failed;
             }
             remStatus = (*found).removeInternal(path.mid(sepIndex + 1));
         }
-        switch (remStatus)
+        switch (remStatus) {
-        {
             case Failed:
-            case HasChildren:
+            case HasChildren: {
-            {
                 return remStatus;
             }
-            case Succeeded:
+            case Succeeded: {
-            {
                 children.remove(childToRemove);
-                if(m_contained)
+                if (m_contained) {
-                {
                     return HasChildren;
                 }
-                if(children.size())
+                if (children.size()) {
-                {
                     return HasChildren;
                 }
                 return Succeeded;

launcher/SkinUtils.cpp

@@ -14,17 +14,16 @@
  */
 
 #include "SkinUtils.h"
-#include "net/HttpMetaCache.h"
 #include "Application.h"
+#include "net/HttpMetaCache.h"
 
 #include <QFile>
-#include <QPainter>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
+#include <QPainter>
 
-namespace SkinUtils
+namespace SkinUtils {
-{
 /*
  * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise
  */
@@ -32,12 +31,15 @@ QPixmap getFaceFromCache(QString username, int height, int width)
 {
     QFile fskin(APPLICATION->metacache()->resolveEntry("skins", username + ".png")->getFullPath());
 
-    if (fskin.exists())
+    if (fskin.exists()) {
-    {
         QPixmap skinTexture(fskin.fileName());
-        if(!skinTexture.isNull())
+        if (!skinTexture.isNull()) {
-        {
             QPixmap skin = QPixmap(8, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            skin.fill(QColorConstants::Transparent);
+#else
+            skin.fill(QColor(0, 0, 0, 0));
+#endif
             QPainter painter(&skin);
             painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
             painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));
@@ -47,4 +49,4 @@ QPixmap getFaceFromCache(QString username, int height, int width)
 
     return QPixmap();
 }
-}
+}  // namespace SkinUtils

launcher/SkinUtils.h

@@ -17,7 +17,6 @@
 
 #include <QPixmap>
 
-namespace SkinUtils
+namespace SkinUtils {
-{
 QPixmap getFaceFromCache(QString id, int height = 64, int width = 64);
 }

launcher/StringUtils.cpp

@@ -35,6 +35,7 @@
  */
 
 #include "StringUtils.h"
+#include <qpair.h>
 
 #include <QRegularExpression>
 #include <QUuid>
@@ -149,7 +150,7 @@ QString StringUtils::truncateUrlHumanFriendly(QUrl& url, int max_len, bool hard_
     }
 
     if ((url_compact.length() >= max_len) && hard_limit) {
-        // still too long, truncate normaly
+        // still too long, truncate normally
         url_compact = QString(str_url);
         auto to_remove = url_compact.length() - max_len + 3;
         url_compact.remove(url_compact.length() - to_remove - 1, to_remove);
@@ -182,3 +183,32 @@ QString StringUtils::getRandomAlphaNumeric()
 {
     return QUuid::createUuid().toString(QUuid::Id128);
 }
+
+QPair<QString, QString> StringUtils::splitFirst(const QString& s, const QString& sep, Qt::CaseSensitivity cs)
+{
+    QString left, right;
+    auto index = s.indexOf(sep, 0, cs);
+    left = s.mid(0, index);
+    right = s.mid(index + sep.length());
+    return qMakePair(left, right);
+}
+
+QPair<QString, QString> StringUtils::splitFirst(const QString& s, QChar sep, Qt::CaseSensitivity cs)
+{
+    QString left, right;
+    auto index = s.indexOf(sep, 0, cs);
+    left = s.mid(0, index);
+    right = s.mid(left.length() + 1);
+    return qMakePair(left, right);
+}
+
+QPair<QString, QString> StringUtils::splitFirst(const QString& s, const QRegularExpression& re)
+{
+    QString left, right;
+    QRegularExpressionMatch match;
+    auto index = s.indexOf(re, 0, &match);
+    left = s.mid(0, index);
+    auto end = match.hasMatch() ? left.length() + match.capturedLength() : left.length() + 1;
+    right = s.mid(end);
+    return qMakePair(left, right);
+}

launcher/StringUtils.h

@@ -36,8 +36,10 @@
 
 #pragma once
 
+#include <QPair>
 #include <QString>
 #include <QUrl>
+#include <utility>
 
 namespace StringUtils {
 
@@ -70,13 +72,17 @@ int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs)
 /**
  * @brief Truncate a url while keeping its readability py placing the `...` in the middle of the path
  * @param url Url to truncate
- * @param max_len max lenght of url in charaters
+ * @param max_len max length of url in characters
- * @param hard_limit if truncating the path can't get the url short enough, truncate it normaly.
+ * @param hard_limit if truncating the path can't get the url short enough, truncate it normally.
  */
 QString truncateUrlHumanFriendly(QUrl& url, int max_len, bool hard_limit = false);
 
 QString humanReadableFileSize(double bytes, bool use_si = false, int decimal_points = 1);
 
-
 QString getRandomAlphaNumeric();
+
+QPair<QString, QString> splitFirst(const QString& s, const QString& sep, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+QPair<QString, QString> splitFirst(const QString& s, QChar sep, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+QPair<QString, QString> splitFirst(const QString& s, const QRegularExpression& re);
+
 }  // namespace StringUtils

launcher/Usable.h

@@ -12,27 +12,19 @@ class Usable;
  *
  * @see UseLock
  */
-class Usable
+class Usable {
-{
     friend class UseLock;
+
    public:
-    std::size_t useCount() const
+    virtual ~Usable() {}
-    {
+
-        return m_useCount;
+    std::size_t useCount() const { return m_useCount; }
-    }
+    bool isInUse() const { return m_useCount > 0; }
-    bool isInUse() const
+
-    {
-        return m_useCount > 0;
-    }
    protected:
-    virtual void decrementUses()
+    virtual void decrementUses() { m_useCount--; }
-    {
+    virtual void incrementUses() { m_useCount++; }
-        m_useCount--;
+
-    }
-    virtual void incrementUses()
-    {
-        m_useCount++;
-    }
    private:
     std::size_t m_useCount = 0;
 };
@@ -42,19 +34,15 @@ private:
  *
  * @see Usable
  */
-class UseLock
+class UseLock {
-{
    public:
-    UseLock(shared_qobject_ptr<Usable> usable)
+    UseLock(shared_qobject_ptr<Usable> usable) : m_usable(usable)
-        : m_usable(usable)
     {
         // this doesn't use shared pointer use count, because that wouldn't be correct. this count is separate.
         m_usable->incrementUses();
     }
-    ~UseLock()
+    ~UseLock() { m_usable->decrementUses(); }
-    {
+
-        m_usable->decrementUses();
-    }
    private:
     shared_qobject_ptr<Usable> m_usable;
 };

launcher/Version.cpp

@@ -117,12 +117,14 @@ QDebug operator<<(QDebug debug, const Version& v)
 
     bool first = true;
     for (auto s : v.m_sections) {
-        if (!first) debug.nospace() << ", ";
+        if (!first)
+            debug.nospace() << ", ";
         debug.nospace() << s.m_fullString;
         first = false;
     }
 
-    debug.nospace() << " ]" << " }";
+    debug.nospace() << " ]"
+                    << " }";
 
     return debug;
 }

launcher/Version.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -56,6 +56,7 @@ class Version {
     bool operator!=(const Version& other) const;
 
     QString toString() const { return m_string; }
+    bool isEmpty() const { return m_string.isEmpty(); }
 
     friend QDebug operator<<(QDebug debug, const Version& v);
 
@@ -63,7 +64,7 @@ class Version {
     struct Section {
         explicit Section(QString fullString) : m_fullString(std::move(fullString))
         {
-            int cutoff = m_fullString.size();
+            qsizetype cutoff = m_fullString.size();
             for (int i = 0; i < m_fullString.size(); i++) {
                 if (!m_fullString[i].isDigit()) {
                     cutoff = i;
@@ -150,14 +151,8 @@ class Version {
             return m_fullString < other.m_fullString;
         }
 
-        inline bool operator!=(const Section& other) const
+        inline bool operator!=(const Section& other) const { return !(*this == other); }
-        {
+        inline bool operator>(const Section& other) const { return !(*this < other || *this == other); }
-            return !(*this == other);
-        }
-        inline bool operator>(const Section &other) const
-        {
-            return !(*this < other || *this == other);
-        }
     };
 
    private:
@@ -166,5 +161,3 @@ class Version {
 
     void parse();
 };
-
-