Merge pull request #781 from Scrumplex/chore-bump-1.3.2

Avoid re-registering InstanceType

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,7 @@ body:
   attributes:
     label: Version of PolyMC
     description: The version of PolyMC used in the bug report.
-    placeholder: PolyMC 1.3.2
+    placeholder: PolyMC 1.2.2
   validations:
     required: true
 - type: textarea

.github/dco.yml

@@ -1,2 +0,0 @@
-allowRemediationCommits:
-  individual: true

.github/workflows/backport.yml

@@ -0,0 +1,19 @@
+name: Backport PR to stable
+on:
+  pull_request:
+    branches: [ develop ]
+    types: [ closed ]
+jobs:
+  release_pull_request:
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'backport')
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Backport PR by cherry-pick-ing
+      uses: Nathanmalnoury/gh-backport-action@master
+      with:
+        pr_branch: 'stable'
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -7,10 +7,6 @@ on:
         description: Type of build (Debug, Release, RelWithDebInfo, MinSizeRel)
         type: string
         default: Debug
-    secrets:
-      SPARKLE_ED25519_KEY:
-        description: Private key for signing Sparkle updates
-        required: false
 
 jobs:
   build:
@@ -20,32 +16,20 @@ jobs:
         include:
 
           - os: ubuntu-20.04
-            qt_ver: 5
 
           - os: ubuntu-20.04
-            qt_ver: 6
+            appimage: true
-            qt_host: linux
-            qt_version: '6.2.4'
-            qt_modules: 'qt5compat qtimageformats'
-            qt_path: /home/runner/work/PolyMC/Qt
 
           - os: windows-2022
-            name: "Windows-Legacy"
+            name: "Windows-i686"
             msystem: mingw32
-            qt_ver: 5
 
           - os: windows-2022
-            name: "Windows"
+            name: "Windows-x86_64"
-            msystem: mingw32
+            msystem: mingw64
-            qt_ver: 6
 
-          - os: macos-12
+          - os: macos-11
-            macosx_deployment_target: 10.14
+            macosx_deployment_target: 10.13
-            qt_ver: 6
-            qt_host: mac
-            qt_version: '6.3.1'
-            qt_modules: 'qt5compat qtimageformats'
-            qt_path: /Users/runner/work/PolyMC/Qt
 
     runs-on: ${{ matrix.os }}
 
@@ -77,21 +61,16 @@ jobs:
           pacboy: >-
             toolchain:p
             cmake:p
-            extra-cmake-modules:p
             ninja:p
-            qt${{ matrix.qt_ver }}-base:p
+            qt5:p
-            qt${{ matrix.qt_ver }}-svg:p
-            qt${{ matrix.qt_ver }}-imageformats:p
-            quazip-qt${{ matrix.qt_ver }}:p
             ccache:p
             nsis:p
-            ${{ matrix.qt_ver == 6 && 'qt6-5compat:p' || '' }}
 
       - name: Setup ccache
         if: runner.os != 'Windows' && inputs.build_type == 'Debug'
         uses: hendrikmuhs/ccache-action@v1.2.1
         with:
-          key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
+          key: ${{ matrix.os }}-${{ matrix.appimage }}
 
       - name: Setup ccache (Windows)
         if: runner.os == 'Windows' && inputs.build_type == 'Debug'
@@ -114,9 +93,9 @@ jobs:
         uses: actions/cache@v3.0.2
         with:
           path: '${{ github.workspace }}\.ccache'
-          key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
+          key: ${{ matrix.os }}-${{ matrix.msystem }}
           restore-keys: |
-              ${{ matrix.os }}-qt${{ matrix.qt_ver }}
+              ${{ matrix.os }}-${{ matrix.msystem }}
 
       - name: Set short version
         shell: bash
@@ -124,44 +103,28 @@ jobs:
           ver_short=`git rev-parse --short HEAD`
           echo "VERSION=$ver_short" >> $GITHUB_ENV
 
