Merge pull request #648 from Scrumplex/bump-6.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

.envrc

@@ -1 +0,0 @@
-use flake

.git-blame-ignore-revs

@@ -1,4 +0,0 @@
-# .git-blame-ignore-revs
-
-# tabs -> spaces
-bbb3b3e6f6e3c0f95873f22e6d0a4aaf350f49d9

.github/workflows/build.yml

@@ -15,12 +15,6 @@ on:
       SPARKLE_ED25519_KEY:
         description: Private key for signing Sparkle updates
         required: false
-      WINDOWS_CODESIGN_CERT:
-        description: Certificate for signing Windows builds
-        required: false
-      WINDOWS_CODESIGN_PASSWORD:
-        description: Password for signing Windows builds
-        required: false
       CACHIX_AUTH_TOKEN:
         description: Private token for authenticating against Cachix cache
         required: false
@@ -46,7 +40,6 @@ jobs:
           - os: windows-2022
             name: "Windows-MinGW-w64"
             msystem: clang64
-            vcvars_arch: 'amd64_x86'
 
           - os: windows-2022
             name: "Windows-MSVC-Legacy"
@@ -68,7 +61,7 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: ''
-            qt_version: '6.5.1'
+            qt_version: '6.4.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -80,17 +73,17 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.5.1'
+            qt_version: '6.4.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
           - os: macos-12
             name: macOS
-            macosx_deployment_target: 11.0
+            macosx_deployment_target: 10.15
             qt_ver: 6
             qt_host: mac
             qt_arch: ''
-            qt_version: '6.5.0'
+            qt_version: '6.3.0'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -112,7 +105,6 @@ jobs:
       INSTALL_APPIMAGE_DIR: "install-appdir"
       BUILD_DIR: "build"
       CCACHE_VAR: ""
-      HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
 
     steps:
       ##
@@ -143,7 +135,6 @@ jobs:
             quazip-qt6:p
             ccache:p
             qt6-5compat:p
-            cmark:p
 
       - name: Force newer ccache
         if: runner.os == 'Windows' && matrix.msystem == '' && inputs.build_type == 'Debug'
@@ -152,19 +143,10 @@ 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.5
         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
-        with:
-          path: '${{ github.workspace }}\.ccache'
-          key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }}
-          restore-keys: |
-              ${{ matrix.os }}-mingw-w64-ccache
-
       - name: Setup ccache (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
         shell: msys2 {0}
@@ -181,6 +163,15 @@ jobs:
         run: |
           echo "CCACHE_VAR=ccache" >> $GITHUB_ENV
 
+      - name: Retrieve ccache cache (Windows MinGW-w64)
+        if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
+        uses: actions/cache@v3.0.11
+        with:
+          path: '${{ github.workspace }}\.ccache'
+          key: ${{ matrix.os }}-mingw-w64
+          restore-keys: |
+              ${{ matrix.os }}-mingw-w64
+
       - name: Set short version
         shell: bash
         run: |
@@ -191,7 +182,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install ninja-build extra-cmake-modules scdoc appstream
+          sudo apt-get -y install ninja-build extra-cmake-modules scdoc
 
       - name: Install Dependencies (macOS)
         if: runner.os == 'macOS'
@@ -208,8 +199,6 @@ jobs:
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
         uses: jurplel/install-qt-action@v3
         with:
-           aqtversion: '==3.1.*'
-           py7zrversion: '>=0.20.2'
            version: ${{ matrix.qt_version }}
            host: 'windows'
            target: 'desktop'
@@ -225,8 +214,6 @@ 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.*'
-           py7zrversion: '>=0.20.2'
            version: ${{ matrix.qt_version }}
            host: ${{ matrix.qt_host }}
            target: 'desktop'
@@ -236,7 +223,7 @@ jobs:
            cache: ${{ inputs.is_qt_cached }}
 
       - name: Install MSVC (Windows MSVC)
-        if: runner.os == 'Windows'  # We want this for MinGW builds as well, as we need SignTool
+        if: runner.os == 'Windows' && matrix.msystem == ''
         uses: ilammy/msvc-dev-cmd@v1
         with:
           vsversion: 2022
@@ -250,7 +237,6 @@ jobs:
           wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
 
           ${{ github.workspace }}/.github/scripts/prepare_JREs.sh
-          sudo apt install libopengl0
 
       - name: Add QT_HOST_PATH var (Windows MSVC arm64)
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
@@ -264,23 +250,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=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
+          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
 
       - 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=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
+          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
 
       - 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=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=6 -DCMAKE_OBJDUMP=/mingw64/bin/objdump.exe -G Ninja
+          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
 
       - 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=official -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=${{ matrix.name }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} -DLauncher_FORCE_BUNDLED_LIBS=ON
           # https://github.com/ccache/ccache/wiki/MS-Visual-Studio (I coudn't figure out the compiler prefix)
           if ("${{ env.CCACHE_VAR }}")
           {
@@ -295,7 +281,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=official -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=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
 
       ##
       # BUILD
@@ -376,8 +362,6 @@ jobs:
         shell: msys2 {0}
         run: |
           cmake --install ${{ env.BUILD_DIR }}
-          touch ${{ env.INSTALL_DIR }}/manifest.txt
-          for l in $(find ${{ env.INSTALL_DIR }} -type f); do l=$(cygpath -u $l); l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_DIR }}/}; l=${l#./}; echo $l; done >> ${{ env.INSTALL_DIR }}/manifest.txt 
 
       - name: Package (Windows MSVC)
         if: runner.os == 'Windows' && matrix.msystem == ''
@@ -390,27 +374,6 @@ jobs:
             Copy-Item D:/a/PrismLauncher/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
           }
-          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
-        run: |
-          echo '${{ secrets.WINDOWS_CODESIGN_CERT }}' | base64 --decode > codesign.pfx
-
-      - name: Sign executable (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          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
-          } else {
-            ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
-          }
 
       - name: Package (Windows MinGW-w64, portable)
         if: runner.os == 'Windows' && matrix.msystem != ''
@@ -418,7 +381,6 @@ jobs:
         run: |
           cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }}  # cmake install on Windows is slow, let's just copy instead
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
-          for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=$(cygpath -u $l); l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done >> ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt
 
       - name: Package (Windows MSVC, portable)
         if: runner.os == 'Windows' && matrix.msystem == ''
@@ -426,28 +388,16 @@ jobs:
           cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }}  # cmake install on Windows is slow, let's just copy instead
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
 
-          Get-ChildItem ${{ env.INSTALL_PORTABLE_DIR }} -Recurse | ForEach FullName | Resolve-Path -Relative | %{ $_.TrimStart('.\') } | %{ $_.TrimStart('${{ env.INSTALL_PORTABLE_DIR }}') } | %{ $_.TrimStart('\') } | Out-File -FilePath ${{ env.INSTALL_DIR }}/manifest.txt
-
       - name: Package (Windows, installer)
         if: runner.os == 'Windows'
         run: |
           cd ${{ env.INSTALL_DIR }}
           makensis -NOCD "${{ github.workspace }}/${{ env.BUILD_DIR }}/program_info/win_install.nsi"
 
-      - name: Sign installer (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          if (Get-Content ./codesign.pfx){
-            SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com PrismLauncher-Setup.exe
-          } else {
-            ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
-          }
-
       - name: Package (Linux)
         if: runner.os == 'Linux'
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }}
-          for l in $(find ${{ env.INSTALL_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_DIR }}/manifest.txt
 
           cd ${{ env.INSTALL_DIR }}
           tar --owner root --group root -czf ../PrismLauncher.tar.gz *
@@ -457,8 +407,6 @@ jobs:
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }}
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
-          for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt
-
 
           cd ${{ env.INSTALL_PORTABLE_DIR }}
           tar -czf ../PrismLauncher-portable.tar.gz *
@@ -468,8 +416,7 @@ jobs:
         shell: bash
         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"
 
           chmod +x linuxdeploy-*.AppImage
@@ -484,8 +431,7 @@ jobs:
           cp -r /home/runner/work/PrismLauncher/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/
+          cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}//usr/lib/
-          cp /usr/lib/x86_64-linux-gnu/libOpenGL.so.0* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
 
           LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib"
           LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk/lib/amd64/server"
@@ -562,12 +508,30 @@ jobs:
         with:
           name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
           path: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
-
+  snap:
-      - name: ccache stats (Windows MinGW-w64)
+    runs-on: ubuntu-20.04
-        if: runner.os == 'Windows' && matrix.msystem != ''
+    steps:
-        shell: msys2 {0}
+      - name: Checkout
+        if: inputs.build_type == 'Debug'
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      - name: Set short version
+        shell: bash
+        if: inputs.build_type == 'Debug'
         run: |
-          ccache -s
+          ver_short=`git rev-parse --short HEAD`
+          echo "VERSION=$ver_short" >> $GITHUB_ENV
+      - name: Package Snap (Linux)
+        id: snapcraft
+        if: inputs.build_type == 'Debug'
+        uses: snapcore/action-build@v1
+      - name: Upload Snap (Linux)
+        if: inputs.build_type == 'Debug'
+        uses: actions/upload-artifact@v3
+        with:
+          name: prismlauncher_${{ env.VERSION }}_amd64.snap
+          path: ${{ steps.snapcraft.outputs.snap }}
 
   flatpak:
     runs-on: ubuntu-latest
@@ -582,10 +546,11 @@ jobs:
           submodules: 'true'
       - name: Build Flatpak (Linux)
         if: inputs.build_type == 'Debug'
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v4
         with:
           bundle: "Prism Launcher.flatpak"
           manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml 
+          cache-key: flatpak-${{ github.sha }}-x86_64
 
   nix:
     runs-on: ubuntu-latest
@@ -602,7 +567,7 @@ jobs:
           submodules: 'true'
       - name: Install nix
         if: inputs.build_type == 'Debug'
-        uses: cachix/install-nix-action@v22
+        uses: cachix/install-nix-action@v18
         with:
           install_url: https://nixos.org/nix/install
           extra_nix_config: |

.github/workflows/trigger_builds.yml

@@ -31,6 +31,4 @@ jobs:
       is_qt_cached: true
     secrets:
       SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
-      WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
-      WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

.github/workflows/trigger_release.yml

@@ -15,9 +15,6 @@ jobs:
       is_qt_cached: false
     secrets:
       SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
-      WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
-      WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
-      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
   create_release:
     needs: build_release
@@ -47,7 +44,7 @@ jobs:
           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
 
-          tar --exclude='.git' -czf PrismLauncher-${{ env.VERSION }}.tar.gz PrismLauncher-${{ env.VERSION }}
+          tar -czf PrismLauncher-${{ env.VERSION }}.tar.gz PrismLauncher-${{ env.VERSION }}
 
           for d in PrismLauncher-Windows-MSVC*; do
             cd "${d}" || continue

.github/workflows/update-flake.yml

@@ -1,28 +0,0 @@
-name: Update Flake Lockfile
-
-on:
-  schedule:
-    # run weekly on sunday
-    - cron: "0 0 * * 0"
-  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: cachix/install-nix-action@v22
-
-      - uses: DeterminateSystems/update-flake-lock@v19
-        with:
-          commit-msg: "chore(nix): update lockfile"
-          pr-title: "chore(nix): update lockfile"
-          pr-labels: |
-            Linux
-            simple change

.github/workflows/winget.yml

@@ -7,7 +7,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
+      - uses: vedantmgoyal2009/winget-releaser@v1
         with:
           identifier: PrismLauncher.PrismLauncher
           version: ${{ github.event.release.tag_name }}

.gitignore

@@ -11,14 +11,10 @@ html/
 *.pro.user
 CMakeLists.txt.user
 CMakeLists.txt.user.*
-CMakeSettings.json
-/CMakeFiles
-CMakeCache.txt
 /.project
 /.settings
 /.idea
 /.vscode
-/.vs
 cmake-build-*/
 Debug
 
@@ -46,9 +42,7 @@ run/
 .cache/
 
 # Nix/NixOS
-.direnv/
+result/
-.pre-commit-config.yaml
-result
 
 # Flatpak
 .flatpak-builder

.gitmodules

@@ -16,9 +16,3 @@
 [submodule "libraries/extra-cmake-modules"]
 	path = libraries/extra-cmake-modules
 	url = https://github.com/KDE/extra-cmake-modules
-[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

BUILD.md

@@ -1,3 +1,53 @@
 # Build Instructions
 
-Full build instructions are available on [the website](https://prismlauncher.org/wiki/development/build-instructions/).
+Full build instructions will be available on [the website](https://prismlauncher.org/wiki/development/build-instructions/).
+
+If you would like to contribute or fix an issue with the Build instructions you will be able to do so [here](https://github.com/PrismLauncher/website/blob/master/src/wiki/development/build-instructions.md).
+
+## Getting the source
+
+Clone the source code using git, and grab all the submodules. This is generic for all platforms you want to build on.
+```
+git clone --recursive https://github.com/PrismLauncher/PrismLauncher
+cd PrismLauncher
+```
+
+## Linux
+
+This guide will mostly mention dependant packages by their Debian naming and commands are done by a user in the sudoers file.
+### Dependencies
+
+- A C++ compiler capable of building C++17 code (can be found in the package `build-essential`).
+- Qt Development tools 5.12 or newer (on Debian 11 or Debian-based distributions, `qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5`).
+- `cmake` 3.15 or newer.
+- `extra-cmake-modules`.
+- zlib (`zlib1g-dev` on Debian 11 or Debian-based distributions).
+- Java Development Kit (Java JDK) (`openjdk-17-jdk` on Debian 11 or Debian-based distributions).
+- Mesa GL headers (`libgl1-mesa-dev` on Debian 11 or Debian-based distributions).
+- (Optional) `scdoc` to generate man pages.
+
+In conclusion, to check if all you need is installed (including optional):
+
+```
+sudo apt install build-essential qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 cmake extra-cmake-modules zlib1g-dev openjdk-17-jdk libgl1-mesa-dev scdoc
+```
+
+### Compiling
+#### Building and installing on the system
+This is usually the suggested way to build the client.
+
+```
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DENABLE_LTO=ON
+cmake --build build -j$(nproc)
+sudo cmake --install build
+```
+
+#### Building a portable binary
+
+```
+cmake -S . -B build -DCMAKE_INSTALL_PREFIX=install
+cmake --build build -j$(nproc)
+cmake --install build
+cmake --install build --component portable
+```
+

CMakeLists.txt

@@ -85,38 +85,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0")
 # set CXXFLAGS for build targets
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}")
 
-option(DEBUG_ADDRESS_SANITIZER "Enable Address Sanitizer in Debug builds" on)
-
-# If this is a Debug build turn on address sanitiser
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND DEBUG_ADDRESS_SANITIZER)
-    message(STATUS "Address Sanitizer enabled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off")
-    if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-            # using clang with clang-cl front end 
-            message(STATUS "Address Sanitizer available on Clang MSVC frontend")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
-        else()
-            # AppleClang and Clang
-            message(STATUS "Address Sanitizer available on Clang")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-        endif()
-    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        # GCC
-        message(STATUS "Address Sanitizer available on GCC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-        link_libraries("asan")
-    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        message(STATUS "Address Sanitizer available on MSVC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
-    else()
-        message(STATUS "Address Sanitizer not available on compiler ${CMAKE_CXX_COMPILER_ID}")
-    endif()
-endif()
-
 option(ENABLE_LTO "Enable Link Time Optimization" off)
 
 if(ENABLE_LTO)
@@ -170,15 +138,15 @@ set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL th
 set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help")
 
 ######## Set version numbers ########
-set(Launcher_VERSION_MAJOR 7)
+set(Launcher_VERSION_MAJOR 6)
-set(Launcher_VERSION_MINOR 2)
+set(Launcher_VERSION_MINOR 1)
 
 set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}")
 set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.0.0")
 set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_MINOR},0,0")
 
 # Build platform.
-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.")
+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.")
 
 # Channel list URL
 set(Launcher_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
@@ -196,17 +164,17 @@ set(Launcher_BUG_TRACKER_URL "https://github.com/PrismLauncher/PrismLauncher/iss
 set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
 
 # Matrix Space
-set(Launcher_MATRIX_URL "https://prismlauncher.org/matrix" CACHE STRING "URL to the Matrix Space")
+set(Launcher_MATRIX_URL "https://matrix.to/#/#prismlauncher:matrix.org" CACHE STRING "URL to the Matrix Space")
 
 # Discord URL
-set(Launcher_DISCORD_URL "https://prismlauncher.org/discord" CACHE STRING "URL for the Discord guild.")
+set(Launcher_DISCORD_URL "https://discord.gg/prismlauncher" CACHE STRING "URL for the Discord guild.")
 
 # Subreddit URL
-set(Launcher_SUBREDDIT_URL "https://prismlauncher.org/reddit" CACHE STRING "URL for the subreddit.")
+set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PrismLauncher/" CACHE STRING "URL for the subreddit.")
 
 # Builds
 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")
+set(Launcher_QT_VERSION_MAJOR "5" CACHE STRING "Major Qt version to build against")
 
 # API Keys
 # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service
@@ -240,15 +208,9 @@ set(Launcher_BUILD_TIMESTAMP "${TODAY}")
 
 ################################ 3rd Party Libs ################################
 
-# Successive configurations of cmake without cleaning the build dir will cause zlib fallback to fail due to cached values
+if(NOT Launcher_FORCE_BUNDLED_LIBS)
-# Record when fallback triggered and skip this find_package
-if(NOT Launcher_FORCE_BUNDLED_LIBS AND NOT FORCE_BUNDLED_ZLIB)
     find_package(ZLIB QUIET)
 endif()
-if(NOT ZLIB_FOUND)
-    set(FORCE_BUNDLED_ZLIB TRUE CACHE BOOL "")
-    mark_as_advanced(FORCE_BUNDLED_ZLIB)
-endif()
 
 # Find the required Qt parts
 include(QtVersionlessBackport)
@@ -304,13 +266,8 @@ if(NOT Launcher_FORCE_BUNDLED_LIBS)
 
     # Find ghc_filesystem
     find_package(ghc_filesystem QUIET)
-
-    # Find cmark
-    find_package(cmark QUIET)
 endif()
 
-include(ECMQtDeclareLoggingCategory)
-
 ####################################### Program Info #######################################
 
 set(Launcher_APP_BINARY_NAME "prismlauncher" CACHE STRING "Name of the Launcher binary")
@@ -364,7 +321,7 @@ elseif(UNIX)
 
     set(BINARY_DEST_DIR "bin")
     set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}")
-    set(JARS_DEST_DIR "share/${Launcher_Name}")
+    set(JARS_DEST_DIR "share/${Launcher_APP_BINARY_NAME}")
 
     # install as bundle with no dependencies included
     set(INSTALL_BUNDLE "nodeps")
@@ -377,8 +334,6 @@ 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 "share/${Launcher_Name}")
-    
     if(Launcher_ManPage)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_ManPage} DESTINATION "${KDE_INSTALL_MANDIR}/man6")
     endif()
@@ -406,8 +361,6 @@ else()
     message(FATAL_ERROR "Platform not supported")
 endif()
 
-
-
 ################################ Included Libs ################################
 
 include(ExternalProject)
@@ -419,26 +372,16 @@ option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests.
 add_subdirectory(libraries/libnbtplusplus)
 
 add_subdirectory(libraries/systeminfo) # system information library
+add_subdirectory(libraries/hoedown) # markdown parser
 add_subdirectory(libraries/launcher) # java based launcher part for Minecraft
 add_subdirectory(libraries/javacheck) # java compatibility checker
-if(FORCE_BUNDLED_ZLIB)
+if(NOT ZLIB_FOUND)
     message(STATUS "Using bundled zlib")
-
     set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Suppress cmake warnings and allow INTERPROCEDURAL_OPTIMIZATION for zlib
     set(SKIP_INSTALL_ALL ON)
     add_subdirectory(libraries/zlib EXCLUDE_FROM_ALL)
     
-    # On OS where unistd.h exists, zlib's generated header defines `Z_HAVE_UNISTD_H`, while the included header does not. 
+    set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib" "${CMAKE_CURRENT_BINARY_DIR}/libraries/zlib" CACHE STRING "")
-    # We cannot safely undo the rename on those systems, and they generally have packages for zlib anyway.
-    check_include_file(unistd.h NEED_GENERATED_ZCONF)
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib/zconf.h.included" AND NOT NEED_GENERATED_ZCONF)
-        # zlib's cmake script renames a file, dirtying the submodule, see https://github.com/madler/zlib/issues/162
-        message(STATUS "Undoing Rename")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib/zconf.h")
-        file(RENAME "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib/zconf.h.included" "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib/zconf.h")
-    endif()
-
-    set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libraries/zlib" "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib" CACHE STRING "" FORCE)
     set_target_properties(zlibstatic PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIR}")
     add_library(ZLIB::ZLIB ALIAS zlibstatic)
     set(ZLIB_LIBRARY ZLIB::ZLIB CACHE STRING "zlib library name")
@@ -463,26 +406,17 @@ if(NOT tomlplusplus_FOUND)
 else()
     message(STATUS "Using system tomlplusplus")
 endif()
-if(NOT cmark_FOUND)
-    message(STATUS "Using bundled cmark")
-    set(CMARK_STATIC ON CACHE BOOL "Build static libcmark library" FORCE)
-    set(CMARK_SHARED OFF CACHE BOOL "Build shared libcmark library" FORCE)
-    set(CMARK_TESTS OFF CACHE BOOL "Build cmark tests and enable testing" FORCE)
-    add_subdirectory(libraries/cmark EXCLUDE_FROM_ALL) # Markdown parser
-    add_library(cmark::cmark ALIAS cmark_static)
-else()
-    message(STATUS "Using system cmark")
-endif()
 add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much
 add_subdirectory(libraries/gamemode)
 add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API
 if (NOT ghc_filesystem_FOUND)
     message(STATUS "Using bundled ghc_filesystem")
+    set(GHC_FILESYSTEM_WITH_INSTALL OFF) # Workaround ghc::filesystem bug
     add_subdirectory(libraries/filesystem) # Implementation of std::filesystem for old C++, for usage in old macOS
+    add_library(ghcFilesystem::ghc_filesystem ALIAS ghc_filesystem)
 else()
     message(STATUS "Using system ghc_filesystem")
 endif()
-add_subdirectory(libraries/qdcss) # css parser
 
 ############################### Built Artifacts ###############################
 

COPYING.md

@@ -1,7 +1,7 @@
 ## Prism Launcher
 
      Prism Launcher - Minecraft Launcher
-     Copyright (C) 2022-2023 Prism Launcher Contributors
+     Copyright (C) 2022 Prism Launcher Contributors
 
      This program is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@ -156,34 +156,23 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 
-## cmark
+## Hoedown
 
-    Copyright (c) 2014, John MacFarlane
+    Copyright (c) 2008, Natacha Porté
+    Copyright (c) 2011, Vicent Martí
+    Copyright (c) 2014, Xavier Mendez, Devin Torres and the Hoedown authors
 
-    All rights reserved.
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
 
-    Redistribution and use in source and binary forms, with or without
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    modification, are permitted provided that the following conditions are met:
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-        * Redistributions of source code must retain the above copyright
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-        notice, this list of conditions and the following disclaimer.
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-        * Redistributions in binary form must reproduce the above
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials provided
-        with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ## Batch icon set
 

README.md

@@ -1,15 +1,16 @@
-<p align="center">
+<p align="left">
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="/program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg">
   <source media="(prefers-color-scheme: light)" srcset="/program_info/org.prismlauncher.PrismLauncher.logo.svg">
-  <img alt="Prism Launcher" src="/program_info/org.prismlauncher.PrismLauncher.logo.svg" width="40%">
+  <img alt="Prism Launcher" src="/program_info/org.prismlauncher.PrismLauncher.logo.svg" width="50%">
 </picture>
 </p>
 
-<p align="center">
+
-  Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.<br />
+Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
-  <br />This is a <b>fork</b> of the MultiMC Launcher and is <b>not</b> endorsed by it.
+
-</p>
+This is a **fork** of the MultiMC Launcher and is not endorsed by MultiMC.
+
 
 ## Installation
 
@@ -17,7 +18,7 @@
     <img src="https://repology.org/badge/vertical-allrepos/prismlauncher.svg" alt="Packaging status" align="right">
 </a>
 
-- All downloads and instructions for Prism Launcher can be found on our [Website](https://prismlauncher.org/download).
+- 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).
 
 ### Development Builds
@@ -28,57 +29,28 @@ Prebuilt Development builds are provided for **Linux**, **Windows** and **macOS*
 
 For **Arch**, **Debian**, **Fedora**, **OpenSUSE (Tumbleweed)** and **Gentoo**, respectively, you can use these packages for the latest development versions:
 