-      - name: Install Dependencies (Linux)
+      - name: Install Qt (macOS)
+        if: runner.os == 'macOS'
+        run: |
+         brew update
+         brew install qt@5 ninja
+
+      - name: Update Qt (AppImage)
+        if: runner.os == 'Linux' && matrix.appimage == true
+        run: |
+         sudo add-apt-repository ppa:savoury1/qt-5-15
+         sudo add-apt-repository ppa:savoury1/kde-5-80
+         sudo add-apt-repository ppa:savoury1/gpg
+         sudo add-apt-repository ppa:savoury1/ffmpeg4
+
+      - name: Install Qt (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install ninja-build extra-cmake-modules scdoc
+          sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 ninja-build qt5-image-formats-plugins
-
-      - name: Install Dependencies (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          brew update
-          brew install ninja extra-cmake-modules
-
-      - name: Install Qt (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 6
-        run: |
-          sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5
- 
-      - name: Cache Qt (macOS and AppImage)
-        id: cache-qt
-        if: matrix.qt_ver == 6 && runner.os != 'Windows'
-        uses: actions/cache@v3
-        with:
-          path: '${{ matrix.qt_path }}/${{ matrix.qt_version }}'
-          key: ${{ matrix.qt_host }}-${{ matrix.qt_version }}-"${{ matrix.qt_modules }}"-qt_cache
-
-      - name: Install Qt (macOS and AppImage)
-        if: matrix.qt_ver == 6 && runner.os != 'Windows'
-        uses: jurplel/install-qt-action@v2
-        with:
-           version: ${{ matrix.qt_version }}
-           host: ${{ matrix.qt_host }}
-           target: 'desktop'
-           modules: ${{ matrix.qt_modules }}
-           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-           aqtversion: ==2.1.*
 
       - name: Prepare AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        if: runner.os == 'Linux' && matrix.appimage == true
         run: |
           wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
           wget "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage"
@@ -176,18 +139,18 @@ jobs:
       - name: Configure CMake (macOS)
         if: runner.os == 'macOS'
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DLauncher_BUILD_PLATFORM=macOS -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=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DQt5_DIR=/usr/local/opt/qt@5 -DCMAKE_PREFIX_PATH=/usr/local/opt/qt@5 -DLauncher_BUILD_PLATFORM=macOS -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -G Ninja
 
       - name: Configure CMake (Windows)
         if: runner.os == 'Windows'
         shell: msys2 {0}
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -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 }} -G Ninja
 
       - name: Configure CMake (Linux)
         if: runner.os == 'Linux'
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -G Ninja
 
       ##
       # BUILD
@@ -204,21 +167,6 @@ jobs:
         run: |
           cmake --build ${{ env.BUILD_DIR }}
 
-      ##
-      # TEST
-      ##
-
-      - name: Test
-        if: runner.os != 'Windows'
-        run: |
-          ctest --test-dir build --output-on-failure
-
-      - name: Test (Windows)
-        if: runner.os == 'Windows'
-        shell: msys2 {0}
-        run: |
-          ctest --test-dir build --output-on-failure
-
       ##
       # PACKAGE BUILDS
       ##
@@ -233,25 +181,6 @@ jobs:
           sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "PolyMC.app/Contents/MacOS/polymc"
           tar -czf ../PolyMC.tar.gz *
 
-      - name: Make Sparkle signature (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then
-            brew install openssl@3
-            echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem
-            signature=$(/usr/local/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PolyMC.tar.gz -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
-            rm ed25519-priv.pem
-            cat >> $GITHUB_STEP_SUMMARY << EOF
-          ### Artifact Information :information_source:
-          - :memo: Sparkle Signature (ed25519): \`$signature\`
-          EOF
-          else
-            cat >> $GITHUB_STEP_SUMMARY << EOF
-          ### Artifact Information :information_source:
-          - :warning: Sparkle Signature (ed25519): No private key available (likely a pull request or fork)
-          EOF
-          fi
-
       - name: Package (Windows)
         if: runner.os == 'Windows'
         shell: msys2 {0}
@@ -280,7 +209,7 @@ jobs:
           makensis -NOCD "${{ github.workspace }}/${{ env.BUILD_DIR }}/program_info/win_install.nsi"
 
       - name: Package (Linux)
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && matrix.appimage != true
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }}
 
@@ -288,7 +217,7 @@ jobs:
           tar --owner root --group root -czf ../PolyMC.tar.gz *
 
       - name: Package (Linux, portable)
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && matrix.appimage != true
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }}
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
@@ -297,7 +226,7 @@ jobs:
           tar -czf ../PolyMC-portable.tar.gz *
 
       - name: Package AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        if: runner.os == 'Linux' && matrix.appimage == true
         shell: bash
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
@@ -307,14 +236,11 @@ jobs:
           chmod +x linuxdeploy-*.AppImage
 
           mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-{8,17}-openjdk
-          mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
 
           cp -r ${{ github.workspace }}/JREs/jre8/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk
 
           cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk
 
-          cp -r /home/runner/work/PolyMC/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
-
           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"
           LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk/lib/amd64"
@@ -356,36 +282,22 @@ jobs:
           name: PolyMC-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC-Setup.exe
 
-      - name: Upload binary tarball (Linux, Qt 5)
+      - name: Upload binary tarball (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 6
+        if: runner.os == 'Linux' && matrix.appimage != true
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC.tar.gz
 
-      - name: Upload binary tarball (Linux, portable, Qt 5)
+      - name: Upload binary tarball (Linux, portable)
-        if: runner.os == 'Linux' && matrix.qt_ver != 6
+        if: runner.os == 'Linux' && matrix.appimage != true
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC-portable.tar.gz
 
-      - name: Upload binary tarball (Linux, Qt 6)
-        if: runner.os == 'Linux' && matrix.qt_ver !=5
-        uses: actions/upload-artifact@v3
-        with:
-          name: PolyMC-${{ runner.os }}-Qt6-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: PolyMC.tar.gz
-
-      - name: Upload binary tarball (Linux, portable, Qt 6)
-        if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
-        with:
-          name: PolyMC-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: PolyMC-portable.tar.gz
-
       - name: Upload AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        if: runner.os == 'Linux' && matrix.appimage == true
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage

.github/workflows/pr-comment.yml

@@ -0,0 +1,61 @@
+name: Comment on pull request
+on:
+  workflow_run:
+    workflows: ['Build Application']
+    types: [completed]
+jobs:
+  pr_comment:
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          # This snippet is public-domain, taken from
+          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
+          script: |
+            async function upsertComment(owner, repo, issue_number, purpose, body) {
+              const {data: comments} = await github.rest.issues.listComments(
+                {owner, repo, issue_number});
+
+              const marker = `<!-- bot: ${purpose} -->`;
+              body = marker + "\n" + body;
+
+              const existing = comments.filter((c) => c.body.includes(marker));
+              if (existing.length > 0) {
+                const last = existing[existing.length - 1];
+                core.info(`Updating comment ${last.id}`);
+                await github.rest.issues.updateComment({
+                  owner, repo,
+                  body,
+                  comment_id: last.id,
+                });
+              } else {
+                core.info(`Creating a comment in issue / PR #${issue_number}`);
+                await github.rest.issues.createComment({issue_number, body, owner, repo});
+              }
+            }
+
+            const {owner, repo} = context.repo;
+            const run_id = ${{github.event.workflow_run.id}};
+
+            const pull_requests = ${{ toJSON(github.event.workflow_run.pull_requests) }};
+            if (!pull_requests.length) {
+              return core.error("This workflow doesn't match any pull requests!");
+            }
+
+            const artifacts = await github.paginate(
+              github.rest.actions.listWorkflowRunArtifacts, {owner, repo, run_id});
+            if (!artifacts.length) {
+              return core.error(`No artifacts found`);
+            }
+            let body = `Download the artifacts for this pull request:\n`;
+            for (const art of artifacts) {
+              body += `\n* [${art.name}.zip](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
+            }
+
+            core.info("Review thread message body:", body);
+
+            for (const pr of pull_requests) {
+              await upsertComment(owner, repo, pr.number,
+                "nightly-link", body);
+            }

.github/workflows/trigger_builds.yml

@@ -28,5 +28,3 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       build_type: Debug
-    secrets:
-      SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}

.github/workflows/trigger_release.yml

@@ -12,8 +12,6 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       build_type: Release
-    secrets:
-      SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
 
   create_release:
     needs: build_release
@@ -35,8 +33,6 @@ jobs:
       - name: Package artifacts properly
         run: |
           mv ${{ github.workspace }}/PolyMC-source PolyMC-${{ env.VERSION }}
-          mv PolyMC-Linux-Qt6-Portable*/PolyMC-portable.tar.gz PolyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
-          mv PolyMC-Linux-Qt6*/PolyMC.tar.gz PolyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz          
           mv PolyMC-Linux-Portable*/PolyMC-portable.tar.gz PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz
           mv PolyMC-Linux*/PolyMC.tar.gz PolyMC-Linux-${{ env.VERSION }}.tar.gz
           mv PolyMC-*.AppImage/PolyMC-*.AppImage PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
@@ -46,11 +42,10 @@ jobs:
 
           for d in PolyMC-Windows-*; do
             cd "${d}" || continue
-            LEGACY="$(echo -n ${d} | grep -o Legacy || true)"
+            ARCH="$(echo -n ${d} | cut -d '-' -f 3)"
             INST="$(echo -n ${d} | grep -o Setup || true)"
             PORT="$(echo -n ${d} | grep -o Portable || true)"
-            NAME="PolyMC-Windows"
+            NAME="PolyMC-Windows-${ARCH}"
-            test -z "${LEGACY}" || NAME="${NAME}-Legacy"
             test -z "${PORT}" || NAME="${NAME}-Portable"
             test -z "${INST}" || mv PolyMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
             test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
@@ -71,13 +66,11 @@ jobs:
             PolyMC-Linux-${{ env.VERSION }}.tar.gz
             PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz
             PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
-            PolyMC-Windows-Legacy-${{ env.VERSION }}.zip
+            PolyMC-Windows-i686-${{ env.VERSION }}.zip
-            PolyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz
+            PolyMC-Windows-i686-Portable-${{ env.VERSION }}.zip
-            PolyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
+            PolyMC-Windows-i686-Setup-${{ env.VERSION }}.exe
-            PolyMC-Windows-Legacy-Portable-${{ env.VERSION }}.zip
+            PolyMC-Windows-x86_64-${{ env.VERSION }}.zip
-            PolyMC-Windows-Legacy-Setup-${{ env.VERSION }}.exe
+            PolyMC-Windows-x86_64-Portable-${{ env.VERSION }}.zip
-            PolyMC-Windows-${{ env.VERSION }}.zip
+            PolyMC-Windows-x86_64-Setup-${{ env.VERSION }}.exe
-            PolyMC-Windows-Portable-${{ env.VERSION }}.zip
-            PolyMC-Windows-Setup-${{ env.VERSION }}.exe
             PolyMC-macOS-${{ env.VERSION }}.tar.gz
             PolyMC-${{ env.VERSION }}.tar.gz

.github/workflows/winget.yml

@@ -1,14 +0,0 @@
-name: Publish to WinGet
-on:
-  release:
-    types: [released]
-
-jobs:
-  publish:
-    runs-on: windows-latest
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@latest
-        with:
-          identifier: PolyMC.PolyMC
-          installers-regex: '\.exe$'
-          token: ${{ secrets.WINGET_TOKEN }}

CMakeLists.txt

@@ -6,12 +6,14 @@ if(WIN32)
 endif()
 
 project(Launcher)
+include(CTest)
 
 string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD)
 if(IS_IN_SOURCE_BUILD)
     message(FATAL_ERROR "You are building the Launcher in-source. Please separate the build tree from the source tree.")
 endif()
 
+
 ##################################### Set CMake options #####################################
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -32,7 +34,7 @@ set(CMAKE_C_STANDARD_REQUIRED true)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_C_STANDARD 11)
 include(GenerateExportHeader)
-set(CMAKE_CXX_FLAGS "-Wall -pedantic -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong --param=ssp-buffer-size=4 ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "-Wall -pedantic -Werror -Wno-deprecated-declarations -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong --param=ssp-buffer-size=4 ${CMAKE_CXX_FLAGS}")
 if(UNIX AND APPLE)
     set(CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
 endif()
@@ -61,16 +63,6 @@ if(ENABLE_LTO)
     endif()
 endif()
 
-option(BUILD_TESTING "Build the testing tree." ON)
-
-find_package(ECM REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH};${CMAKE_MODULE_PATH}")
-include(CTest)
-include(ECMAddTests)
-if (BUILD_TESTING)
-    enable_testing()
-endif()
-
 ##################################### Set Application options #####################################
 
 ######## Set URLs ########
@@ -80,8 +72,8 @@ set(Launcher_HELP_URL "https://polymc.org/wiki/help-pages/%1" CACHE STRING "URL
 
 ######## Set version numbers ########
 set(Launcher_VERSION_MAJOR    1)
-set(Launcher_VERSION_MINOR    4)
+set(Launcher_VERSION_MINOR    3)
-set(Launcher_VERSION_HOTFIX   0)
+set(Launcher_VERSION_HOTFIX   2)
 
 # Build number
 set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -110,6 +102,8 @@ set(Launcher_MATRIX_URL "https://matrix.to/#/#polymc:matrix.org" CACHE STRING "U
 # Discord URL
 set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.")
 
+
+
 # Subreddit URL
 set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PolyMCLauncher/" CACHE STRING "URL for the subreddit.")
 
@@ -131,16 +125,14 @@ set(Launcher_MSA_CLIENT_ID "549033b2-1532-4d4e-ae77-1bbaa46f9d74" CACHE STRING "
 # By using this key in your builds you accept the terms and conditions laid down in
 # https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions
 # NOTE: CurseForge requires you to change this if you make any kind of derivative work.
-set(Launcher_CURSEFORGE_API_KEY "$2a$10$1Oqr2MX3O4n/ilhFGc597u8tfI3L2Hyr9/rtWDAMRjghSQV2QUuxq" CACHE STRING "API key for the CurseForge platform")
+set(Launcher_CURSEFORGE_API_KEY "$2a$10$1Oqr2MX3O4n/ilhFGc597u8tfI3L2Hyr9/rtWDAMRjghSQV2QUuxq" CACHE STRING "CurseForge API Key")
 
 
 #### Check the current Git commit and branch
 include(GetGitRevisionDescription)
-git_get_exact_tag(Launcher_GIT_TAG)
 get_git_head_revision(Launcher_GIT_REFSPEC Launcher_GIT_COMMIT)
 
 message(STATUS "Git commit: ${Launcher_GIT_COMMIT}")
-message(STATUS "Git tag: ${Launcher_GIT_TAG}")
 message(STATUS "Git refspec: ${Launcher_GIT_REFSPEC}")
 
 set(Launcher_RELEASE_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_HOTFIX}")
@@ -156,7 +148,6 @@ add_custom_target(tcversion echo "\\#\\#teamcity[setParameter name=\\'env.LAUNCH
 ################################ 3rd Party Libs ################################
 
 # Find the required Qt parts
-include(QtVersionlessBackport)
 if(Launcher_QT_VERSION_MAJOR EQUAL 5)
     set(QT_VERSION_MAJOR 5)
     find_package(Qt5 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml)
@@ -168,33 +159,19 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 5)
         set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE)
         set(FORCE_BUNDLED_QUAZIP 1)
     endif()
-
-    # Qt 6 sets these by default. Notably causes Windows APIs to use UNICODE strings.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNICODE -D_UNICODE")
-elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
-    set(QT_VERSION_MAJOR 6)
-    find_package(Qt6 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml Core5Compat)
-    list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)
-
-    if(NOT Launcher_FORCE_BUNDLED_LIBS)
-        find_package(QuaZip-Qt6 1.3 QUIET)
-    endif()
-    if (NOT QuaZip-Qt6_FOUND)
-        set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE)
-        set(FORCE_BUNDLED_QUAZIP 1)
-    endif()
 else()
     message(FATAL_ERROR "Qt version ${Launcher_QT_VERSION_MAJOR} is not supported")
 endif()
 
-include(ECMQueryQt)
+# The Qt5 cmake files don't provide its install paths, so ask qmake.
-ecm_query_qt(QT_PLUGINS_DIR  QT_INSTALL_PLUGINS)
+include(QMakeQuery)
-ecm_query_qt(QT_LIBS_DIR     QT_INSTALL_LIBS)
+query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR)
-ecm_query_qt(QT_LIBEXECS_DIR QT_INSTALL_LIBEXECS)
+query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR)
-ecm_query_qt(QT_DATA_DIR     QT_HOST_DATA)
+query_qmake(QT_INSTALL_LIBS QT_LIBS_DIR)
+query_qmake(QT_INSTALL_LIBEXECS QT_LIBEXECS_DIR)
+query_qmake(QT_HOST_DATA QT_DATA_DIR)
 set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs)
 
-# NOTE: Qt 6 already sets this by default
 if (Qt5_POSITION_INDEPENDENT_CODE)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
@@ -215,7 +192,6 @@ if(UNIX AND APPLE)
     set(BINARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
     set(LIBRARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
     set(PLUGIN_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
-    set(FRAMEWORK_DEST_DIR "${Launcher_Name}.app/Contents/Frameworks")
     set(RESOURCES_DEST_DIR "${Launcher_Name}.app/Contents/Resources")
     set(JARS_DEST_DIR "${Launcher_Name}.app/Contents/MacOS/jars")
 
@@ -231,15 +207,9 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_HOTFIX}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
     set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2021-2022 ${Launcher_Copyright}")
-    set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "idALcUIazingvKSSsEa9U7coDVxZVx/ORpOEE/QtJfg=")
-    set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://polymc.org/feed/appcast.xml")
-
-    set(MACOSX_SPARKLE_DOWNLOAD_URL "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz" CACHE STRING "URL to Sparkle release archive")
-    set(MACOSX_SPARKLE_SHA256 "bf6ac1caa9f8d321d5784859c88da874f28412f37fb327bc21b7b14c5d61ef94" CACHE STRING "SHA256 checksum for Sparkle release archive")
-    set(MACOSX_SPARKLE_DIR "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
 
     # directories to look for dependencies
-    set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${MACOSX_SPARKLE_DIR})
+    set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
     # install as bundle
     set(INSTALL_BUNDLE "full")
@@ -262,13 +232,13 @@ elseif(UNIX)
     # Set RPATH
     SET(Launcher_BINARY_RPATH "$ORIGIN/")
 
+    # jars path is determined on runtime, relative to "Application root path", generally /usr or the root of the portable bundle
+    set(Launcher_APP_BINARY_DEFS "-DLAUNCHER_JARS_LOCATION=${JARS_DEST_DIR}")
+
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_Desktop} DESTINATION ${LAUNCHER_DESKTOP_DEST_DIR})
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_MetaInfo} DESTINATION ${LAUNCHER_METAINFO_DEST_DIR})
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION ${LAUNCHER_ICON_DEST_DIR})
-
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_ManPage} DESTINATION ${LAUNCHER_MAN_DEST_DIR} RENAME "${Launcher_APP_BINARY_NAME}.6")
-    if(Launcher_ManPage)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_ManPage} DESTINATION ${LAUNCHER_MAN_DEST_DIR})
-    endif()
 
     # Install basic runner script if component "portable" is selected
     configure_file(launcher/Launcher.in "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" @ONLY)
@@ -317,13 +287,12 @@ else()
     message(STATUS "Using system QuaZip")
 endif()
 add_subdirectory(libraries/rainbow) # Qt extension for colors
+add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader
 add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
 add_subdirectory(libraries/classparser) # class parser library
 add_subdirectory(libraries/optional-bare)
 add_subdirectory(libraries/tomlc99) # toml parser
 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
 
 ############################### Built Artifacts ###############################
 

CONTRIBUTING.md

@@ -1,62 +0,0 @@
-# Contributions Guidelines
-
-## Code formatting
-
-Try to follow the existing formatting.
-If there is no existing formatting, you may use `clang-format` with our included `.clang-format` configuration.
-
-In general, in order of importance:
-- Make sure your IDE is not messing up line endings or whitespace and avoid using linters.
-- Prefer readability over dogma.
-- Keep to the existing formatting.
-- Indent with 4 space unless it's in a submodule.
-- Keep lists (of arguments, parameters, initializers...) as lists, not paragraphs. It should either read from top to bottom, or left to right. Not both.
-
-## Signing your work
-
-In an effort to ensure that the code you contribute is actually compatible with the licenses in this codebase, we require you to sign-off all your contributions.
-
-This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message:
-
-```
-<commit message>
-
-Signed-off-by: Author name <Author email>
-```
-
-By signing off your work, you agree to the terms below:
-
-    Developer's Certificate of Origin 1.1
-
-    By making a contribution to this project, I certify that:
-
-    (a) The contribution was created in whole or in part by me and I
-        have the right to submit it under the open source license
-        indicated in the file; or
-
-    (b) The contribution is based upon previous work that, to the best
-        of my knowledge, is covered under an appropriate open source
-        license and I have the right under that license to submit that
-        work with modifications, whether created in whole or in part
-        by me, under the same open source license (unless I am
-        permitted to submit under a different license), as indicated
-        in the file; or
-
-    (c) The contribution was provided directly to me by some other
-        person who certified (a), (b) or (c) and I have not modified
-        it.
-
-    (d) I understand and agree that this project and the contribution
-        are public and that a record of the contribution (including all
-        personal information I submit with it, including my sign-off) is
-        maintained indefinitely and may be redistributed consistent with
-        this project or the open source license(s) involved.
-
-These terms will be enforced once you create a pull request, and you will be informed automatically if any of your commits aren't signed-off by you.
-
-As a bonus, you can also [cryptographically sign your commits][gh-signing-commits] and enable [vigilant mode][gh-vigilant-mode] on GitHub.
-
-
-
-[gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
-[gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits

COPYING.md

@@ -1,36 +1,33 @@
 # PolyMC
 
-     PolyMC - Minecraft Launcher
+    Copyright (C) 2012-2021 MultiMC Contributors
-     Copyright (C) 2021-2022 PolyMC Contributors
+    Copyright (C) 2021-2022 PolyMC Contributors
 
-     This program is free software: you can redistribute it and/or modify
+    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
+    it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, version 3.
+    the Free Software Foundation, version 3.
 
-     This program is distributed in the hope that it will be useful,
+    This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+    GNU General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-    This file incorporates work covered by the following copyright and
+# Launcher (https://github.com/MultiMC/Launcher)
-    permission notice:
+    Copyright 2012-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
 
-         Copyright 2013-2021 MultiMC Contributors
+        http://www.apache.org/licenses/LICENSE-2.0
 
-         Licensed under the Apache License, Version 2.0 (the "License");
+    Unless required by applicable law or agreed to in writing, software
-         you may not use this file except in compliance with the License.
+    distributed under the License is distributed on an "AS IS" BASIS,
-         You may obtain a copy of the License at
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
+    See the License for the specific language governing permissions and
-             http://www.apache.org/licenses/LICENSE-2.0
+    limitations under the License.
-
-         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.
 
 # MinGW runtime (Windows)
 
@@ -54,12 +51,12 @@
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
 
-# Qt 5/6
+# Qt 5
 
-    Copyright (C) 2022 The Qt Company Ltd and other contributors.
+    Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-    Contact: https://www.qt.io/licensing
+    Contact: http://www.qt-project.org/legal
 
-    Licensed under LGPL v3
+    Licensed under LGPL v2.1
 
 # libnbt++
 
@@ -149,28 +146,27 @@
 
 # Quazip
 
-    Copyright (C) 2005-2021 Sergey A. Tachenov
+    Copyright (C) 2005-2011 Sergey A. Tachenov
 
-    The QuaZip library is licensed under the GNU Lesser General Public
+    This program is free software; you can redistribute it and/or modify it
-    License V2.1 plus a static linking exception.
+    under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at
+    your option) any later version.
 
-    The original ZIP/UNZIP package (MiniZip) is copyrighted by Gilles
+    This program is distributed in the hope that it will be useful, but
-    Vollant and contributors, see quazip/(un)zip.h files for details.
+    WITHOUT ANY WARRANTY; without even the implied warranty of
-    Basically it's the zlib license.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+    General Public License for more details.
 
-    STATIC LINKING EXCEPTION
+    You should have received a copy of the GNU Lesser General Public License
-
+    along with this program; if not, write to the Free Software Foundation,
-    The copyright holders give you permission to link this library with
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-    independent modules to produce an executable, regardless of the license
-    terms of these independent modules, and to copy and distribute the
-    resulting executable under terms of your choice, provided that you also
-    meet, for each linked independent module, the terms and conditions of
-    the license of that module. An independent module is a module which is
-    not derived from or based on this library. If you modify this library,
-    you must extend this exception to your version of the library.
 
     See COPYING file for the full LGPL text.
 
+    Original ZIP package is copyrighted by Gilles Vollant, see
+    quazip/(un)zip.h files for details, basically it's zlib license.
+
 # xz-minidec
 
     XZ decompressor
@@ -217,57 +213,6 @@
     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# launcher (`libraries/launcher`)
-
-     PolyMC - Minecraft Launcher
-     Copyright (C) 2021-2022 PolyMC 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
-     the Free Software Foundation, version 3.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     Linking this library statically or dynamically with other modules is
-     making a combined work based on this library. Thus, the terms and
-     conditions of the GNU General Public License cover the whole
-     combination.
-
-     As a special exception, the copyright holders of this library give
-     you permission to link this library with independent modules to
-     produce an executable, regardless of the license terms of these
-     independent modules, and to copy and distribute the resulting
-     executable under terms of your choice, provided that you also meet,
-     for each linked independent module, the terms and conditions of the
-     license of that module. An independent module is a module which is
-     not derived from or based on this library. If you modify this
-     library, you may extend this exception to your version of the
-     library, but you are not obliged to do so. If you do not wish to do
-     so, delete this exception statement from your version.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-    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.
-
 # lionshead
 
     Code has been taken from https://github.com/natefoo/lionshead and loosely

README.md

@@ -1,7 +1,8 @@
- <p align="center">
+<p align="center">
-<img src="./program_info/polymc-header-black.svg#gh-light-mode-only" alt="PolyMC logo" width="50%"/>
+  <img src="./program_info/polymc-header-black.svg#gh-light-mode-only" alt="PolyMC logo"/>
-<img src="./program_info/polymc-header.svg#gh-dark-mode-only" alt="PolyMC logo" width="50%"/>
+  <img src="./program_info/polymc-header.svg#gh-dark-mode-only" alt="PolyMC logo"/>
 </p>
+<br>
 
 PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.
 
@@ -46,7 +47,7 @@ If there are any issues with the space or you are using a client that does not s
 [![Support](https://img.shields.io/matrix/polymc-support:matrix.org?label=PolyMC%20Support)](https://matrix.to/#/#polymc-support:matrix.org)
 [![Voice](https://img.shields.io/matrix/polymc-voice:matrix.org?label=PolyMC%20Voice)](https://matrix.to/#/#polymc-voice:matrix.org)
 
-We also have a subreddit you can post your issues and suggestions on:
+we also have a subreddit you can post your issues and suggestions on:
 
 [r/PolyMCLauncher](https://www.reddit.com/r/PolyMCLauncher/)
 
@@ -58,41 +59,34 @@ If you want to contribute to PolyMC you might find it useful to join our Discord
 
 If you want to build PolyMC yourself, check [Build Instructions](https://polymc.org/wiki/development/build-instructions/) for build instructions.
 
+## Code formatting
+
+Just follow the existing formatting.
+
+In general, in order of importance:
+
+- Make sure your IDE is not messing up line endings or whitespace and avoid using linters.
+- Prefer readability over dogma.
+- Keep to the existing formatting.
+- Indent with 4 space unless it's in a submodule.
+- Keep lists (of arguments, parameters, initializers...) as lists, not paragraphs. It should either read from top to bottom, or left to right. Not both.
+
 ## Translations
 
 The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/projects/polymc/polymc/) and information about translating PolyMC is available at https://github.com/PolyMC/Translations
 
 ## Download information
-
 To modify download information or change packaging information send a pull request or issue to the website [Here](https://github.com/PolyMC/polymc.github.io/blob/master/src/download.md)
 
 ## Forking/Redistributing/Custom builds policy
 
-We don't care what you do with your fork/custom build as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy:
+Do whatever you want, we don't care. Just follow the license. If you have any questions about this feel free to ask in an issue.
-- Make it clear that your fork is not PolyMC and is not endorsed by or affiliated with the PolyMC project (https://polymc.org).
-- Go through [CMakeLists.txt](CMakeLists.txt) and change PolyMC's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled).
-
-If you have any questions or want any clarification on the above conditions please make an issue and ask us.
 
 Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions:
  - [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use)
  - [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions)
-
+If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file.
-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 (`""`).
 
 All launcher code is available under the GPL-3.0-only license.
   
 The logo and related assets are under the CC BY-SA 4.0 license.
-
-## Sponsors
-Thank you to all our generous backers over at Open Collective! Support PolyMC by [becoming a backer](https://opencollective.com/polymc).
-
-[![OpenCollective Backers](https://opencollective.com/polymc/backers.svg?width=890&limit=1000)](https://opencollective.com/polymc#backers)
-
-Also, 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/)
-
-Additionally, 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>

buildconfig/BuildConfig.cpp.in

@@ -61,27 +61,13 @@ Config::Config()
     BUILD_PLATFORM = "@Launcher_BUILD_PLATFORM@";
     UPDATER_BASE = "@Launcher_UPDATER_BASE@";
 
-    MAC_SPARKLE_PUB_KEY = "@MACOSX_SPARKLE_UPDATE_PUBLIC_KEY@";
-    MAC_SPARKLE_APPCAST_URL = "@MACOSX_SPARKLE_UPDATE_FEED_URL@";
-
-    if (BUILD_PLATFORM == "macOS" && !MAC_SPARKLE_PUB_KEY.isEmpty() && !MAC_SPARKLE_APPCAST_URL.isEmpty())
-    {
-        UPDATER_ENABLED = true;
-    }
-
     GIT_COMMIT = "@Launcher_GIT_COMMIT@";
-    GIT_TAG = "@Launcher_GIT_TAG@";
     GIT_REFSPEC = "@Launcher_GIT_REFSPEC@";
-
+    if (GIT_REFSPEC == QStringLiteral("GITDIR-NOTFOUND"))
-    // Assume that builds outside of Git repos are "stable"
-    if (GIT_REFSPEC == QStringLiteral("GITDIR-NOTFOUND")
-        || GIT_TAG == QStringLiteral("GITDIR-NOTFOUND"))
     {
-        GIT_REFSPEC = "refs/heads/stable";
+        VERSION_CHANNEL = QStringLiteral("stable");
-        GIT_TAG = versionString();
     }
-
+    else if(GIT_REFSPEC.startsWith("refs/heads/"))
-    if (GIT_REFSPEC.startsWith("refs/heads/"))
     {
         VERSION_CHANNEL = GIT_REFSPEC;
         VERSION_CHANNEL.remove("refs/heads/");
@@ -95,7 +81,7 @@ Config::Config()
     }
     else
     {
-        VERSION_CHANNEL = "unknown";
+        VERSION_CHANNEL = QObject::tr("unknown");
     }
 
     VERSION_STR = "@Launcher_VERSION_STRING@";
@@ -104,7 +90,7 @@ Config::Config()
     HELP_URL = "@Launcher_HELP_URL@";
     IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
     MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
-    FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
+    CURSEFORGE_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
 
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
@@ -114,17 +100,12 @@ Config::Config()
     SUBREDDIT_URL = "@Launcher_SUBREDDIT_URL@";
 }
 
-QString Config::versionString() const
-{
-    return QString("%1.%2.%3").arg(VERSION_MAJOR).arg(VERSION_MINOR).arg(VERSION_HOTFIX);
-}
-
 QString Config::printableVersionString() const
 {
-    QString vstr = versionString();
+    QString vstr = QString("%1.%2.%3").arg(QString::number(VERSION_MAJOR), QString::number(VERSION_MINOR), QString::number(VERSION_HOTFIX));
 
     // If the build is not a main release, append the channel
-    if(VERSION_CHANNEL != "stable" && GIT_TAG != vstr)
+    if(VERSION_CHANNEL != "stable")
     {
         vstr += "-" + VERSION_CHANNEL;
     }
@@ -132,7 +113,7 @@ QString Config::printableVersionString() const
     // if a build number is set, also add it to the end
     if(VERSION_BUILD >= 0)
     {
-        vstr += "+build." + QString::number(VERSION_BUILD);
+        vstr += "-" + QString::number(VERSION_BUILD);
     }
     return vstr;
 }

buildconfig/BuildConfig.h

@@ -74,12 +74,6 @@ class Config {
     /// URL for the updater's channel
     QString UPDATER_BASE;
 
-    /// The public key used to sign releases for the Sparkle updater appcast
-    QString MAC_SPARKLE_PUB_KEY;
-
-    /// URL for the Sparkle updater's appcast
-    QString MAC_SPARKLE_APPCAST_URL;
-
     /// User-Agent to use.
     QString USER_AGENT;
 
@@ -89,9 +83,6 @@ class Config {
     /// The git commit hash of this build
     QString GIT_COMMIT;
 
-    /// The git tag of this build
-    QString GIT_TAG;
-
     /// The git refspec of this build
     QString GIT_REFSPEC;
 
@@ -127,7 +118,7 @@ class Config {
     /**
      * Client API key for CurseForge
      */
-    QString FLAME_API_KEY;
+    QString CURSEFORGE_API_KEY;
 
     /**
      * Metadata repository URL prefix
@@ -163,7 +154,6 @@ class Config {
     QString MODRINTH_STAGING_URL = "https://staging-api.modrinth.com/v2";
     QString MODRINTH_PROD_URL = "https://api.modrinth.com/v2";
 
-    QString versionString() const;
     /**
      * \brief Converts the Version to a string.
      * \return The version number in string format (major.minor.revision.build).

buildconfig/CMakeLists.txt

@@ -7,5 +7,5 @@ add_library(BuildConfig STATIC
     ${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp
 )
 
-target_link_libraries(BuildConfig Qt${QT_VERSION_MAJOR}::Core)
+target_link_libraries(BuildConfig Qt5::Core)
 target_include_directories(BuildConfig PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")

cmake/ECMQueryQt.cmake

@@ -1,100 +0,0 @@
-# SPDX-FileCopyrightText: 2014 Rohan Garg <rohan16garg@gmail.com>
-# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kde.org>
-# SPDX-FileCopyrightText: 2014-2016 Aleix Pol <aleixpol@kde.org>
-# SPDX-FileCopyrightText: 2017 Friedrich W. H. Kossebau <kossebau@kde.org>
-# SPDX-FileCopyrightText: 2022 Ahmad Samir <a.samir78@gmail.com>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#[=======================================================================[.rst:
-ECMQueryQt
----------------
-This module can be used to query the installation paths used by Qt.
-
-For Qt5 this uses ``qmake``, and for Qt6 this used ``qtpaths`` (the latter has built-in
-support to query the paths of a target platform when cross-compiling).
-
-This module defines the following function:
-::
-
-    ecm_query_qt(<result_variable> <qt_variable> [TRY])
-
-Passing ``TRY`` will result in the method not making the build fail if the executable
-used for querying has not been found, but instead simply print a warning message and
-return an empty string.
-
-Example usage:
-
-.. code-block:: cmake
-
-    include(ECMQueryQt)
-    ecm_query_qt(bin_dir QT_INSTALL_BINS)
-
-If the call succeeds ``${bin_dir}`` will be set to ``<prefix>/path/to/bin/dir`` (e.g.
-``/usr/lib64/qt/bin/``).
-
-Since: 5.93
-#]=======================================================================]
-
-include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
-include(CheckLanguage)
-check_language(CXX)
-if (CMAKE_CXX_COMPILER)
-    # Enable the CXX language to let CMake look for config files in library dirs.
-    # See: https://gitlab.kitware.com/cmake/cmake/-/issues/23266
-    enable_language(CXX)
-endif()
-
-if (QT_MAJOR_VERSION STREQUAL "5")
-    # QUIET to accommodate the TRY option
-    find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
-    if(TARGET Qt5::qmake)
-        get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
-
-        set(QUERY_EXECUTABLE ${_qmake_executable_default}
-            CACHE FILEPATH "Location of the Qt5 qmake executable")
-        set(_exec_name_text "Qt5 qmake")
-        set(_cli_option "-query")
-    endif()
-elseif(QT_MAJOR_VERSION STREQUAL "6")
-    # QUIET to accommodate the TRY option
-    find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
-    if (TARGET Qt6::qtpaths)
-        get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
-
-        set(QUERY_EXECUTABLE ${_qtpaths_executable}
-            CACHE FILEPATH "Location of the Qt6 qtpaths executable")
-        set(_exec_name_text "Qt6 qtpaths")
-        set(_cli_option "--query")
-    endif()
-endif()
-
-function(ecm_query_qt result_variable qt_variable)
-    set(options TRY)
-    set(oneValueArgs)
-    set(multiValueArgs)
-
-    cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT QUERY_EXECUTABLE)
-        if(ARGS_TRY)
-            set(${result_variable} "" PARENT_SCOPE)
-            message(STATUS "No ${_exec_name_text} executable found. Can't check ${qt_variable}")
-            return()
-        else()
-            message(FATAL_ERROR "No ${_exec_name_text} executable found. Can't check ${qt_variable} as required")
-        endif()
-    endif()
-    execute_process(
-        COMMAND ${QUERY_EXECUTABLE} ${_cli_option} "${qt_variable}"
-        RESULT_VARIABLE return_code
-        OUTPUT_VARIABLE output
-    )
-    if(return_code EQUAL 0)
-        string(STRIP "${output}" output)
-        file(TO_CMAKE_PATH "${output}" output_path)
-        set(${result_variable} "${output_path}" PARENT_SCOPE)
-    else()
-        message(WARNING "Failed call: ${_command} \"${qt_variable}\"")
-        message(FATAL_ERROR "${_exec_name_text} call failed: ${return_code}")
-    endif()
-endfunction()

cmake/GetGitRevisionDescription.cmake

@@ -3,7 +3,7 @@
 # These functions force a re-configure on each git commit so that you can
 # trust the values of the variables in your build system.
 #
-#  get_git_head_revision(<refspecvar> <hashvar> [ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR])
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
 #
 # Returns the refspec and sha hash of the current head revision
 #
@@ -12,33 +12,20 @@
 # Returns the results of git describe on the source tree, and adjusting
 # the output so that it tests false if an error occurs.
 #
-#  git_describe_working_tree(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the working tree (--dirty option),
-# and adjusting the output so that it tests false if an error occurs.
-#
 #  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
 #
 # Returns the results of git describe --exact-match on the source tree,
 # and adjusting the output so that it tests false if there was no exact
 # matching tag.
 #
-#  git_local_changes(<var>)
-#
-# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
-# Uses the return code of "git diff-index --quiet HEAD --".
-# Does not regard untracked files.
-#
 # Requires CMake 2.6 or newer (uses the 'function' command)
 #
 # Original Author:
-# 2009-2020 Ryan Pavlik <ryan.pavlik@gmail.com> <abiryan@ryand.net>
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
 # http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
 #
-# Copyright 2009-2013, Iowa State University.
+# Copyright Iowa State University 2009-2010.
-# Copyright 2013-2020, Ryan Pavlik
-# Copyright 2013-2020, Contributors
-# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
@@ -52,124 +39,45 @@ set(__get_git_revision_description YES)
 # to find the path to this module rather than the path to a calling list file
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 
-# Function _git_find_closest_git_dir finds the next closest .git directory
+function(get_git_head_revision _refspecvar _hashvar)
-# that is part of any directory in the path defined by _start_dir.
+    set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-# The result is returned in the parent scope variable whose name is passed
+    set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-# as variable _git_dir_var. If no .git directory can be found, the
+    while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
-# function returns an empty string via _git_dir_var.
+        set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-#
+        get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-# Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and
+        if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-# neither foo nor bar contain a file/directory .git. This wil return
-# C:/bla/.git
-#
-function(_git_find_closest_git_dir _start_dir _git_dir_var)
-    set(cur_dir "${_start_dir}")
-    set(git_dir "${_start_dir}/.git")
-    while(NOT EXISTS "${git_dir}")
-        # .git dir not found, search parent directories
-        set(git_previous_parent "${cur_dir}")
-        get_filename_component(cur_dir "${cur_dir}" DIRECTORY)
-        if(cur_dir STREQUAL git_previous_parent)
             # We have reached the root directory, we are not in git
-            set(${_git_dir_var}
+            set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-                ""
+            set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-                PARENT_SCOPE)
             return()
         endif()
-        set(git_dir "${cur_dir}/.git")
+        set(GIT_DIR "${GIT_PARENT_DIR}/.git")
     endwhile()
-    set(${_git_dir_var}
+    # check if this is a submodule
-        "${git_dir}"
-        PARENT_SCOPE)
-endfunction()
-
-function(get_git_head_revision _refspecvar _hashvar)
-    _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
-
-    if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR")
-        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE)
-    else()
-        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE)
-    endif()
-    if(NOT "${GIT_DIR}" STREQUAL "")
-        file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
-             "${GIT_DIR}")
-        if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
-            # We've gone above the CMake root dir.
-            set(GIT_DIR "")
-        endif()
-    endif()
-    if("${GIT_DIR}" STREQUAL "")
-        set(${_refspecvar}
-            "GITDIR-NOTFOUND"
-            PARENT_SCOPE)
-        set(${_hashvar}
-            "GITDIR-NOTFOUND"
-            PARENT_SCOPE)
-        return()
-    endif()
-
-    # Check if the current source dir is a git submodule or a worktree.
-    # In both cases .git is a file instead of a directory.
-    #
     if(NOT IS_DIRECTORY ${GIT_DIR})
-        # The following git command will return a non empty string that
+        file(READ ${GIT_DIR} submodule)
-        # points to the super project working tree if the current
+        string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-        # source dir is inside a git submodule.
+        get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-        # Otherwise the command will return an empty string.
+        get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-        #
-        execute_process(
-            COMMAND "${GIT_EXECUTABLE}" rev-parse
-                    --show-superproject-working-tree
-            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-            OUTPUT_VARIABLE out
-            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-        if(NOT "${out}" STREQUAL "")
-            # If out is empty, GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a submodule
-            file(READ ${GIT_DIR} submodule)
-            string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
-                                 ${submodule})
-            string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
-            get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-            get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
-                                   ABSOLUTE)
-            set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
-        else()
-            # GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a worktree
-            file(READ ${GIT_DIR} worktree_ref)
-            # The .git directory contains a path to the worktree information directory
-            # inside the parent git repo of the worktree.
-            #
-            string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
-                                 ${worktree_ref})
-            string(STRIP ${git_worktree_dir} git_worktree_dir)
-            _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
-            set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
-        endif()
-    else()
-        set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
     endif()
     set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
     if(NOT EXISTS "${GIT_DATA}")
         file(MAKE_DIRECTORY "${GIT_DATA}")
     endif()
 
-    if(NOT EXISTS "${HEAD_SOURCE_FILE}")
+    if(NOT EXISTS "${GIT_DIR}/HEAD")
         return()
     endif()
     set(HEAD_FILE "${GIT_DATA}/HEAD")
-    configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
+    configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
 
     configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-                   "${GIT_DATA}/grabRef.cmake" @ONLY)
+        "${GIT_DATA}/grabRef.cmake"
+        @ONLY)
     include("${GIT_DATA}/grabRef.cmake")
 
-    set(${_refspecvar}
+    set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-        "${HEAD_REF}"
+    set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-        PARENT_SCOPE)
-    set(${_hashvar}
-        "${HEAD_HASH}"
-        PARENT_SCOPE)
 endfunction()
 
 function(git_describe _var)
@@ -178,107 +86,45 @@ function(git_describe _var)
     endif()
     get_git_head_revision(refspec hash)
     if(NOT GIT_FOUND)
-        set(${_var}
+        set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-            "GIT-NOTFOUND"
-            PARENT_SCOPE)
         return()
     endif()
     if(NOT hash)
-        set(${_var}
+        set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-            "HEAD-HASH-NOTFOUND"
-            PARENT_SCOPE)
         return()
     endif()
 
     # TODO sanitize
     #if((${ARGN}" MATCHES "&&") OR
-    #	(ARGN MATCHES "||") OR
+    #    (ARGN MATCHES "||") OR
-    #	(ARGN MATCHES "\\;"))
+    #    (ARGN MATCHES "\\;"))
-    #	message("Please report the following error to the project!")
+    #    message("Please report the following error to the project!")
-    #	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+    #    message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
     #endif()
 
     #message(STATUS "Arguments to execute_process: ${ARGN}")
 
-    execute_process(
+    execute_process(COMMAND
-        COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN}
+        "${GIT_EXECUTABLE}"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        describe
-        RESULT_VARIABLE res
+        ${hash}
-        OUTPUT_VARIABLE out
+        ${ARGN}
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+        WORKING_DIRECTORY
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE
+        res
+        OUTPUT_VARIABLE
+        out
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT res EQUAL 0)
         set(out "${out}-${res}-NOTFOUND")
     endif()
 
-    set(${_var}
+    set(${_var} "${out}" PARENT_SCOPE)
-        "${out}"
-        PARENT_SCOPE)
-endfunction()
-
-function(git_describe_working_tree _var)
-    if(NOT GIT_FOUND)
-        find_package(Git QUIET)
-    endif()
-    if(NOT GIT_FOUND)
-        set(${_var}
-            "GIT-NOTFOUND"
-            PARENT_SCOPE)
-        return()
-    endif()
-
-    execute_process(
-        COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN}
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-        RESULT_VARIABLE res
-        OUTPUT_VARIABLE out
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT res EQUAL 0)
-        set(out "${out}-${res}-NOTFOUND")
-    endif()
-
-    set(${_var}
-        "${out}"
-        PARENT_SCOPE)
 endfunction()
 
 function(git_get_exact_tag _var)
     git_describe(out --exact-match ${ARGN})
-    set(${_var}
+    set(${_var} "${out}" PARENT_SCOPE)
-        "${out}"
-        PARENT_SCOPE)
-endfunction()
-
-function(git_local_changes _var)
-    if(NOT GIT_FOUND)
-        find_package(Git QUIET)
-    endif()
-    get_git_head_revision(refspec hash)
-    if(NOT GIT_FOUND)
-        set(${_var}
-            "GIT-NOTFOUND"
-            PARENT_SCOPE)
-        return()
-    endif()
-    if(NOT hash)
-        set(${_var}
-            "HEAD-HASH-NOTFOUND"
-            PARENT_SCOPE)
-        return()
-    endif()
-
-    execute_process(
-        COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-        RESULT_VARIABLE res
-        OUTPUT_VARIABLE out
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(res EQUAL 0)
-        set(${_var}
-            "CLEAN"
-            PARENT_SCOPE)
-    else()
-        set(${_var}
-            "DIRTY"
-            PARENT_SCOPE)
-    endif()
 endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -8,12 +8,10 @@
 # http://academic.cleardefinition.com
 # Iowa State University HCI Graduate Program/VRAC
 #
-# Copyright 2009-2012, Iowa State University
+# Copyright Iowa State University 2009-2010.
-# Copyright 2011-2015, Contributors
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
-# SPDX-License-Identifier: BSL-1.0
 
 set(HEAD_HASH)
 
@@ -21,23 +19,23 @@ file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
 
 string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
 if(HEAD_CONTENTS MATCHES "ref")
-	# named branch
+    # named branch
-	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+    string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+    if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+        configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	else()
+    else()
-		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+        configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
-		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+        file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
-		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+        if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
-			set(HEAD_HASH "${CMAKE_MATCH_1}")
+            set(HEAD_HASH "${CMAKE_MATCH_1}")
-		endif()
+        endif()
-	endif()
+    endif()
 else()
-	# detached HEAD
+    # detached HEAD
-	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+    configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
 endif()
 
 if(NOT HEAD_HASH)
-	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+    file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+    string(STRIP "${HEAD_HASH}" HEAD_HASH)
 endif()

cmake/MacOSXBundleInfo.plist.in

@@ -40,9 +40,5 @@
     <true/>
     <key>NSHumanReadableCopyright</key>
     <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-    <key>SUPublicEDKey</key>
-    <string>${MACOSX_SPARKLE_UPDATE_PUBLIC_KEY}</string>
-    <key>SUFeedURL</key>
-    <string>${MACOSX_SPARKLE_UPDATE_FEED_URL}</string>
 </dict>
 </plist>

cmake/QMakeQuery.cmake

@@ -0,0 +1,14 @@
+if(__QMAKEQUERY_CMAKE__)
+    return()
+endif()
+set(__QMAKEQUERY_CMAKE__ TRUE)
+
+get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+
+function(QUERY_QMAKE VAR RESULT)
+    exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
+    if(NOT return_code)
+        file(TO_CMAKE_PATH "${output}" output)
+        set(${RESULT} ${output} PARENT_SCOPE)
+    endif(NOT return_code)
+endfunction(QUERY_QMAKE)

cmake/QtVersionOption.cmake

@@ -1,38 +0,0 @@
-#.rst:
-# QtVersionOption
-# ---------------
-#
-# Adds a build option to select the major Qt version if necessary,
-# that is, if the major Qt version has not yet been determined otherwise
-# (e.g. by a corresponding find_package() call).
-#
-# This module is typically included by other modules requiring knowledge
-# about the major Qt version.
-#
-# ``QT_MAJOR_VERSION`` is defined to either be "5" or "6".
-#
-#
-# Since 5.82.0.
-
-#=============================================================================
-# SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-
-if (DEFINED QT_MAJOR_VERSION)
-    return()
-endif()
-
-if (TARGET Qt5::Core)
-    set(QT_MAJOR_VERSION 5)
-elseif (TARGET Qt6::Core)
-    set(QT_MAJOR_VERSION 6)
-else()
-    option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
-
-    if (BUILD_WITH_QT6)
-        set(QT_MAJOR_VERSION 6)
-    else()
-        set(QT_MAJOR_VERSION 5)
-    endif()
-endif()

cmake/QtVersionlessBackport.cmake

@@ -1,97 +0,0 @@
-#=============================================================================
-# Copyright 2005-2011 Kitware, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of Kitware, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived
-#   from this software without specific prior written permission.
-#
-# 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
-# HOLDER 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.
-#=============================================================================
-
-# From Qt5CoreMacros.cmake
-
-function(qt_generate_moc)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_generate_moc(${ARGV})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_generate_moc(${ARGV})
-    endif()
-endfunction()
-
-function(qt_wrap_cpp outfiles)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_wrap_cpp("${outfiles}" ${ARGN})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_wrap_cpp("${outfiles}" ${ARGN})
-    endif()
-    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-endfunction()
-
-function(qt_add_binary_resources)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_add_binary_resources(${ARGV})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_add_binary_resources(${ARGV})
-    endif()
-endfunction()
-
-function(qt_add_resources outfiles)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_add_resources("${outfiles}" ${ARGN})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_add_resources("${outfiles}" ${ARGN})
-    endif()
-    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-endfunction()
-
-function(qt_add_big_resources outfiles)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_add_big_resources(${outfiles} ${ARGN})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_add_big_resources(${outfiles} ${ARGN})
-    endif()
-    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-endfunction()
-
-function(qt_import_plugins)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_import_plugins(${ARGV})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_import_plugins(${ARGV})
-    endif()
-endfunction()
-
-
-# From Qt5WidgetsMacros.cmake
-
-function(qt_wrap_ui outfiles)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        qt5_wrap_ui("${outfiles}" ${ARGN})
-    elseif(QT_VERSION_MAJOR EQUAL 6)
-        qt6_wrap_ui("${outfiles}" ${ARGN})
-    endif()
-    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-endfunction()
-

cmake/UnitTest.cmake

@@ -0,0 +1,50 @@
+find_package(Qt5Test REQUIRED)
+
+set(TEST_RESOURCE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+message(${TEST_RESOURCE_PATH})
+
+function(add_unit_test name)
+    if(BUILD_TESTING)
+        set(options "")
+        set(oneValueArgs DATA)
+        set(multiValueArgs SOURCES LIBS)
+
+        cmake_parse_arguments(OPT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+        if(WIN32)
+            add_executable(${name}_test ${OPT_SOURCES} ${TEST_RESOURCE_PATH}/UnitTest/test.rc)
+        else()
+            add_executable(${name}_test ${OPT_SOURCES})
+        endif()
+
+        if(NOT "${OPT_DATA}" STREQUAL "")
+            set(TEST_DATA_PATH "${CMAKE_CURRENT_BINARY_DIR}/data")
+            set(TEST_DATA_PATH_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${OPT_DATA}")
+            message("From ${TEST_DATA_PATH_SRC} to ${TEST_DATA_PATH}")
+            string(REGEX REPLACE "[/\\:]" "_" DATA_TARGET_NAME "${TEST_DATA_PATH_SRC}")
+            if(UNIX)
+                # on unix we get the third / from the filename
+                set(TEST_DATA_URL "file://${TEST_DATA_PATH}")
+            else()
+                # we don't on windows, so we have to add it ourselves
+                set(TEST_DATA_URL "file:///${TEST_DATA_PATH}")
+            endif()
+            if(NOT TARGET "${DATA_TARGET_NAME}")
+                add_custom_target(${DATA_TARGET_NAME})
+                add_dependencies(${name}_test ${DATA_TARGET_NAME})
+                add_custom_command(
+                    TARGET ${DATA_TARGET_NAME}
+                    COMMAND ${CMAKE_COMMAND} "-DTEST_DATA_URL=${TEST_DATA_URL}" -DSOURCE=${TEST_DATA_PATH_SRC} -DDESTINATION=${TEST_DATA_PATH} -P ${TEST_RESOURCE_PATH}/UnitTest/generate_test_data.cmake
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                )
+            endif()
+        endif()
+
+        target_link_libraries(${name}_test Qt5::Test ${OPT_LIBS})
+
+        target_include_directories(${name}_test PRIVATE "${TEST_RESOURCE_PATH}/UnitTest/")
+
+        add_test(NAME ${name} COMMAND ${name}_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+endfunction()

cmake/UnitTest/TestUtil.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <QFile>
+#include <QCoreApplication>
+#include <QTest>
+#include <QDir>
+
+#define expandstr(s) expandstr2(s)
+#define expandstr2(s) #s
+
+class TestsInternal
+{
+public:
+    static QByteArray readFile(const QString &fileName)
+    {
+        QFile f(fileName);
+        f.open(QFile::ReadOnly);
+        return f.readAll();
+    }
+    static QString readFileUtf8(const QString &fileName)
+    {
+        return QString::fromUtf8(readFile(fileName));
+    }
+};
+
+#define GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA(file))
+#define GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA(file))
+

cmake/UnitTest/generate_test_data.cmake

@@ -0,0 +1,23 @@
+# Copy files from source directory to destination directory, substituting any
+# variables.  Create destination directory if it does not exist.
+
+function(configure_files srcDir destDir)
+    make_directory(${destDir})
+
+    file(GLOB templateFiles RELATIVE ${srcDir} ${srcDir}/*)
+    foreach(templateFile ${templateFiles})
+        set(srcTemplatePath ${srcDir}/${templateFile})
+        if(NOT IS_DIRECTORY ${srcTemplatePath})
+            configure_file(
+                    ${srcTemplatePath}
+                    ${destDir}/${templateFile}
+                    @ONLY
+                    NEWLINE_STYLE LF
+            )
+        else()
+            configure_files("${srcTemplatePath}" "${destDir}/${templateFile}")
+        endif()
+    endforeach()
+endfunction()
+
+configure_files(${SOURCE} ${DESTINATION})

cmake/UnitTest/test.manifest

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity name="Launcher.Test.0" type="win32" version="5.0.0.0" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+  <description>Custom Minecraft launcher for managing multiple installs.</description>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates app support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates app support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--The ID below indicates app support for Windows Developer Preview / Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+    </application> 
+  </compatibility>
+</assembly>

cmake/UnitTest/test.rc

@@ -0,0 +1,28 @@
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+1 RT_MANIFEST "test.manifest"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     1,0,0,0
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_APP
+BEGIN
+        BLOCK "StringFileInfo"
+        BEGIN
+                BLOCK "000004b0"
+                BEGIN
+                        VALUE "CompanyName", "MultiMC & PolyMC Contributors"
+                        VALUE "FileDescription", "Testcase"
+                        VALUE "FileVersion", "1.0.0.0"
+                        VALUE "ProductName", "Launcher Testcase"
+                        VALUE "ProductVersion", "5"
+                END
+        END
+        BLOCK "VarFileInfo"
+        BEGIN
+                VALUE "Translation", 0x0000, 0x04b0 // Unicode
+        END
+END

flake.lock

@@ -19,26 +19,26 @@
     "libnbtplusplus": {
       "flake": false,
       "locked": {
-        "lastModified": 1650031308,
+        "lastModified": 1591558203,
-        "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=",
+        "narHash": "sha256-QgvNvaoFflCXEPCCFBCeZvYTpuiwScBG7EosUgFwFNQ=",
-        "owner": "PolyMC",
+        "owner": "multimc",
         "repo": "libnbtplusplus",
-        "rev": "2203af7eeb48c45398139b583615134efd8d407f",
+        "rev": "dc72a20b7efd304d12af2025223fad07b4b78464",
         "type": "github"
       },
       "original": {
-        "owner": "PolyMC",
+        "owner": "multimc",
         "repo": "libnbtplusplus",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1658119717,
+        "lastModified": 1654665288,
-        "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=",
+        "narHash": "sha256-7blJpfoZEu7GKb84uh3io/5eSJNdaagXD9d15P9iQMs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe",
+        "rev": "43ecbe7840d155fa933ee8a500fb00dbbc651fc8",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,34 +4,36 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
-    libnbtplusplus = { url = "github:PolyMC/libnbtplusplus"; flake = false; };
+    libnbtplusplus = { url = "github:multimc/libnbtplusplus"; flake = false; };
   };
 
   outputs = { self, nixpkgs, libnbtplusplus, ... }:
     let
-      # User-friendly version number.
+      # Generate a user-friendly version number.
       version = builtins.substring 0 8 self.lastModifiedDate;
 
-      # Supported systems (qtbase is currently broken for "aarch64-darwin")
+      # System types to support (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.
+      # Nixpkgs instantiated for supported system types.
       pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system});
-
-      packagesFn = pkgs: rec {
-        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
-        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
-      };
     in
     {
-      packages = forAllSystems (system:
+      packages = forAllSystems (system: rec {
-        let packages = packagesFn pkgs.${system}; in
+        polymc = pkgs.${system}.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
-        packages // { default = packages.polymc; }
+        polymc-qt6 = pkgs.${system}.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
-      );
+        
+        default = polymc;
+      });
 
-      overlay = final: packagesFn;
+      defaultPackage = forAllSystems (system: self.packages.${system}.default);
+
+      apps = forAllSystems (system: rec { polymc = { type = "app"; program = "${self.defaultPackage.${system}}/bin/polymc"; }; default = polymc; });
+      defaultApp = forAllSystems (system: self.apps.${system}.default);
+
+      overlay = final: prev: { polymc = self.defaultPackage.${final.system}; };
     };
 }

launcher/Application.cpp

@@ -84,7 +84,6 @@
 #include <QDebug>
 #include <QStyleFactory>
 #include <QWindow>
-#include <QIcon>
 
 #include "InstanceList.h"
 
@@ -100,6 +99,7 @@
 #include "tools/JVisualVM.h"
 #include "tools/MCEditTool.h"
 
+#include <xdgicon.h>
 #include "settings/INISettingsObject.h"
 #include "settings/Setting.h"
 
@@ -224,7 +224,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     setOrganizationName(BuildConfig.LAUNCHER_NAME);
     setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN);
     setApplicationName(BuildConfig.LAUNCHER_NAME);
-    setApplicationDisplayName(QString("%1 %2").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString()));
+    setApplicationDisplayName(BuildConfig.LAUNCHER_DISPLAYNAME);
     setApplicationVersion(BuildConfig.printableVersionString());
     setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPFILENAME);
     startTime = QDateTime::currentDateTime();
@@ -332,6 +332,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         // on macOS, touch the root to force Finder to reload the .app metadata (and fix any icon change issues)
         FS::updateTimestamp(m_rootPath);
 #endif
+
+#ifdef LAUNCHER_JARS_LOCATION
+        m_jarsPath = TOSTRING(LAUNCHER_JARS_LOCATION);
+#endif
     }
 
     QString adjustedBy;
@@ -543,7 +547,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     {
         m_settings.reset(new INISettingsObject(BuildConfig.LAUNCHER_CONFIGFILE, this));
         // Updates
-        // Multiple channels are separated by spaces
         m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);
         m_settings->registerSetting("AutoUpdate", true);
 
@@ -621,7 +624,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("JavaPath", "");
         m_settings->registerSetting("JavaTimestamp", 0);
         m_settings->registerSetting("JavaArchitecture", "");
-        m_settings->registerSetting("JavaRealArchitecture", "");
         m_settings->registerSetting("JavaVersion", "");
         m_settings->registerSetting("JavaVendor", "");
         m_settings->registerSetting("LastHostname", "");
@@ -633,11 +635,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("UseNativeOpenAL", false);
         m_settings->registerSetting("UseNativeGLFW", false);
 
-        // Peformance related options
-        m_settings->registerSetting("EnableFeralGamemode", false);
-        m_settings->registerSetting("EnableMangoHud", false);
-        m_settings->registerSetting("UseDiscreteGpu", false);
-
         // Game time
         m_settings->registerSetting("ShowGameTime", true);
         m_settings->registerSetting("ShowGlobalGameTime", true);
@@ -646,9 +643,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         // Minecraft launch method
         m_settings->registerSetting("MCLaunchMethod", "LauncherPart");
 
-        // Minecraft mods
-        m_settings->registerSetting("ModMetadataDisabled", false);
-
         // Minecraft offline player name
         m_settings->registerSetting("LastOfflinePlayerName", "");
 
@@ -711,21 +705,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("CloseAfterLaunch", false);
         m_settings->registerSetting("QuitAfterGameStop", false);
 
-        // Custom Microsoft Authentication Client ID
+        // Custom MSA credentials
         m_settings->registerSetting("MSAClientIDOverride", "");
-
+        m_settings->registerSetting("CFKeyOverride", "");
-        // Custom Flame API Key
-        {
-            m_settings->registerSetting("CFKeyOverride", "");
-            m_settings->registerSetting("FlameKeyOverride", "");
-
-            QString flameKey = m_settings->get("CFKeyOverride").toString();
-
-            if (!flameKey.isEmpty())
-                m_settings->set("FlameKeyOverride", flameKey);
-            m_settings->reset("CFKeyOverride");
-        }
-        m_settings->registerSetting("UserAgentOverride", "");
 
         // Init page provider
         {
@@ -1194,7 +1176,7 @@ void Application::setApplicationTheme(const QString& name, bool initial)
 
 void Application::setIconTheme(const QString& name)
 {
-    QIcon::setThemeName(name);
+    XdgIcon::setThemeName(name);
 }
 
 QIcon Application::getThemedIcon(const QString& name)
@@ -1202,7 +1184,7 @@ QIcon Application::getThemedIcon(const QString& name)
     if(name == "logo") {
         return QIcon(":/org.polymc.PolyMC.svg");
     }
-    return QIcon::fromTheme(name);
+    return XdgIcon::fromTheme(name);
 }
 
 bool Application::openJsonEditor(const QString &filename)
@@ -1564,32 +1546,13 @@ shared_qobject_ptr<Meta::Index> Application::metadataIndex()
     return m_metadataIndex;
 }
 
-Application::Capabilities Application::currentCapabilities()
+QString Application::getJarsPath()
 {
-    Capabilities c;
+    if(m_jarsPath.isEmpty())
-    if (!getMSAClientID().isEmpty())
-        c |= SupportsMSA;
-    if (!getFlameAPIKey().isEmpty())
-        c |= SupportsFlame;
-    return c;
-}
-
-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/jars"),
-#endif
-        FS::PathCombine(m_rootPath, "jars"),
-        FS::PathCombine(applicationDirPath(), "jars")
-    };
-    for(QString p : potentialPaths)
     {
-        QString jarPath = FS::PathCombine(p, jarFile);
+        return FS::PathCombine(QCoreApplication::applicationDirPath(), "jars");
-        if (QFileInfo(jarPath).isFile())
-            return jarPath;
     }
-    return {};
+    return FS::PathCombine(m_rootPath, m_jarsPath);
 }
 
 QString Application::getMSAClientID()
@@ -1602,33 +1565,12 @@ QString Application::getMSAClientID()
     return BuildConfig.MSA_CLIENT_ID;
 }
 
-QString Application::getFlameAPIKey()
+QString Application::getCurseKey()
 {
-    QString keyOverride = m_settings->get("FlameKeyOverride").toString();
+    QString keyOverride = m_settings->get("CFKeyOverride").toString();
     if (!keyOverride.isEmpty()) {
         return keyOverride;
     }
 
-    return BuildConfig.FLAME_API_KEY;
+    return BuildConfig.CURSEFORGE_API_KEY;
-}
-
-QString Application::getUserAgent()
-{
-    QString uaOverride = m_settings->get("UserAgentOverride").toString();
-    if (!uaOverride.isEmpty()) {
-        return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
-    }
-
-    return BuildConfig.USER_AGENT;
-}
-
-QString Application::getUserAgentUncached()
-{
-    QString uaOverride = m_settings->get("UserAgentOverride").toString();
-    if (!uaOverride.isEmpty()) {
-        uaOverride += " (Uncached)";
-        return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
-    }
-
-    return BuildConfig.USER_AGENT_UNCACHED;
 }

launcher/Application.h

@@ -90,14 +90,6 @@ public:
         Initialized
     };
 
-    enum Capability {
-        None = 0,
-
-        SupportsMSA = 1 << 0,
-        SupportsFlame = 1 << 1,
-    };
-    Q_DECLARE_FLAGS(Capabilities, Capability)
-
 public:
     Application(int &argc, char **argv);
     virtual ~Application();
@@ -162,18 +154,10 @@ public:
 
     shared_qobject_ptr<Meta::Index> metadataIndex();
 
-    Capabilities currentCapabilities();
+    QString getJarsPath();
-
-    /*!
-     * Finds and returns the full path to a jar file.
-     * Returns a null-string if it could not be found.
-     */
-    QString getJarPath(QString jarFile);
 
     QString getMSAClientID();
-    QString getFlameAPIKey();
+    QString getCurseKey();
-    QString getUserAgent();
-    QString getUserAgentUncached();
 
     /// this is the root of the 'installation'. Used for automatic updates
     const QString &root() {
@@ -252,6 +236,7 @@ private:
     std::shared_ptr<GenericPageProvider> m_globalSettingsProvider;
     std::map<QString, std::unique_ptr<ITheme>> m_themes;
     std::unique_ptr<MCEditTool> m_mcedit;
+    QString m_jarsPath;
     QSet<QString> m_features;
 
     QMap<QString, std::shared_ptr<BaseProfilerFactory>> m_profilers;

launcher/ApplicationMessage.cpp

@@ -1,47 +1,11 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "ApplicationMessage.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
-#include "Json.h"
 
 void ApplicationMessage::parse(const QByteArray & input) {
-    auto doc = Json::requireDocument(input, "ApplicationMessage");
+    auto doc = QJsonDocument::fromBinaryData(input);
-    auto root = Json::requireObject(doc, "ApplicationMessage");
+    auto root = doc.object();
 
     command = root.value("command").toString();
     args.clear();
@@ -61,5 +25,7 @@ QByteArray ApplicationMessage::serialize() {
     }
     root.insert("args", outArgs);
 
-    return Json::toText(root);
+    QJsonDocument out;
+    out.setObject(root);
+    return out.toBinaryData();
 }

launcher/BaseInstance.cpp

@@ -2,7 +2,6 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,7 +38,6 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
-#include <QRegularExpression>
 
 #include "settings/INISettingsObject.h"
 #include "settings/Setting.h"
@@ -82,14 +80,6 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
 
     m_settings->registerPassthrough(globalSettings->getSetting("ConsoleMaxLines"), nullptr);
     m_settings->registerPassthrough(globalSettings->getSetting("ConsoleOverflowStop"), nullptr);
-
-    // Managed Packs
-    m_settings->registerSetting("ManagedPack", false);
-    m_settings->registerSetting("ManagedPackType", "");
-    m_settings->registerSetting("ManagedPackID", "");
-    m_settings->registerSetting("ManagedPackName", "");
-    m_settings->registerSetting("ManagedPackVersionID", "");
-    m_settings->registerSetting("ManagedPackVersionName", "");
 }
 
 QString BaseInstance::getPreLaunchCommand()
@@ -107,46 +97,6 @@ QString BaseInstance::getPostExitCommand()
     return settings()->get("PostExitCommand").toString();
 }
 
-bool BaseInstance::isManagedPack()
-{
-    return settings()->get("ManagedPack").toBool();
-}
-
-QString BaseInstance::getManagedPackType()
-{
-    return settings()->get("ManagedPackType").toString();
-}
-
-QString BaseInstance::getManagedPackID()
-{
-    return settings()->get("ManagedPackID").toString();
-}
-
-QString BaseInstance::getManagedPackName()
-{
-    return settings()->get("ManagedPackName").toString();
-}
-
-QString BaseInstance::getManagedPackVersionID()
-{
-    return settings()->get("ManagedPackVersionID").toString();
-}
-
-QString BaseInstance::getManagedPackVersionName()
-{
-    return settings()->get("ManagedPackVersionName").toString();
-}
-
-void BaseInstance::setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version)
-{
-    settings()->set("ManagedPack", true);
-    settings()->set("ManagedPackType", type);
-    settings()->set("ManagedPackID", id);
-    settings()->set("ManagedPackName", name);
-    settings()->set("ManagedPackVersionID", versionId);
-    settings()->set("ManagedPackVersionName", version);
-}
-
 int BaseInstance::getConsoleMaxLines() const
 {
     auto lineSetting = settings()->getSetting("ConsoleMaxLines");
@@ -336,7 +286,7 @@ QString BaseInstance::name() const
 
 QString BaseInstance::windowTitle() const
 {
-    return BuildConfig.LAUNCHER_NAME + ": " + name().replace(QRegularExpression("\\s+"), " ");
+    return BuildConfig.LAUNCHER_NAME + ": " + name().replace(QRegExp("[ \n\r\t]+"), " ");
 }
 
 // FIXME: why is this here? move it to MinecraftInstance!!!

launcher/BaseInstance.h

@@ -2,7 +2,6 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -140,14 +139,6 @@ public:
     QString getPostExitCommand();
     QString getWrapperCommand();
 
-    bool isManagedPack();
-    QString getManagedPackType();
-    QString getManagedPackID();
-    QString getManagedPackName();
-    QString getManagedPackVersionID();
-    QString getManagedPackVersionName();
-    void setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version);
-
     /// guess log level from a line of game log
     virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level)
     {
@@ -188,7 +179,6 @@ public:
      * Create envrironment variables for running the instance
      */
     virtual QProcessEnvironment createEnvironment() = 0;
-    virtual QProcessEnvironment createLaunchEnvironment() = 0;
 
     /*!
      * Returns a matcher that can maps relative paths within the instance to whether they are 'log files'

launcher/BaseVersionList.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "BaseVersionList.h"
@@ -71,7 +51,7 @@ QVariant BaseVersionList::data(const QModelIndex &index, int role) const
     switch (role)
     {
     case VersionPointerRole:
-        return QVariant::fromValue(version);
+        return qVariantFromValue(version);
 
     case VersionRole:
         return version->name();

launcher/CMakeLists.txt

@@ -4,6 +4,8 @@ project(application)
 
 ######## Sources and headers ########
 
+include (UnitTest)
+
 set(CORE_SOURCES
     # LOGIC - Base classes and infrastructure
     BaseInstaller.h
@@ -88,11 +90,16 @@ set(CORE_SOURCES
     MMCTime.cpp
 )
 
-ecm_add_test(FileSystem_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(FileSystem
-    TEST_NAME FileSystem)  # TODO: needs testdata
+    SOURCES FileSystem_test.cpp
+    LIBS Launcher_logic
+    DATA testdata
+    )
 
-ecm_add_test(GZip_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(GZip
-    TEST_NAME GZip)
+    SOURCES GZip_test.cpp
+    LIBS Launcher_logic
+    )
 
 set(PATHMATCHER_SOURCES
     # Path matchers
@@ -117,7 +124,6 @@ set(NET_SOURCES
     net/NetAction.h
     net/NetJob.cpp
     net/NetJob.h
-    net/NetUtils.h
     net/PasteUpload.cpp
     net/PasteUpload.h
     net/Sink.h
@@ -158,13 +164,19 @@ set(UPDATE_SOURCES
     updater/UpdateChecker.cpp
     updater/DownloadTask.h
     updater/DownloadTask.cpp
-    updater/ExternalUpdater.h
 )
 
-set(MAC_UPDATE_SOURCES
+add_unit_test(UpdateChecker
-    updater/MacSparkleUpdater.h
+    SOURCES updater/UpdateChecker_test.cpp
-    updater/MacSparkleUpdater.mm
+    LIBS Launcher_logic
-)
+    DATA updater/testdata
+    )
+
+add_unit_test(DownloadTask
+    SOURCES updater/DownloadTask_test.cpp
+    LIBS Launcher_logic
+    DATA updater/testdata
+    )
 
 # Backend for the news bar... there's usually no news.
 set(NEWS_SOURCES
@@ -312,22 +324,19 @@ set(MINECRAFT_SOURCES
     minecraft/WorldList.h
     minecraft/WorldList.cpp
 
-    minecraft/mod/MetadataHandler.h
     minecraft/mod/Mod.h
     minecraft/mod/Mod.cpp
     minecraft/mod/ModDetails.h
     minecraft/mod/ModFolderModel.h
     minecraft/mod/ModFolderModel.cpp
+    minecraft/mod/ModFolderLoadTask.h
+    minecraft/mod/ModFolderLoadTask.cpp
+    minecraft/mod/LocalModParseTask.h
+    minecraft/mod/LocalModParseTask.cpp
     minecraft/mod/ResourcePackFolderModel.h
     minecraft/mod/ResourcePackFolderModel.cpp
     minecraft/mod/TexturePackFolderModel.h
     minecraft/mod/TexturePackFolderModel.cpp
-    minecraft/mod/tasks/ModFolderLoadTask.h
-    minecraft/mod/tasks/ModFolderLoadTask.cpp
-    minecraft/mod/tasks/LocalModParseTask.h
-    minecraft/mod/tasks/LocalModParseTask.cpp
-    minecraft/mod/tasks/LocalModUpdateTask.h
-    minecraft/mod/tasks/LocalModUpdateTask.cpp
 
     # Assets
     minecraft/AssetsUtils.h
@@ -345,8 +354,10 @@ set(MINECRAFT_SOURCES
     mojang/PackageManifest.cpp
     minecraft/Agent.h)
 
-ecm_add_test(minecraft/GradleSpecifier_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(GradleSpecifier
-    TEST_NAME GradleSpecifier)
+    SOURCES minecraft/GradleSpecifier_test.cpp
+    LIBS Launcher_logic
+    )
 
 if(BUILD_TESTING)
     add_executable(PackageManifest
@@ -354,7 +365,7 @@ if(BUILD_TESTING)
     )
     target_link_libraries(PackageManifest
         Launcher_logic
-        Qt${QT_VERSION_MAJOR}::Test
+        Qt5::Test
     )
     target_include_directories(PackageManifest
         PRIVATE ../cmake/UnitTest/
@@ -366,20 +377,28 @@ if(BUILD_TESTING)
     )
 endif()
 
-# TODO: needs minecraft/testdata
+add_unit_test(MojangVersionFormat
-ecm_add_test(minecraft/MojangVersionFormat_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    SOURCES minecraft/MojangVersionFormat_test.cpp
-    TEST_NAME MojangVersionFormat)
+    LIBS Launcher_logic
+    DATA minecraft/testdata
+    )
 
-ecm_add_test(minecraft/Library_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(Library
-    TEST_NAME Library)
+    SOURCES minecraft/Library_test.cpp
+    LIBS Launcher_logic
+    )
 
 # FIXME: shares data with FileSystem test
-# TODO: needs testdata
+add_unit_test(ModFolderModel
-ecm_add_test(minecraft/mod/ModFolderModel_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    SOURCES minecraft/mod/ModFolderModel_test.cpp
-    TEST_NAME ModFolderModel)
+    DATA testdata
+    LIBS Launcher_logic
+    )
 
-ecm_add_test(minecraft/ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(ParseUtils
-    TEST_NAME ParseUtils)
+    SOURCES minecraft/ParseUtils_test.cpp
+    LIBS Launcher_logic
+    )
 
 # the screenshots feature
 set(SCREENSHOTS_SOURCES
@@ -394,16 +413,14 @@ set(TASKS_SOURCES
     # Tasks
     tasks/Task.h
     tasks/Task.cpp
-    tasks/ConcurrentTask.h
-    tasks/ConcurrentTask.cpp
     tasks/SequentialTask.h
     tasks/SequentialTask.cpp
-    tasks/MultipleOptionsTask.h
-    tasks/MultipleOptionsTask.cpp
 )
 
-ecm_add_test(tasks/Task_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(Task
-    TEST_NAME Task)
+    SOURCES tasks/Task_test.cpp
+    LIBS Launcher_logic
+    )
 
 set(SETTINGS_SOURCES
     # Settings
@@ -421,8 +438,10 @@ set(SETTINGS_SOURCES
     settings/SettingsObject.h
 )
 
-ecm_add_test(settings/INIFile_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(INIFile
-    TEST_NAME INIFile)
+    SOURCES settings/INIFile_test.cpp
+    LIBS Launcher_logic
+    )
 
 set(JAVA_SOURCES
     java/JavaChecker.h
@@ -439,8 +458,10 @@ set(JAVA_SOURCES
     java/JavaVersion.cpp
 )
 
-ecm_add_test(java/JavaVersion_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(JavaVersion
-    TEST_NAME JavaVersion)
+    SOURCES java/JavaVersion_test.cpp
+    LIBS Launcher_logic
+    )
 
 set(TRANSLATIONS_SOURCES
     translations/TranslationsModel.h
@@ -478,20 +499,11 @@ set(META_SOURCES
 )
 
 set(API_SOURCES
-    modplatform/ModIndex.h
-    modplatform/ModIndex.cpp
-
     modplatform/ModAPI.h
 
-    modplatform/EnsureMetadataTask.h
-    modplatform/EnsureMetadataTask.cpp
-
-    modplatform/CheckUpdateTask.h
-
     modplatform/flame/FlameAPI.h
-    modplatform/flame/FlameAPI.cpp
     modplatform/modrinth/ModrinthAPI.h
-    modplatform/modrinth/ModrinthAPI.cpp
+    
     modplatform/helpers/NetworkModAPI.h
     modplatform/helpers/NetworkModAPI.cpp
 )
@@ -517,8 +529,6 @@ set(FLAME_SOURCES
     modplatform/flame/PackManifest.cpp
     modplatform/flame/FileResolvingTask.h
     modplatform/flame/FileResolvingTask.cpp
-    modplatform/flame/FlameCheckUpdate.cpp
-    modplatform/flame/FlameCheckUpdate.h
 )
 
 set(MODRINTH_SOURCES
@@ -526,8 +536,6 @@ set(MODRINTH_SOURCES
     modplatform/modrinth/ModrinthPackIndex.h
     modplatform/modrinth/ModrinthPackManifest.cpp
     modplatform/modrinth/ModrinthPackManifest.h
-    modplatform/modrinth/ModrinthCheckUpdate.cpp
-    modplatform/modrinth/ModrinthCheckUpdate.h
 )
 
 set(MODPACKSCH_SOURCES
@@ -537,15 +545,6 @@ set(MODPACKSCH_SOURCES
     modplatform/modpacksch/FTBPackManifest.cpp
 )
 
-set(PACKWIZ_SOURCES
-    modplatform/packwiz/Packwiz.h
-    modplatform/packwiz/Packwiz.cpp
-)
-
-# TODO: needs modplatform/packwiz/testdata
-ecm_add_test(modplatform/packwiz/Packwiz_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
-    TEST_NAME Packwiz)
-
 set(TECHNIC_SOURCES
     modplatform/technic/SingleZipPackInstallTask.h
     modplatform/technic/SingleZipPackInstallTask.cpp
@@ -568,8 +567,10 @@ set(ATLAUNCHER_SOURCES
     modplatform/atlauncher/ATLShareCode.h
 )
 
-ecm_add_test(meta/Index_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+add_unit_test(Index
-    TEST_NAME Index)
+    SOURCES meta/Index_test.cpp
+    LIBS Launcher_logic
+    )
 
 ################################ COMPILE ################################
 
@@ -597,15 +598,10 @@ set(LOGIC_SOURCES
     ${FLAME_SOURCES}
     ${MODRINTH_SOURCES}
     ${MODPACKSCH_SOURCES}
-    ${PACKWIZ_SOURCES}
     ${TECHNIC_SOURCES}
     ${ATLAUNCHER_SOURCES}
 )
 
-if(APPLE)
-    set (LOGIC_SOURCES ${LOGIC_SOURCES} ${MAC_UPDATE_SOURCES})
-endif()
-
 SET(LAUNCHER_SOURCES
     # Application base
     Application.h
@@ -701,8 +697,6 @@ SET(LAUNCHER_SOURCES
     ui/pages/BasePageProvider.h
 
     # GUI - instance pages
-    ui/pages/instance/ExternalResourcesPage.cpp
-    ui/pages/instance/ExternalResourcesPage.h
     ui/pages/instance/GameOptionsPage.cpp
     ui/pages/instance/GameOptionsPage.h
     ui/pages/instance/VersionPage.cpp
@@ -831,8 +825,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/NewComponentDialog.h
     ui/dialogs/NewInstanceDialog.cpp
     ui/dialogs/NewInstanceDialog.h
-    ui/dialogs/NewsDialog.cpp
-    ui/dialogs/NewsDialog.h
     ui/pagedialog/PageDialog.cpp
     ui/pagedialog/PageDialog.h
     ui/dialogs/ProgressDialog.cpp
@@ -849,10 +841,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ModDownloadDialog.h
     ui/dialogs/ScrollMessageBox.cpp
     ui/dialogs/ScrollMessageBox.h
-    ui/dialogs/ChooseProviderDialog.h
-    ui/dialogs/ChooseProviderDialog.cpp
-    ui/dialogs/ModUpdateDialog.cpp
-    ui/dialogs/ModUpdateDialog.h
 
     # GUI - widgets
     ui/widgets/Common.cpp
@@ -907,7 +895,7 @@ SET(LAUNCHER_SOURCES
     ui/instanceview/VisualGroup.h
 )
 
-qt_wrap_ui(LAUNCHER_UI
+qt5_wrap_ui(LAUNCHER_UI
     ui/setupwizard/PasteWizardPage.ui
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
@@ -916,7 +904,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/global/ProxyPage.ui
     ui/pages/global/MinecraftPage.ui
     ui/pages/global/ExternalToolsPage.ui
-    ui/pages/instance/ExternalResourcesPage.ui
+    ui/pages/instance/ModFolderPage.ui
     ui/pages/instance/NotesPage.ui
     ui/pages/instance/LogPage.ui
     ui/pages/instance/ServersPage.ui
@@ -946,7 +934,6 @@ qt_wrap_ui(LAUNCHER_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
@@ -958,10 +945,9 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/EditAccountDialog.ui
     ui/dialogs/ReviewMessageBox.ui
     ui/dialogs/ScrollMessageBox.ui
-    ui/dialogs/ChooseProviderDialog.ui
 )
 
-qt_add_resources(LAUNCHER_RESOURCES
+qt5_add_resources(LAUNCHER_RESOURCES
     resources/backgrounds/backgrounds.qrc
     resources/multimc/multimc.qrc
     resources/pe_dark/pe_dark.qrc
@@ -985,53 +971,27 @@ add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHE
 target_link_libraries(Launcher_logic
     systeminfo
     Launcher_classparser
-    Launcher_murmur2
     nbt++
     ${ZLIB_LIBRARIES}
     optional-bare
     tomlc99
     BuildConfig
     Katabasis
-    Qt${QT_VERSION_MAJOR}::Widgets
-)
-
-if (UNIX AND NOT CYGWIN AND NOT APPLE)
-    target_link_libraries(Launcher_logic
-        gamemode
-    )
-endif()
-
-target_link_libraries(Launcher_logic
-    Qt${QT_VERSION_MAJOR}::Core
-    Qt${QT_VERSION_MAJOR}::Xml
-    Qt${QT_VERSION_MAJOR}::Network
-    Qt${QT_VERSION_MAJOR}::Concurrent
-    Qt${QT_VERSION_MAJOR}::Gui
-    Qt${QT_VERSION_MAJOR}::Widgets
-    ${Launcher_QT_LIBS}
 )
 target_link_libraries(Launcher_logic
+    Qt5::Core
+    Qt5::Xml
+    Qt5::Network
+    Qt5::Concurrent
+    Qt5::Gui
+)
+target_link_libraries(Launcher_logic
+    Launcher_iconfix
     QuaZip::QuaZip
     hoedown
     LocalPeer
     Launcher_rainbow
 )
-if(APPLE)
-    set(CMAKE_MACOSX_RPATH 1)
-    set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
-
-    file(DOWNLOAD ${MACOSX_SPARKLE_DOWNLOAD_URL} ${CMAKE_BINARY_DIR}/Sparkle.tar.xz EXPECTED_HASH SHA256=${MACOSX_SPARKLE_SHA256})
-    file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
-
-    find_library(SPARKLE_FRAMEWORK Sparkle "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
-    target_link_libraries(Launcher_logic
-        "-framework AppKit"
-        "-framework Carbon"
-        "-framework Foundation"
-        "-framework ApplicationServices"
-    )
-    target_link_libraries(Launcher_logic ${SPARKLE_FRAMEWORK})
-endif()
 
 target_link_libraries(Launcher_logic)
 
@@ -1054,16 +1014,8 @@ install(TARGETS ${Launcher_Name}
     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
 )
 
-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
-    # the framework aren't installed
-    install(DIRECTORY ${MACOSX_SPARKLE_DIR}/Sparkle.framework DESTINATION ${FRAMEWORK_DEST_DIR} USE_SOURCE_PERMISSIONS)
-endif()
-
 #### The bundle mess! ####
 # Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
 # NOTE: it seems that this absolutely has to be here, and nowhere else.
@@ -1104,14 +1056,6 @@ if(INSTALL_BUNDLE STREQUAL "full")
                 COMPONENT Runtime
             )
         endif()
-        # TLS plugins (Qt 6 only)
-        if(EXISTS "${QT_PLUGINS_DIR}/tls")
-            install(
-                DIRECTORY "${QT_PLUGINS_DIR}/tls"
-                DESTINATION ${PLUGIN_DEST_DIR}
-                COMPONENT Runtime
-            )
-        endif()
     else()
         # Image formats
         install(
@@ -1154,16 +1098,6 @@ if(INSTALL_BUNDLE STREQUAL "full")
                 REGEX "\\.dSYM" EXCLUDE
             )
         endif()
-        # TLS plugins (Qt 6 only)
-        if(EXISTS "${QT_PLUGINS_DIR}/tls")
-            install(
-                DIRECTORY "${QT_PLUGINS_DIR}/tls"
-                DESTINATION ${PLUGIN_DEST_DIR}
-                COMPONENT Runtime
-                REGEX "_debug\\." EXCLUDE
-                REGEX "\\.dSYM" EXCLUDE
-            )
-        endif()
     endif()
     configure_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"

launcher/Commandline.cpp

@@ -1,38 +1,18 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *  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,
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * you may not use this file except in compliance with the License.
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * You may obtain a copy of the License at
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * This file incorporates work covered by the following copyright and
+ * Unless required by applicable law or agreed to in writing, software
- * permission notice:
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      Copyright 2013-2021 MultiMC Contributors
+ * See the License for the specific language governing permissions and
- *
+ * limitations under the License.
- *      Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- *      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 "Commandline.h"
@@ -67,7 +47,7 @@ QStringList splitArgs(QString args)
             if (cchar == '\\')
                 escape = true;
             else if (cchar == inquotes)
-                inquotes = QChar::Null;
+                inquotes = 0;
             else
                 current += cchar;
             // otherwise
@@ -500,4 +480,4 @@ void Parser::getPrefix(QString &opt, QString &flag)
 ParsingError::ParsingError(const QString &what) : std::runtime_error(what.toStdString())
 {
 }
-}
+}

launcher/FileSystem.cpp

@@ -1,37 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// Licensed under the Apache-2.0 license. See README.md for details.
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "FileSystem.h"
 
@@ -379,7 +346,7 @@ bool checkProblemticPathJava(QDir folder)
 }
 
 // Win32 crap
-#ifdef Q_OS_WIN
+#if defined Q_OS_WIN
 
 bool called_coinit = false;
 
@@ -399,7 +366,7 @@ HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args)
         }
     }
 
-    IShellLinkA *link;
+    IShellLink *link;
     hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink,
                             (LPVOID *)&link);
 

launcher/FileSystem.h

@@ -1,37 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// Licensed under the Apache-2.0 license. See README.md for details.
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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
 
@@ -82,8 +49,8 @@ class copy
 public:
     copy(const QString & src, const QString & dst)
     {
-        m_src.setPath(src);
+        m_src = src;
-        m_dst.setPath(dst);
+        m_dst = dst;
     }
     copy & followSymlinks(const bool follow)
     {
@@ -153,6 +120,11 @@ bool checkProblemticPathJava(QDir folder);
 // Get the Directory representing the User's Desktop
 QString getDesktopDir();
 
+// Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
+// call it *name* and assign it the icon *icon*
+// return true if operation succeeded
+bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+
 // Overrides one folder with the contents of another, preserving items exclusive to the first folder
 // Equivalent to doing QDir::rename, but allowing for overrides
 bool overrideFolder(QString overwritten_path, QString override_path);

launcher/FileSystem_test.cpp

@@ -1,6 +1,7 @@
 #include <QTest>
 #include <QTemporaryDir>
 #include <QStandardPaths>
+#include "TestUtil.h"
 
 #include "FileSystem.h"
 
@@ -80,7 +81,7 @@ slots:
 
     void test_copy()
     {
-        QString folder = QFINDTESTDATA("testdata/test_folder");
+        QString folder = QFINDTESTDATA("data/test_folder");
         auto f = [&folder]()
         {
             QTemporaryDir tempDir;
@@ -115,6 +116,47 @@ slots:
     {
         QCOMPARE(FS::getDesktopDir(), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
     }
+
+// this is only valid on linux
+// FIXME: implement on windows, OSX, then test.
+#if defined(Q_OS_LINUX)
+    void test_createShortcut_data()
+    {
+        QTest::addColumn<QString>("location");
+        QTest::addColumn<QString>("dest");
+        QTest::addColumn<QStringList>("args");
+        QTest::addColumn<QString>("name");
+        QTest::addColumn<QString>("iconLocation");
+        QTest::addColumn<QByteArray>("result");
+
+        QTest::newRow("unix") << QDir::currentPath()
+                              << "asdfDest"
+                              << (QStringList() << "arg1" << "arg2")
+                              << "asdf"
+                              << QString()
+                         #if defined(Q_OS_LINUX)
+                              << GET_TEST_FILE("data/FileSystem-test_createShortcut-unix")
+                         #elif defined(Q_OS_WIN)
+                              << QByteArray()
+                         #endif
+                                 ;
+    }
+
+    void test_createShortcut()
+    {
+        QFETCH(QString, location);
+        QFETCH(QString, dest);
+        QFETCH(QStringList, args);
+        QFETCH(QString, name);
+        QFETCH(QString, iconLocation);
+        QFETCH(QByteArray, result);
+
+        QVERIFY(FS::createShortCut(location, dest, args, name, iconLocation));
+        QCOMPARE(QString::fromLocal8Bit(TestsInternal::readFile(location + QDir::separator() + name + ".desktop")), QString::fromLocal8Bit(result));
+
+        //QDir().remove(location);
+    }
+#endif
 };
 
 QTEST_GUILESS_MAIN(FileSystemTest)

launcher/GZip.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "GZip.h"
 #include <zlib.h>
 #include <QByteArray>
@@ -102,7 +67,7 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
         return true;
     }
 
-    unsigned compLength = qMin(uncompressedBytes.size(), 16);
+    unsigned compLength = std::min(uncompressedBytes.size(), 16);
     compressedBytes.clear();
     compressedBytes.resize(compLength);
 
@@ -147,4 +112,4 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
         return false;
     }
     return true;
-}
+}

launcher/GZip_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "GZip.h"
 #include <random>

launcher/InstanceImportTask.cpp

@@ -325,7 +325,7 @@ void InstanceImportTask::processFlame()
     // Hack to correct some 'special sauce'...
     if(mcVersion.endsWith('.'))
     {
-        mcVersion.remove(QRegularExpression("[.]+$"));
+        mcVersion.remove(QRegExp("[.]+$"));
         logWarning(tr("Mysterious trailing dots removed from Minecraft version while importing pack."));
     }
     auto components = instance.getPackProfile();
@@ -412,8 +412,12 @@ void InstanceImportTask::processFlame()
                                                           "You will need to manually download them and add them to the modpack"),
                                                        text);
             message_dialog->setModal(true);
-
+            message_dialog->show();
-            if (message_dialog->exec()) {
+            connect(message_dialog, &QDialog::rejected, [&]() {
+                m_modIdResolver.reset();
+                emitFailed("Canceled");
+            });
+            connect(message_dialog, &QDialog::accepted, [&]() {
                 m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
                 for (const auto &result: m_modIdResolver->getResults().files) {
                     QString filename = result.fileName;
@@ -465,11 +469,8 @@ void InstanceImportTask::processFlame()
                 });
                 setStatus(tr("Downloading mods..."));
                 m_filesNetJob->start();
-            } else {
+            });
-                m_modIdResolver.reset();
+        }else{
-                emitFailed("Canceled");
-            }
-        } else {
             //TODO extract to function ?
             m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
             for (const auto &result: m_modIdResolver->getResults().files) {
@@ -722,11 +723,11 @@ void InstanceImportTask::processModrinth()
     components->buildingFromScratch();
     components->setComponentVersion("net.minecraft", minecraftVersion, true);
     if (!fabricVersion.isEmpty())
-        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
+        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion, true);
     if (!quiltVersion.isEmpty())
-        components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
+        components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion, true);
     if (!forgeVersion.isEmpty())
-        components->setComponentVersion("net.minecraftforge", forgeVersion);
+        components->setComponentVersion("net.minecraftforge", forgeVersion, true);
     if (m_instIcon != "default")
     {
         instance.setIconKey(m_instIcon);

launcher/InstanceList.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 <QDir>
@@ -156,7 +136,7 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
     {
     case InstancePointerRole:
     {
-        QVariant v = QVariant::fromValue((void *)pdata);
+        QVariant v = qVariantFromValue((void *)pdata);
         return v;
     }
     case InstanceIDRole:
@@ -272,7 +252,7 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
 
 QStringList InstanceList::getGroups()
 {
-    return m_groupNameCache.values();
+    return m_groupNameCache.toList();
 }
 
 void InstanceList::deleteGroup(const QString& name)
@@ -373,11 +353,7 @@ QList< InstanceId > InstanceList::discoverInstances()
         out.append(id);
         qDebug() << "Found instance ID" << id;
     }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    instanceSet = QSet<QString>(out.begin(), out.end());
-#else
     instanceSet = out.toSet();
-#endif
     m_instancesProbed = true;
     return out;
 }

launcher/InstancePageProvider.h

@@ -33,10 +33,10 @@ public:
         values.append(new LogPage(inst));
         std::shared_ptr<MinecraftInstance> onesix = std::dynamic_pointer_cast<MinecraftInstance>(inst);
         values.append(new VersionPage(onesix.get()));
-        auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList());
+        auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Mods"), "Loader-mods");
         modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
         values.append(modsPage);
-        values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList()));
+        values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods"));
         values.append(new ResourcePackPage(onesix.get()));
         values.append(new TexturePackPage(onesix.get()));
         values.append(new ShaderPackPage(onesix.get()));

launcher/JavaCommon.cpp

@@ -1,47 +1,10 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "JavaCommon.h"
-#include "java/JavaUtils.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include <MMCStrings.h>
-#include <QRegularExpression>
 
 bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
 {
-    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegularExpression("-Xm[sx]"))
+    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]"))
         || jvmargs.contains("-XX-MaxHeapSize") || jvmargs.contains("-XX:InitialHeapSize"))
     {
         auto warnStr = QObject::tr(
@@ -55,7 +18,7 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
         return false;
     }
     // block lunacy with passing required version to the JVM
-    if (jvmargs.contains(QRegularExpression("-version:.*"))) {
+    if (jvmargs.contains(QRegExp("-version:.*"))) {
         auto warnStr = QObject::tr(
             "You tried to pass required Java version argument to the JVM (using \"-version:xxx\"). This is not safe and will not be allowed.\n"
             "This message will be displayed until you remove this from the JVM arguments.");
@@ -102,13 +65,6 @@ void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
 }
 
-void JavaCommon::javaCheckNotFound(QWidget *parent)
-{
-    QString text;
-    text += QObject::tr("Java checker library could not be found. Please check your installation.");
-    CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
-}
-
 void JavaCommon::TestCheck::run()
 {
     if (!JavaCommon::checkJVMArgs(m_args, m_parent))
@@ -116,11 +72,6 @@ void JavaCommon::TestCheck::run()
         emit finished();
         return;
     }
-    if (JavaUtils::getJavaCheckPath().isEmpty()) {
-        javaCheckNotFound(m_parent);
-        emit finished();
-        return;
-    }
     checker.reset(new JavaChecker());
     connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
             SLOT(checkFinished(JavaCheckResult)));

launcher/JavaCommon.h

@@ -10,14 +10,12 @@ namespace JavaCommon
 {
     bool checkJVMArgs(QString args, QWidget *parent);
 
-    // Show a dialog saying that the Java binary was usable
-    void javaWasOk(QWidget *parent, JavaCheckResult result);
-    // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
     // Show a dialog saying that the Java binary was not usable
     void javaBinaryWasBad(QWidget *parent, JavaCheckResult result);
-    // Show a dialog if we couldn't find Java Checker
+    // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaCheckNotFound(QWidget *parent);
+    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
+    // Show a dialog saying that the Java binary was usable
+    void javaWasOk(QWidget *parent, JavaCheckResult result);
 
     class TestCheck : public QObject
     {

launcher/Json.cpp

@@ -1,37 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// Licensed under the Apache-2.0 license. See README.md for details.
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "Json.h"
 
@@ -55,6 +22,14 @@ void write(const QJsonArray &array, const QString &filename)
     write(QJsonDocument(array), filename);
 }
 
+QByteArray toBinary(const QJsonObject &obj)
+{
+    return QJsonDocument(obj).toBinaryData();
+}
+QByteArray toBinary(const QJsonArray &array)
+{
+    return QJsonDocument(array).toBinaryData();
+}
 QByteArray toText(const QJsonObject &obj)
 {
     return QJsonDocument(obj).toJson(QJsonDocument::Compact);
@@ -73,8 +48,12 @@ QJsonDocument requireDocument(const QByteArray &data, const QString &what)
 {
     if (isBinaryJson(data))
     {
-        // FIXME: Is this needed?
+        QJsonDocument doc = QJsonDocument::fromBinaryData(data);
-        throw JsonException(what + ": Invalid JSON. Binary JSON unsupported");
+        if (doc.isNull())
+        {
+            throw JsonException(what + ": Invalid JSON (binary JSON detected)");
+        }
+        return doc;
     }
     else
     {

launcher/Json.h

@@ -1,37 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// Licensed under the Apache-2.0 license. See README.md for details.
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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
 
@@ -62,6 +29,8 @@ void write(const QJsonObject &object, const QString &filename);
 /// @throw FileSystemException
 void write(const QJsonArray &array, const QString &filename);
 
+QByteArray toBinary(const QJsonObject &obj);
+QByteArray toBinary(const QJsonArray &array);
 QByteArray toText(const QJsonObject &obj);
 QByteArray toText(const QJsonArray &array);
 

launcher/Launcher.in

@@ -18,17 +18,13 @@ LAUNCHER_NAME=@Launcher_APP_BINARY_NAME@
 LAUNCHER_DIR="$(dirname "$(readlink -f "$0")")"
 echo "Launcher Dir: ${LAUNCHER_DIR}"
 
-# Set up env.
+# Set up env - filter out input LD_ variables but pass them in under different names
-# Pass our custom variables separately so that the launcher can remove them for child processes
+export GAME_LIBRARY_PATH=${GAME_LIBRARY_PATH-${LD_LIBRARY_PATH}}
-export LAUNCHER_LD_LIBRARY_PATH="${LAUNCHER_DIR}/lib@LIB_SUFFIX@"
+export GAME_PRELOAD=${GAME_PRELOAD-${LD_PRELOAD}}
-export LAUNCHER_LD_PRELOAD=""
+export LD_LIBRARY_PATH="${LAUNCHER_DIR}/lib@LIB_SUFFIX@":$LAUNCHER_LIBRARY_PATH
-export LAUNCHER_QT_PLUGIN_PATH="${LAUNCHER_DIR}/plugins"
+export LD_PRELOAD=$LAUNCHER_PRELOAD
-export LAUNCHER_QT_FONTPATH="${LAUNCHER_DIR}/fonts"
+export QT_PLUGIN_PATH="${LAUNCHER_DIR}/plugins"
-
+export QT_FONTPATH="${LAUNCHER_DIR}/fonts"
-export LD_LIBRARY_PATH="$LAUNCHER_LD_LIBRARY_PATH:$LD_LIBRARY_PATH"
-export LD_PRELOAD="$LAUNCHER_LD_PRELOAD:$LD_PRELOAD"
-export QT_PLUGIN_PATH="$LAUNCHER_QT_PLUGIN_PATH:$QT_PLUGIN_PATH"
-export QT_FONTPATH="$LAUNCHER_QT_FONTPATH:$QT_FONTPATH"
 
 # Detect missing dependencies...
 DEPS_LIST=`ldd "${LAUNCHER_DIR}"/plugins/*/*.so 2>/dev/null | grep "not found" | sort -u | awk -vORS=", " '{ print $1 }'`

launcher/LoggedProcess.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "LoggedProcess.h"
 #include "MessageLevel.h"
 #include <QDebug>
@@ -43,11 +8,7 @@ LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)
     connect(this, &QProcess::readyReadStandardOutput, this, &LoggedProcess::on_stdOut);
     connect(this, &QProcess::readyReadStandardError, this, &LoggedProcess::on_stdErr);
     connect(this, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(on_exit(int,QProcess::ExitStatus)));
-#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);
 }
 
@@ -196,6 +157,19 @@ void LoggedProcess::on_stateChange(QProcess::ProcessState state)
     }
 }
 
+#if defined Q_OS_WIN32
+#include <windows.h>
+#endif
+
+qint64 LoggedProcess::processId() const
+{
+#ifdef Q_OS_WIN
+    return pid() ? pid()->dwProcessId : 0;
+#else
+    return pid();
+#endif
+}
+
 void LoggedProcess::setDetachable(bool detachable)
 {
     m_is_detachable = detachable;

launcher/LoggedProcess.h

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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
@@ -63,6 +43,7 @@ public:
 
     State state() const;
     int exitCode() const;
+    qint64 processId() const;
 
     void setDetachable(bool detachable);
 

launcher/MMCZip.cpp

@@ -127,7 +127,7 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
 }
 
 // ours
-bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods)
+bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods)
 {
     QuaZip zipOut(targetJarPath);
     if (!zipOut.open(QuaZip::mdCreate))
@@ -141,40 +141,42 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
     QSet<QString> addedFiles;
 
     // Modify the jar
-    for (auto i = mods.constEnd(); i != mods.constBegin(); --i)
+    QListIterator<Mod> i(mods);
+    i.toBack();
+    while (i.hasPrevious())
     {
-        const Mod* mod = *i;
+        const Mod &mod = i.previous();
         // do not merge disabled mods.
-        if (!mod->enabled())
+        if (!mod.enabled())
             continue;
-        if (mod->type() == Mod::MOD_ZIPFILE)
+        if (mod.type() == Mod::MOD_ZIPFILE)
         {
-            if (!mergeZipFiles(&zipOut, mod->fileinfo(), addedFiles))
+            if (!mergeZipFiles(&zipOut, mod.filename(), addedFiles))
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
                 return false;
             }
         }
-        else if (mod->type() == Mod::MOD_SINGLEFILE)
+        else if (mod.type() == Mod::MOD_SINGLEFILE)
         {
             // FIXME: buggy - does not work with addedFiles
-            auto filename = mod->fileinfo();
+            auto filename = mod.filename();
             if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName()))
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
                 return false;
             }
             addedFiles.insert(filename.fileName());
         }
-        else if (mod->type() == Mod::MOD_FOLDER)
+        else if (mod.type() == Mod::MOD_FOLDER)
         {
             // untested, but seems to be unused / not possible to reach
             // FIXME: buggy - does not work with addedFiles
-            auto filename = mod->fileinfo();
+            auto filename = mod.filename();
             QString what_to_zip = filename.absoluteFilePath();
             QDir dir(what_to_zip);
             dir.cdUp();
@@ -191,7 +193,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
                 return false;
             }
             qDebug() << "Adding folder " << filename.fileName() << " from "
@@ -202,7 +204,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             // Make sure we do not continue launching when something is missing or undefined...
             zipOut.close();
             QFile::remove(targetJarPath);
-            qCritical() << "Failed to add unknown mod type" << mod->fileinfo().fileName() << "to the jar.";
+            qCritical() << "Failed to add unknown mod type" << mod.filename().fileName() << "to the jar.";
             return false;
         }
     }
@@ -303,7 +305,7 @@ nonstd::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString &
         QString path;
         if(name.contains('/') && !name.endsWith('/')){
             path = name.section('/', 0, -2) + "/";
-            FS::ensureFolderPathExists(FS::PathCombine(target, path));
+            FS::ensureFolderPathExists(path);
 
             name = name.split('/').last();
         }
@@ -419,7 +421,7 @@ bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& s
             continue;
         }
 
-        files->append(e);  // we want the original paths for MMCZip::compressDirFiles
+        files->append(e.filePath());  // we want the original paths for MMCZip::compressDirFiles
     }
     return true;
 }

launcher/MMCZip.h

@@ -75,7 +75,7 @@ namespace MMCZip
     /**
      * take a source jar, add mods to it, resulting in target jar
      */
-    bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods);
+    bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods);
 
     /**
      * Find a single file in archive by file name (not path)

launcher/ModDownloadTask.cpp

@@ -1,56 +1,25 @@
-// 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)
+ModDownloadTask::ModDownloadTask(const QUrl sourceUrl,const QString filename, const std::shared_ptr<ModFolderModel> mods)
-    : m_mod(mod), m_mod_version(version), mods(mods)
+: m_sourceUrl(sourceUrl), mods(mods), filename(filename) {
-{
+}
-    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);
+void ModDownloadTask::executeTask() {
-    }
+    setStatus(tr("Downloading mod:\n%1").arg(m_sourceUrl.toString()));
 
     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_sourceUrl, mods->dir().absoluteFilePath(filename)));
-    
-    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);
-
+    m_filesNetJob->start();
-    addTask(m_filesNetJob);
 }
 
 void ModDownloadTask::downloadSucceeded()
 {
+    emitSucceeded();
     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)
@@ -64,9 +33,7 @@ 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
+bool ModDownloadTask::abort() {
-// downloaded successfully!
+    return m_filesNetJob->abort();
-void ModDownloadTask::hasOldMod(QString name, QString filename)
-{
-    to_delete = {name, filename};
 }
+

launcher/ModDownloadTask.h

@@ -1,56 +1,34 @@
-// 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 "QObjectPtr.h"
+#include "tasks/Task.h"
+#include "minecraft/mod/ModFolderModel.h"
 #include "net/NetJob.h"
-#include "tasks/SequentialTask.h"
+#include <QUrl>
 
-#include "modplatform/ModIndex.h"
-#include "minecraft/mod/tasks/LocalModUpdateTask.h"
 
-class ModFolderModel;
+class ModDownloadTask : public Task {
-
-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);
+    explicit ModDownloadTask(const QUrl sourceUrl, const QString filename, const std::shared_ptr<ModFolderModel> mods);
-    const QString& getFilename() const { return m_mod_version.fileName; }
+    const QString& getFilename() const { return filename; }
+
+public slots:
+    bool abort() override;
+protected:
+    //! Entry point for tasks.
+    void executeTask() override;
 
 private:
-    ModPlatform::IndexedPack m_mod;
+    QUrl m_sourceUrl;
-    ModPlatform::IndexedVersion m_mod_version;
-    const std::shared_ptr<ModFolderModel> mods;
-
     NetJob::Ptr m_filesNetJob;
-    LocalModUpdateTask::Ptr m_update_task;
+    const std::shared_ptr<ModFolderModel> mods;
+    const QString filename;
 
     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/NullInstance.h

@@ -39,10 +39,6 @@ public:
     {
         return QProcessEnvironment();
     }
-    QProcessEnvironment createLaunchEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
     QMap<QString, QString> getVariables() const override
     {
         return QMap<QString, QString>();

launcher/UpdateController.cpp

@@ -93,7 +93,7 @@ void UpdateController::installUpdates()
     qDebug() << "Installing updates.";
 #ifdef Q_OS_WIN
     QString finishCmd = QApplication::applicationFilePath();
-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME);
 #elif defined Q_OS_MAC
     QString finishCmd = QApplication::applicationFilePath();

launcher/Version.h

@@ -1,42 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 <QStringView>
 #include <QList>
 
 class QUrl;
@@ -75,21 +39,13 @@ private:
                     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())
             {
                 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())
             {
                 m_stringPart = stringPart.toString();

launcher/VersionProxyModel.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "VersionProxyModel.h"
 #include "Application.h"
 #include <QSortFilterProxyModel>
@@ -243,8 +208,7 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                         {
                             return APPLICATION->getThemedIcon("bug");
                         }
-                        QPixmap pixmap;
+                        auto pixmap = QPixmapCache::find("placeholder");
-                        QPixmapCache::find("placeholder", &pixmap);
                         if(!pixmap)
                         {
                             QPixmap px(16,16);
@@ -252,7 +216,7 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                             QPixmapCache::insert("placeholder", px);
                             return px;
                         }
-                        return pixmap;
+                        return *pixmap;
                     }
                 }
                 default:

launcher/icons/IconList.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "IconList.h"
@@ -106,11 +86,7 @@ void IconList::directoryChanged(const QString &path)
         QString &foo = (*it);
         foo = m_dir.filePath(foo);
     }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QSet<QString> new_set(new_list.begin(), new_list.end());
-#else
     auto new_set = new_list.toSet();
-#endif
     QList<QString> current_list;
     for (auto &it : icons)
     {
@@ -118,11 +94,7 @@ void IconList::directoryChanged(const QString &path)
             continue;
         current_list.push_back(it.m_images[IconType::FileBased].filename);
     }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QSet<QString> current_set(current_list.begin(), current_list.end());
-#else
     QSet<QString> current_set = current_list.toSet();
-#endif
 
     QSet<QString> to_remove = current_set;
     to_remove -= new_set;

launcher/icons/MMCIcon.cpp

@@ -1,41 +1,21 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "MMCIcon.h"
 #include <QFileInfo>
-#include <QIcon>
+#include <xdgicon.h>
 
 IconType operator--(IconType &t, int)
 {
@@ -83,7 +63,7 @@ QIcon MMCIcon::icon() const
     if(!icon.isNull())
         return icon;
     // FIXME: inject this.
-    return QIcon::fromTheme(m_images[m_current_type].key);
+    return XdgIcon::fromTheme(m_images[m_current_type].key);
 }
 
 void MMCIcon::remove(IconType rm_type)

launcher/java/JavaChecker.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "JavaChecker.h"
 
 #include <QFile>
@@ -51,13 +16,7 @@ JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
 
 void JavaChecker::performCheck()
 {
-    QString checkerJar = JavaUtils::getJavaCheckPath();
+    QString checkerJar = FS::PathCombine(APPLICATION->getJarsPath(), "JavaCheck.jar");
-
-    if (checkerJar.isEmpty())
-    {
-        qDebug() << "Java checker library could not be found. Please check your installation.";
-        return;
-    }
 
     QStringList args;
 
@@ -88,11 +47,7 @@ void JavaChecker::performCheck()
     qDebug() << "Running java checker: " + m_path + args.join(" ");;
 
     connect(process.get(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus)));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    connect(process.get(), SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
-#else
     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()));
@@ -144,12 +99,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     bool success = true;
 
     QMap<QString, QString> results;
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QStringList lines = m_stdout.split("\n", Qt::SkipEmptyParts);
-#else
     QStringList lines = m_stdout.split("\n", QString::SkipEmptyParts);
-#endif
     for(QString line : lines)
     {
         line = line.trimmed();
@@ -158,11 +108,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
             continue;
         }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-        auto parts = line.split('=', Qt::SkipEmptyParts);
-#else
         auto parts = line.split('=', QString::SkipEmptyParts);
-#endif
         if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
         {
             continue;

launcher/java/JavaInstallList.cpp

@@ -1,40 +1,21 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 <QtNetwork>
 #include <QtXml>
+#include <QRegExp>
 
 #include <QDebug>
 
@@ -100,7 +81,7 @@ QVariant JavaInstallList::data(const QModelIndex &index, int role) const
     switch (role)
     {
         case VersionPointerRole:
-            return QVariant::fromValue(m_vlist[index.row()]);
+            return qVariantFromValue(m_vlist[index.row()]);
         case VersionIdRole:
             return version->descriptor();
         case VersionRole:

launcher/java/JavaUtils.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 <QStringList>
@@ -44,7 +24,6 @@
 #include "java/JavaUtils.h"
 #include "java/JavaInstallList.h"
 #include "FileSystem.h"
-#include "Application.h"
 
 #define IBUS "@im=ibus"
 
@@ -52,24 +31,25 @@ JavaUtils::JavaUtils()
 {
 }
 
-QString stripVariableEntries(QString name, QString target, QString remove)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
 {
-    char delimiter = ':';
+    QDir mmcBin(QCoreApplication::applicationDirPath());
-#ifdef Q_OS_WIN32
+    auto items = LD_LIBRARY_PATH.split(':');
-    delimiter = ';';
+    QStringList final;
-#endif
+    for(auto & item: items)
-
+    {
-    auto targetItems = target.split(delimiter);
+        QDir test(item);
-    auto toRemove = remove.split(delimiter);
+        if(test == mmcBin)
-
+        {
-    for (QString item : toRemove) {
+            qDebug() << "Env:LD_LIBRARY_PATH ignoring path" << item;
-        bool removed = targetItems.removeOne(item);
+            continue;
-        if (!removed)
+        }
-            qWarning() << "Entry" << item
+        final.append(item);
-                << "could not be stripped from variable" << name;
     }
-    return targetItems.join(delimiter);
+    return final.join(':');
 }
+#endif
 
 QProcessEnvironment CleanEnviroment()
 {
@@ -88,16 +68,6 @@ QProcessEnvironment CleanEnviroment()
         "JAVA_OPTIONS",
         "JAVA_TOOL_OPTIONS"
     };
-
-    QStringList stripped =
-    {
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        "LD_LIBRARY_PATH",
-        "LD_PRELOAD",
-#endif
-        "QT_PLUGIN_PATH",
-        "QT_FONTPATH"
-    };
     for(auto key: rawenv.keys())
     {
         auto value = rawenv.value(key);
@@ -107,22 +77,19 @@ QProcessEnvironment CleanEnviroment()
             qDebug() << "Env: ignoring" << key << value;
             continue;
         }
-
+        // filter PolyMC-related things
-        // These are used to strip the original variables
+        if(key.startsWith("QT_"))
-        // If there is "LD_LIBRARY_PATH" and "LAUNCHER_LD_LIBRARY_PATH", we want to
-        // remove all values in "LAUNCHER_LD_LIBRARY_PATH" from "LD_LIBRARY_PATH"
-        if(key.startsWith("LAUNCHER_"))
         {
             qDebug() << "Env: ignoring" << key << value;
             continue;
         }
-        if(stripped.contains(key))
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+        // Do not pass LD_* variables to java. They were intended for PolyMC
+        if(key.startsWith("LD_"))
         {
-            QString newValue = stripVariableEntries(key, value, rawenv.value("LAUNCHER_" + key));
+            qDebug() << "Env: ignoring" << key << value;
-
+            continue;
-            qDebug() << "Env: stripped" << key << value << "to" << newValue;
         }
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         // Strip IBus
         // IBus is a Linux IME framework. For some reason, it breaks MC?
         if (key == "XMODIFIERS" && value.contains(IBUS))
@@ -131,12 +98,22 @@ QProcessEnvironment CleanEnviroment()
             value.replace(IBUS, "");
             qDebug() << "Env: stripped" << IBUS << "from" << save << ":" << value;
         }
+        if(key == "GAME_PRELOAD")
+        {
+            env.insert("LD_PRELOAD", value);
+            continue;
+        }
+        if(key == "GAME_LIBRARY_PATH")
+        {
+            env.insert("LD_LIBRARY_PATH", processLD_LIBRARY_PATH(value));
+            continue;
+        }
 #endif
         // qDebug() << "Env: " << key << value;
         env.insert(key, value);
     }
 #ifdef Q_OS_LINUX
-    // HACK: Workaround for QTBUG-42500
+    // HACK: Workaround for QTBUG42500
     if(!env.contains("LD_LIBRARY_PATH"))
     {
         env.insert("LD_LIBRARY_PATH", "");
@@ -199,17 +176,25 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
         archType = "32";
 
     HKEY jreKey;
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().c_str(), 0,
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName.toStdString().c_str(), 0,
                       KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) == ERROR_SUCCESS)
     {
         // Read the current type version from the registry.
         // This will be used to find any key that contains the JavaHome value.
+        char *value = new char[0];
+        DWORD valueSz = 0;
+        if (RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE *)value, &valueSz) ==
+            ERROR_MORE_DATA)
+        {
+            value = new char[valueSz];
+            RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE *)value, &valueSz);
+        }
 
-        WCHAR subKeyName[255];
+        TCHAR subKeyName[255];
         DWORD subKeyNameSize, numSubKeys, retCode;
 
         // Get the number of subkeys
-        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
+        RegQueryInfoKey(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
                         NULL, NULL);
 
         // Iterate until RegEnumKeyEx fails
@@ -218,37 +203,34 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
             for (DWORD i = 0; i < numSubKeys; i++)
             {
                 subKeyNameSize = 255;
-                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
+                retCode = RegEnumKeyEx(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
-                                        NULL);
+                                       NULL);
-                QString newSubkeyName = QString::fromWCharArray(subKeyName);
                 if (retCode == ERROR_SUCCESS)
                 {
                     // Now open the registry key for the version that we just got.
-                    QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;
+                    QString newKeyName = keyName + "\\" + subKeyName + subkeySuffix;
 
                     HKEY newKey;
-                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0,
+                    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, newKeyName.toStdString().c_str(), 0,
-                                      KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
+                                     KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
                     {
                         // Read the JavaHome value to find where Java is installed.
-                        DWORD valueSz = 0;
+                        value = new char[0];
-                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL,
+                        valueSz = 0;
-                                             &valueSz) == ERROR_SUCCESS)
+                        if (RegQueryValueEx(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
+                                            &valueSz) == ERROR_MORE_DATA)
                         {
-                            WCHAR *value = new WCHAR[valueSz];
+                            value = new char[valueSz];
-                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE *)value,
+                            RegQueryValueEx(newKey, keyJavaDir.toStdString().c_str(), NULL, NULL, (BYTE *)value,
-                                             &valueSz);
+                                            &valueSz);
-
-                            QString newValue = QString::fromWCharArray(value);
-                            delete [] value;
 
                             // Now, we construct the version object and add it to the list.
                             JavaInstallPtr javaVersion(new JavaInstall());
 
-                            javaVersion->id = newSubkeyName;
+                            javaVersion->id = subKeyName;
                             javaVersion->arch = archType;
                             javaVersion->path =
-                                QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
+                                QDir(FS::PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
                             javas.append(javaVersion);
                         }
 
@@ -455,8 +437,3 @@ QList<QString> JavaUtils::FindJavaPaths()
     return addJavasFromEnv(javas);
 }
 #endif
-
-QString JavaUtils::getJavaCheckPath()
-{
-    return APPLICATION->getJarPath("JavaCheck.jar");
-}

launcher/java/JavaUtils.h

@@ -24,7 +24,6 @@
 #include <windows.h>
 #endif
 
-QString stripVariableEntries(QString name, QString target, QString remove);
 QProcessEnvironment CleanEnviroment();
 
 class JavaUtils : public QObject
@@ -40,6 +39,4 @@ public:
 #ifdef Q_OS_WIN
     QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName, QString keyJavaDir, QString subkeySuffix = "");
 #endif
-
-    static QString getJavaCheckPath();
 };

launcher/java/JavaVersion_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "java/JavaVersion.h"
 

launcher/launch/LaunchTask.cpp

@@ -282,23 +282,6 @@ void LaunchTask::emitFailed(QString reason)
     Task::emitFailed(reason);
 }
 
-void LaunchTask::substituteVariables(const QStringList &args) const
-{
-    auto variables = m_instance->getVariables();
-    auto envVariables = QProcessEnvironment::systemEnvironment();
-
-    for (auto arg : args) {
-        for (auto key : variables)
-        {
-            arg.replace("$" + key, variables.value(key));
-        }
-        for (auto env : envVariables.keys())
-        {
-            arg.replace("$" + env, envVariables.value(env));
-        }
-    }
-}
-
 QString LaunchTask::substituteVariables(const QString &cmd) const
 {
     QString out = cmd;

launcher/launch/LaunchTask.h

@@ -1,38 +1,18 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *  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,
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * you may not use this file except in compliance with the License.
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * You may obtain a copy of the License at
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * This file incorporates work covered by the following copyright and
+ * Unless required by applicable law or agreed to in writing, software
- * permission notice:
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      Copyright 2013-2021 MultiMC Contributors
+ * See the License for the specific language governing permissions and
- *
+ * limitations under the License.
- *      Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- *      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
@@ -105,7 +85,6 @@ public: /* methods */
     shared_qobject_ptr<LogModel> getLogModel();
 
 public:
-    void substituteVariables(const QStringList &args) const;
     QString substituteVariables(const QString &cmd) const;
     QString censorPrivateInfo(QString in);
 

launcher/launch/steps/CheckJava.cpp

@@ -34,7 +34,6 @@
  */
 
 #include "CheckJava.h"
-#include "java/JavaUtils.h"
 #include <launch/LaunchTask.h>
 #include <FileSystem.h>
 #include <QStandardPaths>
@@ -72,26 +71,15 @@ void CheckJava::executeTask()
         emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::Launcher);
     }
 
-    if (JavaUtils::getJavaCheckPath().isEmpty())
-    {
-        const char *reason = QT_TR_NOOP("Java checker library could not be found. Please check your installation.");
-        emit logLine(tr(reason), MessageLevel::Fatal);
-        emitFailed(tr(reason));
-        return;
-    }
-
     QFileInfo javaInfo(realJavaPath);
     qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
     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;
     // if timestamps are not the same, or something is missing, check!
-    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0
+    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0 || storedArchitecture.size() == 0 || storedVendor.size() == 0)
-        || storedArchitecture.size() == 0 || storedRealArchitecture.size() == 0
-        || storedVendor.size() == 0)
     {
         m_JavaChecker = new JavaChecker();
         emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
@@ -104,9 +92,8 @@ void CheckJava::executeTask()
     {
         auto verString = instance->settings()->get("JavaVersion").toString();
         auto archString = instance->settings()->get("JavaArchitecture").toString();
-        auto realArchString = settings->get("JavaRealArchitecture").toString();
         auto vendorString = instance->settings()->get("JavaVendor").toString();
-        printJavaInfo(verString, archString, realArchString, vendorString);
+        printJavaInfo(verString, archString, vendorString);
     }
     emitSucceeded();
 }