-[![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)
+[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?style=flat-square&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git/) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?style=flat-square&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git/) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?style=flat-square&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git) [![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?style=flat-square&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?style=flat-square&logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?style=flat-square&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.
 
 ## Community & Support
 
-Feel free to create a GitHub issue if you find a bug or want to suggest a new feature. We have multiple community spaces where other community members can help you:
+Feel free to create a GitHub issue if you find a bug or want to suggest a new feature. We have multiple community spaces where other community members can help you.
 
-- **Our Discord server:**
+#### Join our Discord server:
+[![Prism Launcher Discord server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner2)](https://discord.gg/prismlauncher)
 
-[![Prism Launcher Discord server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://prismlauncher.org/discord)
+#### Join our Matrix space:
+[![PrismLauncher Space](https://img.shields.io/matrix/prismlauncher:matrix.org?style=for-the-badge&logo=matrix)](https://matrix.to/#/#prismlauncher:matrix.org)
 
-- **Our Matrix space:**
+#### Join our Subreddit:
-
+[![r/PrismLauncher](https://img.shields.io/reddit/subreddit-subscribers/prismlauncher?style=for-the-badge&logo=reddit)](https://www.reddit.com/r/PrismLauncher/)
-[![PrismLauncher Space](https://img.shields.io/matrix/prismlauncher:matrix.org?style=for-the-badge&label=Matrix%20Space&logo=matrix&color=purple)](https://prismlauncher.org/matrix)
-
-- **Our Subreddit:**
-
-[![r/PrismLauncher](https://img.shields.io/reddit/subreddit-subscribers/prismlauncher?style=for-the-badge&logo=reddit)](https://prismlauncher.org/reddit)
-
-## 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>
 
 ## Building
 
 If you want to build Prism Launcher yourself, check the [Build Instructions](https://prismlauncher.org/wiki/development/build-instructions/).
 
-## Sponsors & Partners
+## Translations
 
-We thank all the wonderful backers over at Open Collective! Support Prism Launcher by [becoming a backer](https://opencollective.com/prismlauncher).
+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>
-
-[![OpenCollective Backers](https://opencollective.com/prismlauncher/backers.svg?width=890&limit=1000)](https://opencollective.com/prismlauncher#backers)
-
-Thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/).
-
-[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/)
-
-Thanks to Weblate for hosting our translation efforts.
-
-<a href="https://hosted.weblate.org/engage/prismlauncher/">
-<img src="https://hosted.weblate.org/widgets/prismlauncher/-/open-graph.png" alt="Translation status" width="300" />
-</a>
-
-Thanks to Netlify for providing us their excellent web services, as part of their [Open Source program](https://www.netlify.com/open-source/).
-
-<a href="https://www.netlify.com"> <img src="https://www.netlify.com/v3/img/components/netlify-color-accent.svg" alt="Deploys by Netlify" /> </a>
-
-Thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
-
-<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
 
 ## Forking/Redistributing/Custom builds policy
 
@@ -96,8 +68,35 @@ Be aware that if you build this software without removing the provided API keys
 
 If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file by setting them to an empty string (`""`).
 
-## License [![https://github.com/PrismLauncher/PrismLauncher/blob/develop/LICENSE](https://img.shields.io/github/license/PrismLauncher/PrismLauncher?label=License&logo=gnu&color=C4282D)](LICENSE)
+## Sponsors & Partners
+
+We thank all the wonderful backers over at Open Collective! Support Prism Launcher by [becoming a backer](https://opencollective.com/prismlauncher).
+
+[![OpenCollective Backers](https://opencollective.com/prismlauncher/backers.svg?width=890&limit=1000)](https://opencollective.com/prismlauncher#backers)
+
+Thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/).
+
+[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/)
+
+Thanks to Weblate for hosting our translation efforts.
+
+<a href="https://hosted.weblate.org/engage/prismlauncher/">
+<img src="https://hosted.weblate.org/widgets/prismlauncher/-/open-graph.png" alt="Translation status" width="300" />
+</a>
+
+Thanks to Netlify for providing us their excellent web services, as part of their [Open Source program](https://www.netlify.com/open-source/)
+
+<a href="https://www.netlify.com"> <img src="https://www.netlify.com/v3/img/components/netlify-color-accent.svg" alt="Deploys by Netlify" /> </a>
+
+Thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
+
+<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
+
+
+## License
 
 All launcher code is available under the GPL-3.0-only license.
 
+![https://github.com/PrismLauncher/PrismLauncher/blob/develop/LICENSE](https://img.shields.io/github/license/PrismLauncher/PrismLauncher?style=for-the-badge&logo=gnu&color=C4282D)
+
 The logo and related assets are under the CC BY-SA 4.0 license.

buildconfig/BuildConfig.cpp.in

@@ -65,7 +65,7 @@ Config::Config()
     MAC_SPARKLE_PUB_KEY = "@MACOSX_SPARKLE_UPDATE_PUBLIC_KEY@";
     MAC_SPARKLE_APPCAST_URL = "@MACOSX_SPARKLE_UPDATE_FEED_URL@";
 
-    if (!MAC_SPARKLE_PUB_KEY.isEmpty() && !MAC_SPARKLE_APPCAST_URL.isEmpty())
+    if (BUILD_PLATFORM == "macOS" && !MAC_SPARKLE_PUB_KEY.isEmpty() && !MAC_SPARKLE_APPCAST_URL.isEmpty())
     {
         UPDATER_ENABLED = true;
     }
@@ -76,13 +76,10 @@ Config::Config()
 
     // Assume that builds outside of Git repos are "stable"
     if (GIT_REFSPEC == QStringLiteral("GITDIR-NOTFOUND")
-        || GIT_TAG == QStringLiteral("GITDIR-NOTFOUND")
+        || GIT_TAG == QStringLiteral("GITDIR-NOTFOUND"))
-        || GIT_REFSPEC == QStringLiteral("")
-        || GIT_TAG == QStringLiteral("GIT-NOTFOUND"))
     {
         GIT_REFSPEC = "refs/heads/stable";
         GIT_TAG = versionString();
-        GIT_COMMIT = "";
     }
 
     if (GIT_REFSPEC.startsWith("refs/heads/"))

buildconfig/BuildConfig.h

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  Prism Launcher - Minecraft Launcher
+ *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  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,7 +36,6 @@
 
 #pragma once
 #include <QString>
-#include <QList>
 
 /**
  * \brief The Config class holds all the build-time information passed from the build system.
@@ -68,7 +66,7 @@ class Config {
 
     bool UPDATER_ENABLED = false;
 
-    /// A short string identifying this build's platform or distribution.
+    /// A short string identifying this build's platform. For example, "lin64" or "win32".
     QString BUILD_PLATFORM;
 
     /// A string containing the build timestamp
@@ -162,7 +160,6 @@ class Config {
 
     QString MODRINTH_STAGING_URL = "https://staging-api.modrinth.com/v2";
     QString MODRINTH_PROD_URL = "https://api.modrinth.com/v2";
-    QStringList MODRINTH_MRPACK_HOSTS{"cdn.modrinth.com", "github.com", "raw.githubusercontent.com", "gitlab.com"};
 
     QString FLAME_BASE_URL = "https://api.curseforge.com/v1";
 

default.nix

@@ -1,14 +1 @@
-(
+(import nix/flake-compat.nix).defaultNix
-  import
-  (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  )
-  {src = ./.;}
-)
-.defaultNix

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1668681692,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
         "type": "github"
       },
       "original": {
@@ -16,63 +16,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1688466019,
-        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "libnbtplusplus": {
       "flake": false,
       "locked": {
@@ -91,11 +34,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689413807,
+        "lastModified": 1671417167,
-        "narHash": "sha256-exuzOvOhGAEKWQKwDuZAL4N8a1I837hH5eocaTcIbLc=",
+        "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46ed466081b9cad1125b11f11a2af5cc40b942c7",
+        "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7",
         "type": "github"
       },
       "original": {
@@ -105,74 +48,11 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1688049487,
-        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1689328505,
-        "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "5e28316db471d1ac234beb70031b635437421dd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
         "libnbtplusplus": "libnbtplusplus",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "pre-commit-hooks": "pre-commit-hooks"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -3,25 +3,35 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    flake-parts.url = "github:hercules-ci/flake-parts";
+    flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
-    pre-commit-hooks = {
+    libnbtplusplus = { url = "github:PrismLauncher/libnbtplusplus"; flake = false; };
-      url = "github:cachix/pre-commit-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-    libnbtplusplus = {
-      url = "github:PrismLauncher/libnbtplusplus";
-      flake = false;
-    };
   };
 
-  outputs = inputs:
+  outputs = { self, nixpkgs, libnbtplusplus, ... }:
-    inputs.flake-parts.lib.mkFlake
+    let
-    {inherit inputs;}
+      # User-friendly version number.
-    {imports = [./nix];};
+      version = builtins.substring 0 8 self.lastModifiedDate;
+
+      # Supported systems (qtbase is currently broken for "aarch64-darwin")
+      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+
+      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+
+      # Nixpkgs instantiated for supported systems.
+      pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system});
+
+      packagesFn = pkgs: rec {
+        prismlauncher-qt5 = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
+        prismlauncher = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
+      };
+    in
+    {
+      packages = forAllSystems (system:
+        let packages = packagesFn pkgs.${system}; in
+        packages // { default = packages.prismlauncher; }
+      );
+
+      overlay = final: packagesFn;
+    };
 }

flatpak/libdecor.json

@@ -1,22 +0,0 @@
-{
-  "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,6 +5,13 @@ 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:
@@ -19,23 +26,12 @@ finish-args:
     # Mod drag&drop
   - --filesystem=xdg-download:ro
 
-cleanup:
-  - /lib/libGLU*
-
 modules:
-  # Might be needed by some Controller mods (see https://github.com/isXander/Controlify/issues/31)
-  - shared-modules/libusb/libusb.json
-
-  # Needed for proper Wayland support
-  - libdecor.json
-
   - name: prismlauncher
     buildsystem: cmake-ninja
-    builddir: true
     config-opts:
       - -DLauncher_BUILD_PLATFORM=flatpak
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DCMAKE_BUILD_TYPE=Debug
-      - -DLauncher_QT_VERSION_MAJOR=5
     build-options:
       env:
         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
@@ -43,7 +39,6 @@ modules:
     sources:
         - type: dir
           path: ../
-
   - name: openjdk
     buildsystem: simple
     build-commands:
@@ -52,45 +47,14 @@ modules:
       - mv /app/jre /app/jdk/17
       - /usr/lib/sdk/openjdk8/install.sh
       - mv /app/jre /app/jdk/8
-    cleanup:
+    cleanup: [/jre]
-      - /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.2.tar.xz
+        url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.1.tar.xz
-        sha256: c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240
+        sha256: 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762
-        x-checker-data:
+    cleanup: [/share/man, /bin/xkeystone]
-          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:
@@ -101,56 +65,19 @@ 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: archive
+      - type: git
-        archive-type: tar-gzip
+        url: https://github.com/FeralInteractive/gamemode
-        url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.7
+        tag: "1.7"
-        sha256: 57ce73ba605d1cf12f8d13725006a895182308d93eba0f69f285648449641803
+        commit: 4dc99dff76218718763a6b07fc1900fa6d1dafd9
-        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: prime-run
+        path: ../flatpak/prime-run
       - type: file
-        path: prismlauncher
+        path: ../flatpak/prismlauncher

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

@@ -1,24 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
+export PATH="${PATH}${PATH:+:}/app/utils/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
-export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}/usr/lib/extensions/vulkan/MangoHud/\$LIB/"
 
 exec /app/bin/prismrun "$@"

launcher/Application.cpp

@@ -7,9 +7,6 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
  *  Copyright (C) 2022 Tayou <tayou@gmx.net>
- *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
- *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -48,7 +45,6 @@
 #include "net/PasteUpload.h"
 #include "pathmatcher/MultiMatcher.h"
 #include "pathmatcher/SimplePrefixMatcher.h"
-#include "settings/INIFile.h"
 #include "ui/MainWindow.h"
 #include "ui/InstanceWindow.h"
 
@@ -66,11 +62,15 @@
 #include "ui/pages/global/APIPage.h"
 #include "ui/pages/global/CustomCommandsPage.h"
 
+#ifdef Q_OS_WIN
+#include "ui/WinDarkmode.h"
+#include <versionhelpers.h>
+#endif
+
 #include "ui/setupwizard/SetupWizard.h"
 #include "ui/setupwizard/LanguageWizardPage.h"
 #include "ui/setupwizard/JavaWizardPage.h"
 #include "ui/setupwizard/PasteWizardPage.h"
-#include "ui/setupwizard/ThemeWizardPage.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
 
@@ -81,9 +81,7 @@
 #include "ApplicationMessage.h"
 
 #include <iostream>
-#include <mutex>
 
-#include <QFileOpenEvent>
 #include <QAccessible>
 #include <QCommandLineParser>
 #include <QDir>
@@ -107,7 +105,7 @@
 
 #include "java/JavaUtils.h"
 
-#include "updater/ExternalUpdater.h"
+#include "updater/UpdateChecker.h"
 
 #include "tools/JProfiler.h"
 #include "tools/JVisualVM.h"
@@ -131,10 +129,6 @@
 #include "MangoHud.h"
 #endif
 
-#ifdef Q_OS_MAC
-#include "updater/MacSparkleUpdater.h"
-#endif
-
 
 #if defined Q_OS_WIN32
 #ifndef WIN32_LEAN_AND_MEAN
@@ -152,15 +146,19 @@ static const QLatin1String liveCheckFile("live.check");
 PixmapCache* PixmapCache::s_instance = nullptr;
 
 namespace {
-
-/** This is used so that we can output to the log file in addition to the CLI. */
 void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
-    static std::mutex loggerMutex;
+    const char *levels = "DWCFIS";
-    const std::lock_guard<std::mutex> lock(loggerMutex); // synchronized, QFile logFile is not thread-safe
+    const QString format("%1 %2 %3\n");
 
-    QString out = qFormatLogMessage(type, context, msg);
+    qint64 msecstotal = APPLICATION->timeSinceStart();
-    out += QChar::LineFeed;
+    qint64 seconds = msecstotal / 1000;
+    qint64 msecs = msecstotal % 1000;
+    QString foo;
+    char buf[1025] = {0};
+    ::snprintf(buf, 1024, "%5lld.%03lld", seconds, msecs);
+
+    QString out = format.arg(buf).arg(levels[type]).arg(msg);
 
     APPLICATION->logFile->write(out.toUtf8());
     APPLICATION->logFile->flush();
@@ -168,6 +166,45 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QSt
     fflush(stderr);
 }
 
+QString getIdealPlatform(QString currentPlatform) {
+    auto info = Sys::getKernelInfo();
+    switch(info.kernelType) {
+        case Sys::KernelType::Darwin: {
+            if(info.kernelMajor >= 17) {
+                // macOS 10.13 or newer
+                return "osx64-5.15.2";
+            }
+            else {
+                // macOS 10.12 or older
+                return "osx64";
+            }
+        }
+        case Sys::KernelType::Windows: {
+            // FIXME: 5.15.2 is not stable on Windows, due to a large number of completely unpredictable and hard to reproduce issues
+            break;
+/*
+            if(info.kernelMajor == 6 && info.kernelMinor >= 1) {
+                // Windows 7
+                return "win32-5.15.2";
+            }
+            else if (info.kernelMajor > 6) {
+                // Above Windows 7
+                return "win32-5.15.2";
+            }
+            else {
+                // Below Windows 7
+                return "win32";
+            }
+*/
+        }
+        case Sys::KernelType::Undetermined:
+        case Sys::KernelType::Linux: {
+            break;
+        }
+    }
+    return currentPlatform;
+}
+
 }
 
 Application::Application(int &argc, char **argv) : QApplication(argc, argv)
@@ -229,19 +266,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     m_serverToJoin = parser.value("server");
     m_profileToUse = parser.value("profile");
     m_liveCheck = parser.isSet("alive");
-
+    m_zipToImport = parser.value("import");
     m_instanceIdToShowWindowOf = parser.value("show");
 
-    for (auto zip_path : parser.values("import")){
-        m_zipsToImport.append(QUrl::fromLocalFile(QFileInfo(zip_path).absoluteFilePath()));
-    }
-
-    // treat unspecified positional arguments as import urls
-    for (auto zip_path : parser.positionalArguments()) {
-        m_zipsToImport.append(QUrl::fromLocalFile(QFileInfo(zip_path).absoluteFilePath()));
-    }
-
-
     // error if --launch is missing with --server or --profile
     if((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty()) && m_instanceIdToLaunch.isEmpty())
     {
@@ -289,7 +316,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
             dataPath = m_rootPath;
             adjustedBy = "Portable data path";
-            m_portable = true;
         }
 #endif
     }
@@ -326,7 +352,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     }
 
     /*
-     * Establish the mechanism for communication with an already running PrismLauncher that uses the same data path.
+     * Establish the mechanism for communication with an already running PolyMC that uses the same data path.
      * If there is one, tell it what the user actually wanted to do and exit.
      * We want to initialize this before logging to avoid messing with the log of a potential already running copy.
      */
@@ -344,16 +370,14 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
                 activate.command = "activate";
                 m_peerInstance->sendMessage(activate.serialize(), timeout);
 
-                if(!m_zipsToImport.isEmpty())
+                if(!m_zipToImport.isEmpty())
                 {
-                    for (auto zip_url : m_zipsToImport) {
                     ApplicationMessage import;
                     import.command = "import";
-                        import.args.insert("path", zip_url.toString());
+                    import.args.insert("path", m_zipToImport.toString());
                     m_peerInstance->sendMessage(import.serialize(), timeout);
                 }
             }
-            }
             else
             {
                 ApplicationMessage launch;
@@ -377,89 +401,36 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
     // init the logger
     {
-        static const QString baseLogFile = BuildConfig.LAUNCHER_NAME + "-%0.log";
+        static const QString logBase = BuildConfig.LAUNCHER_NAME + "-%0.log";
-        static const QString logBase = FS::PathCombine("logs", baseLogFile);
+        auto moveFile = [](const QString &oldName, const QString &newName)
-        auto moveFile = [](const QString& oldName, const QString& newName) {
+        {
             QFile::remove(newName);
             QFile::copy(oldName, newName);
             QFile::remove(oldName);
         };
-        if (FS::ensureFolderPathExists("logs")) {  // if this did not fail
-            for (auto i = 0; i <= 4; i++)
-                if (auto oldName = baseLogFile.arg(i);
-                    QFile::exists(oldName))  // do not pointlessly delete new files if the old ones are not there
-                    moveFile(oldName, logBase.arg(i));
-        }
 
-        for (auto i = 4; i > 0; i--)
+        moveFile(logBase.arg(3), logBase.arg(4));
-            moveFile(logBase.arg(i - 1), logBase.arg(i));
+        moveFile(logBase.arg(2), logBase.arg(3));
+        moveFile(logBase.arg(1), logBase.arg(2));
+        moveFile(logBase.arg(0), logBase.arg(1));
 
         logFile = std::unique_ptr<QFile>(new QFile(logBase.arg(0)));
-        if (!logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        if(!logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
-            showFatalErrorMessage("The launcher data folder is not writable!",
+        {
-                                  QString("The launcher couldn't create a log file - the data folder is not writable.\n"
+            showFatalErrorMessage(
+                "The launcher data folder is not writable!",
+                QString(
+                    "The launcher couldn't create a log file - the data folder is not writable.\n"
                     "\n"
                     "Make sure you have write permissions to the data folder.\n"
                     "(%1)\n"
                     "\n"
-                                          "The launcher cannot continue until you fix this problem.")
+                    "The launcher cannot continue until you fix this problem."
-                                      .arg(dataPath));
+                ).arg(dataPath)
+            );
             return;
         }
         qInstallMessageHandler(appDebugOutput);
-
-        qSetMessagePattern(
-                "%{time process}" " "
-                "%{if-debug}D%{endif}" "%{if-info}I%{endif}" "%{if-warning}W%{endif}" "%{if-critical}C%{endif}" "%{if-fatal}F%{endif}"
-                " " "|" " "
-                "%{if-category}[%{category}]: %{endif}"
-                "%{message}");
-      
-        bool foundLoggingRules = false;
-        
-        auto logRulesFile = QStringLiteral("qtlogging.ini");
-        auto logRulesPath = FS::PathCombine(dataPath, logRulesFile);
-        
-        qDebug() << "Testing" << logRulesPath << "...";              
-        foundLoggingRules = QFile::exists(logRulesPath);
-
-        // search the dataPath()
-        // seach app data standard path
-        if(!foundLoggingRules && !isPortable() && dirParam.isEmpty()) {
-            logRulesPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, FS::PathCombine("..", logRulesFile));
-            if(!logRulesPath.isEmpty()) {
-                qDebug() << "Found" << logRulesPath << "...";
-                foundLoggingRules = true;
-            }
-        }
-        // seach root path
-        if(!foundLoggingRules) {
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-           logRulesPath = FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME, logRulesFile); 
-#else
-           logRulesPath = FS::PathCombine(m_rootPath, logRulesFile); 
-#endif
-            qDebug() << "Testing" << logRulesPath << "...";
-            foundLoggingRules = QFile::exists(logRulesPath);
-        }
-        
-        if(foundLoggingRules) {
-            // load and set logging rules
-            qDebug() << "Loading logging rules from:" << logRulesPath;
-            QSettings loggingRules(logRulesPath, QSettings::IniFormat); 
-            loggingRules.beginGroup("Rules");
-            QStringList rule_names = loggingRules.childKeys();
-            QStringList rules;
-            qDebug() << "Setting log rules:";
-            for (auto rule_name : rule_names) {
-                auto rule = QString("%1=%2").arg(rule_name).arg(loggingRules.value(rule_name).toString());
-                rules.append(rule);
-                qDebug() << "    " << rule;
-            }
-            auto rules_str = rules.join("\n");
-            QLoggingCategory::setFilterRules(rules_str);
-        }
-
         qDebug() << "<> Log initialized.";
     }
 
@@ -476,7 +447,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT;
         qDebug() << "Version                    : " << BuildConfig.printableVersionString();
-        qDebug() << "Platform                   : " << BuildConfig.BUILD_PLATFORM;
         qDebug() << "Git commit                 : " << BuildConfig.GIT_COMMIT;
         qDebug() << "Git refspec                : " << BuildConfig.GIT_REFSPEC;
         if (adjustedBy.size())
@@ -524,10 +494,14 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     {
         // Provide a fallback for migration from PolyMC
         m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg", "multimc.cfg" }, this));
+        // Updates
+        // Multiple channels are separated by spaces
+        m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);
+        m_settings->registerSetting("AutoUpdate", true);
 
         // Theming
         m_settings->registerSetting("IconTheme", QString("pe_colored"));
-        m_settings->registerSetting("ApplicationTheme", QString());
+        m_settings->registerSetting("ApplicationTheme", QString("system"));
         m_settings->registerSetting("BackgroundCat", QString("kitteh"));
 
         // Remembered state
@@ -566,15 +540,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("InstanceDir", "instances");
         m_settings->registerSetting({"CentralModsDir", "ModsDir"}, "mods");
         m_settings->registerSetting("IconsDir", "icons");
-        m_settings->registerSetting("DownloadsDir", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
-        m_settings->registerSetting("DownloadsDirWatchRecursive", false);
 
         // Editors
         m_settings->registerSetting("JsonEditor", QString());
 
         // Language
         m_settings->registerSetting("Language", QString());
-        m_settings->registerSetting("UseSystemLocale", false);
 
         // Console
         m_settings->registerSetting("ShowConsole", false);
@@ -601,7 +572,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         // Java Settings
         m_settings->registerSetting("JavaPath", "");
-        m_settings->registerSetting("JavaSignature", "");
+        m_settings->registerSetting("JavaTimestamp", 0);
         m_settings->registerSetting("JavaArchitecture", "");
         m_settings->registerSetting("JavaRealArchitecture", "");
         m_settings->registerSetting("JavaVersion", "");
@@ -611,9 +582,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("IgnoreJavaCompatibility", false);
         m_settings->registerSetting("IgnoreJavaWizard", false);
 
-        // Mod loader settings
-        m_settings->registerSetting("DisableQuiltBeacon", false);
-
         // Native library workarounds
         m_settings->registerSetting("UseNativeOpenAL", false);
         m_settings->registerSetting("UseNativeGLFW", false);
@@ -668,9 +636,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("UpdateDialogGeometry", "");
 
         m_settings->registerSetting("ModDownloadGeometry", "");
-        m_settings->registerSetting("RPDownloadGeometry", "");
-        m_settings->registerSetting("TPDownloadGeometry", "");
-        m_settings->registerSetting("ShaderDownloadGeometry", "");
 
         // HACK: This code feels so stupid is there a less stupid way of doing this?
         {
@@ -697,17 +662,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
                 m_settings->reset("PastebinCustomAPIBase");
             }
         }
-        {
+        // meta URL
-            // Meta URL
         m_settings->registerSetting("MetaURLOverride", "");
 
-            QUrl metaUrl(m_settings->get("MetaURLOverride").toString());
-
-            // get rid of invalid meta urls
-            if (!metaUrl.isValid() || metaUrl.scheme() != "http" || metaUrl.scheme() != "https")
-                m_settings->reset("MetaURLOverride");
-        }
-
         m_settings->registerSetting("CloseAfterLaunch", false);
         m_settings->registerSetting("QuitAfterGameStop", false);
 
@@ -725,7 +682,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
                 m_settings->set("FlameKeyOverride", flameKey);
             m_settings->reset("CFKeyOverride");
         }
-        m_settings->registerSetting("ModrinthToken", "");
         m_settings->registerSetting("UserAgentOverride", "");
 
         // Init page provider
@@ -753,7 +709,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
     // initialize network access and proxy setup
     {
-        m_network.reset(new QNetworkAccessManager());
+        m_network = new QNetworkAccessManager();
         QString proxyTypeStr = settings()->get("ProxyType").toString();
         QString addr = settings()->get("ProxyAddr").toString();
         int port = settings()->get("ProxyPort").value<qint16>();
@@ -775,10 +731,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     // initialize the updater
     if(BuildConfig.UPDATER_ENABLED)
     {
-        qDebug() << "Initializing updater";
+        auto platform = getIdealPlatform(BuildConfig.BUILD_PLATFORM);
-#ifdef Q_OS_MAC
+        auto channelUrl = BuildConfig.UPDATER_BASE + platform + "/channels.json";
-        m_updater.reset(new MacSparkleUpdater());
+        qDebug() << "Initializing updater with platform: " << platform << " -- " << channelUrl;
-#endif
+        m_updateChecker.reset(new UpdateChecker(m_network, channelUrl, BuildConfig.VERSION_CHANNEL));
         qDebug() << "<> Updater started.";
     }
 
@@ -893,7 +849,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         }
     });
 
-    applyCurrentlySelectedTheme(true);
+    {
+        setIconTheme(settings()->get("IconTheme").toString());
+        qDebug() << "<> Icon theme set.";
+        setApplicationTheme(settings()->get("ApplicationTheme").toString(), true);
+        qDebug() << "<> Application theme set.";
+    }
 
     updateCapabilities();
 
@@ -928,10 +889,14 @@ bool Application::createSetupWizard()
         }
         return false;
     }();
-    bool languageRequired = settings()->get("Language").toString().isEmpty();
+    bool languageRequired = [&]()
+    {
+        if (settings()->get("Language").toString().isEmpty())
+            return true;
+        return false;
+    }();
     bool pasteInterventionRequired = settings()->get("PastebinURL") != "";
-    bool themeInterventionRequired = settings()->get("ApplicationTheme") == "";
+    bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired;
-    bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired;
 
     if(wizardRequired)
     {
@@ -950,12 +915,6 @@ bool Application::createSetupWizard()
         {
             m_setupWizard->addPage(new PasteWizardPage(m_setupWizard));
         }
-
-        if (themeInterventionRequired)
-        {
-            settings()->set("ApplicationTheme", QString("system")); // set default theme after going into theme wizard
-            m_setupWizard->addPage(new ThemeWizardPage(m_setupWizard));
-        }
         connect(m_setupWizard, &QDialog::finished, this, &Application::setupWizardFinished);
         m_setupWizard->show();
         return true;
@@ -978,7 +937,7 @@ bool Application::event(QEvent* event)
 
     if (event->type() == QEvent::FileOpen) {
         auto ev = static_cast<QFileOpenEvent*>(event);
-        m_mainWindow->processURLs({ ev->url() });
+        m_mainWindow->droppedURLs({ ev->url() });
     }
 
     return QApplication::event(event);
@@ -1038,10 +997,10 @@ void Application::performMainStartupAction()
         showMainWindow(false);
         qDebug() << "<> Main window shown.";
     }
-    if(!m_zipsToImport.isEmpty())
+    if(!m_zipToImport.isEmpty())
     {
-        qDebug() << "<> Importing from zip:" << m_zipsToImport;
+        qDebug() << "<> Importing instance from zip:" << m_zipToImport;
-        m_mainWindow->processURLs( m_zipsToImport );
+        m_mainWindow->droppedURLs({ m_zipToImport });
     }
 }
 
@@ -1094,7 +1053,7 @@ void Application::messageReceived(const QByteArray& message)
             qWarning() << "Received" << command << "message without a zip path/URL.";
             return;
         }
-        m_mainWindow->processURLs({ QUrl::fromLocalFile(QFileInfo(path).absoluteFilePath()) });
+        m_mainWindow->droppedURLs({ QUrl(path) });
     }
     else if(command == "launch")
     {
@@ -1163,14 +1122,9 @@ QList<ITheme*> Application::getValidApplicationThemes()
     return m_themeManager->getValidApplicationThemes();
 }
 
-void Application::applyCurrentlySelectedTheme(bool initial)
+void Application::setApplicationTheme(const QString& name, bool initial)
 {
-    m_themeManager->applyCurrentlySelectedTheme(initial);
+    m_themeManager->setApplicationTheme(name, initial);
-}
-
-void Application::setApplicationTheme(const QString& name)
-{
-    m_themeManager->setApplicationTheme(name);
 }
 
 void Application::setIconTheme(const QString& name)
@@ -1398,7 +1352,16 @@ MainWindow* Application::showMainWindow(bool minimized)
         m_mainWindow = new MainWindow();
         m_mainWindow->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowState").toByteArray()));
         m_mainWindow->restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowGeometry").toByteArray()));
-
+#ifdef Q_OS_WIN
+        if (IsWindows10OrGreater())
+        {
+            if (QString::compare(settings()->get("ApplicationTheme").toString(), "dark") == 0) {
+                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true);
+            } else {
+                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), false);
+            }
+        }
+#endif
         if(minimized)
         {
             m_mainWindow->showMinimized();
@@ -1572,11 +1535,10 @@ QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME),
+        FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME),
 #endif
         FS::PathCombine(m_rootPath, "jars"),
-        FS::PathCombine(applicationDirPath(), "jars"),
+        FS::PathCombine(applicationDirPath(), "jars")
-        FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir, for debuging
     };
     for(QString p : potentialPaths)
     {
@@ -1607,15 +1569,6 @@ QString Application::getFlameAPIKey()
     return BuildConfig.FLAME_API_KEY;
 }
 
-QString Application::getModrinthAPIToken()
-{
-    QString tokenOverride = m_settings->get("ModrinthToken").toString();
-    if (!tokenOverride.isEmpty())
-        return tokenOverride;
-
-    return QString();
-}
-
 QString Application::getUserAgent()
 {
     QString uaOverride = m_settings->get("UserAgentOverride").toString();
@@ -1712,7 +1665,6 @@ bool Application::handleDataMigration(const QString& currentData,
         matcher->add(std::make_shared<SimplePrefixMatcher>(configFile));
         matcher->add(std::make_shared<SimplePrefixMatcher>(
             BuildConfig.LAUNCHER_CONFIGFILE));  // it's possible that we already used that directory before
-        matcher->add(std::make_shared<SimplePrefixMatcher>("logs/"));
         matcher->add(std::make_shared<SimplePrefixMatcher>("accounts.json"));
         matcher->add(std::make_shared<SimplePrefixMatcher>("accounts/"));
         matcher->add(std::make_shared<SimplePrefixMatcher>("assets/"));
@@ -1736,14 +1688,3 @@ bool Application::handleDataMigration(const QString& currentData,
     }
     return true;
 }
-
-void Application::triggerUpdateCheck()
-{
-    if (m_updater) {
-        qDebug() << "Checking for updates.";
-        m_updater->setBetaAllowed(false);  // There are no other channels than stable
-        m_updater->checkForUpdates();
-    } else {
-        qDebug() << "Updater not available.";
-    }
-}

launcher/Application.h

@@ -3,7 +3,6 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Tayou <tayou@gmx.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
@@ -44,6 +43,7 @@
 #include <QIcon>
 #include <QDateTime>
 #include <QUrl>
+#include <updater/GoUpdate.h>
 
 #include <BaseInstance.h>
 
@@ -63,7 +63,7 @@ class AccountList;
 class IconList;
 class QNetworkAccessManager;
 class JavaInstallList;
-class ExternalUpdater;
+class UpdateChecker;
 class BaseProfilerFactory;
 class BaseDetachedToolFactory;
 class TranslationsModel;
@@ -120,18 +120,14 @@ public:
 
     void setIconTheme(const QString& name);
 
-    void applyCurrentlySelectedTheme(bool initial = false);
-
     QList<ITheme*> getValidApplicationThemes();
 
-    void setApplicationTheme(const QString& name);
+    void setApplicationTheme(const QString& name, bool initial);
 
-    shared_qobject_ptr<ExternalUpdater> updater() {
+    shared_qobject_ptr<UpdateChecker> updateChecker() {
-        return m_updater;
+        return m_updateChecker;
     }
 
-    void triggerUpdateCheck();
-
     std::shared_ptr<TranslationsModel> translations();
 
     std::shared_ptr<JavaInstallList> javalist();
@@ -178,7 +174,6 @@ public:
 
     QString getMSAClientID();
     QString getFlameAPIKey();
-    QString getModrinthAPIToken();
     QString getUserAgent();
     QString getUserAgentUncached();
 
@@ -187,10 +182,6 @@ public:
         return m_rootPath;
     }
 
-    bool isPortable() {
-        return m_portable;
-    }
-
     const Capabilities capabilities() {
         return m_capabilities;
     }
@@ -215,7 +206,6 @@ signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
     void globalSettingsClosed();
-    int currentCatChanged(int index);
 
 #ifdef Q_OS_MACOS
     void clickedOnDock();
@@ -258,7 +248,7 @@ private:
 
     shared_qobject_ptr<QNetworkAccessManager> m_network;
 
-    shared_qobject_ptr<ExternalUpdater> m_updater;
+    shared_qobject_ptr<UpdateChecker> m_updateChecker;
     shared_qobject_ptr<AccountList> m_accounts;
 
     shared_qobject_ptr<HttpMetaCache> m_metacache;
@@ -279,7 +269,6 @@ private:
     QString m_rootPath;
     Status m_status = Application::StartingUp;
     Capabilities m_capabilities;
-    bool m_portable = false; 
 
 #ifdef Q_OS_MACOS
     Qt::ApplicationState m_prevAppState = Qt::ApplicationInactive;
@@ -314,7 +303,8 @@ public:
     QString m_serverToJoin;
     QString m_profileToUse;
     bool m_liveCheck = false;
-    QList<QUrl> m_zipsToImport;
+    QUrl m_zipToImport;
     QString m_instanceIdToShowWindowOf;
     std::unique_ptr<QFile> logFile;
 };
+

launcher/BaseInstance.cpp

@@ -40,8 +40,6 @@
 #include <QDir>
 #include <QDebug>
 #include <QRegularExpression>
-#include <QJsonDocument>
-#include <QJsonObject>
 
 #include "settings/INISettingsObject.h"
 #include "settings/Setting.h"
@@ -66,8 +64,6 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
     m_settings->registerSetting("totalTimePlayed", 0);
     m_settings->registerSetting("lastTimePlayed", 0);
 
-    m_settings->registerSetting("linkedInstances", "[]");
-
     // Game time override
     auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
     m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride);
@@ -186,38 +182,6 @@ bool BaseInstance::shouldStopOnConsoleOverflow() const
     return m_settings->get("ConsoleOverflowStop").toBool();
 }
 
-QStringList BaseInstance::getLinkedInstances() const
-{
-    return m_settings->get("linkedInstances").toStringList();
-}
-
-void BaseInstance::setLinkedInstances(const QStringList& list)
-{
-    auto linkedInstances = m_settings->get("linkedInstances").toStringList();
-    m_settings->set("linkedInstances", list);
-}
-
-void BaseInstance::addLinkedInstanceId(const QString& id)
-{
-    auto linkedInstances = m_settings->get("linkedInstances").toStringList();
-    linkedInstances.append(id);
-    setLinkedInstances(linkedInstances);
-}
-
-bool BaseInstance::removeLinkedInstanceId(const QString& id)
-{
-    auto linkedInstances = m_settings->get("linkedInstances").toStringList();
-    int numRemoved = linkedInstances.removeAll(id);
-    setLinkedInstances(linkedInstances);
-    return numRemoved > 0;
-}
-
-bool BaseInstance::isLinkedToInstanceId(const QString& id) const
-{
-    auto linkedInstances = m_settings->get("linkedInstances").toStringList();
-    return linkedInstances.contains(id);
-}
-
 void BaseInstance::iconUpdated(QString key)
 {
     if(iconKey() == key)

launcher/BaseInstance.h

@@ -282,12 +282,6 @@ public:
     int getConsoleMaxLines() const;
     bool shouldStopOnConsoleOverflow() const;
 
-    QStringList getLinkedInstances() const;
-    void setLinkedInstances(const QStringList& list);
-    void addLinkedInstanceId(const QString& id);
-    bool removeLinkedInstanceId(const QString& id);
-    bool isLinkedToInstanceId(const QString& id) const;
-
 protected:
     void changeStatus(Status newStatus);
 

launcher/BaseVersion.h

@@ -15,15 +15,16 @@
 
 #pragma once
 
-#include <QMetaType>
-#include <QString>
 #include <memory>
+#include <QString>
+#include <QMetaType>
 
 /*!
  * An abstract base class for versions.
  */
-class BaseVersion {
+class BaseVersion
-   public:
+{
+public:
     using Ptr = std::shared_ptr<BaseVersion>;
     virtual ~BaseVersion() {}
     /*!
@@ -44,8 +45,14 @@ class BaseVersion {
      */
     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/CMakeLists.txt

@@ -26,7 +26,6 @@ set(CORE_SOURCES
     MMCZip.cpp
     StringUtils.h
     StringUtils.cpp
-    QVariantUtils.h
     RuntimeContext.h
 
     # Basic instance manipulation tasks (derived from InstanceTask)
@@ -39,9 +38,9 @@ set(CORE_SOURCES
     InstanceImportTask.h
     InstanceImportTask.cpp
 
-    # Resource downloading task
+    # Mod downloading task
-    ResourceDownloadTask.h
+    ModDownloadTask.h
-    ResourceDownloadTask.cpp
+    ModDownloadTask.cpp
 
     # Use tracking separate from memory management
     Usable.h
@@ -124,8 +123,6 @@ set(NET_SOURCES
     net/HttpMetaCache.h
     net/MetaCacheSink.cpp
     net/MetaCacheSink.h
-    net/Logging.h
-    net/Logging.cpp
     net/NetAction.h
     net/NetJob.cpp
     net/NetJob.h
@@ -164,6 +161,12 @@ set(LAUNCH_SOURCES
 
 # Old update system
 set(UPDATE_SOURCES
+    updater/GoUpdate.h
+    updater/GoUpdate.cpp
+    updater/UpdateChecker.h
+    updater/UpdateChecker.cpp
+    updater/DownloadTask.h
+    updater/DownloadTask.cpp
     updater/ExternalUpdater.h
 )
 
@@ -328,18 +331,12 @@ set(MINECRAFT_SOURCES
     minecraft/mod/Resource.cpp
     minecraft/mod/ResourceFolderModel.h
     minecraft/mod/ResourceFolderModel.cpp
-    minecraft/mod/DataPack.h
-    minecraft/mod/DataPack.cpp
     minecraft/mod/ResourcePack.h
     minecraft/mod/ResourcePack.cpp
     minecraft/mod/ResourcePackFolderModel.h
     minecraft/mod/ResourcePackFolderModel.cpp
     minecraft/mod/TexturePack.h
     minecraft/mod/TexturePack.cpp
-    minecraft/mod/ShaderPack.h
-    minecraft/mod/ShaderPack.cpp
-    minecraft/mod/WorldSave.h
-    minecraft/mod/WorldSave.cpp
     minecraft/mod/TexturePackFolderModel.h
     minecraft/mod/TexturePackFolderModel.cpp
     minecraft/mod/ShaderPackFolderModel.h
@@ -350,18 +347,10 @@ set(MINECRAFT_SOURCES
     minecraft/mod/tasks/LocalModParseTask.cpp
     minecraft/mod/tasks/LocalModUpdateTask.h
     minecraft/mod/tasks/LocalModUpdateTask.cpp
-    minecraft/mod/tasks/LocalDataPackParseTask.h
-    minecraft/mod/tasks/LocalDataPackParseTask.cpp
     minecraft/mod/tasks/LocalResourcePackParseTask.h
     minecraft/mod/tasks/LocalResourcePackParseTask.cpp
     minecraft/mod/tasks/LocalTexturePackParseTask.h
     minecraft/mod/tasks/LocalTexturePackParseTask.cpp
-    minecraft/mod/tasks/LocalShaderPackParseTask.h
-    minecraft/mod/tasks/LocalShaderPackParseTask.cpp
-    minecraft/mod/tasks/LocalWorldSaveParseTask.h
-    minecraft/mod/tasks/LocalWorldSaveParseTask.cpp
-    minecraft/mod/tasks/LocalResourceParse.h
-    minecraft/mod/tasks/LocalResourceParse.cpp
 
     # Assets
     minecraft/AssetsUtils.h
@@ -375,6 +364,8 @@ set(MINECRAFT_SOURCES
     minecraft/services/SkinDelete.cpp
     minecraft/services/SkinDelete.h
 
+    mojang/PackageManifest.h
+    mojang/PackageManifest.cpp
     minecraft/Agent.h)
 
 # the screenshots feature
@@ -468,7 +459,7 @@ set(API_SOURCES
     modplatform/ModIndex.h
     modplatform/ModIndex.cpp
 
-    modplatform/ResourceAPI.h
+    modplatform/ModAPI.h
 
     modplatform/EnsureMetadataTask.h
     modplatform/EnsureMetadataTask.cpp
@@ -479,8 +470,8 @@ set(API_SOURCES
     modplatform/flame/FlameAPI.cpp
     modplatform/modrinth/ModrinthAPI.h
     modplatform/modrinth/ModrinthAPI.cpp
-    modplatform/helpers/NetworkResourceAPI.h
+    modplatform/helpers/NetworkModAPI.h
-    modplatform/helpers/NetworkResourceAPI.cpp
+    modplatform/helpers/NetworkModAPI.cpp
     modplatform/helpers/HashUtils.h
     modplatform/helpers/HashUtils.cpp
     modplatform/helpers/OverrideUtils.h
@@ -523,8 +514,13 @@ set(MODRINTH_SOURCES
     modplatform/modrinth/ModrinthCheckUpdate.h
     modplatform/modrinth/ModrinthInstanceCreationTask.cpp
     modplatform/modrinth/ModrinthInstanceCreationTask.h
-    modplatform/modrinth/ModrinthPackExportTask.cpp
+)
-    modplatform/modrinth/ModrinthPackExportTask.h
+
+set(MODPACKSCH_SOURCES
+    modplatform/modpacksch/FTBPackInstallTask.h
+    modplatform/modpacksch/FTBPackInstallTask.cpp
+    modplatform/modpacksch/FTBPackManifest.h
+    modplatform/modpacksch/FTBPackManifest.cpp
 )
 
 set(PACKWIZ_SOURCES
@@ -555,85 +551,6 @@ set(ATLAUNCHER_SOURCES
     modplatform/atlauncher/ATLShareCode.h
 )
 
-set(LINKEXE_SOURCES
-    filelink/FileLink.h
-    filelink/FileLink.cpp
-    FileSystem.h
-    FileSystem.cpp
-    Exception.h
-    StringUtils.h
-    StringUtils.cpp
-    DesktopServices.h
-    DesktopServices.cpp
-)
-
-######## Logging categories ########
-
-ecm_qt_declare_logging_category(CORE_SOURCES
-    HEADER Logging.h
-    IDENTIFIER authCredentials
-    CATEGORY_NAME "launcher.auth.credentials"
-    DEFAULT_SEVERITY Warning
-    DESCRIPTION "Secrets and credentials for debugging purposes"
-    EXPORT "${Launcher_Name}"
-)
-
-ecm_qt_export_logging_category(
-    IDENTIFIER taskLogC
-    CATEGORY_NAME "launcher.task"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "Task actions"
-    EXPORT "${Launcher_Name}"
-)
-
-ecm_qt_export_logging_category(
-    IDENTIFIER taskNetLogC
-    CATEGORY_NAME "launcher.task.net"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network action"
-    EXPORT "${Launcher_Name}"
-)
-
-ecm_qt_export_logging_category(
-    IDENTIFIER taskDownloadLogC
-    CATEGORY_NAME "launcher.task.net.download"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network download actions"
-    EXPORT "${Launcher_Name}"
-)
-ecm_qt_export_logging_category(
-    IDENTIFIER taskUploadLogC
-    CATEGORY_NAME "launcher.task.net.upload"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network upload actions"
-    EXPORT "${Launcher_Name}"
-)
-
-ecm_qt_export_logging_category(
-    IDENTIFIER taskMetaCacheLogC
-    CATEGORY_NAME "launcher.task.net.metacache"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network meta-cache actions"
-    EXPORT "${Launcher_Name}"
-)
-
-ecm_qt_export_logging_category(
-    IDENTIFIER taskHttpMetaCacheLogC
-    CATEGORY_NAME "launcher.task.net.metacache.http"
-    DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network http meta-cache actions"
-    EXPORT "${Launcher_Name}"
-)
-
-
-
-if(KDE_INSTALL_LOGGINGCATEGORIESDIR)  # only install if there is a standard path for this
-    ecm_qt_install_logging_categories(
-        EXPORT "${Launcher_Name}"
-        DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}"
-    )
-endif()
-
 ################################ COMPILE ################################
 
 set(LOGIC_SOURCES
@@ -656,6 +573,7 @@ set(LOGIC_SOURCES
     ${FTB_SOURCES}
     ${FLAME_SOURCES}
     ${MODRINTH_SOURCES}
+    ${MODPACKSCH_SOURCES}
     ${PACKWIZ_SOURCES}
     ${TECHNIC_SOURCES}
     ${ATLAUNCHER_SOURCES}
@@ -671,6 +589,8 @@ SET(LAUNCHER_SOURCES
     Application.cpp
     DataMigrationTask.h
     DataMigrationTask.cpp
+    UpdateController.cpp
+    UpdateController.h
     ApplicationMessage.h
     ApplicationMessage.cpp
 
@@ -679,8 +599,7 @@ SET(LAUNCHER_SOURCES
     DesktopServices.cpp
     VersionProxyModel.h
     VersionProxyModel.cpp
-    Markdown.h
+    HoeDown.h
-    Markdown.cpp
 
     # Super secret!
     KonamiCode.h
@@ -721,10 +640,6 @@ SET(LAUNCHER_SOURCES
     # FIXME: maybe find a better home for this.
     SkinUtils.cpp
     SkinUtils.h
-    FileIgnoreProxy.cpp
-    FileIgnoreProxy.h
-    FastFileIconProvider.cpp
-    FastFileIconProvider.h
 
     # GUI - setup wizard
     ui/setupwizard/SetupWizard.h
@@ -736,8 +651,6 @@ SET(LAUNCHER_SOURCES
     ui/setupwizard/LanguageWizardPage.h
     ui/setupwizard/PasteWizardPage.cpp
     ui/setupwizard/PasteWizardPage.h
-    ui/setupwizard/ThemeWizardPage.cpp
-    ui/setupwizard/ThemeWizardPage.h
 
     # GUI - themes
     ui/themes/FusionTheme.cpp
@@ -781,11 +694,8 @@ SET(LAUNCHER_SOURCES
     ui/pages/instance/ManagedPackPage.cpp
     ui/pages/instance/ManagedPackPage.h
     ui/pages/instance/TexturePackPage.h
-    ui/pages/instance/TexturePackPage.cpp
     ui/pages/instance/ResourcePackPage.h
-    ui/pages/instance/ResourcePackPage.cpp
     ui/pages/instance/ShaderPackPage.h
-    ui/pages/instance/ShaderPackPage.cpp
     ui/pages/instance/ModFolderPage.cpp
     ui/pages/instance/ModFolderPage.h
     ui/pages/instance/NotesPage.cpp
@@ -824,29 +734,14 @@ SET(LAUNCHER_SOURCES
     ui/pages/global/APIPage.h
 
     # GUI - platform pages
-    ui/pages/modplatform/CustomPage.cpp
+    ui/pages/modplatform/VanillaPage.cpp
-    ui/pages/modplatform/CustomPage.h
+    ui/pages/modplatform/VanillaPage.h
-
-    ui/pages/modplatform/ResourcePage.cpp
-    ui/pages/modplatform/ResourcePage.h
-    ui/pages/modplatform/ResourceModel.cpp
-    ui/pages/modplatform/ResourceModel.h
 
     ui/pages/modplatform/ModPage.cpp
     ui/pages/modplatform/ModPage.h
     ui/pages/modplatform/ModModel.cpp
     ui/pages/modplatform/ModModel.h
 
-    ui/pages/modplatform/ResourcePackPage.cpp
-    ui/pages/modplatform/ResourcePackModel.cpp
-
-    # Needed for MOC to find them without a corresponding .cpp
-    ui/pages/modplatform/TexturePackPage.h
-    ui/pages/modplatform/TexturePackModel.cpp
-
-    ui/pages/modplatform/ShaderPackPage.cpp
-    ui/pages/modplatform/ShaderPackModel.cpp
-
     ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
     ui/pages/modplatform/atlauncher/AtlFilterModel.h
     ui/pages/modplatform/atlauncher/AtlListModel.cpp
@@ -858,6 +753,13 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
     ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
 
+    ui/pages/modplatform/ftb/FtbFilterModel.cpp
+    ui/pages/modplatform/ftb/FtbFilterModel.h
+    ui/pages/modplatform/ftb/FtbListModel.cpp
+    ui/pages/modplatform/ftb/FtbListModel.h
+    ui/pages/modplatform/ftb/FtbPage.cpp
+    ui/pages/modplatform/ftb/FtbPage.h
+
     ui/pages/modplatform/legacy_ftb/Page.cpp
     ui/pages/modplatform/legacy_ftb/Page.h
     ui/pages/modplatform/legacy_ftb/ListModel.h
@@ -867,10 +769,10 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/flame/FlameModel.h
     ui/pages/modplatform/flame/FlamePage.cpp
     ui/pages/modplatform/flame/FlamePage.h
-    ui/pages/modplatform/flame/FlameResourceModels.cpp
+    ui/pages/modplatform/flame/FlameModModel.cpp
-    ui/pages/modplatform/flame/FlameResourceModels.h
+    ui/pages/modplatform/flame/FlameModModel.h
-    ui/pages/modplatform/flame/FlameResourcePages.cpp
+    ui/pages/modplatform/flame/FlameModPage.cpp
-    ui/pages/modplatform/flame/FlameResourcePages.h
+    ui/pages/modplatform/flame/FlameModPage.h
 
     ui/pages/modplatform/modrinth/ModrinthPage.cpp
     ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -885,10 +787,10 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/ImportPage.cpp
     ui/pages/modplatform/ImportPage.h
 
-    ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
+    ui/pages/modplatform/modrinth/ModrinthModModel.cpp
-    ui/pages/modplatform/modrinth/ModrinthResourceModels.h
+    ui/pages/modplatform/modrinth/ModrinthModModel.h
-    ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
+    ui/pages/modplatform/modrinth/ModrinthModPage.cpp
-    ui/pages/modplatform/modrinth/ModrinthResourcePages.h
+    ui/pages/modplatform/modrinth/ModrinthModPage.h
 
     # GUI - dialogs
     ui/dialogs/AboutDialog.cpp
@@ -905,12 +807,10 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/EditAccountDialog.h
     ui/dialogs/ExportInstanceDialog.cpp
     ui/dialogs/ExportInstanceDialog.h
-    ui/dialogs/ExportMrPackDialog.cpp
-    ui/dialogs/ExportMrPackDialog.h
     ui/dialogs/IconPickerDialog.cpp
     ui/dialogs/IconPickerDialog.h
-    ui/dialogs/ImportResourceDialog.cpp
+    ui/dialogs/ImportResourcePackDialog.cpp
-    ui/dialogs/ImportResourceDialog.h
+    ui/dialogs/ImportResourcePackDialog.h
     ui/dialogs/LoginDialog.cpp
     ui/dialogs/LoginDialog.h
     ui/dialogs/MSALoginDialog.cpp
@@ -929,12 +829,14 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ProgressDialog.h
     ui/dialogs/ReviewMessageBox.cpp
     ui/dialogs/ReviewMessageBox.h
+    ui/dialogs/UpdateDialog.cpp
+    ui/dialogs/UpdateDialog.h
     ui/dialogs/VersionSelectDialog.cpp
     ui/dialogs/VersionSelectDialog.h
     ui/dialogs/SkinUploadDialog.cpp
     ui/dialogs/SkinUploadDialog.h
-    ui/dialogs/ResourceDownloadDialog.cpp
+    ui/dialogs/ModDownloadDialog.cpp
-    ui/dialogs/ResourceDownloadDialog.h
+    ui/dialogs/ModDownloadDialog.h
     ui/dialogs/ScrollMessageBox.cpp
     ui/dialogs/ScrollMessageBox.h
     ui/dialogs/BlockedModsDialog.cpp
@@ -980,8 +882,6 @@ SET(LAUNCHER_SOURCES
     ui/widgets/VariableSizedImageObject.cpp
     ui/widgets/ProjectItem.h
     ui/widgets/ProjectItem.cpp
-    ui/widgets/SubTaskProgressBar.h
-    ui/widgets/SubTaskProgressBar.cpp
     ui/widgets/VersionListView.cpp
     ui/widgets/VersionListView.h
     ui/widgets/VersionSelectWidget.cpp
@@ -990,8 +890,6 @@ SET(LAUNCHER_SOURCES
     ui/widgets/ProgressWidget.cpp
     ui/widgets/WideBar.h
     ui/widgets/WideBar.cpp
-    ui/widgets/ThemeCustomizationWidget.h
-    ui/widgets/ThemeCustomizationWidget.cpp
 
     # GUI - instance group view
     ui/instanceview/InstanceProxyModel.cpp
@@ -1007,10 +905,18 @@ SET(LAUNCHER_SOURCES
     ui/instanceview/VisualGroup.h
 )
 
+if(WIN32)
+    set(LAUNCHER_SOURCES
+        ${LAUNCHER_SOURCES}
+
+        # GUI - dark titlebar for Windows 10/11
+        ui/WinDarkmode.h
+        ui/WinDarkmode.cpp
+    )
+endif()
+
 qt_wrap_ui(LAUNCHER_UI
-    ui/MainWindow.ui
     ui/setupwizard/PasteWizardPage.ui
-    ui/setupwizard/ThemeWizardPage.ui
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
     ui/pages/global/LauncherPage.ui
@@ -1031,31 +937,30 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/instance/ScreenshotsPage.ui
     ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
     ui/pages/modplatform/atlauncher/AtlPage.ui
-    ui/pages/modplatform/CustomPage.ui
+    ui/pages/modplatform/VanillaPage.ui
-    ui/pages/modplatform/ResourcePage.ui
+    ui/pages/modplatform/ModPage.ui
     ui/pages/modplatform/flame/FlamePage.ui
     ui/pages/modplatform/legacy_ftb/Page.ui
     ui/pages/modplatform/ImportPage.ui
+    ui/pages/modplatform/ftb/FtbPage.ui
     ui/pages/modplatform/modrinth/ModrinthPage.ui
     ui/pages/modplatform/technic/TechnicPage.ui
     ui/widgets/InstanceCardWidget.ui
     ui/widgets/CustomCommands.ui
     ui/widgets/InfoFrame.ui
     ui/widgets/ModFilterWidget.ui
-    ui/widgets/SubTaskProgressBar.ui
-    ui/widgets/ThemeCustomizationWidget.ui
     ui/dialogs/CopyInstanceDialog.ui
     ui/dialogs/ProfileSetupDialog.ui
     ui/dialogs/ProgressDialog.ui
     ui/dialogs/NewInstanceDialog.ui
+    ui/dialogs/UpdateDialog.ui
     ui/dialogs/NewComponentDialog.ui
     ui/dialogs/NewsDialog.ui
     ui/dialogs/ProfileSelectDialog.ui
     ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
-    ui/dialogs/ExportMrPackDialog.ui
     ui/dialogs/IconPickerDialog.ui
-    ui/dialogs/ImportResourceDialog.ui
+    ui/dialogs/ImportResourcePackDialog.ui
     ui/dialogs/MSALoginDialog.ui
     ui/dialogs/OfflineLoginDialog.ui
     ui/dialogs/AboutDialog.ui
@@ -1097,7 +1002,6 @@ target_link_libraries(Launcher_logic
     nbt++
     ${ZLIB_LIBRARIES}
     tomlplusplus::tomlplusplus
-    qdcss
     BuildConfig
     Katabasis
     Qt${QT_VERSION_MAJOR}::Widgets
@@ -1121,7 +1025,7 @@ target_link_libraries(Launcher_logic
 )
 target_link_libraries(Launcher_logic
     QuaZip::QuaZip
-    cmark::cmark
+    hoedown
     LocalPeer
     Launcher_rainbow
 )
@@ -1166,41 +1070,6 @@ install(TARGETS ${Launcher_Name}
     FRAMEWORK DESTINATION ${FRAMEWORK_DEST_DIR} COMPONENT Runtime
 )
 
-if(WIN32)
-    add_library(filelink_logic STATIC ${LINKEXE_SOURCES})
-    target_include_directories(filelink_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-    target_link_libraries(filelink_logic
-        systeminfo
-        BuildConfig
-        ghcFilesystem::ghc_filesystem
-        Qt${QT_VERSION_MAJOR}::Widgets
-        Qt${QT_VERSION_MAJOR}::Core
-        Qt${QT_VERSION_MAJOR}::Network
-        # Qt${QT_VERSION_MAJOR}::Concurrent
-        ${Launcher_QT_LIBS}
-    )
-
-    add_executable("${Launcher_Name}_filelink" WIN32 filelink/main.cpp)
-
-    target_sources("${Launcher_Name}_filelink" PRIVATE filelink/filelink.exe.manifest)
-
-    target_link_libraries("${Launcher_Name}_filelink" filelink_logic)
-
-    if(DEFINED Launcher_APP_BINARY_NAME)
-        set_target_properties("${Launcher_Name}_filelink" PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}_filelink")
-    endif()
-    if(DEFINED Launcher_BINARY_RPATH)
-        SET_TARGET_PROPERTIES("${Launcher_Name}_filelink" PROPERTIES INSTALL_RPATH "${Launcher_BINARY_RPATH}")
-    endif()
-
-    install(TARGETS "${Launcher_Name}_filelink"
-        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 (UNIX AND APPLE)
     # Add Sparkle updater
     # It has to be copied here instead of just allowing fixup_bundle to install it, otherwise essential parts of
@@ -1217,12 +1086,6 @@ if(INSTALL_BUNDLE STREQUAL "full")
         CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")"
         COMPONENT Runtime
     )
-    # add qtlogging.ini as a config file
-    install(
-        FILES "qtlogging.ini"
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}
-        COMPONENT Runtime
-    )
     # Bundle plugins
     # Image formats
     install(

launcher/DesktopServices.cpp

@@ -37,6 +37,7 @@
 #include <QDesktopServices>
 #include <QProcess>
 #include <QDebug>
+#include "Application.h"
 
 /**
  * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.

launcher/FastFileIconProvider.cpp

@@ -1,47 +0,0 @@
-// 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/>.
- */
-
-#include "FastFileIconProvider.h"
-
-#include <QApplication>
-#include <QStyle>
-
-QIcon FastFileIconProvider::icon(const QFileInfo& info) const
-{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-    bool link = info.isSymbolicLink() || info.isAlias() || info.isShortcut();
-#else
-    // in versions prior to 6.4 we don't have access to isAlias
-    bool link = info.isSymLink();
-#endif
-    QStyle::StandardPixmap icon;
-
-    if (info.isDir()) {
-        if (link)
-            icon = QStyle::SP_DirLinkIcon;
-        else
-            icon = QStyle::SP_DirIcon;
-    } else {
-        if (link)
-            icon = QStyle::SP_FileLinkIcon;
-        else
-            icon = QStyle::SP_FileIcon;
-    }
-
-    return QApplication::style()->standardIcon(icon);
-}

launcher/FastFileIconProvider.h

@@ -1,26 +0,0 @@
-// 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/>.
- */
-
-#pragma once
-
-#include <QFileIconProvider>
-
-class FastFileIconProvider : public QFileIconProvider {
-   public:
-    QIcon icon(const QFileInfo& info) const override;
-};

launcher/FileIgnoreProxy.cpp

@@ -1,279 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  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
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include "FileIgnoreProxy.h"
-
-#include <QDebug>
-#include <QFileSystemModel>
-#include <QSortFilterProxyModel>
-#include <QStack>
-#include <algorithm>
-#include "FileSystem.h"
-#include "SeparatorPrefixTree.h"
-#include "StringUtils.h"
-
-FileIgnoreProxy::FileIgnoreProxy(QString root, QObject* parent) : QSortFilterProxyModel(parent), root(root) {}
-// NOTE: Sadly, we have to do sorting ourselves.
-bool FileIgnoreProxy::lessThan(const QModelIndex& left, const QModelIndex& right) const
-{
-    QFileSystemModel* fsm = qobject_cast<QFileSystemModel*>(sourceModel());
-    if (!fsm) {
-        return QSortFilterProxyModel::lessThan(left, right);
-    }
-    bool asc = sortOrder() == Qt::AscendingOrder ? true : false;
-
-    QFileInfo leftFileInfo = fsm->fileInfo(left);
-    QFileInfo rightFileInfo = fsm->fileInfo(right);
-
-    if (!leftFileInfo.isDir() && rightFileInfo.isDir()) {
-        return !asc;
-    }
-    if (leftFileInfo.isDir() && !rightFileInfo.isDir()) {
-        return asc;
-    }
-
-    // sort and proxy model breaks the original model...
-    if (sortColumn() == 0) {
-        return StringUtils::naturalCompare(leftFileInfo.fileName(), rightFileInfo.fileName(), Qt::CaseInsensitive) < 0;
-    }
-    if (sortColumn() == 1) {
-        auto leftSize = leftFileInfo.size();
-        auto rightSize = rightFileInfo.size();
-        if ((leftSize == rightSize) || (leftFileInfo.isDir() && rightFileInfo.isDir())) {
-            return StringUtils::naturalCompare(leftFileInfo.fileName(), rightFileInfo.fileName(), Qt::CaseInsensitive) < 0 ? asc : !asc;
-        }
-        return leftSize < rightSize;
-    }
-    return QSortFilterProxyModel::lessThan(left, right);
-}
-
-Qt::ItemFlags FileIgnoreProxy::flags(const QModelIndex& index) const
-{
-    if (!index.isValid())
-        return Qt::NoItemFlags;
-
-    auto sourceIndex = mapToSource(index);
-    Qt::ItemFlags flags = sourceIndex.flags();
-    if (index.column() == 0) {
-        flags |= Qt::ItemIsUserCheckable;
-        if (sourceIndex.model()->hasChildren(sourceIndex)) {
-            flags |= Qt::ItemIsAutoTristate;
-        }
-    }
-
-    return flags;
-}
-
-QVariant FileIgnoreProxy::data(const QModelIndex& index, int role) const
-{
-    QModelIndex sourceIndex = mapToSource(index);
-
-    if (index.column() == 0 && role == Qt::CheckStateRole) {
-        QFileSystemModel* fsm = qobject_cast<QFileSystemModel*>(sourceModel());
-        auto blockedPath = relPath(fsm->filePath(sourceIndex));
-        auto cover = blocked.cover(blockedPath);
-        if (!cover.isNull()) {
-            return QVariant(Qt::Unchecked);
-        } else if (blocked.exists(blockedPath)) {
-            return QVariant(Qt::PartiallyChecked);
-        } else {
-            return QVariant(Qt::Checked);
-        }
-    }
-
-    return sourceIndex.data(role);
-}
-
-bool FileIgnoreProxy::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    if (index.column() == 0 && role == Qt::CheckStateRole) {
-        Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
-        return setFilterState(index, state);
-    }
-
-    QModelIndex sourceIndex = mapToSource(index);
-    return QSortFilterProxyModel::sourceModel()->setData(sourceIndex, value, role);
-}
-
-QString FileIgnoreProxy::relPath(const QString& path) const
-{
-    return QDir(root).relativeFilePath(path);
-}
-
-bool FileIgnoreProxy::setFilterState(QModelIndex index, Qt::CheckState state)
-{
-    QFileSystemModel* fsm = qobject_cast<QFileSystemModel*>(sourceModel());
-
-    if (!fsm) {
-        return false;
-    }
-
-    QModelIndex sourceIndex = mapToSource(index);
-    auto blockedPath = relPath(fsm->filePath(sourceIndex));
-    bool changed = false;
-    if (state == Qt::Unchecked) {
-        // blocking a path
-        auto& node = blocked.insert(blockedPath);
-        // get rid of all blocked nodes below
-        node.clear();
-        changed = true;
-    } else if (state == Qt::Checked || state == Qt::PartiallyChecked) {
-        if (!blocked.remove(blockedPath)) {
-            auto cover = blocked.cover(blockedPath);
-            qDebug() << "Blocked by cover" << cover;
-            // uncover
-            blocked.remove(cover);
-            // block all contents, except for any cover
-            QModelIndex rootIndex = fsm->index(FS::PathCombine(root, cover));
-            QModelIndex doing = rootIndex;
-            int row = 0;
-            QStack<QModelIndex> todo;
-            while (1) {
-                auto node = fsm->index(row, 0, doing);
-                if (!node.isValid()) {
-                    if (!todo.size()) {
-                        break;
-                    } else {
-                        doing = todo.pop();
-                        row = 0;
-                        continue;
-                    }
-                }
-                auto relpath = relPath(fsm->filePath(node));
-                if (blockedPath.startsWith(relpath))  // cover found?
-                {
-                    // continue processing cover later
-                    todo.push(node);
-                } else {
-                    // or just block this one.
-                    blocked.insert(relpath);
-                }
-                row++;
-            }
-        }
-        changed = true;
-    }
-    if (changed) {
-        // update the thing
-        emit dataChanged(index, index, { Qt::CheckStateRole });
-        // update everything above index
-        QModelIndex up = index.parent();
-        while (1) {
-            if (!up.isValid())
-                break;
-            emit dataChanged(up, up, { Qt::CheckStateRole });
-            up = up.parent();
-        }
-        // and everything below the index
-        QModelIndex doing = index;
-        int row = 0;
-        QStack<QModelIndex> todo;
-        while (1) {
-            auto node = this->index(row, 0, doing);
-            if (!node.isValid()) {
-                if (!todo.size()) {
-                    break;
-                } else {
-                    doing = todo.pop();
-                    row = 0;
-                    continue;
-                }
-            }
-            emit dataChanged(node, node, { Qt::CheckStateRole });
-            todo.push(node);
-            row++;
-        }
-        // siblings and unrelated nodes are ignored
-    }
-    return true;
-}
-
-bool FileIgnoreProxy::shouldExpand(QModelIndex index)
-{
-    QModelIndex sourceIndex = mapToSource(index);
-    QFileSystemModel* fsm = qobject_cast<QFileSystemModel*>(sourceModel());
-    if (!fsm) {
-        return false;
-    }
-    auto blockedPath = relPath(fsm->filePath(sourceIndex));
-    auto found = blocked.find(blockedPath);
-    if (found) {
-        return !found->leaf();
-    }
-    return false;
-}
-
-void FileIgnoreProxy::setBlockedPaths(QStringList paths)
-{
-    beginResetModel();
-    blocked.clear();
-    blocked.insert(paths);
-    endResetModel();
-}
-
-bool FileIgnoreProxy::filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const
-{
-    Q_UNUSED(source_parent)
-
-    // adjust the columns you want to filter out here
-    // return false for those that will be hidden
-    if (source_column == 2 || source_column == 3)
-        return false;
-
-    return true;
-}
-
-bool FileIgnoreProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
-{
-    QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
-    QFileSystemModel* fsm = qobject_cast<QFileSystemModel*>(sourceModel());
-
-    auto fileInfo = fsm->fileInfo(index);
-    return !ignoreFile(fileInfo);
-}
-
-bool FileIgnoreProxy::ignoreFile(QFileInfo fileInfo) const
-{
-    auto fileName = fileInfo.fileName();
-    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
-{
-    return blocked.covers(fileName) || ignoreFile(QFileInfo(QDir(root), fileName));
-}

launcher/FileIgnoreProxy.h

@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  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
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#pragma once
-
-#include <QFileInfo>
-#include <QSortFilterProxyModel>
-#include "SeparatorPrefixTree.h"
-
-class FileIgnoreProxy : public QSortFilterProxyModel {
-    Q_OBJECT
-
-   public:
-    FileIgnoreProxy(QString root, QObject* parent);
-    // NOTE: Sadly, we have to do sorting ourselves.
-    bool lessThan(const QModelIndex& left, const QModelIndex& right) const;
-
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-
-    QString relPath(const QString& path) const;
-
-    bool setFilterState(QModelIndex index, Qt::CheckState state);
-
-    bool shouldExpand(QModelIndex index);
-
-    void setBlockedPaths(QStringList paths);
-
-    inline const SeparatorPrefixTree<'/'>& blockedPaths() const { return blocked; }
-    inline SeparatorPrefixTree<'/'>& blockedPaths() { return blocked; }
-
-    // list of file names that need to be removed completely from model
-    inline QStringList& ignoreFilesWithName() { return m_ignoreFiles; }
-    // list of relative paths that need to be removed completely from model
-    inline SeparatorPrefixTree<'/'>& ignoreFilesWithPath() { return m_ignoreFilePaths; }
-
-    bool filterFile(const QString& fileName) const;
-
-   protected:
-    bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const;
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
-
-    bool ignoreFile(QFileInfo file) const;
-
-   private:
-    const QString root;
-    SeparatorPrefixTree<'/'> blocked;
-    QStringList m_ignoreFiles;
-    SeparatorPrefixTree<'/'> m_ignoreFilePaths;
-};

launcher/FileSystem.h

@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  Prism Launcher - Minecraft Launcher
+ *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.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
@@ -40,14 +38,9 @@
 #include "Exception.h"
 #include "pathmatcher/IPathMatcher.h"
 
-#include <system_error>
-
 #include <QDir>
-#include <QPair>
 #include <QFlags>
-#include <QLocalServer>
 #include <QObject>
-#include <QThread>
 
 namespace FS {
 
@@ -83,9 +76,7 @@ bool ensureFilePathExists(QString filenamepath);
  */
 bool ensureFolderPathExists(QString filenamepath);
 
-/**
+/// @brief Copies a directory and it's contents from src to dest
- * @brief Copies a directory and it's contents from src to dest
- */
 class copy : public QObject {
     Q_OBJECT
    public:
@@ -113,12 +104,9 @@ class copy : public QObject {
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
     int totalCopied() { return m_copied; }
-    int totalFailed() { return m_failedPaths.length(); }
-    QStringList failed() { return m_failedPaths; }
 
    signals:
     void fileCopied(const QString& relativeName);
-    void copyFailed(const QString& relativeName);
     // TODO: maybe add a "shouldCopy" signal in the future?
 
    private:
@@ -131,138 +119,8 @@ class copy : public QObject {
     QDir m_src;
     QDir m_dst;
     int m_copied;
-    QStringList m_failedPaths;
 };
 
-struct LinkPair {
-    QString src;
-    QString dst;
-};
-
-struct LinkResult {
-    QString src;
-    QString dst;
-    QString err_msg;
-    int err_value;
-};
-
-class ExternalLinkFileProcess : public QThread {
-    Q_OBJECT
-   public:
-    ExternalLinkFileProcess(QString server, bool useHardLinks, QObject* parent = nullptr)
-        : QThread(parent), m_useHardLinks(useHardLinks), m_server(server)
-    {}
-
-    void run() override
-    {
-        runLinkFile();
-        emit processExited();
-    }
-
-   signals:
-    void processExited();
-
-   private:
-    void runLinkFile();
-
-    bool m_useHardLinks = false;
-
-    QString m_server;
-};
-
-/**
- * @brief links (a file / a directory and it's contents) from src to dest
- */
-class create_link : public QObject {
-    Q_OBJECT
-   public:
-    create_link(const QList<LinkPair> path_pairs, QObject* parent = nullptr) : QObject(parent) { m_path_pairs.append(path_pairs); }
-    create_link(const QString& src, const QString& dst, QObject* parent = nullptr) : QObject(parent)
-    {
-        LinkPair pair = { src, dst };
-        m_path_pairs.append(pair);
-    }
-    create_link& useHardLinks(const bool useHard)
-    {
-        m_useHardLinks = useHard;
-        return *this;
-    }
-    create_link& matcher(const IPathMatcher* filter)
-    {
-        m_matcher = filter;
-        return *this;
-    }
-    create_link& whitelist(bool whitelist)
-    {
-        m_whitelist = whitelist;
-        return *this;
-    }
-    create_link& linkRecursively(bool recursive)
-    {
-        m_recursive = recursive;
-        return *this;
-    }
-    create_link& setMaxDepth(int depth)
-    {
-        m_max_depth = depth;
-        return *this;
-    }
-    create_link& debug(bool d)
-    {
-        m_debug = d;
-        return *this;
-    }
-
-    std::error_code getOSError() { return m_os_err; }
-
-    bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
-
-    int totalLinked() { return m_linked; }
-
-    void runPrivileged() { runPrivileged(QString()); }
-    void runPrivileged(const QString& offset);
-
-    QList<LinkResult> getResults() { return m_path_results; }
-
-   signals:
-    void fileLinked(const QString& srcName, const QString& dstName);
-    void linkFailed(const QString& srcName, const QString& dstName, const QString& err_msg, int err_value);
-    void finished();
-    void finishedPrivileged(bool gotResults);
-
-   private:
-    bool operator()(const QString& offset, bool dryRun = false);
-    void make_link_list(const QString& offset);
-    bool make_links();
-
-   private:
-    bool m_useHardLinks = false;
-    const IPathMatcher* m_matcher = nullptr;
-    bool m_whitelist = false;
-    bool m_recursive = true;
-
-    /// @brief >= -1 = infinite, 0 = link files at src/* to dest/*, 1 = link files at src/*/* to dest/*/*, etc.
-    int m_max_depth = -1;
-
-    QList<LinkPair> m_path_pairs;
-    QList<LinkResult> m_path_results;
-    QList<LinkPair> m_links_to_make;
-
-    int m_linked;
-    bool m_debug = false;
-    std::error_code m_os_err;
-
-    QLocalServer m_linkServer;
-};
-
-/**
- * @brief moves a file by renaming it
- * @param source source file path
- * @param dest destination filepath
- *
- */
-bool move(const QString& source, const QString& dest);
-
 /**
  * Delete a folder recursively
  */
@@ -271,30 +129,13 @@ bool deletePath(QString path);
 /**
  * Trash a folder / file
  */
-bool trash(QString path, QString* pathInTrash = nullptr);
+bool trash(QString path, QString *pathInTrash);
 
 QString PathCombine(const QString& path1, const QString& path2);
 QString PathCombine(const QString& path1, const QString& path2, const QString& path3);
 QString PathCombine(const QString& path1, const QString& path2, const QString& path3, const QString& path4);
 
-QString AbsolutePath(const QString& path);
+QString AbsolutePath(QString path);
-
-/**
- * @brief depth of path. "foo.txt" -> 0 , "bar/foo.txt" -> 1, /baz/bar/foo.txt -> 2, etc.
- *
- * @param path path to measure
- * @return int number of components before base path
- */
-int pathDepth(const QString& path);
-
-/**
- * @brief  cut off segments of path until it is a max of length depth
- *
- * @param path path to truncate
- * @param depth max depth of new path
- * @return QString truncated path
- */
-QString pathTruncate(const QString& path, int depth);
 
 /**
  * Resolve an executable
@@ -336,198 +177,4 @@ bool overrideFolder(QString overwritten_path, QString override_path);
  * Creates a shortcut to the specified target file at the specified destination path.
  */
 bool createShortcut(QString destination, QString target, QStringList args, QString name, QString icon);
-
+}
-enum class FilesystemType {
-    FAT,
-    NTFS,
-    REFS,
-    EXT,
-    EXT_2_OLD,
-    EXT_2_3_4,
-    XFS,
-    BTRFS,
-    NFS,
-    ZFS,
-    APFS,
-    HFS,
-    HFSPLUS,
-    HFSX,
-    FUSEBLK,
-    F2FS,
-    UNKNOWN
-};
-
-/**
- * @brief Ordered Mapping of enum types to reported filesystem names
- * this mapping is non exsaustive, it just attempts to capture the filesystems which could be reasonalbly be in use .
- * all string values are in uppercase, use `QString.toUpper()` or equivalent during lookup.
- *
- * QMap is ordered
- *
- */
-static const QMap<FilesystemType, QStringList> s_filesystem_type_names = {
-    {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,        { "EXT" }},
-    {FilesystemType::XFS,        { "XFS" }},
-    {FilesystemType::BTRFS,      { "BTRFS" }},
-    {FilesystemType::NFS,        { "NFS" }},
-    {FilesystemType::ZFS,        { "ZFS" }},
-    {FilesystemType::APFS,       { "APFS" }},
-    {FilesystemType::HFS,        { "HFS" }},
-    {FilesystemType::HFSPLUS,    { "HFSPLUS" }},
-    {FilesystemType::HFSX,       { "HFSX" }},
-    {FilesystemType::FUSEBLK,    { "FUSEBLK" }},
-    {FilesystemType::F2FS,       { "F2FS" }},
-    {FilesystemType::UNKNOWN,    { "UNKNOWN" }}
-};
-
-/**
- * @brief Get the string name of Filesystem enum object
- *
- * @param type
- * @return QString
- */
-QString getFilesystemTypeName(FilesystemType type);
-
-/**
- * @brief Get the Filesystem enum object from a name
- *  Does a lookup of the type name and returns an exact match
- *
- * @param name
- * @return FilesystemType
- */
-FilesystemType getFilesystemType(const QString& name);
-
-/**
- * @brief Get the Filesystem enum object from a name
- *  Does a fuzzy lookup of the type name and returns an apropreate match
- *
- * @param name
- * @return FilesystemType
- */
-FilesystemType getFilesystemTypeFuzzy(const QString& name);
-
-struct FilesystemInfo {
-    FilesystemType fsType = FilesystemType::UNKNOWN;
-    QString fsTypeName;
-    int blockSize;
-    qint64 bytesAvailable;
-    qint64 bytesFree;
-    qint64 bytesTotal;
-    QString name;
-    QString rootPath;
-};
-
-/**
- * @brief path to the near ancestor that exists
- *
- */
-QString nearestExistentAncestor(const QString& path);
-
-/**
- * @brief colect information about the filesystem under a file
- *
- */
-FilesystemInfo statFS(const QString& path);
-
-static const QList<FilesystemType> s_clone_filesystems = { FilesystemType::BTRFS, FilesystemType::APFS, FilesystemType::ZFS,
-                                                           FilesystemType::XFS, FilesystemType::REFS };
-
-/**
- * @brief if the Filesystem is reflink/clone capable
- *
- */
-bool canCloneOnFS(const QString& path);
-bool canCloneOnFS(const FilesystemInfo& info);
-bool canCloneOnFS(FilesystemType type);
-
-/**
- * @brief if the Filesystems are reflink/clone capable and both are on the same device
- *
- */
-bool canClone(const QString& src, const QString& dst);
-
-/**
- * @brief Copies a directory and it's contents from src to dest
- */
-class clone : public QObject {
-    Q_OBJECT
-   public:
-    clone(const QString& src, const QString& dst, QObject* parent = nullptr) : QObject(parent)
-    {
-        m_src.setPath(src);
-        m_dst.setPath(dst);
-    }
-    clone& matcher(const IPathMatcher* filter)
-    {
-        m_matcher = filter;
-        return *this;
-    }
-    clone& whitelist(bool whitelist)
-    {
-        m_whitelist = whitelist;
-        return *this;
-    }
-
-    bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
-
-    int totalCloned() { return m_cloned; }
-    int totalFailed() { return m_failedClones.length(); }
-
-    QList<QPair<QString, QString>> failed() { return m_failedClones; }
-
-   signals:
-    void fileCloned(const QString& src, const QString& dst);
-    void cloneFailed(const QString& src, const QString& dst);
-
-   private:
-    bool operator()(const QString& offset, bool dryRun = false);
-
-   private:
-    const IPathMatcher* m_matcher = nullptr;
-    bool m_whitelist = false;
-    QDir m_src;
-    QDir m_dst;
-    int m_cloned;
-    QList<QPair<QString, QString>> m_failedClones;
-};
-
-/**
- * @brief clone/reflink file from src to dst
- *
- */
-bool clone_file(const QString& src, const QString& dst, std::error_code& ec);
-
-#if defined(Q_OS_WIN)
-bool win_ioctl_clone(const std::wstring& src_path, const std::wstring& dst_path, std::error_code& ec);
-#elif defined(Q_OS_LINUX)
-bool linux_ficlone(const std::string& src_path, const std::string& dst_path, std::error_code& ec);
-#elif defined(Q_OS_MACOS) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-bool macos_bsd_clonefile(const std::string& src_path, const std::string& dst_path, std::error_code& ec);
-#endif
-
-static const QList<FilesystemType> s_non_link_filesystems = {
-    FilesystemType::FAT,
-};
-
-/**
- * @brief if the Filesystem is symlink capable
- *
- */
-bool canLinkOnFS(const QString& path);
-bool canLinkOnFS(const FilesystemInfo& info);
-bool canLinkOnFS(FilesystemType type);
-
-/**
- * @brief if the Filesystem is symlink capable on both ends
- *
- */
-bool canLink(const QString& src, const QString& dst);
-
-uintmax_t hardLinkCount(const QString& path);
-
-}  // namespace FS

launcher/HoeDown.h

@@ -0,0 +1,76 @@
+/* Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <hoedown/html.h>
+#include <hoedown/document.h>
+#include <QString>
+#include <QByteArray>
+
+/**
+ * hoedown wrapper, because dealing with resource lifetime in C is stupid
+ */
+class HoeDown
+{
+public:
+    class buffer
+    {
+    public:
+        buffer(size_t unit = 4096)
+        {
+            buf = hoedown_buffer_new(unit);
+        }
+        ~buffer()
+        {
+            hoedown_buffer_free(buf);
+        }
+        const char * cstr()
+        {
+            return hoedown_buffer_cstr(buf);
+        }
+        void put(QByteArray input)
+        {
+            hoedown_buffer_put(buf, reinterpret_cast<uint8_t *>(input.data()), input.size());
+        }
+        const uint8_t * data() const
+        {
+            return buf->data;
+        }
+        size_t size() const
+        {
+            return buf->size;
+        }
+        hoedown_buffer * buf;
+    } ib, ob;
+    HoeDown()
+    {
+        renderer = hoedown_html_renderer_new((hoedown_html_flags) 0,0);
+        document = hoedown_document_new(renderer, (hoedown_extensions) 0, 8);
+    }
+    ~HoeDown()
+    {
+        hoedown_document_free(document);
+        hoedown_html_renderer_free(renderer);
+    }
+    QString process(QByteArray input)
+    {
+        ib.put(input);
+        hoedown_document_render(document, ob.buf, ib.data(), ib.size());
+        return ob.cstr();
+    }
+private:
+    hoedown_document * document;
+    hoedown_renderer * renderer;
+};

launcher/InstanceCopyPrefs.cpp

@@ -16,13 +16,8 @@ bool InstanceCopyPrefs::allTrue() const
         copyScreenshots;
 }
 
-
 // Returns a single RegEx string of the selected folders/files to filter out (ex: ".minecraft/saves|.minecraft/server.dat")
 QString InstanceCopyPrefs::getSelectedFiltersAsRegex() const
-{
-    return getSelectedFiltersAsRegex({});
-}
-QString InstanceCopyPrefs::getSelectedFiltersAsRegex(const QStringList& additionalFilters) const
 {
     QStringList filters;
 
@@ -47,10 +42,6 @@ QString InstanceCopyPrefs::getSelectedFiltersAsRegex(const QStringList& addition
     if(!copyScreenshots)
         filters << "screenshots";
 
-    for (auto filter : additionalFilters) {
-        filters << filter;
-    }
-
     // If we have any filters to add, join them as a single regex string to return:
     if (!filters.isEmpty()) {
         const QString MC_ROOT = "[.]?minecraft/";
@@ -102,31 +93,6 @@ bool InstanceCopyPrefs::isCopyScreenshotsEnabled() const
     return copyScreenshots;
 }
 
-bool InstanceCopyPrefs::isUseSymLinksEnabled() const
-{
-    return useSymLinks;
-}
-
-bool InstanceCopyPrefs::isUseHardLinksEnabled() const
-{
-    return useHardLinks;
-}
-
-bool InstanceCopyPrefs::isLinkRecursivelyEnabled() const
-{
-    return linkRecursively;
-}
-
-bool InstanceCopyPrefs::isDontLinkSavesEnabled() const
-{
-    return dontLinkSaves;
-}
-
-bool InstanceCopyPrefs::isUseCloneEnabled() const
-{
-    return useClone;
-}
-
 // ======= Setters =======
 void InstanceCopyPrefs::enableCopySaves(bool b)
 {
@@ -167,28 +133,3 @@ void InstanceCopyPrefs::enableCopyScreenshots(bool b)
 {
     copyScreenshots = b;
 }
-
-void InstanceCopyPrefs::enableUseSymLinks(bool b)
-{
-    useSymLinks = b;
-}
-
-void InstanceCopyPrefs::enableLinkRecursively(bool b)
-{
-    linkRecursively = b;
-}
-
-void InstanceCopyPrefs::enableUseHardLinks(bool b)
-{
-    useHardLinks = b;
-}
-
-void InstanceCopyPrefs::enableDontLinkSaves(bool b)
-{
-    dontLinkSaves = b;
-}
-
-void InstanceCopyPrefs::enableUseClone(bool b)
-{
-    useClone = b;
-}

launcher/InstanceCopyPrefs.h

@@ -10,7 +10,6 @@ struct InstanceCopyPrefs {
    public:
     [[nodiscard]] bool allTrue() const;
     [[nodiscard]] QString getSelectedFiltersAsRegex() const;
-    [[nodiscard]] QString getSelectedFiltersAsRegex(const QStringList& additionalFilters) const;
     // Getters
     [[nodiscard]] bool isCopySavesEnabled() const;
     [[nodiscard]] bool isKeepPlaytimeEnabled() const;
@@ -20,11 +19,6 @@ struct InstanceCopyPrefs {
     [[nodiscard]] bool isCopyServersEnabled() const;
     [[nodiscard]] bool isCopyModsEnabled() const;
     [[nodiscard]] bool isCopyScreenshotsEnabled() const;
-    [[nodiscard]] bool isUseSymLinksEnabled() const;
-    [[nodiscard]] bool isLinkRecursivelyEnabled() const;
-    [[nodiscard]] bool isUseHardLinksEnabled() const;
-    [[nodiscard]] bool isDontLinkSavesEnabled() const;
-    [[nodiscard]] bool isUseCloneEnabled() const;
     // Setters
     void enableCopySaves(bool b);
     void enableKeepPlaytime(bool b);
@@ -34,11 +28,6 @@ struct InstanceCopyPrefs {
     void enableCopyServers(bool b);
     void enableCopyMods(bool b);
     void enableCopyScreenshots(bool b);
-    void enableUseSymLinks(bool b);
-    void enableLinkRecursively(bool b);
-    void enableUseHardLinks(bool b);
-    void enableDontLinkSaves(bool b);
-    void enableUseClone(bool b);
 
    protected: // data
     bool copySaves = true;
@@ -49,9 +38,4 @@ struct InstanceCopyPrefs {
     bool copyServers = true;
     bool copyMods = true;
     bool copyScreenshots = true;
-    bool useSymLinks = false;
-    bool linkRecursively = false;
-    bool useHardLinks = false;
-    bool dontLinkSaves = false;
-    bool useClone = false;
 };

launcher/InstanceCopyTask.cpp

@@ -1,31 +1,18 @@
 #include "InstanceCopyTask.h"
-#include <QDebug>
+#include "settings/INISettingsObject.h"
-#include <QtConcurrentRun>
 #include "FileSystem.h"
 #include "NullInstance.h"
 #include "pathmatcher/RegexpMatcher.h"
-#include "settings/INISettingsObject.h"
+#include <QtConcurrentRun>
 
 InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, const InstanceCopyPrefs& prefs)
 {
     m_origInstance = origInstance;
     m_keepPlaytime = prefs.isKeepPlaytimeEnabled();
-    m_useLinks = prefs.isUseSymLinksEnabled();
-    m_linkRecursively = prefs.isLinkRecursivelyEnabled();
-    m_useHardLinks = prefs.isLinkRecursivelyEnabled() && prefs.isUseHardLinksEnabled();
-    m_copySaves = prefs.isLinkRecursivelyEnabled() && prefs.isDontLinkSavesEnabled() && prefs.isCopySavesEnabled();
-    m_useClone = prefs.isUseCloneEnabled();
 
     QString filters = prefs.getSelectedFiltersAsRegex();
-    if (m_useLinks || m_useHardLinks) {
     if (!filters.isEmpty())
-            filters += "|";
+    {
-        filters += "instance.cfg";
-    }
-
-    qDebug() << "CopyFilters:" << filters;
-
-    if (!filters.isEmpty()) {
         // Set regex filter:
         // FIXME: get this from the original instance type...
         auto matcherReal = new RegexpMatcher(filters);
@@ -38,87 +25,11 @@ void InstanceCopyTask::executeTask()
 {
     setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
 
-    auto copySaves = [&]() {
+    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]{
-        QFileInfo mcDir(FS::PathCombine(m_stagingPath, "minecraft"));
-        QFileInfo dotMCDir(FS::PathCombine(m_stagingPath, ".minecraft"));
-
-        QString staging_mc_dir;
-        if (mcDir.exists() && !dotMCDir.exists())
-            staging_mc_dir = mcDir.filePath();
-        else
-            staging_mc_dir = dotMCDir.filePath();
-
-        FS::copy savesCopy(FS::PathCombine(m_origInstance->gameRoot(), "saves"), FS::PathCombine(staging_mc_dir, "saves"));
-        savesCopy.followSymlinks(true);
-
-        return savesCopy();
-    };
-
-    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this, copySaves] {
-        if (m_useClone) {
-            FS::clone folderClone(m_origInstance->instanceRoot(), m_stagingPath);
-            folderClone.matcher(m_matcher.get());
-
-            return folderClone();
-        } else if (m_useLinks || m_useHardLinks) {
-            FS::create_link folderLink(m_origInstance->instanceRoot(), m_stagingPath);
-            int depth = m_linkRecursively ? -1 : 0;  // we need to at least link the top level instead of the instance folder
-            folderLink.linkRecursively(true).setMaxDepth(depth).useHardLinks(m_useHardLinks).matcher(m_matcher.get());
-
-            bool there_were_errors = false;
-
-            if (!folderLink()) {
-#if defined Q_OS_WIN32
-                if (!m_useHardLinks) {
-                    qDebug() << "EXPECTED: Link failure, Windows requires permissions for symlinks";
-
-                    qDebug() << "attempting to run with privelage";
-
-                    QEventLoop loop;
-                    bool got_priv_results = false;
-
-                    connect(&folderLink, &FS::create_link::finishedPrivileged, this, [&](bool gotResults) {
-                        if (!gotResults) {
-                            qDebug() << "Privileged run exited without results!";
-                        }
-                        got_priv_results = gotResults;
-                        loop.quit();
-                    });
-                    folderLink.runPrivileged();
-
-                    loop.exec();  // wait for the finished signal
-
-                    for (auto result : folderLink.getResults()) {
-                        if (result.err_value != 0) {
-                            there_were_errors = true;
-                        }
-                    }
-
-                    if (m_copySaves) {
-                        there_were_errors |= !copySaves();
-                    }
-
-                    return got_priv_results && !there_were_errors;
-                } else {
-                    qDebug() << "Link Failed!" << folderLink.getOSError().value() << folderLink.getOSError().message().c_str();
-                }
-#else
-                qDebug() << "Link Failed!" << folderLink.getOSError().value() << folderLink.getOSError().message().c_str();
-#endif
-                return false;
-            }
-
-            if (m_copySaves) {
-                there_were_errors |= !copySaves();
-            }
-
-            return !there_were_errors;
-        } else {
         FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
         folderCopy.followSymlinks(false).matcher(m_matcher.get());
 
         return folderCopy();
-        }
     });
     connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished);
     connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted);
@@ -128,40 +39,20 @@ void InstanceCopyTask::executeTask()
 void InstanceCopyTask::copyFinished()
 {
     auto successful = m_copyFuture.result();
-    if (!successful) {
+    if(!successful)
+    {
         emitFailed(tr("Instance folder copy failed."));
         return;
     }
-
     // FIXME: shouldn't this be able to report errors?
     auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
 
     InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
     inst->setName(name());
     inst->setIconKey(m_instIcon);
-    if (!m_keepPlaytime) {
+    if(!m_keepPlaytime) {
         inst->resetTimePlayed();
     }
-    if (m_useLinks)
-        inst->addLinkedInstanceId(m_origInstance->id());
-    if (m_useLinks) {
-        auto allowed_symlinks_file = QFileInfo(FS::PathCombine(inst->gameRoot(), "allowed_symlinks.txt"));
-
-        QByteArray allowed_symlinks;
-        if (allowed_symlinks_file.exists()) {
-            allowed_symlinks.append(FS::read(allowed_symlinks_file.filePath()));
-            if (allowed_symlinks.right(1) != "\n")
-                allowed_symlinks.append("\n");  // we want to be on a new line
-        }
-        allowed_symlinks.append(m_origInstance->gameRoot().toUtf8());
-        allowed_symlinks.append("\n");
-        if (allowed_symlinks_file.isSymLink())
-            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);
-    }
-
     emitSucceeded();
 }
 

launcher/InstanceCopyTask.h

@@ -30,9 +30,4 @@ private:
     QFutureWatcher<bool> m_copyFutureWatcher;
     std::unique_ptr<IPathMatcher> m_matcher;
     bool m_keepPlaytime;
-    bool m_useLinks = false;
-    bool m_useHardLinks = false;
-    bool m_copySaves = false;
-    bool m_linkRecursively = false;
-    bool m_useClone = false;
 };

launcher/InstanceCreationTask.h

@@ -34,7 +34,7 @@ class InstanceCreationTask : public InstanceTask {
     QString getError() const { return m_error_message; }
 
    protected:
-    void setError(const QString& message) { m_error_message = message; };
+    void setError(QString message) { m_error_message = message; };
 
    protected:
     bool m_abort = false;

launcher/InstanceImportTask.cpp

@@ -41,7 +41,6 @@
 #include "MMCZip.h"
 #include "NullInstance.h"
 
-#include "QObjectPtr.h"
 #include "icons/IconList.h"
 #include "icons/IconUtils.h"
 
@@ -67,12 +66,7 @@ bool InstanceImportTask::abort()
 
     if (m_filesNetJob)
         m_filesNetJob->abort();
-    if (m_extractFuture.isRunning()) {
-        // NOTE: The tasks created by QtConcurrent::run() can't actually get cancelled,
-        // but we can use this call to check the state when the extraction finishes.
     m_extractFuture.cancel();
-        m_extractFuture.waitForFinished();
-    }
 
     return Task::abort();
 }
@@ -94,12 +88,11 @@ void InstanceImportTask::executeTask()
         entry->setStale(true);
         m_archivePath = entry->getFullPath();
 
-        m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
+        m_filesNetJob = new NetJob(tr("Modpack download"), APPLICATION->network());
         m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
 
         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::failed, this, &InstanceImportTask::downloadFailed);
         connect(m_filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::downloadAborted);
 
@@ -192,20 +185,18 @@ void InstanceImportTask::processZipPack()
     // make sure we extract just the pack
     m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &InstanceImportTask::extractFinished);
+    connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, &InstanceImportTask::extractAborted);
     m_extractFutureWatcher.setFuture(m_extractFuture);
 }
 
 void InstanceImportTask::extractFinished()
 {
     m_packZip.reset();
-
+    if (!m_extractFuture.result())
-    if (m_extractFuture.isCanceled())
+    {
-        return;
-    if (!m_extractFuture.result().has_value()) {
         emitFailed(tr("Failed to extract modpack"));
         return;
     }
-
     QDir extractDir(m_stagingPath);
 
     qDebug() << "Fixing permissions for extracted pack files...";
@@ -259,9 +250,14 @@ void InstanceImportTask::extractFinished()
     }
 }
 
+void InstanceImportTask::extractAborted()
+{
+    emitAborted();
+}
+
 void InstanceImportTask::processFlame()
 {
-    shared_qobject_ptr<FlameCreationTask> inst_creation_task = nullptr;
+    FlameCreationTask* inst_creation_task = nullptr;
     if (!m_extra_info.isEmpty()) {
         auto pack_id_it = m_extra_info.constFind("pack_id");
         Q_ASSERT(pack_id_it != m_extra_info.constEnd());
@@ -276,10 +272,10 @@ 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 = new 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());
+        inst_creation_task = new FlameCreationTask(m_stagingPath, m_globalSettings, m_parent, {}, {});
     }
 
     inst_creation_task->setName(*this);
@@ -287,26 +283,25 @@ void InstanceImportTask::processFlame()
     inst_creation_task->setGroup(m_instGroup);
     inst_creation_task->setConfirmUpdate(shouldConfirmUpdate());
     
-    connect(inst_creation_task.get(), &Task::succeeded, this, [this, inst_creation_task] {
+    connect(inst_creation_task, &Task::succeeded, this, [this, inst_creation_task] {
         setOverride(inst_creation_task->shouldOverride(), inst_creation_task->originalInstanceID());
         emitSucceeded();
     });
-    connect(inst_creation_task.get(), &Task::failed, this, &InstanceImportTask::emitFailed);
+    connect(inst_creation_task, &Task::failed, this, &InstanceImportTask::emitFailed);
-    connect(inst_creation_task.get(), &Task::progress, this, &InstanceImportTask::setProgress);
+    connect(inst_creation_task, &Task::progress, this, &InstanceImportTask::setProgress);
-    connect(inst_creation_task.get(), &Task::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(inst_creation_task, &Task::status, this, &InstanceImportTask::setStatus);
-    connect(inst_creation_task.get(), &Task::status, this, &InstanceImportTask::setStatus);
+    connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);
-    connect(inst_creation_task.get(), &Task::details, this, &InstanceImportTask::setDetails);
 
-    connect(this, &Task::aborted, inst_creation_task.get(), &InstanceCreationTask::abort);
+    connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);
-    connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort);
+    connect(inst_creation_task, &Task::aborted, this, &Task::abort);
-    connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable);
+    connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortable);
 
     inst_creation_task->start();
 }
 
 void InstanceImportTask::processTechnic()
 {
-    shared_qobject_ptr<Technic::TechnicPackProcessor> packProcessor{ new Technic::TechnicPackProcessor };
+    shared_qobject_ptr<Technic::TechnicPackProcessor> packProcessor = new Technic::TechnicPackProcessor();
     connect(packProcessor.get(), &Technic::TechnicPackProcessor::succeeded, this, &InstanceImportTask::emitSucceeded);
     connect(packProcessor.get(), &Technic::TechnicPackProcessor::failed, this, &InstanceImportTask::emitFailed);
     packProcessor->run(m_globalSettings, name(), m_instIcon, m_stagingPath);
@@ -366,7 +361,7 @@ void InstanceImportTask::processModrinth()
     } else {
         QString pack_id;
         if (!m_sourceUrl.isEmpty()) {
-            QRegularExpression regex(R"(data\/([^\/]*)\/versions)");
+            QRegularExpression regex(R"(data\/(.*)\/versions)");
             pack_id = regex.match(m_sourceUrl.toString()).captured(1);
         }
 
@@ -385,9 +380,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::status, this, &InstanceImportTask::setStatus);
-    connect(inst_creation_task, &Task::details, this, &InstanceImportTask::setDetails);
     connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);
 
     connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);

launcher/InstanceImportTask.h

@@ -81,6 +81,7 @@ private slots:
     void downloadProgressChanged(qint64 current, qint64 total);
     void downloadAborted();
     void extractFinished();
+    void extractAborted();
 
 private: /* data */
     NetJob::Ptr m_filesNetJob;

launcher/InstanceList.cpp

@@ -129,16 +129,6 @@ QMimeData* InstanceList::mimeData(const QModelIndexList& indexes) const
     return mimeData;
 }
 
-QStringList InstanceList::getLinkedInstancesById(const QString &id) const
-{
-    QStringList linkedInstances;
-    for (auto inst : m_instances) {
-        if (inst->isLinkedToInstanceId(id))
-            linkedInstances.append(inst->id());
-    }
-    return linkedInstances;
-}
-
 int InstanceList::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
@@ -797,9 +787,7 @@ class InstanceStaging : public Task {
         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(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceded);
     }
 
@@ -877,7 +865,7 @@ Task* InstanceList::wrapInstanceTask(InstanceTask* task)
 
 QString InstanceList::getStagedInstancePath()
 {
-    QString key = QUuid::createUuid().toString(QUuid::WithoutBraces);
+    QString key = QUuid::createUuid().toString();
     QString tempDir = ".LAUNCHER_TEMP/";
     QString relPath = FS::PathCombine(tempDir, key);
     QDir rootPath(m_instDir);

launcher/InstanceList.h

@@ -154,8 +154,6 @@ public:
     QStringList mimeTypes() const override;
     QMimeData *mimeData(const QModelIndexList &indexes) const override;
 
-    QStringList getLinkedInstancesById(const QString &id) const;
-
 signals:
     void dataIsInvalid();
     void instancesChanged();

launcher/InstancePageProvider.h

@@ -36,10 +36,9 @@ public:
         values.append(new VersionPage(onesix.get()));
         values.append(ManagedPackPage::createPage(onesix.get()));
         auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList());
-        modsPage->setFilter("%1 (*.zip *.jar *.litemod *.nilmod)");
+        modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
         values.append(modsPage);
         values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList()));
-        values.append(new NilModFolderPage(onesix.get(), onesix->nilModList()));
         values.append(new ResourcePackPage(onesix.get(), onesix->resourcePackList()));
         values.append(new TexturePackPage(onesix.get(), onesix->texturePackList()));
         values.append(new ShaderPackPage(onesix.get(), onesix->shaderPackList()));

launcher/InstanceTask.cpp

@@ -45,10 +45,7 @@ QString InstanceName::name() const
 {
     if (!m_modified_name.isEmpty())
         return modifiedName();
-    if (!m_original_version.isEmpty())
     return QString("%1 %2").arg(m_original_name, m_original_version);
-
-    return m_original_name;
 }
 
 QString InstanceName::originalName() const

launcher/JavaCommon.cpp

@@ -122,7 +122,8 @@ void JavaCommon::TestCheck::run()
         return;
     }
     checker.reset(new JavaChecker());
-    connect(checker.get(), &JavaChecker::checkFinished, this, &JavaCommon::TestCheck::checkFinished);
+    connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
+            SLOT(checkFinished(JavaCheckResult)));
     checker->m_path = m_path;
     checker->performCheck();
 }
@@ -136,7 +137,8 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
         return;
     }
     checker.reset(new JavaChecker());
-    connect(checker.get(), &JavaChecker::checkFinished, this, &JavaCommon::TestCheck::checkFinishedWithArgs);
+    connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
+            SLOT(checkFinishedWithArgs(JavaCheckResult)));
     checker->m_path = m_path;
     checker->m_args = m_args;
     checker->m_minMem = m_minMem;

launcher/LaunchController.cpp

@@ -112,15 +112,7 @@ 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) {
     m_accountToUse = accounts->defaultAccount();
-    } else {
-        m_accountToUse = accounts->at(instanceAccountIndex);
-    }
-
     if (!m_accountToUse)
     {
         // If no default account is set, ask the user which one to use.
@@ -187,8 +179,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
@@ -267,8 +259,8 @@ 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);
@@ -382,18 +374,15 @@ void LaunchController::launchInstance()
             }
             resolved_servers = resolved_servers + "]\n\n";
         }
-        m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), resolved_servers, MessageLevel::Launcher));
+        m_launcher->prependStep(new TextPrint(m_launcher.get(), resolved_servers, MessageLevel::Launcher));
     } else {
         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(new TextPrint(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher));
 
     // Prepend Version
-    {
+    m_launcher->prependStep(new TextPrint(m_launcher.get(), BuildConfig.LAUNCHER_DISPLAYNAME + " version: " + BuildConfig.printableVersionString() + "\n\n", MessageLevel::Launcher));
-        auto versionString = QString("%1 version: %2 (%3)").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM);
-        m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), versionString + "\n\n", MessageLevel::Launcher));
-    }
     m_launcher->start();
 }
 

launcher/Launcher.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Basic start script for running the launcher with the libs packaged with it.
 
 function printerror {

launcher/LoggedProcess.cpp

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  Prism Launcher - Minecraft Launcher
+ *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022,2023 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (c) 2023 flowln <flowlnlnln@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
@@ -44,8 +43,12 @@ LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)
     // QProcess has a strange interface... let's map a lot of those into a few.
     connect(this, &QProcess::readyReadStandardOutput, this, &LoggedProcess::on_stdOut);
     connect(this, &QProcess::readyReadStandardError, this, &LoggedProcess::on_stdErr);
-    connect(this, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &LoggedProcess::on_exit);
+    connect(this, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(on_exit(int,QProcess::ExitStatus)));
-    connect(this, &QProcess::errorOccurred, this, &LoggedProcess::on_error);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    connect(this, SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(on_error(QProcess::ProcessError)));
+#else
+    connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(on_error(QProcess::ProcessError)));
+#endif
     connect(this, &QProcess::stateChanged, this, &LoggedProcess::on_stateChange);
 }
 
@@ -57,23 +60,14 @@ LoggedProcess::~LoggedProcess()
     }
 }
 