@@ -137,11 +124,10 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
         case JavaCheckResult::Validity::Valid:
         {
             auto instance = m_parent->instance();
-            printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.realPlatform, result.javaVendor);
+            printJavaInfo(result.javaVersion.toString(), result.realPlatform, result.javaVendor);
             printSystemInfo(true, result.is_64bit);
             instance->settings()->set("JavaVersion", result.javaVersion.toString());
             instance->settings()->set("JavaArchitecture", result.mojangPlatform);
-            instance->settings()->set("JavaRealArchitecture", result.realPlatform);
             instance->settings()->set("JavaVendor", result.javaVendor);
             instance->settings()->set("JavaTimestamp", m_javaUnixTime);
             emitSucceeded();
@@ -150,10 +136,9 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
     }
 }
 
-void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString & vendor)
+void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString & vendor)
 {
-    emit logLine(QString("Java is version %1, using %2 (%3) architecture, from %4.\n\n")
+    emit logLine(QString("Java is version %1, using %2 architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::Launcher);
-                    .arg(version, architecture, realArchitecture, vendor), MessageLevel::Launcher);
 }
 
 void CheckJava::printSystemInfo(bool javaIsKnown, bool javaIs64bit)

launcher/launch/steps/CheckJava.h

@@ -35,7 +35,7 @@ private slots:
     void checkJavaFinished(JavaCheckResult result);
 
 private:
-    void printJavaInfo(const QString & version, const QString & architecture, const QString & realArchitecture, const QString & vendor);
+    void printJavaInfo(const QString & version, const QString & architecture, const QString & vendor);
     void printSystemInfo(bool javaIsKnown, bool javaIs64bit);
 
 private:

launcher/launch/steps/PostLaunchCommand.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "PostLaunchCommand.h"
@@ -47,19 +27,9 @@ PostLaunchCommand::PostLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
 
 void PostLaunchCommand::executeTask()
 {
-    //FIXME: where to put this?
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    auto args = QProcess::splitCommand(m_command);
-    m_parent->substituteVariables(args);
-
-    emit logLine(tr("Running Post-Launch command: %1").arg(args.join(' ')), MessageLevel::Launcher);
-    const QString program = args.takeFirst();
-    m_process.start(program, args);
-#else
     QString postlaunch_cmd = m_parent->substituteVariables(m_command);
     emit logLine(tr("Running Post-Launch command: %1").arg(postlaunch_cmd), MessageLevel::Launcher);
     m_process.start(postlaunch_cmd);
-#endif
 }
 
 void PostLaunchCommand::on_state(LoggedProcess::State state)

launcher/launch/steps/PreLaunchCommand.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "PreLaunchCommand.h"
@@ -48,18 +28,9 @@ PreLaunchCommand::PreLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
 void PreLaunchCommand::executeTask()
 {
     //FIXME: where to put this?
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    auto args = QProcess::splitCommand(m_command);
-    m_parent->substituteVariables(args);
-
-    emit logLine(tr("Running Pre-Launch command: %1").arg(args.join(' ')), MessageLevel::Launcher);
-    const QString program = args.takeFirst();
-    m_process.start(program, args);
-#else
     QString prelaunch_cmd = m_parent->substituteVariables(m_command);
     emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::Launcher);
     m_process.start(prelaunch_cmd);
-#endif
 }
 
 void PreLaunchCommand::on_state(LoggedProcess::State state)

launcher/main.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "Application.h"
 
 // #define BREAK_INFINITE_LOOP
@@ -59,10 +24,8 @@ int main(int argc, char *argv[])
     return 42;
 #endif
 
-#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
 
     // initialize Qt
     Application app(argc, argv);

launcher/meta/Index_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "meta/Index.h"
 #include "meta/VersionList.h"

launcher/minecraft/ComponentUpdateTask.cpp

@@ -197,10 +197,6 @@ void ComponentUpdateTask::loadComponents()
             {
                 remoteLoadFailed(taskIndex, error);
             });