-QStringList LoggedProcess::reprocess(const QByteArray& data, QTextDecoder& decoder)
+QStringList reprocess(const QByteArray& data, QTextDecoder& decoder)
 {
     auto str = decoder.toUnicode(data);
-
-    if (!m_leftover_line.isEmpty()) {
-        str.prepend(m_leftover_line);
-        m_leftover_line = "";
-    }
-
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     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;
 }
 

launcher/LoggedProcess.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  Prism Launcher - Minecraft Launcher
+ *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022,2023 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  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
@@ -88,12 +88,9 @@ private slots:
 private:
     void changeState(LoggedProcess::State state);
 
-    QStringList reprocess(const QByteArray& data, QTextDecoder& decoder);
-
 private:
     QTextDecoder m_err_decoder = QTextDecoder(QTextCodec::codecForLocale());
     QTextDecoder m_out_decoder = QTextDecoder(QTextCodec::codecForLocale());
-    QString m_leftover_line;
     bool m_killed = false;
     State m_state = NotRunning;
     int m_exit_code = 0;

launcher/MMCTime.cpp

@@ -18,8 +18,6 @@
 #include <MMCTime.h>
 
 #include <QObject>
-#include <QDateTime>
-#include <QTextStream>
 
 QString Time::prettifyDuration(int64_t duration) {
     int seconds = (int) (duration % 60);
@@ -38,65 +36,3 @@ QString Time::prettifyDuration(int64_t duration) {
     }
     return QObject::tr("%1d %2h %3min").arg(days).arg(hours).arg(minutes);
 }