-            connect(indexLoadTask.get(), &Task::aborted, [=]()
-            {
-                remoteLoadFailed(taskIndex, tr("Aborted"));
-            });
             taskIndex++;
         }
     }
@@ -247,10 +243,6 @@ void ComponentUpdateTask::loadComponents()
             {
                 remoteLoadFailed(taskIndex, error);
             });
-            connect(loadTask.get(), &Task::aborted, [=]()
-            {
-                remoteLoadFailed(taskIndex, tr("Aborted"));
-            });
             RemoteLoadStatus status;
             status.type = loadType;
             status.PackProfileIndex = componentIndex;

launcher/minecraft/GradleSpecifier.h

@@ -1,43 +1,7 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 <QStringList>
-#include <QRegularExpression>
 #include "DefaultVariable.h"
 
 struct GradleSpecifier
@@ -61,21 +25,20 @@ struct GradleSpecifier
          4 "jdk15"
          5 "jar"
         */
-        QRegularExpression matcher(QRegularExpression::anchoredPattern("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?"));
+        QRegExp matcher("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?");
-        QRegularExpressionMatch match = matcher.match(value);
+        m_valid = matcher.exactMatch(value);
-        m_valid = match.hasMatch();
         if(!m_valid) {
             m_invalidValue = value;
             return *this;
         }