-
-QString Time::humanReadableDuration(double duration, int precision) {
-
-    using days = std::chrono::duration<int, std::ratio<86400>>;
-
-    QString outStr;
-    QTextStream os(&outStr);
-
-    bool neg = false;
-    if (duration < 0) {
-        neg = true; // flag
-        duration  *= -1; // invert
-    }
-        
-    auto std_duration = std::chrono::duration<double>(duration);
-    auto d = std::chrono::duration_cast<days>(std_duration);
-    std_duration -= d;
-    auto h = std::chrono::duration_cast<std::chrono::hours>(std_duration);
-    std_duration -= h;
-    auto m = std::chrono::duration_cast<std::chrono::minutes>(std_duration);
-    std_duration -= m;
-    auto s = std::chrono::duration_cast<std::chrono::seconds>(std_duration);
-    std_duration -= s;
-    auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(std_duration);
-
-    auto dc = d.count();
-    auto hc = h.count();
-    auto mc = m.count();
-    auto sc = s.count();
-    auto msc = ms.count();
-
-    if (neg) {
-        os << '-';
-    }
-    if (dc) {
-        os << dc << QObject::tr("days");
-    }
-    if (hc) {
-        if (dc)
-            os << " ";
-        os << qSetFieldWidth(2) << hc << QObject::tr("h"); // hours
-    }
-    if (mc) {
-        if (dc || hc)
-            os << " ";
-        os << qSetFieldWidth(2) << mc << QObject::tr("m"); // minutes
-    }
-    if (dc || hc || mc || sc) {
-        if (dc || hc || mc)
-            os << " ";
-        os << qSetFieldWidth(2) << sc << QObject::tr("s"); // seconds
-    }
-    if ((msc && (precision > 0)) || !(dc || hc || mc || sc)) {
-        if (dc || hc || mc || sc)
-            os << " ";
-        os << qSetFieldWidth(0) << qSetRealNumberPrecision(precision) << msc << QObject::tr("ms"); // miliseconds
-    }
-
-    os.flush();
-
-    return outStr;
-}