-        auto elements = match.captured();
+        auto elements = matcher.capturedTexts();
-        m_groupId = match.captured(1);
+        m_groupId = elements[1];
-        m_artifactId = match.captured(2);
+        m_artifactId = elements[2];
-        m_version = match.captured(3);
+        m_version = elements[3];
-        m_classifier = match.captured(4);
+        m_classifier = elements[4];
-        if(match.lastCapturedIndex() >= 5)
+        if(!elements[5].isEmpty())
         {
-            m_extension = match.captured(5);
+            m_extension = elements[5];
         }
         return *this;
     }

launcher/minecraft/GradleSpecifier_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "minecraft/GradleSpecifier.h"
 

launcher/minecraft/Library_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "minecraft/MojangVersionFormat.h"
 #include "minecraft/OneSixVersionFormat.h"
@@ -10,14 +11,15 @@ class LibraryTest : public QObject
 {
     Q_OBJECT
 private:
-    LibraryPtr readMojangJson(const QString path)
+    LibraryPtr readMojangJson(const char *file)
     {
+        auto path = QFINDTESTDATA(file);
         QFile jsonFile(path);
         jsonFile.open(QIODevice::ReadOnly);
         auto data = jsonFile.readAll();
         jsonFile.close();
         ProblemContainer problems;
-        return MojangVersionFormat::libraryFromJson(problems, QJsonDocument::fromJson(data).object(), path);
+        return MojangVersionFormat::libraryFromJson(problems, QJsonDocument::fromJson(data).object(), file);
     }
     // get absolute path to expected storage, assuming default cache prefix
     QStringList getStorage(QString relative)
@@ -30,7 +32,7 @@ slots:
     {
         cache.reset(new HttpMetaCache());
         cache->addBase("libraries", QDir("libraries").absolutePath());
-        dataDir = QDir(QFINDTESTDATA("testdata")).absolutePath();
+        dataDir = QDir("data").absolutePath();
     }
     void test_legacy()
     {
@@ -72,14 +74,14 @@ slots:
         QCOMPARE(test.isNative(), false);
         QStringList failedFiles;
         test.setHint("local");
-        auto downloads = test.getDownloads(currentSystem, cache.get(), failedFiles, QFINDTESTDATA("testdata"));
+        auto downloads = test.getDownloads(currentSystem, cache.get(), failedFiles, QString("data"));
         QCOMPARE(downloads.size(), 0);
         qDebug() << failedFiles;
         QCOMPARE(failedFiles.size(), 0);
 
         QStringList jar, native, native32, native64;
-        test.getApplicableFiles(currentSystem, jar, native, native32, native64, QFINDTESTDATA("testdata"));
+        test.getApplicableFiles(currentSystem, jar, native, native32, native64, QString("data"));
-        QCOMPARE(jar, {QFileInfo(QFINDTESTDATA("testdata/codecwav-20101023.jar")).absoluteFilePath()});
+        QCOMPARE(jar, {QFileInfo("data/codecwav-20101023.jar").absoluteFilePath()});
         QCOMPARE(native, {});
         QCOMPARE(native32, {});
         QCOMPARE(native64, {});
@@ -165,20 +167,20 @@ slots:
         test.setRepositoryURL("file://foo/bar");
         {
             QStringList jar, native, native32, native64;
-            test.getApplicableFiles(Os_Linux, jar, native, native32, native64, QFINDTESTDATA("testdata"));
+            test.getApplicableFiles(Os_Linux, jar, native, native32, native64, QString("data"));
             QCOMPARE(jar, {});
             QCOMPARE(native, {});
-            QCOMPARE(native32, {QFileInfo(QFINDTESTDATA("testdata/testname-testversion-linux-32.jar")).absoluteFilePath()});
+            QCOMPARE(native32, {QFileInfo("data/testname-testversion-linux-32.jar").absoluteFilePath()});
-            QCOMPARE(native64, {QFileInfo(QFINDTESTDATA("testdata") + "/testname-testversion-linux-64.jar").absoluteFilePath()});
+            QCOMPARE(native64, {QFileInfo("data/testname-testversion-linux-64.jar").absoluteFilePath()});
             QStringList failedFiles;
-            auto dls = test.getDownloads(Os_Linux, cache.get(), failedFiles, QFINDTESTDATA("testdata"));
+            auto dls = test.getDownloads(Os_Linux, cache.get(), failedFiles, QString("data"));
             QCOMPARE(dls.size(), 0);
-            QCOMPARE(failedFiles, {QFileInfo(QFINDTESTDATA("testdata") + "/testname-testversion-linux-64.jar").absoluteFilePath()});
+            QCOMPARE(failedFiles, {"data/testname-testversion-linux-64.jar"});
         }
     }
     void test_onenine()
     {
-        auto test = readMojangJson(QFINDTESTDATA("testdata/lib-simple.json"));
+        auto test = readMojangJson("data/lib-simple.json");
         {
             QStringList jar, native, native32, native64;
             test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QString());
@@ -197,41 +199,41 @@ slots:
         test->setHint("local");
         {
             QStringList jar, native, native32, native64;
-            test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QFINDTESTDATA("testdata"));
+            test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QString("data"));
-            QCOMPARE(jar, {QFileInfo(QFINDTESTDATA("testdata/codecwav-20101023.jar")).absoluteFilePath()});
+            QCOMPARE(jar, {QFileInfo("data/codecwav-20101023.jar").absoluteFilePath()});
             QCOMPARE(native, {});
             QCOMPARE(native32, {});
             QCOMPARE(native64, {});
         }
         {
             QStringList failedFiles;
-            auto dls = test->getDownloads(Os_Linux, cache.get(), failedFiles, QFINDTESTDATA("testdata"));
+            auto dls = test->getDownloads(Os_Linux, cache.get(), failedFiles, QString("data"));
             QCOMPARE(dls.size(), 0);
             QCOMPARE(failedFiles, {});
         }
     }
     void test_onenine_local_override()
     {
-        auto test = readMojangJson(QFINDTESTDATA("testdata/lib-simple.json"));
+        auto test = readMojangJson("data/lib-simple.json");
         test->setHint("local");
         {
             QStringList jar, native, native32, native64;
-            test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QFINDTESTDATA("testdata"));
+            test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QString("data"));
-            QCOMPARE(jar, {QFileInfo(QFINDTESTDATA("testdata/codecwav-20101023.jar")).absoluteFilePath()});
+            QCOMPARE(jar, {QFileInfo("data/codecwav-20101023.jar").absoluteFilePath()});
             QCOMPARE(native, {});
             QCOMPARE(native32, {});
             QCOMPARE(native64, {});
         }
         {
             QStringList failedFiles;
-            auto dls = test->getDownloads(Os_Linux, cache.get(), failedFiles, QFINDTESTDATA("testdata"));
+            auto dls = test->getDownloads(Os_Linux, cache.get(), failedFiles, QString("data"));
             QCOMPARE(dls.size(), 0);
             QCOMPARE(failedFiles, {});
         }
     }
     void test_onenine_native()
     {
-        auto test = readMojangJson(QFINDTESTDATA("testdata/lib-native.json"));
+        auto test = readMojangJson("data/lib-native.json");
         QStringList jar, native, native32, native64;
         test->getApplicableFiles(Os_OSX, jar, native, native32, native64, QString());
         QCOMPARE(jar, QStringList());
@@ -246,7 +248,7 @@ slots:
     }
     void test_onenine_native_arch()
     {
-        auto test = readMojangJson(QFINDTESTDATA("testdata/lib-native-arch.json"));
+        auto test = readMojangJson("data/lib-native-arch.json");
         QStringList jar, native, native32, native64;
         test->getApplicableFiles(Os_Windows, jar, native, native32, native64, QString());
         QCOMPARE(jar, {});

launcher/minecraft/MinecraftInstance.cpp

@@ -154,12 +154,6 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
     m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
     m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
 
-    // Peformance related options
-    auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
-    m_settings->registerOverride(globalSettings->getSetting("EnableFeralGamemode"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("EnableMangoHud"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("UseDiscreteGpu"), performanceOverride);
-
     // Game time
     auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
     m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride);
@@ -441,57 +435,27 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
     return env;
 }
 
-QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
-{
-    // prepare the process environment
-    QProcessEnvironment env = createEnvironment();
-
-#ifdef Q_OS_LINUX
-    if (settings()->get("EnableMangoHud").toBool())
-    {
-        auto preload = env.value("LD_PRELOAD", "") + ":libMangoHud_dlsym.so:libMangoHud.so";
-        auto lib_path = env.value("LD_LIBRARY_PATH", "") +  ":/usr/local/$LIB/mangohud/:/usr/$LIB/mangohud/";
-
-        env.insert("LD_PRELOAD", preload);
-        env.insert("LD_LIBRARY_PATH", lib_path);
-        env.insert("MANGOHUD", "1");
-    }
-
-    if (settings()->get("UseDiscreteGpu").toBool())
-    {
-        // Open Source Drivers
-        env.insert("DRI_PRIME", "1");
-        // Proprietary Nvidia Drivers
-        env.insert("__NV_PRIME_RENDER_OFFLOAD", "1");
-        env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only");
-        env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
-    }
-#endif
-
-    return env;
-}
-
 static QString replaceTokensIn(QString text, QMap<QString, QString> with)
 {
-    // TODO: does this still work??
     QString result;
-    QRegularExpression token_regexp("\\$\\{(.+)\\}", QRegularExpression::InvertedGreedinessOption);
+    QRegExp token_regexp("\\$\\{(.+)\\}");
+    token_regexp.setMinimal(true);
     QStringList list;
-    QRegularExpressionMatchIterator i = token_regexp.globalMatch(text);
+    int tail = 0;
-    int lastCapturedEnd = 0;
+    int head = 0;
-    while (i.hasNext())
+    while ((head = token_regexp.indexIn(text, head)) != -1)
     {
-        QRegularExpressionMatch match = i.next();
+        result.append(text.mid(tail, head - tail));
-        result.append(text.mid(lastCapturedEnd, match.capturedStart()));
+        QString key = token_regexp.cap(1);
-        QString key = match.captured(1);
         auto iter = with.find(key);
         if (iter != with.end())
         {
             result.append(*iter);
         }
-        lastCapturedEnd = match.capturedEnd();
+        head += token_regexp.matchedLength();
+        tail = head;
     }
-    result.append(text.mid(lastCapturedEnd));
+    result.append(text.mid(tail));
     return result;
 }
 
@@ -540,11 +504,7 @@ QStringList MinecraftInstance::processMinecraftArgs(
     token_mapping["assets_root"] = absAssetsDir;
     token_mapping["assets_index_name"] = assets->id;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QStringList parts = args_pattern.split(' ', Qt::SkipEmptyParts);
-#else
     QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts);
-#endif
     for (int i = 0; i < parts.length(); i++)
     {
         parts[i] = replaceTokensIn(parts[i], token_mapping);
@@ -700,24 +660,24 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
         {
             out << QString("%1:").arg(label);
             auto modList = model.allMods();
-            std::sort(modList.begin(), modList.end(), [](Mod::Ptr a, Mod::Ptr b) {
+            std::sort(modList.begin(), modList.end(), [](Mod &a, Mod &b) {
-                auto aName = a->fileinfo().completeBaseName();
+                auto aName = a.filename().completeBaseName();
-                auto bName = b->fileinfo().completeBaseName();
+                auto bName = b.filename().completeBaseName();
                 return aName.localeAwareCompare(bName) < 0;
             });
-            for(auto mod: modList)
+            for(auto & mod: modList)
             {
-                if(mod->type() == Mod::MOD_FOLDER)
+                if(mod.type() == Mod::MOD_FOLDER)
                 {
-                    out << u8"  [🖿] " + mod->fileinfo().completeBaseName() + " (folder)";
+                    out << u8"  [📁] " + mod.filename().completeBaseName() + " (folder)";
                     continue;
                 }
 
-                if(mod->enabled()) {
+                if(mod.enabled()) {
-                    out << u8"  [✔] " + mod->fileinfo().completeBaseName();
+                    out << u8"  [✔️] " + mod.filename().completeBaseName();
                 }
                 else {
-                    out << u8"  [✘] " + mod->fileinfo().completeBaseName() + " (disabled)";
+                    out << u8"  [❌] " + mod.filename().completeBaseName() + " (disabled)";
                 }
 
             }
@@ -787,9 +747,7 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess
     {
         addToFilter(sessionRef.session, tr("<SESSION ID>"));
     }
-    if (sessionRef.access_token != "offline") {
+    addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
-        addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
-    }
     if(sessionRef.client_token.size()) {
         addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>"));
     }
@@ -868,16 +826,8 @@ QString MinecraftInstance::getStatusbarDescription()
         traits.append(tr("broken"));
     }
 
-    QString mcVersion = m_components->getComponentVersion("net.minecraft");
-    if (mcVersion.isEmpty())
-    {
-        // Load component info if needed
-        m_components->reload(Net::Mode::Offline);
-        mcVersion = m_components->getComponentVersion("net.minecraft");
-    }
-
     QString description;
-    description.append(tr("Minecraft %1").arg(mcVersion));
+    description.append(tr("Minecraft %1 (%2)").arg(m_components->getComponentVersion("net.minecraft")).arg(typeName()));
     if(m_settings->get("ShowGameTime").toBool())
     {
         if (lastTimePlayed() > 0) {
@@ -1065,8 +1015,7 @@ 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()));
-        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);
     }
@@ -1077,8 +1026,7 @@ 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()));
-        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);
     }
@@ -1136,16 +1084,16 @@ std::shared_ptr<GameOptions> MinecraftInstance::gameOptionsModel() const
     return m_game_options;
 }
 
-QList<Mod*> MinecraftInstance::getJarMods() const
+QList< Mod > MinecraftInstance::getJarMods() const
 {
     auto profile = m_components->getProfile();
-    QList<Mod*> mods;
+    QList<Mod> mods;
     for (auto jarmod : profile->getJarMods())
     {
         QStringList jar, temp1, temp2, temp3;
         jarmod->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, jarmodsPath().absolutePath());
         // QString filePath = jarmodsPath().absoluteFilePath(jarmod->filename(currentSystem));
-        mods.push_back(new Mod(QFileInfo(jar[0])));
+        mods.push_back(Mod(QFileInfo(jar[0])));
     }
     return mods;
 }

launcher/minecraft/MinecraftInstance.h

@@ -81,7 +81,7 @@ public:
     shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) override;
     QStringList extraArguments() const override;
     QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override;
-    QList<Mod*> getJarMods() const;
+    QList<Mod> getJarMods() const;
     QString createLaunchScript(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin);
     /// get arguments passed to java
     QStringList javaArguments() const;
@@ -91,7 +91,6 @@ public:
 
     /// create an environment for launching processes
     QProcessEnvironment createEnvironment() override;