launcher/MMCTime.h

@@ -22,13 +22,4 @@ namespace Time {
 
 QString prettifyDuration(int64_t duration);
 
-/**
- * @brief Returns a string with short form time duration ie. `2days 1h3m4s56.0ms`.
- * miliseconds are only included if `precision` is greater than 0.
- * 
- * @param duration a number of seconds as floating point
- * @param precision number of decmial points to display on fractons of a second, defualts to 0.
- * @return QString 
- */
-QString humanReadableDuration(double duration, int precision = 0);
 }

launcher/MMCZip.cpp

@@ -94,28 +94,20 @@ bool MMCZip::mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &containe
     return true;
 }
 
-bool MMCZip::compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files, bool followSymlinks)
+bool MMCZip::compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files)
 {
     QDir directory(dir);
     if (!directory.exists()) return false;
 
     for (auto e : files) {
         auto filePath = directory.relativeFilePath(e.absoluteFilePath());
-        auto srcPath = e.absoluteFilePath();
+        if( !JlCompress::compressFile(zip, e.absoluteFilePath(), filePath)) return false;
-        if (followSymlinks) {
-            if (e.isSymLink()) {
-                srcPath = e.symLinkTarget();
-            } else {
-                srcPath = e.canonicalFilePath();
-            }
-        }
-        if( !JlCompress::compressFile(zip, srcPath, filePath)) return false;
     }
 
     return true;
 }
 
-bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks)
+bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files)
 {
     QuaZip zip(fileCompressed);
     QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
@@ -124,7 +116,7 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
         return false;
     }
 