-    QProcessEnvironment createLaunchEnvironment() override;
 
     /// guess log level from a line of minecraft log
     MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level) override;

launcher/minecraft/MinecraftLoadAndCheck.cpp

@@ -20,7 +20,6 @@ void MinecraftLoadAndCheck::executeTask()
     }
     connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::subtaskSucceeded);
     connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::subtaskFailed);
-    connect(m_task.get(), &Task::aborted, this, [this]{ subtaskFailed(tr("Aborted")); });
     connect(m_task.get(), &Task::progress, this, &MinecraftLoadAndCheck::progress);
     connect(m_task.get(), &Task::status, this, &MinecraftLoadAndCheck::setStatus);
 }

launcher/minecraft/MinecraftUpdate.cpp

@@ -98,7 +98,6 @@ void MinecraftUpdate::next()
         auto task = m_tasks[m_currentTask - 1];
         disconnect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
         disconnect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
-        disconnect(task.get(), &Task::aborted, this, &Task::abort);
         disconnect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
         disconnect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
     }
@@ -116,7 +115,6 @@ void MinecraftUpdate::next()
     }
     connect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
     connect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
-    connect(task.get(), &Task::aborted, this, &Task::abort);
     connect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
     connect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
     // if the task is already running, do not start it again

launcher/minecraft/MinecraftUpdate.h

@@ -27,8 +27,6 @@
 class MinecraftVersion;
 class MinecraftInstance;
 
-// FIXME: This looks very similar to a SequentialTask. Maybe we can reduce code duplications? :^)
-
 class MinecraftUpdate : public Task
 {
     Q_OBJECT

launcher/minecraft/MojangDownloadInfo.h

@@ -65,7 +65,7 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo
         // https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
         if(id == "legacy")
         {
-            url = "https://piston-meta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
+            url = "https://launchermeta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
         }
         // HACK
         else

launcher/minecraft/MojangVersionFormat_test.cpp

@@ -1,5 +1,6 @@
 #include <QTest>
 #include <QDebug>
+#include "TestUtil.h"
 
 #include "minecraft/MojangVersionFormat.h"
 
@@ -7,8 +8,9 @@ class MojangVersionFormatTest : public QObject
 {
     Q_OBJECT
 
-    static QJsonDocument readJson(const QString path)
+    static QJsonDocument readJson(const char *file)
     {
+        auto path = QFINDTESTDATA(file);
         QFile jsonFile(path);
         jsonFile.open(QIODevice::ReadOnly);
         auto data = jsonFile.readAll();
@@ -29,7 +31,7 @@ private
 slots:
     void test_Through_Simple()
     {
-        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/1.9-simple.json"));
+        QJsonDocument doc = readJson("data/1.9-simple.json");
         auto vfile = MojangVersionFormat::versionFileFromJson(doc, "1.9-simple.json");
         auto doc2 = MojangVersionFormat::versionFileToJson(vfile);
         writeJson("1.9-simple-passthorugh.json", doc2);
@@ -39,7 +41,7 @@ slots:
 
     void test_Through()
     {
-        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/1.9.json"));
+        QJsonDocument doc = readJson("data/1.9.json");
         auto vfile = MojangVersionFormat::versionFileFromJson(doc, "1.9.json");
         auto doc2 = MojangVersionFormat::versionFileToJson(vfile);
         writeJson("1.9-passthorugh.json", doc2);

launcher/minecraft/OneSixVersionFormat.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "OneSixVersionFormat.h"
 #include <Json.h>
 #include "minecraft/Agent.h"
@@ -331,7 +296,7 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch
     }
     writeString(root, "appletClass", patch->appletClass);
     writeStringList(root, "+tweakers", patch->addTweakers);
-    writeStringList(root, "+traits", patch->traits.values());
+    writeStringList(root, "+traits", patch->traits.toList());
     if (!patch->libraries.isEmpty())
     {
         QJsonArray array;

launcher/minecraft/PackProfile.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2013-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 <QFile>
@@ -366,7 +346,6 @@ void PackProfile::resolve(Net::Mode netmode)
     d->m_updateTask.reset(updateTask);
     connect(updateTask, &ComponentUpdateTask::succeeded, this, &PackProfile::updateSucceeded);
     connect(updateTask, &ComponentUpdateTask::failed, this, &PackProfile::updateFailed);
-    connect(updateTask, &ComponentUpdateTask::aborted, this, [this]{ updateFailed(tr("Aborted")); });
     d->m_updateTask->start();
 }
 
@@ -708,11 +687,7 @@ void PackProfile::move(const int index, const MoveDirection direction)
         return;
     }
     beginMoveRows(QModelIndex(), index, index, QModelIndex(), togap);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-    d->components.swapItemsAt(index, theirIndex);
-#else
     d->components.swap(index, theirIndex);
-#endif
     endMoveRows();
     invalidateLaunchProfile();
     scheduleSave();

launcher/minecraft/ParseUtils_test.cpp

@@ -1,4 +1,5 @@
 #include <QTest>
+#include "TestUtil.h"
 
 #include "minecraft/ParseUtils.h"
 
@@ -41,3 +42,4 @@ slots:
 QTEST_GUILESS_MAIN(ParseUtilsTest)
 
 #include "ParseUtils_test.moc"
+

launcher/minecraft/ProfileUtils.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "ProfileUtils.h"
 #include "minecraft/VersionFilterData.h"
 #include "minecraft/OneSixVersionFormat.h"
@@ -176,6 +141,24 @@ bool saveJsonFile(const QJsonDocument doc, const QString & filename)
     return true;
 }
 
+VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
+{
+    QFile file(fileInfo.absoluteFilePath());
+    if (!file.open(QFile::ReadOnly))
+    {
+        auto errorStr = QObject::tr("Unable to open the version file %1: %2.").arg(fileInfo.fileName(), file.errorString());
+        return createErrorVersionFile(fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), errorStr);
+    }
+    QJsonDocument doc = QJsonDocument::fromBinaryData(file.readAll());
+    file.close();
+    if (doc.isNull())
+    {
+        file.remove();
+        throw JSONValidationError(QObject::tr("Unable to process the version file %1.").arg(fileInfo.fileName()));
+    }
+    return guardedParseJson(doc, fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), false);
+}
+
 void removeLwjglFromPatch(VersionFilePtr patch)
 {
     auto filter = [](QList<LibraryPtr>& libs)

launcher/minecraft/ProfileUtils.h

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 "Library.h"
 #include "VersionFile.h"
@@ -54,6 +19,9 @@ VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder)
 /// Save a JSON file (in any format)
 bool saveJsonFile(const QJsonDocument doc, const QString & filename);
 
+/// Parse a version file in binary JSON format
+VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo);
+
 /// Remove LWJGL from a patch file. This is applied to all Mojang-like profile files.
 void removeLwjglFromPatch(VersionFilePtr patch);
 

launcher/minecraft/VersionFile.cpp

@@ -89,3 +89,14 @@ void VersionFile::applyTo(LaunchProfile *profile)
     }
     profile->applyProblemSeverity(getProblemSeverity());
 }
+
+/*
+    auto theirVersion = profile->getMinecraftVersion();
+    if (!theirVersion.isNull() && !dependsOnMinecraftVersion.isNull())
+    {
+        if (QRegExp(dependsOnMinecraftVersion, Qt::CaseInsensitive, QRegExp::Wildcard).indexIn(theirVersion) == -1)
+        {
+            throw MinecraftVersionMismatch(uid, dependsOnMinecraftVersion, theirVersion);
+        }
+    }
+*/

launcher/minecraft/World.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2015-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 <QDir>
@@ -341,8 +321,7 @@ bool World::install(const QString &to, const QString &name)
 
     if(ok && !name.isEmpty() && m_actualName != name)
     {
-        QFileInfo finalPathInfo(finalPath);
+        World newWorld(finalPath);
-        World newWorld(finalPathInfo);
         if(newWorld.isValid())
         {
             newWorld.rename(name);

launcher/minecraft/WorldList.cpp

@@ -1,36 +1,16 @@
-// SPDX-License-Identifier: GPL-3.0-only
+/* Copyright 2015-2021 MultiMC Contributors
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- *  This program is free software: you can redistribute it and/or modify
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *  it under the terms of the GNU General Public License as published by
+ * you may not use this file except in compliance with the License.
- *  the Free Software Foundation, version 3.
+ * You may obtain a copy of the License at
  *
- *  This program is distributed in the hope that it will be useful,
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *  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
+ * Unless required by applicable law or agreed to in writing, software
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * This file incorporates work covered by the following copyright and
+ * See the License for the specific language governing permissions and
- * permission notice:
+ * limitations under the License.
- *
- *      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 "WorldList.h"
@@ -215,7 +195,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
         switch (column)
         {
             case SizeColumn:
-                return QVariant::fromValue<qlonglong>(world.bytes());
+                return qVariantFromValue<qlonglong>(world.bytes());
 
             default:
                 return data(index, Qt::DisplayRole);
@@ -235,7 +215,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
     }
     case SeedRole:
     {
-        return QVariant::fromValue<qlonglong>(world.seed());
+        return qVariantFromValue<qlonglong>(world.seed());
     }
     case NameRole:
     {
@@ -247,7 +227,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
     }
     case SizeRole:
     {
-        return QVariant::fromValue<qlonglong>(world.bytes());
+        return qVariantFromValue<qlonglong>(world.bytes());
     }
     case IconFileRole:
     {
@@ -321,11 +301,7 @@ public:
     }
 
 protected:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QVariant retrieveData(const QString &mimetype, QMetaType type) const
-#else
     QVariant retrieveData(const QString &mimetype, QVariant::Type type) const
-#endif
     {
         QList<QUrl> urls;
         for(auto &world: m_worlds)

launcher/minecraft/auth/AccountData.cpp

@@ -39,7 +39,6 @@
 #include <QJsonArray>
 #include <QDebug>
 #include <QUuid>
-#include <QRegularExpression>
 
 namespace {
 void tokenToJSONV3(QJsonObject &parent, Katabasis::Token t, const char * tokenName) {
@@ -452,7 +451,7 @@ void AccountData::invalidateClientToken() {
     if(type != AccountType::Mojang) {
         return;
     }
-    yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{-}]"));
+    yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegExp("[{-}]"));
 }
 
 QString AccountData::profileId() const {
@@ -474,7 +473,7 @@ QString AccountData::accountDisplayString() const {
             return userName();
         }
         case AccountType::Offline: {
-            return QObject::tr("<Offline>");
+            return userName();
         }
         case AccountType::MSA: {
             if(xboxApiToken.extra.contains("gtg")) {

launcher/minecraft/auth/AccountList.cpp

@@ -282,10 +282,6 @@ QVariant AccountList::data(const QModelIndex &index, int role) const
         case Qt::DisplayRole:
             switch (index.column())
             {
-            case ProfileNameColumn: {
-                return account->profileName();
-            }
-
             case NameColumn:
                 return account->accountDisplayString();
 
@@ -304,7 +300,7 @@ QVariant AccountList::data(const QModelIndex &index, int role) const
                         return tr("Offline", "Account status");
                     }
                     case AccountState::Online: {
-                        return tr("Ready", "Account status");
+                        return tr("Online", "Account status");
                     }
                     case AccountState::Working: {
                         return tr("Working", "Account status");
@@ -324,6 +320,10 @@ QVariant AccountList::data(const QModelIndex &index, int role) const
                 }
             }
 
+            case ProfileNameColumn: {
+                return account->profileName();
+            }
+
             case MigrationColumn: {
                 if(account->isMSA() || account->isOffline()) {
                     return tr("N/A", "Can Migrate?");
@@ -349,7 +349,7 @@ QVariant AccountList::data(const QModelIndex &index, int role) const
         case Qt::CheckStateRole:
             switch (index.column())
             {
-                case ProfileNameColumn:
+                case NameColumn:
                     return account == m_defaultAccount ? Qt::Checked : Qt::Unchecked;
             }
 
@@ -365,8 +365,6 @@ QVariant AccountList::headerData(int section, Qt::Orientation orientation, int r
     case Qt::DisplayRole:
         switch (section)
         {
-        case ProfileNameColumn:
-            return tr("Username");
         case NameColumn:
             return tr("Account");
         case TypeColumn:
@@ -375,6 +373,8 @@ QVariant AccountList::headerData(int section, Qt::Orientation orientation, int r
             return tr("Status");
         case MigrationColumn:
             return tr("Can Migrate?");
+        case ProfileNameColumn:
+            return tr("Profile");
         default:
             return QVariant();
         }
@@ -382,8 +382,6 @@ QVariant AccountList::headerData(int section, Qt::Orientation orientation, int r
     case Qt::ToolTipRole:
         switch (section)
         {
-        case ProfileNameColumn:
-            return tr("Minecraft username associated with the account.");
         case NameColumn:
             return tr("User name of the account.");
         case TypeColumn:
@@ -391,7 +389,9 @@ QVariant AccountList::headerData(int section, Qt::Orientation orientation, int r
         case StatusColumn:
             return tr("Current status of the account.");
         case MigrationColumn:
-            return tr("Can this account migrate to a Microsoft account?");
+            return tr("Can this account migrate to Microsoft account?");
+        case ProfileNameColumn:
+            return tr("Name of the Minecraft profile associated with the account.");
         default:
             return QVariant();
         }

launcher/minecraft/auth/AccountList.h

@@ -58,8 +58,8 @@ public:
     enum VListColumns
     {
         // TODO: Add icon column.
-        ProfileNameColumn = 0,
+        NameColumn = 0,
-        NameColumn,
+        ProfileNameColumn,
         MigrationColumn,
         TypeColumn,
         StatusColumn,

launcher/minecraft/auth/AccountTask.cpp

@@ -79,8 +79,6 @@ QString AccountTask::getStateMessage() const
 bool AccountTask::changeState(AccountTaskState newState, QString reason)
 {
     m_taskState = newState;
-    // FIXME: virtual method invoked in constructor.
-    // We want that behavior, but maybe make it less weird?
     setStatus(getStateMessage());
     switch(newState) {
         case AccountTaskState::STATE_CREATED: {

launcher/minecraft/auth/AuthRequest.cpp

@@ -1,38 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  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/>.
- *
- * 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 <cassert>
 
 #include <QDebug>
@@ -55,11 +20,7 @@ void AuthRequest::get(const QNetworkRequest &req, int timeout/* = 60*1000*/) {
     reply_ = APPLICATION->network()->get(request_);
     status_ = Requesting;
     timedReplies_.add(new Katabasis::Reply(reply_, timeout));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    connect(reply_, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)));
-#else
     connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)));
-#endif
     connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()));
     connect(reply_, &QNetworkReply::sslErrors, this, &AuthRequest::onSslErrors);
 }
@@ -70,11 +31,7 @@ void AuthRequest::post(const QNetworkRequest &req, const QByteArray &data, int t
     status_ = Requesting;
     reply_ = APPLICATION->network()->post(request_, data_);
     timedReplies_.add(new Katabasis::Reply(reply_, timeout));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    connect(reply_, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)));
-#else
     connect(reply_, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onRequestError(QNetworkReply::NetworkError)));
-#endif
     connect(reply_, SIGNAL(finished()), this, SLOT(onRequestFinished()));
     connect(reply_, &QNetworkReply::sslErrors, this, &AuthRequest::onSslErrors);
     connect(reply_, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onUploadProgress(qint64,qint64)));

launcher/minecraft/auth/MinecraftAccount.cpp

@@ -40,7 +40,7 @@
 #include <QUuid>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QRegularExpression>
+#include <QRegExp>
 #include <QStringList>
 #include <QJsonDocument>
 
@@ -53,7 +53,7 @@
 #include "flows/Offline.h"
 
 MinecraftAccount::MinecraftAccount(QObject* parent) : QObject(parent) {
-    data.internalId = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
+    data.internalId = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
 }
 
 
@@ -78,7 +78,7 @@ MinecraftAccountPtr MinecraftAccount::createFromUsername(const QString &username
     MinecraftAccountPtr account = new MinecraftAccount();
     account->data.type = AccountType::Mojang;
     account->data.yggdrasilToken.extra["userName"] = username;
-    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
+    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
     return account;
 }
 
@@ -97,10 +97,10 @@ MinecraftAccountPtr MinecraftAccount::createOffline(const QString &username)
     account->data.yggdrasilToken.validity = Katabasis::Validity::Certain;
     account->data.yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
     account->data.yggdrasilToken.extra["userName"] = username;
-    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
+    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
     account->data.minecraftEntitlement.ownsMinecraft = true;
     account->data.minecraftEntitlement.canPlayMinecraft = true;
-    account->data.minecraftProfile.id = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
+    account->data.minecraftProfile.id = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
     account->data.minecraftProfile.name = username;
     account->data.minecraftProfile.validity = Katabasis::Validity::Certain;
     return account;
@@ -135,7 +135,6 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::login(QString password) {
     m_currentTask.reset(new MojangLogin(&data, password));
     connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
     connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
-    connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); });
     emit activityChanged(true);
     return m_currentTask;
 }
@@ -146,7 +145,6 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::loginMSA() {
     m_currentTask.reset(new MSAInteractive(&data));
     connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
     connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
-    connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); });
     emit activityChanged(true);
     return m_currentTask;
 }
@@ -157,7 +155,6 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::loginOffline() {
     m_currentTask.reset(new OfflineLogin(&data));
     connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
     connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
-    connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); });
     emit activityChanged(true);
     return m_currentTask;
 }
@@ -179,7 +176,6 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::refresh() {
 
     connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
     connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
-    connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); });
     emit activityChanged(true);
     return m_currentTask;
 }