-    auto result = compressDirFiles(&zip, dir, files, followSymlinks);
+    auto result = compressDirFiles(&zip, dir, files);
 
     zip.close();
     if(zip.getZipError()!=0) {
@@ -283,8 +275,7 @@ bool MMCZip::findFilesInZip(QuaZip * zip, const QString & what, QStringList & re
 // ours
 std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
 {
-    auto target_top_dir = QUrl::fromLocalFile(target);
+    QDir directory(target);
-
     QStringList extracted;
 
     qDebug() << "Extracting subdir" << subdir << "from" << zip->getZipName() << "to" << target;
@@ -303,53 +294,48 @@ std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & su
         return std::nullopt;
     }
 
-    do {
+    do
-        QString file_name = zip->getCurrentFileName();
+    {
-        if (!file_name.startsWith(subdir))
+        QString name = zip->getCurrentFileName();
+        if(!name.startsWith(subdir))
+        {
             continue;
+        }
 
-        auto relative_file_name = QDir::fromNativeSeparators(file_name.remove(0, subdir.size()));
+        name.remove(0, subdir.size());
-        auto original_name = relative_file_name;
+        auto original_name = name;
-
-        // Fix subdirs/files ending with a / getting transformed into absolute paths
-        if (relative_file_name.startsWith('/'))
-            relative_file_name = relative_file_name.mid(1);
 
         // Fix weird "folders with a single file get squashed" thing
-        QString sub_path;
+        QString path;
-        if (relative_file_name.contains('/') && !relative_file_name.endsWith('/')) {
+        if(name.contains('/') && !name.endsWith('/')){
-            sub_path = relative_file_name.section('/', 0, -2) + '/';
+            path = name.section('/', 0, -2) + "/";
-            FS::ensureFolderPathExists(FS::PathCombine(target, sub_path));
+            FS::ensureFolderPathExists(FS::PathCombine(target, path));
 
-            relative_file_name = relative_file_name.split('/').last();
+            name = name.split('/').last();
         }
 
-        QString target_file_path;
+        QString absFilePath;
-        if (relative_file_name.isEmpty()) {
+        if(name.isEmpty())
-            target_file_path = target + '/';
+        {
-        } else {
+            absFilePath = directory.absoluteFilePath(name) + "/";
-            target_file_path = FS::PathCombine(target_top_dir.toLocalFile(), sub_path, relative_file_name);
+        }
-            if (relative_file_name.endsWith('/') && !target_file_path.endsWith('/'))
+        else
-                target_file_path += '/';
+        {
+            absFilePath = directory.absoluteFilePath(path + name);
         }
 
-        if (!target_top_dir.isParentOf(QUrl::fromLocalFile(target_file_path))) {
+        if (!JlCompress::extractFile(zip, "", absFilePath))
-            qWarning() << "Extracting" << relative_file_name << "was cancelled, because it was effectively outside of the target path" << target;
+        {
-            return std::nullopt;
+            qWarning() << "Failed to extract file" << original_name << "to" << absFilePath;
-        }
-
-        if (!JlCompress::extractFile(zip, "", target_file_path)) {
-            qWarning() << "Failed to extract file" << original_name << "to" << target_file_path;
             JlCompress::removeFile(extracted);
             return std::nullopt;
         }
 
-        extracted.append(target_file_path);
+        extracted.append(absFilePath);
-        QFile::setPermissions(target_file_path, QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
+        QFile::setPermissions(absFilePath, QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
 
-        qDebug() << "Extracted file" << relative_file_name << "to" << target_file_path;
+        qDebug() << "Extracted file" << name << "to" << absFilePath;
     } while (zip->goToNextFile());
-
     return extracted;
 }
 

launcher/MMCZip.h

@@ -59,20 +59,18 @@ namespace MMCZip
      * \param zip target archive
      * \param dir directory that will be compressed (to compress with relative paths)
      * \param files list of files to compress
-     * \param followSymlinks should follow symlinks when compressing file data
      * \return true for success or false for failure
      */
-    bool compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files, bool followSymlinks = false);
+    bool compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files);
 
     /**
      * Compress directory, by providing a list of files to compress
      * \param fileCompressed target archive file
      * \param dir directory that will be compressed (to compress with relative paths)
      * \param files list of files to compress
-     * \param followSymlinks should follow symlinks when compressing file data
      * \return true for success or false for failure
      */
-    bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks = false);
+    bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files);
 
     /**
      * take a source jar, add mods to it, resulting in target jar

launcher/MangoHud.cpp

@@ -19,7 +19,6 @@
 #include <QStringList>
 #include <QDir>
 #include <QString>
-#include <QSysInfo>
 #include <QtGlobal>
 
 #include "MangoHud.h"
@@ -76,27 +75,9 @@ QString getLibraryString()
     }
 
     for (QString vkLayer : vkLayerList) {
-        // prefer to use architecture specific vulkan layers
+        QString filePath = FS::PathCombine(vkLayer, "MangoHud.json");
-        QString currentArch = QSysInfo::currentCpuArchitecture();
+        if (!QFile::exists(filePath))
-
-        if (currentArch == "arm64") {
-            currentArch = "aarch64";
-        }
-
-        QStringList manifestNames = { QString("MangoHud.%1.json").arg(currentArch), "MangoHud.json" };
-
-        QString filePath = "";
-        for (QString manifestName : manifestNames) {
-            QString tryPath = FS::PathCombine(vkLayer, manifestName);
-            if (QFile::exists(tryPath)) {
-                filePath = tryPath;
-                break;
-            }
-        }
-
-        if (filePath.isEmpty()) {
             continue;
-        }
 
         auto conf = Json::requireDocument(filePath, vkLayer);
         auto confObject = Json::requireObject(conf, vkLayer);

launcher/Markdown.cpp

@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Joshua Goins <josh@redstrate.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "Markdown.h"
-
-QString markdownToHTML(const QString& markdown)
-{
-    const QByteArray markdownData = markdown.toUtf8();
-    char* buffer = cmark_markdown_to_html(markdownData.constData(), markdownData.length(), CMARK_OPT_NOBREAKS | CMARK_OPT_UNSAFE);
-
-    QString htmlStr(buffer);
-
-    free(buffer);
-
-    return htmlStr;
-}

launcher/Markdown.h

@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Joshua Goins <josh@redstrate.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QString>
-#include <cmark.h>
-
-QString markdownToHTML(const QString& markdown);

launcher/ModDownloadTask.cpp

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, version 3.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "ModDownloadTask.h"
+
+#include "Application.h"
+#include "minecraft/mod/ModFolderModel.h"
+
+ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods, bool is_indexed)
+    : m_mod(mod), m_mod_version(version), mods(mods)
+{
+    if (is_indexed) {
+        m_update_task.reset(new LocalModUpdateTask(mods->indexDir(), m_mod, m_mod_version));
+        connect(m_update_task.get(), &LocalModUpdateTask::hasOldMod, this, &ModDownloadTask::hasOldMod);
+
+        addTask(m_update_task);
+    }
+
+    m_filesNetJob.reset(new NetJob(tr("Mod download"), APPLICATION->network()));
+    m_filesNetJob->setStatus(tr("Downloading mod:\n%1").arg(m_mod_version.downloadUrl));
+    
+    m_filesNetJob->addNetAction(Net::Download::makeFile(m_mod_version.downloadUrl, mods->dir().absoluteFilePath(getFilename())));
+    connect(m_filesNetJob.get(), &NetJob::succeeded, this, &ModDownloadTask::downloadSucceeded);
+    connect(m_filesNetJob.get(), &NetJob::progress, this, &ModDownloadTask::downloadProgressChanged);
+    connect(m_filesNetJob.get(), &NetJob::failed, this, &ModDownloadTask::downloadFailed);
+
+    addTask(m_filesNetJob);
+}
+
+void ModDownloadTask::downloadSucceeded()
+{
+    m_filesNetJob.reset();
+    auto name = std::get<0>(to_delete);
+    auto filename = std::get<1>(to_delete);
+    if (!name.isEmpty() && filename != m_mod_version.fileName) {
+        mods->uninstallMod(filename, true);
+    }
+}
+
+void ModDownloadTask::downloadFailed(QString reason)
+{
+    emitFailed(reason);
+    m_filesNetJob.reset();
+}
+
+void ModDownloadTask::downloadProgressChanged(qint64 current, qint64 total)
+{
+    emit progress(current, total);
+}
+
+// This indirection is done so that we don't delete a mod before being sure it was
+// downloaded successfully!
+void ModDownloadTask::hasOldMod(QString name, QString filename)
+{
+    to_delete = {name, filename};
+}

launcher/ModDownloadTask.h

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, version 3.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "net/NetJob.h"
+#include "tasks/SequentialTask.h"
+
+#include "modplatform/ModIndex.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
+
+class ModFolderModel;
+
+class ModDownloadTask : public SequentialTask {
+    Q_OBJECT
+public:
+    explicit ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods, bool is_indexed = true);
+    const QString& getFilename() const { return m_mod_version.fileName; }
+
+private:
+    ModPlatform::IndexedPack m_mod;
+    ModPlatform::IndexedVersion m_mod_version;
+    const std::shared_ptr<ModFolderModel> mods;
+
+    NetJob::Ptr m_filesNetJob;
+    LocalModUpdateTask::Ptr m_update_task;
+
+    void downloadProgressChanged(qint64 current, qint64 total);
+
+    void downloadFailed(QString reason);
+
+    void downloadSucceeded();
+
+    std::tuple<QString, QString> to_delete {"", ""};
+
+private slots:
+    void hasOldMod(QString name, QString filename);
+};
+
+
+

launcher/QObjectPtr.h

@@ -20,34 +20,18 @@ using unique_qobject_ptr = QScopedPointer<T, QScopedPointerDeleteLater>;
 template <typename T>
 class shared_qobject_ptr : public QSharedPointer<T> {
    public:
-    constexpr explicit shared_qobject_ptr() : QSharedPointer<T>() {}
+    constexpr shared_qobject_ptr() : QSharedPointer<T>() {}
-    constexpr explicit shared_qobject_ptr(T* ptr) : QSharedPointer<T>(ptr, &QObject::deleteLater) {}
+    constexpr shared_qobject_ptr(T* ptr) : QSharedPointer<T>(ptr, &QObject::deleteLater) {}
     constexpr shared_qobject_ptr(std::nullptr_t null_ptr) : QSharedPointer<T>(null_ptr, &QObject::deleteLater) {}
 
     template <typename Derived>
     constexpr shared_qobject_ptr(const shared_qobject_ptr<Derived>& other) : QSharedPointer<T>(other)
     {}
 
-    template <typename Derived>
-    constexpr shared_qobject_ptr(const QSharedPointer<Derived>& other) : QSharedPointer<T>(other)
-    {}
-
     void reset() { QSharedPointer<T>::reset(); }
-    void reset(T*&& other)
-    {
-        shared_qobject_ptr<T> t(other);
-        this->swap(t);
-    }
     void reset(const shared_qobject_ptr<T>& other)
     {
         shared_qobject_ptr<T> t(other);
         this->swap(t);
     }
 };
-
-template <typename T, typename... Args>
-shared_qobject_ptr<T> makeShared(Args... args)
-{
-    auto obj = new T(args...);
-    return shared_qobject_ptr<T>(obj);
-}

launcher/ResourceDownloadTask.cpp

@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022-2023 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "ResourceDownloadTask.h"
-
-#include "Application.h"
-
-#include "minecraft/mod/ModFolderModel.h"
-#include "minecraft/mod/ResourceFolderModel.h"
-
-ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
-                                           ModPlatform::IndexedVersion version,
-                                           const std::shared_ptr<ResourceFolderModel> packs,
-                                           bool is_indexed,
-                                           QString custom_target_folder)
-    : m_pack(std::move(pack)), m_pack_version(std::move(version)), m_pack_model(packs), m_custom_target_folder(custom_target_folder)
-{
-    if (auto model = dynamic_cast<ModFolderModel*>(m_pack_model.get()); model && is_indexed) {
-        m_update_task.reset(new LocalModUpdateTask(model->indexDir(), *m_pack, m_pack_version));
-        connect(m_update_task.get(), &LocalModUpdateTask::hasOldMod, this, &ResourceDownloadTask::hasOldResource);
-
-        addTask(m_update_task);
-    }
-
-    m_filesNetJob.reset(new NetJob(tr("Resource download"), APPLICATION->network()));
-    m_filesNetJob->setStatus(tr("Downloading resource:\n%1").arg(m_pack_version.downloadUrl));
-
-    QDir dir{ m_pack_model->dir() };
-    {
-        // FIXME: Make this more generic. May require adding additional info to IndexedVersion,
-        //        or adquiring a reference to the base instance.
-        if (!m_custom_target_folder.isEmpty()) {
-            dir.cdUp();
-            dir.cd(m_custom_target_folder);
-        }
-    }
-
-    m_filesNetJob->addNetAction(Net::Download::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::failed, this, &ResourceDownloadTask::downloadFailed);
-
-    addTask(m_filesNetJob);
-}
-
-void ResourceDownloadTask::downloadSucceeded()
-{
-    m_filesNetJob.reset();
-    auto name = std::get<0>(to_delete);
-    auto filename = std::get<1>(to_delete);
-    if (!name.isEmpty() && filename != m_pack_version.fileName) {
-        if (auto model = dynamic_cast<ModFolderModel*>(m_pack_model.get()); model)
-            model->uninstallMod(filename, true);
-        else
-            m_pack_model->uninstallResource(filename);
-    }
-}
-
-void ResourceDownloadTask::downloadFailed(QString reason)
-{
-    emitFailed(reason);
-    m_filesNetJob.reset();
-}
-
-void ResourceDownloadTask::downloadProgressChanged(qint64 current, qint64 total)
-{
-    emit progress(current, total);
-}
-
-// This indirection is done so that we don't delete a mod before being sure it was
-// downloaded successfully!
-void ResourceDownloadTask::hasOldResource(QString name, QString filename)
-{
-    to_delete = { name, filename };
-}

launcher/ResourceDownloadTask.h

@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022-2023 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "net/NetJob.h"
-#include "tasks/SequentialTask.h"
-
-#include "minecraft/mod/tasks/LocalModUpdateTask.h"
-#include "modplatform/ModIndex.h"
-
-class ResourceFolderModel;
-
-class ResourceDownloadTask : public SequentialTask {
-    Q_OBJECT
-   public:
-    explicit ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
-                                  ModPlatform::IndexedVersion version,
-                                  const std::shared_ptr<ResourceFolderModel> packs,
-                                  bool is_indexed = true,
-                                  QString custom_target_folder = {});
-    const QString& getFilename() const { return m_pack_version.fileName; }
-    const QString& getCustomPath() const { return m_custom_target_folder; }
-    const QVariant& getVersionID() const { return m_pack_version.fileId; }
-    const QString& getName() const { return m_pack->name; }
-    ModPlatform::IndexedPack::Ptr getPack() { return m_pack; }
-
-   private:
-    ModPlatform::IndexedPack::Ptr m_pack;
-    ModPlatform::IndexedVersion m_pack_version;
-    const std::shared_ptr<ResourceFolderModel> m_pack_model;
-    QString m_custom_target_folder;
-
-    NetJob::Ptr m_filesNetJob;
-    LocalModUpdateTask::Ptr m_update_task;
-
-    void downloadProgressChanged(qint64 current, qint64 total);
-    void downloadFailed(QString reason);
-    void downloadSucceeded();
-
-    std::tuple<QString, QString> to_delete{ "", "" };
-
-   private slots:
-    void hasOldResource(QString name, QString filename);
-};

launcher/StringUtils.cpp

@@ -1,45 +1,5 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
 #include "StringUtils.h"
 
-#include <QRegularExpression>
-#include <QUuid>
-#include <cmath>
-
 /// If you're wondering where these came from exactly, then know you're not the only one =D
 
 /// TAKEN FROM Qt, because it doesn't expose it intelligently
@@ -114,71 +74,3 @@ int StringUtils::naturalCompare(const QString& s1, const QString& s2, Qt::CaseSe
     // The two strings are the same (02 == 2) so fall back to the normal sort
     return QString::compare(s1, s2, cs);
 }
-
-QString StringUtils::truncateUrlHumanFriendly(QUrl& url, int max_len, bool hard_limit)
-{
-    auto display_options = QUrl::RemoveUserInfo | QUrl::RemoveFragment | QUrl::NormalizePathSegments;
-    auto str_url = url.toDisplayString(display_options);
-
-    if (str_url.length() <= max_len)
-        return str_url;
-
-    auto url_path_parts = url.path().split('/');
-    QString last_path_segment = url_path_parts.takeLast();
-
-    if (url_path_parts.size() >= 1 && url_path_parts.first().isEmpty())
-        url_path_parts.removeFirst();  // drop empty first segment (from leading / )
-
-    if (url_path_parts.size() >= 1)
-        url_path_parts.removeLast();  // drop the next to last path segment
-
-    auto url_template = QStringLiteral("%1://%2/%3%4");
-
-    auto url_compact = url_path_parts.isEmpty()
-                           ? url_template.arg(url.scheme(), url.host(), QStringList({ "...", last_path_segment }).join('/'), url.query())
-                           : url_template.arg(url.scheme(), url.host(),
-                                              QStringList({ url_path_parts.join('/'), "...", last_path_segment }).join('/'), url.query());
-
-    // remove url parts one by one if it's still too long
-    while (url_compact.length() > max_len && url_path_parts.size() >= 1) {
-        url_path_parts.removeLast();  // drop the next to last path segment
-        url_compact = url_path_parts.isEmpty()
-                          ? url_template.arg(url.scheme(), url.host(), QStringList({ "...", last_path_segment }).join('/'), url.query())
-                          : url_template.arg(url.scheme(), url.host(),
-                                             QStringList({ url_path_parts.join('/'), "...", last_path_segment }).join('/'), url.query());
-    }
-
-    if ((url_compact.length() >= max_len) && hard_limit) {
-        // still too long, truncate normaly
-        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);
-        url_compact.append("...");
-    }
-
-    return url_compact;
-}
-
-static const QStringList s_units_si{ "KB", "MB", "GB", "TB" };
-static const QStringList s_units_kibi{ "KiB", "MiB", "GiB", "TiB" };
-
-QString StringUtils::humanReadableFileSize(double bytes, bool use_si, int decimal_points)
-{
-    const QStringList units = use_si ? s_units_si : s_units_kibi;
-    const int scale = use_si ? 1000 : 1024;
-
-    int u = -1;
-    double r = pow(10, decimal_points);
-
-    do {
-        bytes /= scale;
-        u++;
-    } while (round(abs(bytes) * r) / r >= scale && u < units.length() - 1);
-
-    return QString::number(bytes, 'f', 2) + " " + units[u];
-}
-
-QString StringUtils::getRandomAlphaNumeric()
-{
-    return QUuid::createUuid().toString(QUuid::Id128);
-}

launcher/StringUtils.h

@@ -1,43 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
 #pragma once
 
 #include <QString>
-#include <QUrl>
 
 namespace StringUtils {
 
@@ -66,17 +29,4 @@ inline QString fromStdString(string s)
 #endif
 
 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 hard_limit if truncating the path can't get the url short enough, truncate it normaly.
- */
-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();
 }  // namespace StringUtils

launcher/UpdateController.cpp

@@ -0,0 +1,443 @@
+#include <QFile>
+#include <QMessageBox>
+#include <FileSystem.h>
+#include <updater/GoUpdate.h>
+#include "UpdateController.h"
+#include <QApplication>
+#include <thread>
+#include <chrono>
+#include <LocalPeer.h>
+
+#include "BuildConfig.h"
+
+
+// from <sys/stat.h>
+#ifndef S_IRUSR
+#define __S_IREAD 0400         /* Read by owner.  */
+#define __S_IWRITE 0200        /* Write by owner.  */
+#define __S_IEXEC 0100         /* Execute by owner.  */
+#define S_IRUSR __S_IREAD      /* Read by owner.  */
+#define S_IWUSR __S_IWRITE     /* Write by owner.  */
+#define S_IXUSR __S_IEXEC      /* Execute by owner.  */
+
+#define S_IRGRP (S_IRUSR >> 3) /* Read by group.  */
+#define S_IWGRP (S_IWUSR >> 3) /* Write by group.  */
+#define S_IXGRP (S_IXUSR >> 3) /* Execute by group.  */
+
+#define S_IROTH (S_IRGRP >> 3) /* Read by others.  */
+#define S_IWOTH (S_IWGRP >> 3) /* Write by others.  */
+#define S_IXOTH (S_IXGRP >> 3) /* Execute by others.  */
+#endif
+static QFile::Permissions unixModeToPermissions(const int mode)
+{
+    QFile::Permissions perms;
+
+    if (mode & S_IRUSR)
+    {
+        perms |= QFile::ReadUser;
+    }
+    if (mode & S_IWUSR)
+    {
+        perms |= QFile::WriteUser;
+    }
+    if (mode & S_IXUSR)
+    {
+        perms |= QFile::ExeUser;
+    }
+
+    if (mode & S_IRGRP)
+    {
+        perms |= QFile::ReadGroup;
+    }
+    if (mode & S_IWGRP)
+    {
+        perms |= QFile::WriteGroup;
+    }
+    if (mode & S_IXGRP)
+    {
+        perms |= QFile::ExeGroup;
+    }
+
+    if (mode & S_IROTH)
+    {
+        perms |= QFile::ReadOther;
+    }
+    if (mode & S_IWOTH)
+    {
+        perms |= QFile::WriteOther;
+    }
+    if (mode & S_IXOTH)
+    {
+        perms |= QFile::ExeOther;
+    }
+    return perms;
+}
+
+static const QLatin1String liveCheckFile("live.check");
+
+UpdateController::UpdateController(QWidget * parent, const QString& root, const QString updateFilesDir, GoUpdate::OperationList operations)
+{
+    m_parent = parent;
+    m_root = root;
+    m_updateFilesDir = updateFilesDir;
+    m_operations = operations;
+}
+
+
+void UpdateController::installUpdates()
+{
+    qint64 pid = -1;
+    QStringList args;
+    bool started = false;
+
+    qDebug() << "Installing updates.";
+#ifdef Q_OS_WIN
+    QString finishCmd = QApplication::applicationFilePath();
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
+    QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME);
+#elif defined Q_OS_MAC
+    QString finishCmd = QApplication::applicationFilePath();
+#else
+#error Unsupported operating system.
+#endif
+
+    QString backupPath = FS::PathCombine(m_root, "update", "backup");
+    QDir origin(m_root);
+
+    // clean up the backup folder. it should be empty before we start
+    if(!FS::deletePath(backupPath))
+    {
+        qWarning() << "couldn't remove previous backup folder" << backupPath;
+    }
+    // and it should exist.
+    if(!FS::ensureFolderPathExists(backupPath))
+    {
+        qWarning() << "couldn't create folder" << backupPath;
+        return;
+    }
+
+    bool useXPHack = false;
+    QString exePath;
+    QString exeOrigin;
+    QString exeBackup;
+
+    // perform the update operations
+    for(auto op: m_operations)
+    {
+        switch(op.type)
+        {
+            // replace = move original out to backup, if it exists, move the new file in its place
+            case GoUpdate::Operation::OP_REPLACE:
+            {
+#ifdef Q_OS_WIN32
+                QString windowsExeName = BuildConfig.LAUNCHER_NAME + ".exe";
+                // hack for people renaming the .exe because ... reasons :)
+                if(op.destination == windowsExeName)
+                {
+                    op.destination = QFileInfo(QApplication::applicationFilePath()).fileName();
+                }
+#endif
+                QFileInfo destination (FS::PathCombine(m_root, op.destination));
+                if(destination.exists())
+                {
+                    QString backupName = op.destination;
+                    backupName.replace('/', '_');
+                    QString backupFilePath = FS::PathCombine(backupPath, backupName);
+                    if(!QFile::rename(destination.absoluteFilePath(), backupFilePath))
+                    {
+                        qWarning() << "Couldn't move:" << destination.absoluteFilePath() << "to" << backupFilePath;
+                        m_failedOperationType = Replace;
+                        m_failedFile = op.destination;
+                        fail();
+                        return;
+                    }
+                    BackupEntry be;
+                    be.original = destination.absoluteFilePath();
+                    be.backup = backupFilePath;
+                    be.update = op.source;
+                    m_replace_backups.append(be);
+                }
+                // make sure the folder we are putting this into exists
+                if(!FS::ensureFilePathExists(destination.absoluteFilePath()))
+                {
+                    qWarning() << "REPLACE: Couldn't create folder:" << destination.absoluteFilePath();
+                    m_failedOperationType = Replace;
+                    m_failedFile = op.destination;
+                    fail();
+                    return;
+                }
+                // now move the new file in
+                if(!QFile::rename(op.source, destination.absoluteFilePath()))
+                {
+                    qWarning() << "REPLACE: Couldn't move:" << op.source << "to" << destination.absoluteFilePath();
+                    m_failedOperationType = Replace;
+                    m_failedFile = op.destination;
+                    fail();
+                    return;
+                }
+                QFile::setPermissions(destination.absoluteFilePath(), unixModeToPermissions(op.destinationMode));
+            }
+            break;
+            // delete = move original to backup
+            case GoUpdate::Operation::OP_DELETE:
+            {
+                QString destFilePath = FS::PathCombine(m_root, op.destination);
+                if(QFile::exists(destFilePath))
+                {
+                    QString backupName = op.destination;
+                    backupName.replace('/', '_');
+                    QString trashFilePath = FS::PathCombine(backupPath, backupName);
+
+                    if(!QFile::rename(destFilePath, trashFilePath))
+                    {
+                        qWarning() << "DELETE: Couldn't move:" << op.destination << "to" << trashFilePath;
+                        m_failedFile = op.destination;
+                        m_failedOperationType = Delete;
+                        fail();
+                        return;
+                    }
+                    BackupEntry be;
+                    be.original = destFilePath;
+                    be.backup = trashFilePath;
+                    m_delete_backups.append(be);
+                }
+            }
+            break;
+        }
+    }
+
+    // try to start the new binary
+    args = qApp->arguments();
+    args.removeFirst();
+
+    // on old Windows, do insane things... no error checking here, this is just to have something.
+    if(useXPHack)
+    {
+        QString script;
+        auto nativePath = QDir::toNativeSeparators(exePath);
+        auto nativeOriginPath = QDir::toNativeSeparators(exeOrigin);
+        auto nativeBackupPath = QDir::toNativeSeparators(exeBackup);
+
+        // so we write this vbscript thing...
+        QTextStream out(&script);
+        out << "WScript.Sleep 1000\n";
+        out << "Set fso=CreateObject(\"Scripting.FileSystemObject\")\n";
+        out << "Set shell=CreateObject(\"WScript.Shell\")\n";
+        out << "fso.MoveFile \"" << nativePath << "\", \"" << nativeBackupPath << "\"\n";
+        out << "fso.MoveFile \"" << nativeOriginPath << "\", \"" << nativePath << "\"\n";
+        out << "shell.Run \"" << nativePath << "\"\n";
+
+        QString scriptPath = FS::PathCombine(m_root, "update", "update.vbs");
+
+        // we save it
+        QFile scriptFile(scriptPath);
+        scriptFile.open(QIODevice::WriteOnly);
+        scriptFile.write(script.toLocal8Bit().replace("\n", "\r\n"));
+        scriptFile.close();
+
+        // we run it
+        started = QProcess::startDetached("wscript", {scriptPath}, m_root);
+
+        // and we quit. conscious thought.
+        qApp->quit();
+        return;
+    }
+    bool doLiveCheck = true;
+    bool startFailed = false;
+
+    // remove live check file, if any
+    if(QFile::exists(liveCheckFile))
+    {
+        if(!QFile::remove(liveCheckFile))
+        {
+            qWarning() << "Couldn't remove the" << liveCheckFile << "file! We will proceed without :(";
+            doLiveCheck = false;
+        }
+    }
+
+    if(doLiveCheck)
+    {
+        if(!args.contains("--alive"))
+        {
+            args.append("--alive");
+        }
+    }
+
+    // FIXME: reparse args and construct a safe variant from scratch. This is a workaround for GH-1874:
+    QStringList realargs;
+    int skip = 0;
+    for(auto & arg: args)
+    {
+        if(skip)
+        {
+            skip--;
+            continue;
+        }
+        if(arg == "-l")
+        {
+            skip = 1;
+            continue;
+        }
+        realargs.append(arg);
+    }
+
+    // start the updated application
+    started = QProcess::startDetached(finishCmd, realargs, QDir::currentPath(), &pid);
+    // much dumber check - just find out if the call
+    if(!started || pid == -1)
+    {
+        qWarning() << "Couldn't start new process properly!";
+        startFailed = true;
+    }
+    if(!startFailed && doLiveCheck)
+    {
+        int attempts = 0;
+        while(attempts < 10)
+        {
+            attempts++;
+            QString key;
+            std::this_thread::sleep_for(std::chrono::milliseconds(250));
+            if(!QFile::exists(liveCheckFile))
+            {
+                qWarning() << "Couldn't find the" << liveCheckFile << "file!";
+                startFailed = true;
+                continue;
+            }
+            try
+            {
+                key = QString::fromUtf8(FS::read(liveCheckFile));
+                auto id = ApplicationId::fromRawString(key);
+                LocalPeer peer(nullptr, id);
+                if(peer.isClient())
+                {
+                    startFailed = false;
+                    qDebug() << "Found process started with key " << key;
+                    break;
+                }
+                else
+                {
+                    startFailed = true;
+                    qDebug() << "Process started with key " << key << "apparently died or is not reponding...";
+                    break;
+                }
+            }
+            catch (const Exception &e)
+            {
+                qWarning() << "Couldn't read the" << liveCheckFile << "file!";
+                startFailed = true;
+                continue;
+            }
+        }
+    }
+    if(startFailed)
+    {
+        m_failedOperationType = Start;
+        fail();
+        return;
+    }
+    else
+    {
+        origin.rmdir(m_updateFilesDir);
+        qApp->quit();
+        return;
+    }
+}
+
+void UpdateController::fail()
+{
+    qWarning() << "Update failed!";
+
+    QString msg;
+    bool doRollback = false;
+    QString failTitle = QObject::tr("Update failed!");
+    QString rollFailTitle = QObject::tr("Rollback failed!");
+    switch (m_failedOperationType)
+    {
+        case Replace:
+        {
+            msg = QObject::tr(
+                "Couldn't replace file %1. Changes will be reverted.\n"
+                "See the %2 log file for details."
+            ).arg(m_failedFile, BuildConfig.LAUNCHER_DISPLAYNAME);
+            doRollback = true;
+            QMessageBox::critical(m_parent, failTitle, msg);
+            break;
+        }
+        case Delete:
+        {
+            msg = QObject::tr(
+                "Couldn't remove file %1. Changes will be reverted.\n"
+                "See the %2 log file for details."
+            ).arg(m_failedFile, BuildConfig.LAUNCHER_DISPLAYNAME);
+            doRollback = true;
+            QMessageBox::critical(m_parent, failTitle, msg);
+            break;
+        }
+        case Start:
+        {
+            msg = QObject::tr("The new version didn't start or is too old and doesn't respond to startup checks.\n"
+                "\n"
+                "Roll back to previous version?");
+            auto result = QMessageBox::critical(
+                m_parent,
+                failTitle,
+                msg,
+                QMessageBox::Yes | QMessageBox::No,
+                QMessageBox::Yes
+            );
+            doRollback = (result == QMessageBox::Yes);
+            break;
+        }
+        case Nothing:
+        default:
+            return;
+    }
+    if(doRollback)
+    {
+        auto rollbackOK = rollback();
+        if(!rollbackOK)
+        {
+            msg = QObject::tr("The rollback failed too.\n"
+                "You will have to repair %1 manually.\n"
+                "Please let us know why and how this happened.").arg(BuildConfig.LAUNCHER_DISPLAYNAME);
+            QMessageBox::critical(m_parent, rollFailTitle, msg);
+            qApp->quit();
+        }
+    }
+    else
+    {
+        qApp->quit();
+    }
+}
+
+bool UpdateController::rollback()
+{
+    bool revertOK = true;
+    // if the above failed, roll back changes
+    for(auto backup:m_replace_backups)
+    {
+        qWarning() << "restoring" << backup.original << "from" << backup.backup;
+        if(!QFile::rename(backup.original, backup.update))
+        {
+            revertOK = false;
+            qWarning() << "moving new" << backup.original << "back to" << backup.update << "failed!";
+            continue;
+        }
+
+        if(!QFile::rename(backup.backup, backup.original))
+        {
+            revertOK = false;
+            qWarning() << "restoring" << backup.original << "failed!";
+        }
+    }
+    for(auto backup:m_delete_backups)
+    {
+        qWarning() << "restoring" << backup.original << "from" << backup.backup;
+        if(!QFile::rename(backup.backup, backup.original))
+        {
+            revertOK = false;
+            qWarning() << "restoring" << backup.original << "failed!";
+        }
+    }
+    return revertOK;
+}

launcher/UpdateController.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <QString>
+#include <QList>
+#include <updater/GoUpdate.h>
+
+class QWidget;
+
+class UpdateController
+{
+public:
+    UpdateController(QWidget * parent, const QString &root, const QString updateFilesDir, GoUpdate::OperationList operations);
+    void installUpdates();
+
+private:
+    void fail();
+    bool rollback();
+
+private:
+    QString m_root;
+    QString m_updateFilesDir;
+    GoUpdate::OperationList m_operations;
+    QWidget * m_parent;
+
+    struct BackupEntry
+    {
+        // path where we got the new file from
+        QString update;
+        // path of what is being actually updated
+        QString original;
+        // path where the backup of the updated file was placed
+        QString backup;
+    };
+    QList <BackupEntry> m_replace_backups;
+    QList <BackupEntry> m_delete_backups;
+    enum Failure
+    {
+        Replace,
+        Delete,
+        Start,
+        Nothing
+    } m_failedOperationType = Nothing;
+    QString m_failedFile;
+};

launcher/Version.cpp

@@ -1,128 +1,85 @@
 #include "Version.h"
 
-#include <QDebug>
+#include <QStringList>
+#include <QUrl>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QUrl>
 
-Version::Version(QString str) : m_string(std::move(str))
+Version::Version(const QString &str) : m_string(str)
 {
     parse();
 }
 
-#define VERSION_OPERATOR(return_on_different)                                               \
+bool Version::operator<(const Version &other) const
-    bool exclude_our_sections = false;                                                      \
-    bool exclude_their_sections = false;                                                    \
-                                                                                            \
-    const auto size = qMax(m_sections.size(), other.m_sections.size());                     \
-    for (int i = 0; i < size; ++i) {                                                        \
-        Section sec1 = (i >= m_sections.size()) ? Section() : m_sections.at(i);             \
-        Section sec2 = (i >= other.m_sections.size()) ? Section() : other.m_sections.at(i); \
-                                                                                            \
-        { /* Don't include appendixes in the comparison */                                  \
-            if (sec1.isAppendix())                                                          \
-                exclude_our_sections = true;                                                \
-            if (sec2.isAppendix())                                                          \
-                exclude_their_sections = true;                                              \
-                                                                                            \
-            if (exclude_our_sections) {                                                     \
-                sec1 = Section();                                                           \
-                if (sec2.m_isNull)                                                          \
-                    break;                                                                  \
-            }                                                                               \
-                                                                                            \
-            if (exclude_their_sections) {                                                   \
-                sec2 = Section();                                                           \
-                if (sec1.m_isNull)                                                          \
-                    break;                                                                  \
-            }                                                                               \
-        }                                                                                   \
-                                                                                            \
-        if (sec1 != sec2)                                                                   \
-            return return_on_different;                                                     \
-    }
-
-bool Version::operator<(const Version& other) const
 {
-    VERSION_OPERATOR(sec1 < sec2)
+    const int size = qMax(m_sections.size(), other.m_sections.size());
+    for (int i = 0; i < size; ++i)
+    {
+        const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
+        const Section sec2 =
+            (i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
+        if (sec1 != sec2)
+        {
+            return sec1 < sec2;
+        }
+    }
 
     return false;
 }
-bool Version::operator==(const Version& other) const
+bool Version::operator<=(const Version &other) const
-{
-    VERSION_OPERATOR(false)
-
-    return true;
-}
-bool Version::operator!=(const Version& other) const
-{
-    return !operator==(other);
-}
-bool Version::operator<=(const Version& other) const
 {
     return *this < other || *this == other;
 }
-bool Version::operator>(const Version& other) const
+bool Version::operator>(const Version &other) const
 {
-    return !(*this <= other);
+    const int size = qMax(m_sections.size(), other.m_sections.size());
+    for (int i = 0; i < size; ++i)
+    {
+        const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
+        const Section sec2 =
+            (i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
+        if (sec1 != sec2)
+        {
+            return sec1 > sec2;
+        }
+    }
+
+    return false;
 }
-bool Version::operator>=(const Version& other) const
+bool Version::operator>=(const Version &other) const
 {
-    return !(*this < other);
+    return *this > other || *this == other;
+}
+bool Version::operator==(const Version &other) const
+{
+    const int size = qMax(m_sections.size(), other.m_sections.size());
+    for (int i = 0; i < size; ++i)
+    {
+        const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
+        const Section sec2 =
+            (i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
+        if (sec1 != sec2)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+bool Version::operator!=(const Version &other) const
+{
+    return !operator==(other);
 }
 
 void Version::parse()
 {
     m_sections.clear();
-    QString currentSection;
 
-    if (m_string.isEmpty())
+    // FIXME: this is bad. versions can contain a lot more separators...
-        return;
+    QStringList parts = m_string.split('.');
 
-    auto classChange = [&](QChar lastChar, QChar currentChar) {
+    for (const auto& part : parts)
-        if (lastChar.isNull())
+    {
-            return false;
+        m_sections.append(Section(part));
-        if (lastChar.isDigit() != currentChar.isDigit())
-            return true;
-
-        const QList<QChar> s_separators{ '.', '-', '+' };
-        if (s_separators.contains(currentChar) && currentSection.at(0) != currentChar)
-            return true;
-
-        return false;
-    };
-
-    currentSection += m_string.at(0);
-    for (int i = 1; i < m_string.size(); ++i) {
-        const auto& current_char = m_string.at(i);
-        if (classChange(m_string.at(i - 1), current_char)) {
-            if (!currentSection.isEmpty())
-                m_sections.append(Section(currentSection));
-            currentSection = "";
     }
-
-        currentSection += current_char;
-    }
-
-    if (!currentSection.isEmpty())
-        m_sections.append(Section(currentSection));
-}
-
-/// qDebug print support for the Version class
-QDebug operator<<(QDebug debug, const Version& v)
-{
-    QDebugStateSaver saver(debug);
-
-    debug.nospace() << "Version{ string: " << v.toString() << ", sections: [ ";
-
-    bool first = true;
-    for (auto s : v.m_sections) {
-        if (!first) debug.nospace() << ", ";
-        debug.nospace() << s.m_fullString;
-        first = false;
-    }
-                    
-    debug.nospace() << " ]" << " }";
-
-    return debug;
 }

launcher/Version.h

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -36,17 +35,17 @@
 
 #pragma once
 
-#include <QDebug>
-#include <QList>
 #include <QString>
 #include <QStringView>
+#include <QList>
 
 class QUrl;
 
-class Version {
+class Version
-   public:
+{
-    Version(QString str);
+public:
-    Version() = default;
+    Version(const QString &str);
+    Version() {}
 
     bool operator<(const Version &other) const;
     bool operator<=(const Version &other) const;
@@ -55,116 +54,96 @@ class Version {
     bool operator==(const Version &other) const;
     bool operator!=(const Version &other) const;
 
-    QString toString() const { return m_string; }
+    QString toString() const
-
-    friend QDebug operator<<(QDebug debug, const Version& v);
-
-   private:
-    struct Section {
-        explicit Section(QString fullString) : m_fullString(std::move(fullString))
     {
+        return m_string;
+    }
+
+private:
+    QString m_string;
+    struct Section
+    {
+        explicit Section(const QString &fullString)
+        {
+            m_fullString = fullString;
             int cutoff = m_fullString.size();
-            for (int i = 0; i < m_fullString.size(); i++) {
+            for(int i = 0; i < m_fullString.size(); i++)
-                if (!m_fullString[i].isDigit()) {
+            {
+                if(!m_fullString[i].isDigit())
+                {
                     cutoff = i;
                     break;
                 }
             }
-
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
             auto numPart = QStringView{m_fullString}.left(cutoff);
 #else
             auto numPart = m_fullString.leftRef(cutoff);
 #endif
-
+            if(numPart.size())
-            if (!numPart.isEmpty()) {
+            {
-                m_isNull = false;
+                numValid = true;
                 m_numPart = numPart.toInt();
             }
-
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
             auto stringPart = QStringView{m_fullString}.mid(cutoff);
 #else
             auto stringPart = m_fullString.midRef(cutoff);
 #endif
-
+            if(stringPart.size())
-            if (!stringPart.isEmpty()) {
+            {
-                m_isNull = false;
                 m_stringPart = stringPart.toString();
             }
         }
-
+        explicit Section() {}
-        explicit Section() = default;
+        bool numValid = false;
-
-        bool m_isNull = true;
-
         int m_numPart = 0;
         QString m_stringPart;
-
         QString m_fullString;
 
-        [[nodiscard]] inline bool isAppendix() const { return m_stringPart.startsWith('+'); }
+        inline bool operator!=(const Section &other) const
-        [[nodiscard]] inline bool isPreRelease() const { return m_stringPart.startsWith('-') && m_stringPart.length() > 1; }
-
-        inline bool operator==(const Section& other) const
         {
-            if (m_isNull && !other.m_isNull)
+            if(numValid && other.numValid)
-                return false;
-            if (!m_isNull && other.m_isNull)
-                return false;
-
-            if (!m_isNull && !other.m_isNull) {
-                return (m_numPart == other.m_numPart) && (m_stringPart == other.m_stringPart);
-            }
-
-            return true;
-        }
-
-        inline bool operator<(const Section& other) const
             {
-            static auto unequal_is_less = [](Section const& non_null) -> bool {
+                return m_numPart != other.m_numPart || m_stringPart != other.m_stringPart;
-                if (non_null.m_stringPart.isEmpty())
+            }
-                    return non_null.m_numPart == 0;
+            else
-                return (non_null.m_stringPart != QLatin1Char('.')) && non_null.isPreRelease();
+            {
-            };
+                return m_fullString != other.m_fullString;
-
+            }
-            if (!m_isNull && other.m_isNull)
+        }
-                return unequal_is_less(*this);
+        inline bool operator<(const Section &other) const
-            if (m_isNull && !other.m_isNull)
+        {
-                return !unequal_is_less(other);
+            if(numValid && other.numValid)
-
+            {
-            if (!m_isNull && !other.m_isNull) {
+                if(m_numPart < other.m_numPart)
-                if (m_numPart < other.m_numPart)
                     return true;
-                if (m_numPart == other.m_numPart && m_stringPart < other.m_stringPart)
+                if(m_numPart == other.m_numPart && m_stringPart < other.m_stringPart)
                     return true;
-
-                if (!m_stringPart.isEmpty() && other.m_stringPart.isEmpty())
-                    return false;
-                if (m_stringPart.isEmpty() && !other.m_stringPart.isEmpty())
-                    return true;
-
                 return false;
             }
-
+            else
+            {
                 return m_fullString < other.m_fullString;
             }
-
-        inline bool operator!=(const Section& other) const
-        {
-            return !(*this == other);
         }
         inline bool operator>(const Section &other) const
         {
-            return !(*this < other || *this == other);
+            if(numValid && other.numValid)
+            {
+                if(m_numPart > other.m_numPart)
+                    return true;
+                if(m_numPart == other.m_numPart && m_stringPart > other.m_stringPart)
+                    return true;
+                return false;
+            }
+            else
+            {
+                return m_fullString > other.m_fullString;
+            }
         }
     };
-
-   private:
-    QString m_string;
     QList<Section> m_sections;
 
     void parse();
 };
-
-

launcher/VersionProxyModel.cpp

@@ -187,26 +187,37 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
         }
         case Qt::ToolTipRole:
         {
-            if(column == Name && hasRecommended) 
+            switch(column)
+            {
+                case Name:
+                {
+                    if(hasRecommended)
                     {
                         auto value = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
                         if(value.toBool())
                         {
                             return tr("Recommended");
-                } else if(hasLatest) {
+                        }
+                        else if(hasLatest)
+                        {
                             auto value = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
                             if(value.toBool())
                             {
                                 return tr("Latest");
                             }
-                } else if(index.row() == 0)
+                        }
+                        else if(index.row() == 0)
                         {
                             return tr("Latest");
                         }
-            } else {
+                    }
+                }
+                default:
+                {
                     return sourceModel()->data(parentIndex, BaseVersionList::VersionIdRole);
                 }
             }
+        }
         case Qt::DecorationRole:
         {
             switch(column)

launcher/filelink/FileLink.cpp

@@ -1,277 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
-//
-// SPDX-License-Identifier: GPL-3.0-only
-
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "FileLink.h"
-#include "BuildConfig.h"
-
-#include "StringUtils.h"
-
-#include <iostream>
-
-#include <QAccessible>
-#include <QCommandLineParser>
-
-#include <QDebug>
-
-#include <DesktopServices.h>
-
-#include <sys.h>
-
-#if defined Q_OS_WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <stdio.h>
-#include <windows.h>
-#endif
-
-// Snippet from https://github.com/gulrak/filesystem#using-it-as-single-file-header
-
-#ifdef __APPLE__
-#include <Availability.h>  // for deployment target to support pre-catalina targets without std::fs
-#endif                     // __APPLE__
-
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (defined(__cplusplus) && __cplusplus >= 201703L)) && defined(__has_include)
-#if __has_include(<filesystem>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
-#define GHC_USE_STD_FS
-#include <filesystem>
-namespace fs = std::filesystem;
-#endif  // MacOS min version check
-#endif  // Other OSes version check
-
-#ifndef GHC_USE_STD_FS
-#include <ghc/filesystem.hpp>
-namespace fs = ghc::filesystem;
-#endif
-
-FileLinkApp::FileLinkApp(int& argc, char** argv) : QCoreApplication(argc, argv), socket(new QLocalSocket(this))
-{
-#if defined Q_OS_WIN32
-    // attach the parent console
-    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
-        // if attach succeeds, reopen and sync all the i/o
-        if (freopen("CON", "w", stdout)) {
-            std::cout.sync_with_stdio();
-        }
-        if (freopen("CON", "w", stderr)) {
-            std::cerr.sync_with_stdio();
-        }
-        if (freopen("CON", "r", stdin)) {
-            std::cin.sync_with_stdio();
-        }
-        auto out = GetStdHandle(STD_OUTPUT_HANDLE);
-        DWORD written;
-        const char* endline = "\n";
-        WriteConsole(out, endline, strlen(endline), &written, NULL);
-        consoleAttached = true;
-    }
-#endif
-    setOrganizationName(BuildConfig.LAUNCHER_NAME);
-    setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN);
-    setApplicationName(BuildConfig.LAUNCHER_NAME + "FileLink");
-    setApplicationVersion(BuildConfig.printableVersionString() + "\n" + BuildConfig.GIT_COMMIT);
-
-    // Commandline parsing
-    QCommandLineParser parser;
-    parser.setApplicationDescription(QObject::tr("a batch MKLINK program for windows to be used with prismlauncher"));
-
-    parser.addOptions({ { { "s", "server" }, "Join the specified server on launch", "pipe name" },
-                        { { "H", "hard" }, "use hard links instead of symbolic", "true/false" } });
-    parser.addHelpOption();
-    parser.addVersionOption();
-
-    parser.process(arguments());
-
-    QString serverToJoin = parser.value("server");
-    m_useHardLinks = QVariant(parser.value("hard")).toBool();
-
-    qDebug() << "link program launched";
-
-    if (!serverToJoin.isEmpty()) {
-        qDebug() << "joining server" << serverToJoin;
-        joinServer(serverToJoin);
-    } else {
-        qDebug() << "no server to join";
-        exit();
-    }
-}
-
-void FileLinkApp::joinServer(QString server)
-{
-    blockSize = 0;
-
-    in.setDevice(&socket);
-
-    connect(&socket, &QLocalSocket::connected, this, [&]() { qDebug() << "connected to server"; });
-
-    connect(&socket, &QLocalSocket::readyRead, this, &FileLinkApp::readPathPairs);
-
-    connect(&socket, &QLocalSocket::errorOccurred, this, [&](QLocalSocket::LocalSocketError socketError) {
-        switch (socketError) {
-            case QLocalSocket::ServerNotFoundError:
-                qDebug()
-                    << ("The host was not found. Please make sure "
-                        "that the server is running and that the "
-                        "server name is correct.");
-                break;
-            case QLocalSocket::ConnectionRefusedError:
-                qDebug()
-                    << ("The connection was refused by the peer. "
-                        "Make sure the server is running, "
-                        "and check that the server name "
-                        "is correct.");
-                break;
-            case QLocalSocket::PeerClosedError:
-                qDebug() << ("The connection was closed by the peer. ");
-                break;
-            default:
-                qDebug() << "The following error occurred: " << socket.errorString();
-        }
-    });
-
-    connect(&socket, &QLocalSocket::disconnected, this, [&]() {
-        qDebug() << "disconnected from server, should exit";
-        exit();
-    });
-
-    socket.connectToServer(server);
-}
-
-void FileLinkApp::runLink()
-{
-    std::error_code os_err;
-
-    qDebug() << "creating links";
-
-    for (auto link : m_links_to_make) {
-        QString src_path = link.src;
-        QString dst_path = link.dst;
-
-        FS::ensureFilePathExists(dst_path);
-        if (m_useHardLinks) {
-            qDebug() << "making hard link:" << src_path << "to" << dst_path;
-            fs::create_hard_link(StringUtils::toStdString(src_path), StringUtils::toStdString(dst_path), os_err);
-        } else if (fs::is_directory(StringUtils::toStdString(src_path))) {
-            qDebug() << "making directory_symlink:" << src_path << "to" << dst_path;
-            fs::create_directory_symlink(StringUtils::toStdString(src_path), StringUtils::toStdString(dst_path), os_err);
-        } else {
-            qDebug() << "making symlink:" << src_path << "to" << dst_path;
-            fs::create_symlink(StringUtils::toStdString(src_path), StringUtils::toStdString(dst_path), os_err);
-        }
-
-        if (os_err) {
-            qWarning() << "Failed to link files:" << QString::fromStdString(os_err.message());
-            qDebug() << "Source file:" << src_path;
-            qDebug() << "Destination file:" << dst_path;
-            qDebug() << "Error category:" << os_err.category().name();
-            qDebug() << "Error code:" << os_err.value();
-
-            FS::LinkResult result = { src_path, dst_path, QString::fromStdString(os_err.message()), os_err.value() };
-            m_path_results.append(result);
-        } else {
-            FS::LinkResult result = { src_path, dst_path };
-            m_path_results.append(result);
-        }
-    }
-
-    sendResults();
-    qDebug() << "done, should exit soon";
-}
-
-void FileLinkApp::sendResults()
-{
-    // construct block of data to send
-    QByteArray block;
-    QDataStream out(&block, QIODevice::WriteOnly);
-
-    qint32 blocksize = quint32(sizeof(quint32));
-    for (auto result : m_path_results) {
-        blocksize += quint32(result.src.size());
-        blocksize += quint32(result.dst.size());
-        blocksize += quint32(result.err_msg.size());
-        blocksize += quint32(sizeof(quint32));
-    }
-    qDebug() << "About to write block of size:" << blocksize;
-    out << blocksize;
-
-    out << quint32(m_path_results.length());
-    for (auto result : m_path_results) {
-        out << result.src;
-        out << result.dst;
-        out << result.err_msg;
-        out << quint32(result.err_value);
-    }
-
-    qint64 byteswritten = socket.write(block);
-    bool bytesflushed = socket.flush();
-    qDebug() << "block flushed" << byteswritten << bytesflushed;
-}
-
-void FileLinkApp::readPathPairs()
-{
-    m_links_to_make.clear();
-    qDebug() << "Reading path pairs from server";
-    qDebug() << "bytes available" << socket.bytesAvailable();
-    if (blockSize == 0) {
-        // Relies on the fact that QDataStream serializes a quint32 into
-        // sizeof(quint32) bytes
-        if (socket.bytesAvailable() < (int)sizeof(quint32))
-            return;
-        qDebug() << "reading block size";
-        in >> blockSize;
-    }
-    qDebug() << "blocksize is" << blockSize;
-    qDebug() << "bytes available" << socket.bytesAvailable();
-    if (socket.bytesAvailable() < blockSize || in.atEnd())
-        return;
-
-    quint32 numLinks;
-    in >> numLinks;
-    qDebug() << "numLinks" << numLinks;
-
-    for (int i = 0; i < numLinks; i++) {
-        FS::LinkPair pair;
-        in >> pair.src;
-        in >> pair.dst;
-        qDebug() << "link" << pair.src << "to" << pair.dst;
-        m_links_to_make.append(pair);
-    }
-
-    runLink();
-}
-
-FileLinkApp::~FileLinkApp()
-{
-    qDebug() << "link program shutting down";
-    // Shut down logger by setting the logger function to nothing
-    qInstallMessageHandler(nullptr);
-
-#if defined Q_OS_WIN32
-    // Detach from Windows console
-    if (consoleAttached) {
-        fclose(stdout);
-        fclose(stdin);
-        fclose(stderr);
-        FreeConsole();
-    }
-#endif
-}

launcher/filelink/FileLink.h

@@ -1,67 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
-//
-// SPDX-License-Identifier: GPL-3.0-only
-
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <QtCore>
-
-#include <QApplication>
-#include <QDataStream>
-#include <QDateTime>
-#include <QDebug>
-#include <QFlag>
-#include <QIcon>
-#include <QLocalSocket>
-#include <QUrl>
-#include <memory>
-
-#define PRISM_EXTERNAL_EXE
-#include "FileSystem.h"
-
-class FileLinkApp : public QCoreApplication {
-    // friends for the purpose of limiting access to deprecated stuff
-    Q_OBJECT
-   public:
-    FileLinkApp(int& argc, char** argv);
-    virtual ~FileLinkApp();
-
-   private:
-    void joinServer(QString server);
-    void readPathPairs();
-    void runLink();
-    void sendResults();
-
-    bool m_useHardLinks = false;
-
-    QDateTime m_startTime;
-    QLocalSocket socket;
-    QDataStream in;
-    quint32 blockSize;
-
-    QList<FS::LinkPair> m_links_to_make;
-    QList<FS::LinkResult> m_path_results;
-
-#if defined Q_OS_WIN32
-    // used on Windows to attach the standard IO streams
-    bool consoleAttached = false;
-#endif
-};

launcher/filelink/filelink.exe.manifest

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-    </windowsSettings>
-  </application>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Windows 10, Windows 11 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-    </application>
-  </compatibility>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel
-          level="requireAdministrator"
-          uiAccess="false"/>
-       </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

launcher/filelink/main.cpp

@@ -1,30 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
-//
-// SPDX-License-Identifier: GPL-3.0-only
-
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "FileLink.h"
-
-int main(int argc, char* argv[])
-{
-    FileLinkApp ldh(argc, argv);
-
-    return ldh.exec();
-}

launcher/icons/IconList.cpp

@@ -66,8 +66,9 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *paren
 
     m_watcher.reset(new QFileSystemWatcher());
     is_watching = false;
-    connect(m_watcher.get(), &QFileSystemWatcher::directoryChanged, this, &IconList::directoryChanged);
+    connect(m_watcher.get(), SIGNAL(directoryChanged(QString)),
-    connect(m_watcher.get(), &QFileSystemWatcher::fileChanged, this, &IconList::fileChanged);
+            SLOT(directoryChanged(QString)));
+    connect(m_watcher.get(), SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
 
     directoryChanged(path);
 
@@ -353,18 +354,15 @@ const MMCIcon *IconList::icon(const QString &key) const
 
 bool IconList::deleteIcon(const QString &key)
 {
-    if (!iconFileExists(key))
+    int iconIdx = getIconIndex(key);
+    if (iconIdx == -1)
         return false;
-
+    auto &iconEntry = icons[iconIdx];
-    return QFile::remove(icon(key)->getFilePath());
+    if (iconEntry.has(IconType::FileBased))
-}
+    {
-
+        return QFile::remove(iconEntry.m_images[IconType::FileBased].filename);
-bool IconList::trashIcon(const QString &key)
+    }
-{
-    if (!iconFileExists(key))
     return false;
-
-    return FS::trash(icon(key)->getFilePath(), nullptr);
 }
 
 bool IconList::addThemeIcon(const QString& key)

launcher/icons/IconList.h

@@ -52,7 +52,6 @@ public:
     bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type);
     void saveIcon(const QString &key, const QString &path, const char * format) const;
     bool deleteIcon(const QString &key);
-    bool trashIcon(const QString &key);
     bool iconFileExists(const QString &key) const;
 
     void installIcons(const QStringList &iconFiles);

launcher/java/JavaChecker.cpp

@@ -85,13 +85,17 @@ void JavaChecker::performCheck()
     process->setProgram(m_path);
     process->setProcessChannelMode(QProcess::SeparateChannels);
     process->setProcessEnvironment(CleanEnviroment());
-    qDebug() << "Running java checker:" << m_path << args.join(" ");
+    qDebug() << "Running java checker: " + m_path + args.join(" ");;
 
-    connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &JavaChecker::finished);
+    connect(process.get(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus)));
-    connect(process.get(), &QProcess::errorOccurred, this, &JavaChecker::error);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    connect(process.get(), &QProcess::readyReadStandardOutput, this, &JavaChecker::stdoutReady);
+    connect(process.get(), SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
-    connect(process.get(), &QProcess::readyReadStandardError, this, &JavaChecker::stderrReady);
+#else
-    connect(&killTimer, &QTimer::timeout, this, &JavaChecker::timeout);
+    connect(process.get(), SIGNAL(error(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
+#endif
+    connect(process.get(), SIGNAL(readyReadStandardOutput()), this, SLOT(stdoutReady()));
+    connect(process.get(), SIGNAL(readyReadStandardError()), this, SLOT(stderrReady()));
+    connect(&killTimer, SIGNAL(timeout()), SLOT(timeout()));
     killTimer.setSingleShot(true);
     killTimer.start(15000);
     process->start();
@@ -128,7 +132,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     result.outLog = m_stdout;
     qDebug() << "STDOUT" << m_stdout;
     qWarning() << "STDERR" << m_stderr;
-    qDebug() << "Java checker finished with status" << status << "exit code" << exitcode;
+    qDebug() << "Java checker finished with status " << status << " exit code " << exitcode;
 
     if (status == QProcess::CrashExit || exitcode == 1)
     {

launcher/java/JavaCheckerJob.cpp

@@ -38,7 +38,7 @@ void JavaCheckerJob::executeTask()
     for (auto iter : javacheckers)
     {
         javaresults.append(JavaCheckResult());
-        connect(iter.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
+        connect(iter.get(), SIGNAL(checkFinished(JavaCheckResult)), SLOT(partFinished(JavaCheckResult)));
         iter->performCheck();
     }
 }

launcher/java/JavaInstall.cpp

@@ -1,64 +1,29 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 #include "JavaInstall.h"
 
-#include "BaseVersion.h"
 #include "StringUtils.h"
 
-bool JavaInstall::operator<(const JavaInstall& rhs)
+bool JavaInstall::operator<(const JavaInstall &rhs)
 {
     auto archCompare = StringUtils::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive);
-    if (archCompare != 0)
+    if(archCompare != 0)
         return archCompare < 0;
-    if (id < rhs.id) {
+    if(id < rhs.id)
+    {
         return true;
     }
-    if (id > rhs.id) {
+    if(id > rhs.id)
+    {
         return false;
     }
     return StringUtils::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0;
 }
 
-bool JavaInstall::operator==(const JavaInstall& rhs)
+bool JavaInstall::operator==(const JavaInstall &rhs)
 {
     return arch == rhs.arch && id == rhs.id && path == rhs.path;
 }
 
-bool JavaInstall::operator>(const JavaInstall& rhs)
+bool JavaInstall::operator>(const JavaInstall &rhs)
 {
     return (!operator<(rhs)) && (!operator==(rhs));
 }
-
-bool JavaInstall::operator<(BaseVersion& a)
-{
-    try {
-        return operator<(dynamic_cast<JavaInstall&>(a));
-    } catch (const std::bad_cast& e) {
-        return BaseVersion::operator<(a);
-    }
-}
-
-bool JavaInstall::operator>(BaseVersion& a)
-{
-    try {
-        return operator>(dynamic_cast<JavaInstall&>(a));
-    } catch (const std::bad_cast& e) {
-        return BaseVersion::operator>(a);
-    }
-}

launcher/java/JavaInstall.h

@@ -1,40 +1,33 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 #pragma once
 
 #include "BaseVersion.h"
 #include "JavaVersion.h"
 
-struct JavaInstall : public BaseVersion {
+struct JavaInstall : public BaseVersion
-    JavaInstall() {}
+{
-    JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
+    JavaInstall(){}
-    virtual QString descriptor() { return id.toString(); }
+    JavaInstall(QString id, QString arch, QString path)
+    : id(id), arch(arch), path(path)
+    {
+    }
+    virtual QString descriptor()
+    {
+        return id.toString();
+    }
 
-    virtual QString name() { return id.toString(); }
+    virtual QString name()
+    {
+        return id.toString();
+    }
 
-    virtual QString typeString() const { return arch; }
+    virtual QString typeString() const
+    {
+        return arch;
+    }
 
-    virtual bool operator<(BaseVersion& a) override;
+    bool operator<(const JavaInstall & rhs);
-    virtual bool operator>(BaseVersion& a) override;
+    bool operator==(const JavaInstall & rhs);
-    bool operator<(const JavaInstall& rhs);
+    bool operator>(const JavaInstall & rhs);
-    bool operator==(const JavaInstall& rhs);
-    bool operator>(const JavaInstall& rhs);
 
     JavaVersion id;
     QString arch;

launcher/java/JavaInstallList.cpp

@@ -67,7 +67,7 @@ void JavaInstallList::load()
     if(m_status != Status::InProgress)
     {
         m_status = Status::InProgress;
-        m_loadTask.reset(new JavaListLoadTask(this));
+        m_loadTask = new JavaListLoadTask(this);
         m_loadTask->start();
     }
 }
@@ -167,7 +167,7 @@ void JavaListLoadTask::executeTask()
     JavaUtils ju;
     QList<QString> candidate_paths = ju.FindJavaPaths();
 
-    m_job.reset(new JavaCheckerJob("Java detection"));
+    m_job = new JavaCheckerJob("Java detection");
     connect(m_job.get(), &Task::finished, this, &JavaListLoadTask::javaCheckerFinished);
     connect(m_job.get(), &Task::progress, this, &Task::setProgress);
 

launcher/java/JavaUtils.cpp

@@ -412,6 +412,8 @@ QList<QString> JavaUtils::FindJavaPaths()
 #elif defined(Q_OS_LINUX)
 QList<QString> JavaUtils::FindJavaPaths()
 {
+    qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
+
     QList<QString> javas;
     javas.append(this->GetDefaultJava()->path);
     auto scanJavaDir = [&](const QString & dirPath)
@@ -419,11 +421,20 @@ QList<QString> JavaUtils::FindJavaPaths()
         QDir dir(dirPath);
         if(!dir.exists())
             return;
-        auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+        auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
         for(auto & entry: entries)
         {
+
             QString prefix;
-            prefix = entry.canonicalFilePath();
+            if(entry.isAbsolute())
+            {
+                prefix = entry.absoluteFilePath();
+            }
+            else
+            {
+                prefix = entry.filePath();
+            }
+
             javas.append(FS::PathCombine(prefix, "jre/bin/java"));
             javas.append(FS::PathCombine(prefix, "bin/java"));
         }

launcher/launch/steps/CheckJava.cpp

@@ -81,24 +81,19 @@ void CheckJava::executeTask()
     }
 
     QFileInfo javaInfo(realJavaPath);
-    qint64 javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
+    qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
-    auto storedSignature = settings->get("JavaSignature").toString();
+    auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
     auto storedArchitecture = settings->get("JavaArchitecture").toString();
     auto storedRealArchitecture = settings->get("JavaRealArchitecture").toString();
     auto storedVersion = settings->get("JavaVersion").toString();
     auto storedVendor = settings->get("JavaVendor").toString();
-
+    m_javaUnixTime = javaUnixTime;
-    QCryptographicHash hash(QCryptographicHash::Sha1);
-    hash.addData(QByteArray::number(javaUnixTime));
-    hash.addData(m_javaPath.toUtf8());
-    m_javaSignature = hash.result().toHex();
-
     // if timestamps are not the same, or something is missing, check!
-    if (m_javaSignature != storedSignature || storedVersion.size() == 0
+    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0
         || storedArchitecture.size() == 0 || storedRealArchitecture.size() == 0
         || storedVendor.size() == 0)
     {
-        m_JavaChecker.reset(new JavaChecker);
+        m_JavaChecker = new JavaChecker();
         emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
         connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this, &CheckJava::checkJavaFinished);
         m_JavaChecker->m_path = realJavaPath;
@@ -145,7 +140,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             instance->settings()->set("JavaArchitecture", result.mojangPlatform);
             instance->settings()->set("JavaRealArchitecture", result.realPlatform);
             instance->settings()->set("JavaVendor", result.javaVendor);
-            instance->settings()->set("JavaSignature", m_javaSignature);
+            instance->settings()->set("JavaTimestamp", m_javaUnixTime);
             emitSucceeded();
             return;
         }

launcher/launch/steps/CheckJava.h

@@ -40,6 +40,6 @@ private:
 
 private:
     QString m_javaPath;
-    QString m_javaSignature;
+    qlonglong m_javaUnixTime;
     JavaCheckerPtr m_JavaChecker;
 };

launcher/launch/steps/Update.cpp

@@ -26,11 +26,9 @@ void Update::executeTask()
     m_updateTask.reset(m_parent->instance()->createUpdateTask(m_mode));
     if(m_updateTask)
     {
-        connect(m_updateTask.get(), &Task::finished, this, &Update::updateFinished);
+        connect(m_updateTask.get(), SIGNAL(finished()), this, SLOT(updateFinished()));
-        connect(m_updateTask.get(), &Task::progress, this, &Update::setProgress);
+        connect(m_updateTask.get(), &Task::progress, this, &Task::setProgress);
-        connect(m_updateTask.get(), &Task::stepProgress, this, &Update::propogateStepProgress);
+        connect(m_updateTask.get(), &Task::status, this, &Task::setStatus);
-        connect(m_updateTask.get(), &Task::status, this, &Update::setStatus);
-        connect(m_updateTask.get(), &Task::details, this, &Update::setDetails);
         emit progressReportingRequest();
         return;
     }

launcher/meta/BaseEntity.cpp

@@ -126,7 +126,7 @@ void Meta::BaseEntity::load(Net::Mode loadType)
     {
         return;
     }
-    m_updateTask.reset(new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()), APPLICATION->network()));
+    m_updateTask = new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()), APPLICATION->network());
     auto url = this->url();
     auto entry = APPLICATION->metacache()->resolveEntry("meta", localFilename());
     entry->setStale(true);

launcher/meta/Index.cpp

@@ -45,10 +45,10 @@ QVariant Index::data(const QModelIndex &index, int role) const
     switch (role)
     {
     case Qt::DisplayRole:
-        if (index.column() == 0) {
+        switch (index.column())
-            return list->humanReadable();
+        {
-        } else {
+        case 0: return list->humanReadable();
-            break;
+        default: break;
         }
     case UidRole: return list->uid();
     case NameRole: return list->name();

launcher/meta/JsonFormat.cpp

@@ -56,10 +56,10 @@ static Version::Ptr parseCommonVersion(const QString &uid, const QJsonObject &ob
     version->setType(ensureString(obj, "type", QString()));
     version->setRecommended(ensureBoolean(obj, QString("recommended"), false));
     version->setVolatile(ensureBoolean(obj, QString("volatile"), false));
-    RequireSet reqs, conflicts;
+    RequireSet requires, conflicts;
-    parseRequires(obj, &reqs, "requires");
+    parseRequires(obj, &requires, "requires");
     parseRequires(obj, &conflicts, "conflicts");
-    version->setRequires(reqs, conflicts);
+    version->setRequires(requires, conflicts);
     return version;
 }
 
@@ -176,6 +176,7 @@ void parseRequires(const QJsonObject& obj, RequireSet* ptr, const char * keyName
 {
     if(obj.contains(keyName))
     {
+        QSet<QString> requires;
         auto reqArray = requireArray(obj, keyName);
         auto iter = reqArray.begin();
         while(iter != reqArray.end())

launcher/meta/Version.cpp

@@ -99,11 +99,6 @@ QString Meta::Version::localFilename() const
     return m_uid + '/' + m_version + ".json";
 }
 
-::Version Meta::Version::toComparableVersion() const
-{
-    return { const_cast<Meta::Version*>(this)->descriptor() };
-}
-
 void Meta::Version::setType(const QString &type)
 {
     m_type = type;
@@ -116,9 +111,9 @@ void Meta::Version::setTime(const qint64 time)
     emit timeChanged();
 }
 
-void Meta::Version::setRequires(const Meta::RequireSet &reqs, const Meta::RequireSet &conflicts)
+void Meta::Version::setRequires(const Meta::RequireSet &requires, const Meta::RequireSet &conflicts)
 {
-    m_requires = reqs;
+    m_requires = requires;
     m_conflicts = conflicts;
     emit requiresChanged();
 }

launcher/meta/Version.h

@@ -16,7 +16,6 @@
 #pragma once
 
 #include "BaseVersion.h"
-#include "../Version.h"
 
 #include <QJsonObject>
 #include <QStringList>
@@ -63,7 +62,7 @@ public:
     {
         return m_time;
     }
-    const Meta::RequireSet &requiredSet() const
+    const Meta::RequireSet &requires() const
     {
         return m_requires;
     }
@@ -86,12 +85,10 @@ public:
 
     QString localFilename() const override;
 
-    [[nodiscard]] ::Version toComparableVersion() const;
-
 public: // for usage by format parsers only
     void setType(const QString &type);
     void setTime(const qint64 time);
-    void setRequires(const Meta::RequireSet &reqs, const Meta::RequireSet &conflicts);
+    void setRequires(const Meta::RequireSet &requires, const Meta::RequireSet &conflicts);
     void setVolatile(bool volatile_);
     void setRecommended(bool recommended);
     void setProvidesRecommendations();

launcher/meta/VersionList.cpp

@@ -77,7 +77,7 @@ QVariant VersionList::data(const QModelIndex &index, int role) const
     case ParentVersionRole:
     {
         // FIXME: HACK: this should be generic and be replaced by something else. Anything that is a hard 'equals' dep is a 'parent uid'.
-        auto & reqs = version->requiredSet();
+        auto & reqs = version->requires();
         auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Require & req)
         {
             return req.uid == "net.minecraft";
@@ -92,7 +92,7 @@ QVariant VersionList::data(const QModelIndex &index, int role) const
 
     case UidRole: return version->uid();
     case TimeRole: return version->time();
-    case RequiresRole: return QVariant::fromValue(version->requiredSet());
+    case RequiresRole: return QVariant::fromValue(version->requires());
     case SortRole: return version->rawTime();
     case VersionPtrRole: return QVariant::fromValue(version);
     case RecommendedRole: return version->isRecommended();

launcher/minecraft/AssetsUtils.cpp

@@ -340,7 +340,7 @@ QString AssetObject::getRelPath()
 
 NetJob::Ptr AssetsIndex::getDownloadJob()
 {
-    auto job = makeShared<NetJob>(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
+    auto job = new NetJob(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
     for (auto &object : objects.values())
     {
         auto dl = object.getDownloadAction();

launcher/minecraft/Component.cpp

@@ -451,9 +451,9 @@ void Component::updateCachedData()
             m_cachedVolatile = file->m_volatile;
             changed = true;
         }
-        if(!deepCompare(m_cachedRequires, file->m_requires))
+        if(!deepCompare(m_cachedRequires, file->requires))
         {
-            m_cachedRequires = file->m_requires;
+            m_cachedRequires = file->requires;
             changed = true;
         }
         if(!deepCompare(m_cachedConflicts, file->conflicts))

launcher/minecraft/ComponentUpdateTask.cpp

@@ -572,7 +572,7 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
         // add stuff...
         for(auto &add: toAdd)
         {
-            auto component = makeShared<Component>(d->m_list, add.uid);
+            ComponentPtr component = new Component(d->m_list, add.uid);
             if(!add.equalsVersion.isEmpty())
             {
                 // exact version

launcher/minecraft/MinecraftInstance.cpp

@@ -4,7 +4,6 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *  Copyright (c) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -149,11 +148,10 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
 
         // special!
-        m_settings->registerPassthrough(global_settings->getSetting("JavaSignature"), javaOrLocation);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaTimestamp"), javaOrLocation);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation);
         m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), javaOrLocation);
         m_settings->registerPassthrough(global_settings->getSetting("JavaRealArchitecture"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaVendor"), javaOrLocation);
 
         // Window Size
         auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
@@ -187,10 +185,6 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
         m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
 
-        // Mod loader specific options
-        auto modLoaderSettings = m_settings->registerSetting("OverrideModLoaderSettings", false);
-        m_settings->registerOverride(global_settings->getSetting("DisableQuiltBeacon"), modLoaderSettings);
-
         m_settings->set("InstanceType", "OneSix");
     }
 
@@ -198,10 +192,6 @@ void MinecraftInstance::loadSpecificSettings()
     m_settings->registerSetting("JoinServerOnLaunch", false);
     m_settings->registerSetting("JoinServerOnLaunchAddress", "");
 
-    // Use account for instance, this does not have a global override
-    m_settings->registerSetting("UseAccountForInstance", false);
-    m_settings->registerSetting("InstanceAccountId", "");
-
     qDebug() << "Instance-type specific settings were loaded!";
 
     setSpecificSettingsLoaded(true);
@@ -296,11 +286,6 @@ QString MinecraftInstance::coreModsDir() const
     return FS::PathCombine(gameRoot(), "coremods");
 }
 
-QString MinecraftInstance::nilModsDir() const
-{
-    return FS::PathCombine(gameRoot(), "nilmods");
-}
-
 QString MinecraftInstance::resourcePacksDir() const
 {
     return FS::PathCombine(gameRoot(), "resourcepacks");
@@ -396,12 +381,6 @@ QStringList MinecraftInstance::extraArguments()
         agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath());
         list.append("-javaagent:"+jar[0]+(agent->argument().isEmpty() ? "" : "="+agent->argument()));
     }
-
-    {
-        const auto loaders = version->getModLoaders();
-        if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool())
-            list.append("-Dloader.disable_beacon=true");
-    }
     return list;
 }
 
@@ -478,8 +457,8 @@ QMap<QString, QString> MinecraftInstance::getVariables()
     QMap<QString, QString> out;
     out.insert("INST_NAME", name());
     out.insert("INST_ID", id());
-    out.insert("INST_DIR", QDir::toNativeSeparators(QDir(instanceRoot()).absolutePath()));
+    out.insert("INST_DIR", QDir(instanceRoot()).absolutePath());
-    out.insert("INST_MC_DIR", QDir::toNativeSeparators(QDir(gameRoot()).absolutePath()));
+    out.insert("INST_MC_DIR", QDir(gameRoot()).absolutePath());
     out.insert("INST_JAVA", settings()->get("JavaPath").toString());
     out.insert("INST_JAVA_ARGS", javaArguments().join(' '));
     return out;
@@ -843,7 +822,7 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess
     {
         addToFilter(sessionRef.session, tr("<SESSION ID>"));
     }
-    if (sessionRef.access_token != "0") {
+    if (sessionRef.access_token != "offline") {
         addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
     }
     if(sessionRef.client_token.size()) {
@@ -937,10 +916,7 @@ QString MinecraftInstance::getStatusbarDescription()
     if(m_settings->get("ShowGameTime").toBool())
     {
         if (lastTimePlayed() > 0) {
-            QDateTime lastLaunchTime = QDateTime::fromMSecsSinceEpoch(lastLaunch());
+            description.append(tr(", last played for %1").arg(Time::prettifyDuration(lastTimePlayed())));
-            description.append(tr(", last played on %1 for %2")
-                                   .arg(QLocale().toString(lastLaunchTime, QLocale::ShortFormat))
-                                   .arg(Time::prettifyDuration(lastTimePlayed())));
         }
 
         if (totalTimePlayed() > 0) {
@@ -982,12 +958,12 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
     // print a header
     {
-        process->appendStep(makeShared<TextPrint>(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
+        process->appendStep(new TextPrint(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
     }
 
     // check java
     {
-        process->appendStep(makeShared<CheckJava>(pptr));
+        process->appendStep(new CheckJava(pptr));
     }
 
     // check launch method
@@ -995,13 +971,13 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     QString method = launchMethod();
     if(!validMethods.contains(method))
     {
-        process->appendStep(makeShared<TextPrint>(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
+        process->appendStep(new TextPrint(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
         return process;
     }
 
     // create the .minecraft folder and server-resource-packs (workaround for Minecraft bug MCL-3732)
     {
-        process->appendStep(makeShared<CreateGameFolders>(pptr));
+        process->appendStep(new CreateGameFolders(pptr));
     }
 
     if (!serverToJoin && settings()->get("JoinServerOnLaunch").toBool())
@@ -1013,7 +989,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     if(serverToJoin && serverToJoin->port == 25565)
     {
         // Resolve server address to join on launch
-        auto step = makeShared<LookupServerAddress>(pptr);
+        auto *step = new LookupServerAddress(pptr);
         step->setLookupAddress(serverToJoin->address);
         step->setOutputAddressPtr(serverToJoin);
         process->appendStep(step);
@@ -1022,7 +998,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     // run pre-launch command if that's needed
     if(getPreLaunchCommand().size())
     {
-        auto step = makeShared<PreLaunchCommand>(pptr);
+        auto step = new PreLaunchCommand(pptr);
         step->setWorkingDirectory(gameRoot());
         process->appendStep(step);
     }
@@ -1031,43 +1007,43 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     if(session->status != AuthSession::PlayableOffline)
     {
         if(!session->demo) {
-            process->appendStep(makeShared<ClaimAccount>(pptr, session));
+            process->appendStep(new ClaimAccount(pptr, session));
         }
-        process->appendStep(makeShared<Update>(pptr, Net::Mode::Online));
+        process->appendStep(new Update(pptr, Net::Mode::Online));
     }
     else
     {
-        process->appendStep(makeShared<Update>(pptr, Net::Mode::Offline));
+        process->appendStep(new Update(pptr, Net::Mode::Offline));
     }
 
     // if there are any jar mods
     {
-        process->appendStep(makeShared<ModMinecraftJar>(pptr));
+        process->appendStep(new ModMinecraftJar(pptr));
     }
 
     // Scan mods folders for mods
     {
-        process->appendStep(makeShared<ScanModFolders>(pptr));
+        process->appendStep(new ScanModFolders(pptr));
     }
 
     // print some instance info here...
     {
-        process->appendStep(makeShared<PrintInstanceInfo>(pptr, session, serverToJoin));
+        process->appendStep(new PrintInstanceInfo(pptr, session, serverToJoin));
     }
 
     // extract native jars if needed
     {
-        process->appendStep(makeShared<ExtractNatives>(pptr));
+        process->appendStep(new ExtractNatives(pptr));
     }
 
     // reconstruct assets if needed
     {
-        process->appendStep(makeShared<ReconstructAssets>(pptr));
+        process->appendStep(new ReconstructAssets(pptr));
     }
 
     // verify that minimum Java requirements are met
     {
-        process->appendStep(makeShared<VerifyJavaInstall>(pptr));
+        process->appendStep(new VerifyJavaInstall(pptr));
     }
 
     {
@@ -1075,7 +1051,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         auto method = launchMethod();
         if(method == "LauncherPart")
         {
-            auto step = makeShared<LauncherPartLaunch>(pptr);
+            auto step = new LauncherPartLaunch(pptr);
             step->setWorkingDirectory(gameRoot());
             step->setAuthSession(session);
             step->setServerToJoin(serverToJoin);
@@ -1083,7 +1059,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         }
         else if (method == "DirectJava")
         {
-            auto step = makeShared<DirectJavaLaunch>(pptr);
+            auto step = new DirectJavaLaunch(pptr);
             step->setWorkingDirectory(gameRoot());
             step->setAuthSession(session);
             step->setServerToJoin(serverToJoin);
@@ -1094,7 +1070,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     // run post-exit command if that's needed
     if(getPostExitCommand().size())
     {
-        auto step = makeShared<PostLaunchCommand>(pptr);
+        auto step = new PostLaunchCommand(pptr);
         step->setWorkingDirectory(gameRoot());
         process->appendStep(step);
     }
@@ -1104,7 +1080,8 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     }
     if(m_settings->get("QuitAfterGameStop").toBool())
     {
-        process->appendStep(makeShared<QuitAfterGameStop>(pptr));
+        auto step = new QuitAfterGameStop(pptr);
+        process->appendStep(step);
     }
     m_launchProcess = process;
     emit launchTaskChanged(m_launchProcess);
@@ -1121,79 +1098,67 @@ JavaVersion MinecraftInstance::getJavaVersion()
     return JavaVersion(settings()->get("JavaVersion").toString());
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList()
+std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList() const
 {
     if (!m_loader_mod_list)
     {
         bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
-        m_loader_mod_list.reset(new ModFolderModel(modsRoot(), this, is_indexed));
+        m_loader_mod_list.reset(new ModFolderModel(modsRoot(), is_indexed));
         m_loader_mod_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_loader_mod_list;
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList()
+std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList() const
 {
     if (!m_core_mod_list)
     {
         bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
-        m_core_mod_list.reset(new ModFolderModel(coreModsDir(), this, is_indexed));
+        m_core_mod_list.reset(new ModFolderModel(coreModsDir(), is_indexed));
         m_core_mod_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_core_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_core_mod_list;
 }
 
-std::shared_ptr<ModFolderModel> MinecraftInstance::nilModList()
+std::shared_ptr<ResourcePackFolderModel> MinecraftInstance::resourcePackList() const
-{
-    if (!m_nil_mod_list)
-    {
-        bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
-        m_nil_mod_list.reset(new ModFolderModel(nilModsDir(), this, is_indexed, false));
-        m_nil_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_nil_mod_list.get(), &ModFolderModel::disableInteraction);
-    }
-    return m_nil_mod_list;
-}
-
-std::shared_ptr<ResourcePackFolderModel> MinecraftInstance::resourcePackList()
 {
     if (!m_resource_pack_list)
     {
-        m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir(), this));
+        m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir()));
     }
     return m_resource_pack_list;
 }
 
-std::shared_ptr<TexturePackFolderModel> MinecraftInstance::texturePackList()
+std::shared_ptr<TexturePackFolderModel> MinecraftInstance::texturePackList() const
 {
     if (!m_texture_pack_list)
     {
-        m_texture_pack_list.reset(new TexturePackFolderModel(texturePacksDir(), this));
+        m_texture_pack_list.reset(new TexturePackFolderModel(texturePacksDir()));
     }
     return m_texture_pack_list;
 }
 
-std::shared_ptr<ShaderPackFolderModel> MinecraftInstance::shaderPackList()
+std::shared_ptr<ShaderPackFolderModel> MinecraftInstance::shaderPackList() const
 {
     if (!m_shader_pack_list)
     {
-        m_shader_pack_list.reset(new ShaderPackFolderModel(shaderPacksDir(), this));
+        m_shader_pack_list.reset(new ShaderPackFolderModel(shaderPacksDir()));
     }
     return m_shader_pack_list;
 }
 
-std::shared_ptr<WorldList> MinecraftInstance::worldList()
+std::shared_ptr<WorldList> MinecraftInstance::worldList() const
 {
     if (!m_world_list)
     {
-        m_world_list.reset(new WorldList(worldDir(), this));
+        m_world_list.reset(new WorldList(worldDir()));
     }
     return m_world_list;
 }
 
-std::shared_ptr<GameOptions> MinecraftInstance::gameOptionsModel()
+std::shared_ptr<GameOptions> MinecraftInstance::gameOptionsModel() const
 {
     if (!m_game_options)
     {