Merge remote-tracking branch 'upstream/develop' into skinfix

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-02 22:13:50 +01:00 · 2023-09-02 22:13:50 +01:00 · 1213a5ab46
commit 1213a5ab46
parent c5bffed21e c01e95b79c
765 changed files with 21366 additions and 19387 deletions
--- a/.clang-format
+++ b/.clang-format
@ -1,10 +1,12 @@
 ---
-Language:        Cpp
 BasedOnStyle: Chromium
 IndentWidth: 4
-AlignConsecutiveMacros: false
-AlignConsecutiveAssignments: false
 AllowShortIfStatementsOnASingleLine: false
+ColumnLimit: 140
+---
+Language: Cpp
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
 BraceWrapping:
  AfterFunction: true
  SplitEmptyFunction: false
@ -12,5 +14,4 @@ BraceWrapping:
  SplitEmptyNamespace: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
-ColumnLimit:     140
 Cpp11BracedListStyle: false
--- a/.envrc
+++ b/.envrc
@ -1 +1,2 @@
 use flake
+watch_file nix/*.nix
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@ -24,7 +24,7 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Create backport PRs
-        uses: korthout/backport-action@v1.3.1
+        uses: korthout/backport-action@v1.4.0
        with:
          # Config README: https://github.com/korthout/backport-action#backport-action
          pull_description: |-
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -24,6 +24,12 @@ on:
      CACHIX_AUTH_TOKEN:
        description: Private token for authenticating against Cachix cache
        required: false
+      GPG_PRIVATE_KEY:
+        description: Private key for AppImage signing
+        required: false
+      GPG_PRIVATE_KEY_ID:
+        description: ID for the GPG_PRIVATE_KEY, to select the signing key
+        required: false

 jobs:
  build:
@ -68,7 +74,7 @@ jobs:
            qt_ver: 6
            qt_host: windows
            qt_arch: ''
-            qt_version: '6.5.1'
+            qt_version: '6.5.2'
            qt_modules: 'qt5compat qtimageformats'
            qt_tools: ''

@ -80,7 +86,7 @@ jobs:
            qt_ver: 6
            qt_host: windows
            qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.5.1'
+            qt_version: '6.5.2'
            qt_modules: 'qt5compat qtimageformats'
            qt_tools: ''

@ -90,7 +96,7 @@ jobs:
            qt_ver: 6
            qt_host: mac
            qt_arch: ''
-            qt_version: '6.5.0'
+            qt_version: '6.5.2'
            qt_modules: 'qt5compat qtimageformats'
            qt_tools: ''

@ -152,7 +158,7 @@ jobs:

      - name: Setup ccache
        if: (runner.os != 'Windows' || matrix.msystem == '') && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.9
+        uses: hendrikmuhs/ccache-action@v1.2.10
        with:
          key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}-${{ matrix.architecture }}

@ -249,6 +255,8 @@ jobs:
          wget "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage"
          wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"

+          wget "https://github.com/AppImageCommunity/AppImageUpdate/releases/download/continuous/AppImageUpdate-x86_64.AppImage"
+
          ${{ github.workspace }}/.github/scripts/prepare_JREs.sh
          sudo apt install libopengl0

@ -387,8 +395,8 @@ jobs:
          cd ${{ env.INSTALL_DIR }}
          if ("${{ matrix.qt_ver }}" -eq "5")
          {
-            Copy-Item D:/a/PrismLauncher/Qt/Tools/OpenSSL/Win_x86/bin/libcrypto-1_1.dll -Destination libcrypto-1_1.dll
-            Copy-Item D:/a/PrismLauncher/Qt/Tools/OpenSSL/Win_x86/bin/libssl-1_1.dll -Destination libssl-1_1.dll
+            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libcrypto-1_1.dll -Destination libcrypto-1_1.dll
+            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libssl-1_1.dll -Destination libssl-1_1.dll
          }
          cd ${{ github.workspace }}

@ -466,11 +474,15 @@ jobs:
      - name: Package AppImage (Linux)
        if: runner.os == 'Linux' && matrix.qt_ver != 5
        shell: bash
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
        run: |
          cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
+
          mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.appdata.xml
          export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated
-          export OUTPUT="PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
+
+          export OUTPUT="PrismLauncher-Linux-x86_64.AppImage"

          chmod +x linuxdeploy-*.AppImage

@ -481,7 +493,7 @@ jobs:

          cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk

-          cp -r /home/runner/work/PrismLauncher/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
+          cp -r ${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines

          cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
          cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
@ -494,8 +506,33 @@ jobs:
          LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk/lib"
          export LD_LIBRARY_PATH

+          chmod +x AppImageUpdate-x86_64.AppImage
+          ./AppImageUpdate-x86_64.AppImage --appimage-extract
+
+          mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/optional
+          mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins
+
+          cp -r squashfs-root/usr/bin/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/bin
+          cp -r squashfs-root/usr/lib/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib
+          cp -r squashfs-root/usr/optional/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/optional
+          cp -r squashfs-root/usr/optional/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins
+
+          export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|PrismLauncher-Linux-x86_64.AppImage.zsync" 
+
+          if [ '${{ secrets.GPG_PRIVATE_KEY_ID }}' != '' ]; then
+            export SIGN=1
+            export SIGN_KEY=${{ secrets.GPG_PRIVATE_KEY_ID }}
+            mkdir -p ~/.gnupg/
+            printf "$GPG_PRIVATE_KEY" | base64 --decode > ~/.gnupg/private.key
+            gpg --import ~/.gnupg/private.key
+          else
+            echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY
+          fi
+
          ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_APPIMAGE_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg

+          mv "PrismLauncher-Linux-x86_64.AppImage" "PrismLauncher-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
+
      ##
      # UPLOAD BUILDS
      ##
@ -563,6 +600,13 @@ jobs:
          name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
          path: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
      
+      - name: Upload AppImage Zsync (Linux)
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        uses: actions/upload-artifact@v3
+        with:
+          name: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
+          path: PrismLauncher-Linux-x86_64.AppImage.zsync
+
      - name: ccache stats (Windows MinGW-w64)
        if: runner.os == 'Windows' && matrix.msystem != ''
        shell: msys2 {0}
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@ -43,7 +43,8 @@ jobs:
          mv PrismLauncher-Linux-Qt6*/PrismLauncher.tar.gz PrismLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz          
          mv PrismLauncher-Linux-Portable*/PrismLauncher-portable.tar.gz PrismLauncher-Linux-Portable-${{ env.VERSION }}.tar.gz
          mv PrismLauncher-Linux*/PrismLauncher.tar.gz PrismLauncher-Linux-${{ env.VERSION }}.tar.gz
-          mv PrismLauncher-*.AppImage/PrismLauncher-*.AppImage PrismLauncher-Linux-${{ env.VERSION }}-x86_64.AppImage
+          mv PrismLauncher-*.AppImage/PrismLauncher-*.AppImage PrismLauncher-Linux-x86_64.AppImage
+          mv PrismLauncher-*.AppImage.zsync/PrismLauncher-*.AppImage.zsync PrismLauncher-Linux-x86_64.AppImage.zsync
          mv PrismLauncher-macOS-Legacy*/PrismLauncher.tar.gz PrismLauncher-macOS-Legacy-${{ env.VERSION }}.tar.gz
          mv PrismLauncher-macOS*/PrismLauncher.tar.gz PrismLauncher-macOS-${{ env.VERSION }}.tar.gz

@ -78,9 +79,8 @@ jobs:
      - name: Create release
        id: create_release
        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
          tag_name: ${{ github.ref }}
          name: Prism Launcher ${{ env.VERSION }}
          draft: true
@ -88,7 +88,8 @@ jobs:
          files: |
            PrismLauncher-Linux-${{ env.VERSION }}.tar.gz
            PrismLauncher-Linux-Portable-${{ env.VERSION }}.tar.gz
-            PrismLauncher-Linux-${{ env.VERSION }}-x86_64.AppImage
+            PrismLauncher-Linux-x86_64.AppImage
+            PrismLauncher-Linux-x86_64.AppImage.zsync
            PrismLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz
            PrismLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
            PrismLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip
--- a/.github/workflows/update-flake.yml
+++ b/.github/workflows/update-flake.yml
@ -19,10 +19,12 @@ jobs:
      - uses: actions/checkout@v3
      - uses: cachix/install-nix-action@v22

-      - uses: DeterminateSystems/update-flake-lock@v19
+      - uses: DeterminateSystems/update-flake-lock@v20
        with:
          commit-msg: "chore(nix): update lockfile"
          pr-title: "chore(nix): update lockfile"
          pr-labels: |
            Linux
+            packaging
            simple change
+            changelog:omit
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -33,6 +33,13 @@ if(MSVC)
    # Use /W4 as /Wall includes unnesserey warnings such as added padding to structs
    set(CMAKE_CXX_FLAGS "/GS /permissive- /W4 ${CMAKE_CXX_FLAGS}")

+    # /EHs Enables stack unwind semantics for standard C++ exceptions to ensure stackframes are unwound
+    # and object deconstructors are called when an exception is caught.
+    # without it memory leaks and a warning is printed
+    # /EHc tells the compiler to assume that functions declared as extern "C" never throw a C++ exception
+    # This appears to not always be a defualt compiler option in CMAKE
+    set(CMAKE_CXX_FLAGS "/EHsc ${CMAKE_CXX_FLAGS}")
+
    # LINK accepts /SUBSYSTEM whics sets if we are a WINDOWS (gui) or a CONSOLE programs
    # This implicitly selects an entrypoint specific to the subsystem selected
    # qtmain/QtEntryPointLib provides the correct entrypoint (wWinMain) for gui programs
@ -85,38 +92,39 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0")
 # set CXXFLAGS for build targets
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}")

-option(DEBUG_ADDRESS_SANITIZER "Enable Address Sanitizer in Debug builds" on)
+option(DEBUG_ADDRESS_SANITIZER "Enable Address Sanitizer in Debug builds" OFF)

 # If this is a Debug build turn on address sanitiser
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND DEBUG_ADDRESS_SANITIZER)
+if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND DEBUG_ADDRESS_SANITIZER)
    message(STATUS "Address Sanitizer enabled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off")
    if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
            # using clang with clang-cl front end 
            message(STATUS "Address Sanitizer available on Clang MSVC frontend")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /Oy-")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /Oy-")
        else()
            # AppleClang and Clang
            message(STATUS "Address Sanitizer available on Clang")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
        endif()
    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
        # GCC
        message(STATUS "Address Sanitizer available on GCC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
        link_libraries("asan")
    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
        message(STATUS "Address Sanitizer available on MSVC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /O1 /Oy-")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /Oy-")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /Oy-")
    else()
        message(STATUS "Address Sanitizer not available on compiler ${CMAKE_CXX_COMPILER_ID}")
    endif()
 endif()

+
 option(ENABLE_LTO "Enable Link Time Optimization" off)

 if(ENABLE_LTO)
@ -208,6 +216,18 @@ set(Launcher_SUBREDDIT_URL "https://prismlauncher.org/reddit" CACHE STRING "URL
 set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules")
 set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against")

+# Native libraries
+if(UNIX AND APPLE)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.dylib" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.dylib" CACHE STRING "Name of native openal library")
+elseif(UNIX)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.so" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.so" CACHE STRING "Name of native openal library")
+elseif(WIN32)
+    set(Launcher_GLFW_LIBRARY_NAME "glfw.dll" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "OpenAL.dll" CACHE STRING "Name of native openal library")
+endif()
+
 # API Keys
 # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service
 # of these platforms, please change these API keys beforehand.
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -110,6 +110,9 @@ Config::Config()
    FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
    META_URL = "@Launcher_META_URL@";

+    GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
+    OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
+
    BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
    TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
    MATRIX_URL = "@Launcher_MATRIX_URL@";
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@ -36,8 +36,8 @@
 */

 #pragma once
-#include <QString>
 #include <QList>
+#include <QString>

 /**
 * \brief The Config class holds all the build-time information passed from the build system.
@ -134,6 +134,9 @@ class Config {
     */
    QString META_URL;

+    QString GLFW_LIBRARY_NAME;
+    QString OPENAL_LIBRARY_NAME;
+
    QString BUG_TRACKER_URL;
    QString TRANSLATIONS_URL;
    QString MATRIX_URL;
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@ -0,0 +1,152 @@
+# 
+# Function to set compiler warnings with reasonable defaults at the project level.
+# Taken from https://github.com/aminya/project_options/blob/main/src/CompilerWarnings.cmake
+# under the folowing license:
+# 
+# MIT License
+#
+# Copyright (c) 2022-2100 Amin Yahyaabadi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+include_guard()
+
+function(_set_project_warnings_add_target_link_option TARGET OPTIONS)
+  target_link_options(${_project_name} INTERFACE ${OPTIONS})
+endfunction()
+
+# Set the compiler warnings
+#
+# https://clang.llvm.org/docs/DiagnosticsReference.html
+# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
+function(
+  set_project_warnings
+  _project_name
+  MSVC_WARNINGS
+  CLANG_WARNINGS
+  GCC_WARNINGS
+)
+  if("${MSVC_WARNINGS}" STREQUAL "")
+    set(MSVC_WARNINGS
+        /W4 # Baseline reasonable warnings
+        /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
+        /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
+        /w14263 # 'function': member function does not override any base class virtual member function
+        /w14265 # 'classname': class has virtual functions, but destructor is not virtual instances of this class may not
+                # be destructed correctly
+        /w14287 # 'operator': unsigned/negative constant mismatch
+        /we4289 # nonstandard extension used: 'variable': loop control variable declared in the for-loop is used outside
+                # the for-loop scope
+        /w14296 # 'operator': expression is always 'boolean_value'
+        /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
+        /w14545 # expression before comma evaluates to a function which is missing an argument list
+        /w14546 # function call before comma missing argument list
+        /w14547 # 'operator': operator before comma has no effect; expected operator with side-effect
+        /w14549 # 'operator': operator before comma has no effect; did you intend 'operator'?
+        /w14555 # expression has no effect; expected expression with side- effect
+        /w14619 # pragma warning: there is no warning number 'number'
+        /w14640 # Enable warning on thread un-safe static member initialization
+        /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may cause unexpected runtime behavior.
+        /w14905 # wide string literal cast to 'LPSTR'
+        /w14906 # string literal cast to 'LPWSTR'
+        /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied
+        /permissive- # standards conformance mode for MSVC compiler.
+    )
+  endif()
+
+  if("${CLANG_WARNINGS}" STREQUAL "")
+    set(CLANG_WARNINGS
+        -Wall
+        -Wextra # reasonable and standard
+        -Wextra-semi # Warn about semicolon after in-class function definition.
+        -Wshadow # warn the user if a variable declaration shadows one from a parent context
+        -Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps
+        # catch hard to track down memory errors
+        -Wold-style-cast # warn for c-style casts
+        -Wcast-align # warn for potential performance problem casts
+        -Wunused # warn on anything being unused
+        -Woverloaded-virtual # warn if you overload (not override) a virtual function
+        -Wpedantic # warn if non-standard C++ is used
+        -Wconversion # warn on type conversions that may lose data
+        -Wsign-conversion # warn on sign conversions
+        -Wnull-dereference # warn if a null dereference is detected
+        -Wdouble-promotion # warn if float is implicit promoted to double
+        -Wformat=2 # warn on security issues around functions that format output (ie printf)
+        -Wimplicit-fallthrough # warn on statements that fallthrough without an explicit annotation
+    )
+  endif()
+
+  if("${GCC_WARNINGS}" STREQUAL "")
+    set(GCC_WARNINGS
+        ${CLANG_WARNINGS}
+        -Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
+        -Wduplicated-cond # warn if if / else chain has duplicated conditions
+        -Wduplicated-branches # warn if if / else branches have duplicated code
+        -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
+        -Wuseless-cast # warn if you perform a cast to the same type
+    )
+  endif()
+
+  if(MSVC)
+    set(PROJECT_WARNINGS_CXX ${MSVC_WARNINGS})
+  elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+    set(PROJECT_WARNINGS_CXX ${CLANG_WARNINGS})
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(PROJECT_WARNINGS_CXX ${GCC_WARNINGS})
+  else()
+    message(AUTHOR_WARNING "No compiler warnings set for CXX compiler: '${CMAKE_CXX_COMPILER_ID}'")
+    # TODO support Intel compiler
+  endif()
+
+  # Add C warnings
+  set(PROJECT_WARNINGS_C "${PROJECT_WARNINGS_CXX}")
+  list(
+    REMOVE_ITEM
+    PROJECT_WARNINGS_C
+    -Wnon-virtual-dtor
+    -Wold-style-cast
+    -Woverloaded-virtual
+    -Wuseless-cast
+    -Wextra-semi
+  )
+
+  target_compile_options(
+    ${_project_name}
+    INTERFACE # C++ warnings
+              $<$<COMPILE_LANGUAGE:CXX>:${PROJECT_WARNINGS_CXX}>
+              # C warnings
+              $<$<COMPILE_LANGUAGE:C>:${PROJECT_WARNINGS_C}>
+   )
+
+  # If we are using the compiler as a linker driver pass the warnings to it
+  # (most useful when using LTO or warnings as errors)
+  if(CMAKE_CXX_LINK_EXECUTABLE MATCHES "^<CMAKE_CXX_COMPILER>")
+    _set_project_warnings_add_target_link_option(
+      ${_project_name} "$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_WARNINGS_CXX}>"
+    )
+  endif()
+
+  if(CMAKE_C_LINK_EXECUTABLE MATCHES "^<CMAKE_C_COMPILER>")
+    _set_project_warnings_add_target_link_option(
+      ${_project_name} "$<$<COMPILE_LANGUAGE:C>:${PROJECT_WARNINGS_C}>"
+    )
+  endif()
+
+ endfunction()
--- a/cmake/MacOSXBundleInfo.plist.in
+++ b/cmake/MacOSXBundleInfo.plist.in
@ -67,5 +67,16 @@
            <string>Alternate</string>
        </dict>
    </array>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>Curseforge</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+            <string>curseforge</string>
+            </array>
+        </dict>
+    </array>
 </dict>
 </plist>
--- a/flake.lock
+++ b/flake.lock
@ -21,11 +21,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1688466019,
-        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+        "lastModified": 1690933134,
+        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
        "type": "github"
      },
      "original": {
@ -91,11 +91,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1690630721,
-        "narHash": "sha256-Y04onHyBQT4Erfr2fc82dbJTfXGYrf4V0ysLUYnPOP8=",
+        "lastModified": 1693145325,
+        "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d2b52322f35597c62abf56de91b0236746b2a03d",
+        "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56",
        "type": "github"
      },
      "original": {
@ -108,11 +108,11 @@
    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
-        "lastModified": 1688049487,
-        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
+        "lastModified": 1690881714,
+        "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
+        "rev": "9e1960bc196baf6881340d53dccb203a951745a2",
        "type": "github"
      },
      "original": {
@ -138,11 +138,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1690628027,
-        "narHash": "sha256-OTSbA2hM6VmxyZ/4siYPANffMBzIsKu04GLjXcv8ST0=",
+        "lastModified": 1692274144,
+        "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "1e2443dd3f669eb65433b2fc26a3065e05a7dc9c",
+        "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
        "type": "github"
      },
      "original": {
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
--- a/launcher/Application.h
+++ b/launcher/Application.h
@ -38,12 +38,12 @@
 #pragma once

 #include <QApplication>
-#include <memory>
+#include <QDateTime>
 #include <QDebug>
 #include <QFlag>
 #include <QIcon>
-#include <QDateTime>
 #include <QUrl>
+#include <memory>

 #include <BaseInstance.h>

@ -71,6 +71,7 @@ class TranslationsModel;
 class ITheme;
 class MCEditTool;
 class ThemeManager;
+class IconTheme;

 namespace Meta {
 class Index;
@ -81,17 +82,11 @@ namespace Meta {
 #endif
 #define APPLICATION (static_cast<Application*>(QCoreApplication::instance()))

-class Application : public QApplication
-{
+class Application : public QApplication {
    // friends for the purpose of limiting access to deprecated stuff
    Q_OBJECT
   public:
-    enum Status {
-        StartingUp,
-        Failed,
-        Succeeded,
-        Initialized
-    };
+    enum Status { StartingUp, Failed, Succeeded, Initialized };

    enum Capability {
        None = 0,
@ -109,27 +104,13 @@ public:

    bool event(QEvent* event) override;

-    std::shared_ptr<SettingsObject> settings() const {
-        return m_settings;
-    }
+    std::shared_ptr<SettingsObject> settings() const { return m_settings; }

-    qint64 timeSinceStart() const {
-        return startTime.msecsTo(QDateTime::currentDateTime());
-    }
+    qint64 timeSinceStart() const { return startTime.msecsTo(QDateTime::currentDateTime()); }

    QIcon getThemedIcon(const QString& name);

-    void setIconTheme(const QString& name);
-
-    void applyCurrentlySelectedTheme(bool initial = false);
-
-    QList<ITheme*> getValidApplicationThemes();
-
-    void setApplicationTheme(const QString& name);
-
-    QList<CatPack*> getValidCatPacks();
-
-    QString getCatPack(QString catName = "");
+    ThemeManager* themeManager() { return m_themeManager.get(); }

    shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }

@ -139,29 +120,17 @@ public:

    std::shared_ptr<JavaInstallList> javalist();

-    std::shared_ptr<InstanceList> instances() const {
-        return m_instances;
-    }
+    std::shared_ptr<InstanceList> instances() const { return m_instances; }

-    std::shared_ptr<IconList> icons() const {
-        return m_icons;
-    }
+    std::shared_ptr<IconList> icons() const { return m_icons; }

-    MCEditTool *mcedit() const {
-        return m_mcedit.get();
-    }
+    MCEditTool* mcedit() const { return m_mcedit.get(); }

-    shared_qobject_ptr<AccountList> accounts() const {
-        return m_accounts;
-    }
+    shared_qobject_ptr<AccountList> accounts() const { return m_accounts; }

-    Status status() const {
-        return m_status;
-    }
+    Status status() const { return m_status; }

-    const QMap<QString, std::shared_ptr<BaseProfilerFactory>> &profilers() const {
-        return m_profilers;
-    }
+    const QMap<QString, std::shared_ptr<BaseProfilerFactory>>& profilers() const { return m_profilers; }

    void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);

@ -173,6 +142,8 @@ public:

    void updateCapabilities();

+    void detectLibraries();
+
    /*!
     * Finds and returns the full path to a jar file.
     * Returns a null-string if it could not be found.
@ -186,17 +157,11 @@ public:
    QString getUserAgentUncached();

    /// this is the root of the 'installation'. Used for automatic updates
-    const QString &root() {
-        return m_rootPath;
-    }
+    const QString& root() { return m_rootPath; }

-    bool isPortable() {
-        return m_portable;
-    }
+    bool isPortable() { return m_portable; }

-    const Capabilities capabilities() {
-        return m_capabilities;
-    }
+    const Capabilities capabilities() { return m_capabilities; }

    /*!
     * Opens a json file using either a system default editor, or, if not empty, the editor
@ -214,6 +179,8 @@ public:

    int suitableMaxMem();

+    QUrl normalizeImportUrl(QString const& url);
+
   signals:
    void updateAllowedChanged(bool status);
    void globalSettingsAboutToOpen();
@ -225,14 +192,11 @@ signals:
 #endif

   public slots:
-    bool launch(
-        InstancePtr instance,
+    bool launch(InstancePtr instance,
                bool online = true,
                bool demo = false,
-        BaseProfilerFactory *profiler = nullptr,
                MinecraftServerTargetPtr serverToJoin = nullptr,
-        MinecraftAccountPtr accountToUse = nullptr
-    );
+                MinecraftAccountPtr accountToUse = nullptr);
    bool kill(InstancePtr instance);
    void closeCurrentWindow();

@ -312,12 +276,15 @@ private:
    LocalPeer* m_peerInstance = nullptr;

    SetupWizard* m_setupWizard = nullptr;
+
   public:
+    QString m_detectedGLFWPath;
+    QString m_detectedOpenALPath;
    QString m_instanceIdToLaunch;
    QString m_serverToJoin;
    QString m_profileToUse;
    bool m_liveCheck = false;
-    QList<QUrl> m_zipsToImport;
+    QList<QUrl> m_urlsToImport;
    QString m_instanceIdToShowWindowOf;
    std::unique_ptr<QFile> logFile;
 };
--- a/launcher/ApplicationMessage.cpp
+++ b/launcher/ApplicationMessage.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -39,7 +39,8 @@
 #include <QJsonObject>
 #include "Json.h"

-void ApplicationMessage::parse(const QByteArray & input) {
+void ApplicationMessage::parse(const QByteArray& input)
+{
    auto doc = Json::requireDocument(input, "ApplicationMessage");
    auto root = Json::requireObject(doc, "ApplicationMessage");

@ -52,7 +53,8 @@ void ApplicationMessage::parse(const QByteArray & input) {
    }
 }

-QByteArray ApplicationMessage::serialize() {
+QByteArray ApplicationMessage::serialize()
+{
    QJsonObject root;
    root.insert("command", command);
    QJsonObject outArgs;
--- a/launcher/ApplicationMessage.h
+++ b/launcher/ApplicationMessage.h
@ -1,8 +1,8 @@
 #pragma once

-#include <QString>
-#include <QHash>
 #include <QByteArray>
+#include <QHash>
+#include <QString>

 struct ApplicationMessage {
    QString command;
--- a/launcher/BaseInstaller.cpp
+++ b/launcher/BaseInstaller.cpp
@ -18,10 +18,7 @@
 #include "BaseInstaller.h"
 #include "minecraft/MinecraftInstance.h"

-BaseInstaller::BaseInstaller()
-{
-
-}
+BaseInstaller::BaseInstaller() {}

 bool BaseInstaller::isApplied(MinecraftInstance* on)
 {
@ -30,15 +27,12 @@ bool BaseInstaller::isApplied(MinecraftInstance *on)

 bool BaseInstaller::add(MinecraftInstance* to)
 {
-    if (!patchesDir(to->instanceRoot()).exists())
-    {
+    if (!patchesDir(to->instanceRoot()).exists()) {
        QDir(to->instanceRoot()).mkdir("patches");
    }

-    if (isApplied(to))
-    {
-        if (!remove(to))
-        {
+    if (isApplied(to)) {
+        if (!remove(to)) {
            return false;
        }
    }
--- a/launcher/BaseInstaller.h
+++ b/launcher/BaseInstaller.h
@ -26,8 +26,7 @@ class QObject;
 class Task;
 class BaseVersion;

-class BaseInstaller
-{
+class BaseInstaller {
   public:
    BaseInstaller();
    virtual ~BaseInstaller(){};
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -36,23 +37,22 @@

 #include "BaseInstance.h"

-#include <QFileInfo>
-#include <QDir>
 #include <QDebug>
-#include <QRegularExpression>
+#include <QDir>
+#include <QFileInfo>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QRegularExpression>

 #include "settings/INISettingsObject.h"
-#include "settings/Setting.h"
 #include "settings/OverrideSetting.h"
+#include "settings/Setting.h"

-#include "FileSystem.h"
-#include "Commandline.h"
 #include "BuildConfig.h"
+#include "Commandline.h"
+#include "FileSystem.h"

-BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-    : QObject()
+BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir) : QObject()
 {
    m_settings = settings;
    m_global_settings = globalSettings;
@ -101,6 +101,8 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
    m_settings->registerSetting("ManagedPackName", "");
    m_settings->registerSetting("ManagedPackVersionID", "");
    m_settings->registerSetting("ManagedPackVersionName", "");
+
+    m_settings->registerSetting("Profiler", "");
 }

 QString BaseInstance::getPreLaunchCommand()
@ -148,7 +150,11 @@ QString BaseInstance::getManagedPackVersionName() const
    return m_settings->get("ManagedPackVersionName").toString();
 }

-void BaseInstance::setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version)
+void BaseInstance::setManagedPack(const QString& type,
+                                  const QString& id,
+                                  const QString& name,
+                                  const QString& versionId,
+                                  const QString& version)
 {
    m_settings->set("ManagedPack", true);
    m_settings->set("ManagedPackType", type);
@ -173,8 +179,7 @@ int BaseInstance::getConsoleMaxLines() const
    auto lineSetting = m_settings->getSetting("ConsoleMaxLines");
    bool conversionOk = false;
    int maxLines = lineSetting->get().toInt(&conversionOk);
-    if(!conversionOk)
-    {
+    if (!conversionOk) {
        maxLines = lineSetting->defValue().toInt();
        qWarning() << "ConsoleMaxLines has nonsensical value, defaulting to" << maxLines;
    }
@ -220,8 +225,7 @@ bool BaseInstance::isLinkedToInstanceId(const QString& id) const

 void BaseInstance::iconUpdated(QString key)
 {
-    if(iconKey() == key)
-    {
+    if (iconKey() == key) {
        emit propertiesChanged(this);
    }
 }
@ -235,8 +239,7 @@ void BaseInstance::invalidate()
 void BaseInstance::changeStatus(BaseInstance::Status newStatus)
 {
    Status status = currentStatus();
-    if(status != newStatus)
-    {
+    if (status != newStatus) {
        m_status = newStatus;
        emit statusChanged(status, newStatus);
    }
@ -264,18 +267,14 @@ void BaseInstance::setRunning(bool running)

    m_isRunning = running;

-    if(!m_settings->get("RecordGameTime").toBool())
-    {
+    if (!m_settings->get("RecordGameTime").toBool()) {
        emit runningStatusChanged(running);
        return;
    }

-    if(running)
-    {
+    if (running) {
        m_timeStarted = QDateTime::currentDateTime();
-    }
-    else
-    {
+    } else {
        QDateTime timeEnded = QDateTime::currentDateTime();

        qint64 current = settings()->get("totalTimePlayed").toLongLong();
@ -291,8 +290,7 @@ void BaseInstance::setRunning(bool running)
 int64_t BaseInstance::totalTimePlayed() const
 {
    qint64 current = m_settings->get("totalTimePlayed").toLongLong();
-    if(m_isRunning)
-    {
+    if (m_isRunning) {
        QDateTime timeNow = QDateTime::currentDateTime();
        return current + m_timeStarted.secsTo(timeNow);
    }
@ -301,8 +299,7 @@ int64_t BaseInstance::totalTimePlayed() const

 int64_t BaseInstance::lastTimePlayed() const
 {
-    if(m_isRunning)
-    {
+    if (m_isRunning) {
        QDateTime timeNow = QDateTime::currentDateTime();
        return m_timeStarted.secsTo(timeNow);
    }
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -37,24 +38,25 @@
 #pragma once
 #include <cassert>

-#include <QObject>
-#include "QObjectPtr.h"
 #include <QDateTime>
-#include <QSet>
+#include <QMenu>
+#include <QObject>
 #include <QProcess>
+#include <QSet>
+#include "QObjectPtr.h"

 #include "settings/SettingsObject.h"

-#include "settings/INIFile.h"
 #include "BaseVersionList.h"
-#include "minecraft/auth/MinecraftAccount.h"
 #include "MessageLevel.h"
+#include "minecraft/auth/MinecraftAccount.h"
 #include "pathmatcher/IPathMatcher.h"
+#include "settings/INIFile.h"

 #include "net/Mode.h"

-#include "minecraft/launch/MinecraftServerTarget.h"
 #include "RuntimeContext.h"
+#include "minecraft/launch/MinecraftServerTarget.h"

 class QDir;
 class Task;
@ -72,23 +74,21 @@ typedef std::shared_ptr<BaseInstance> InstancePtr;
 * To create a new instance type, create a new class inheriting from this class
 * and implement the pure virtual functions.
 */
-class BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance>
-{
+class BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance> {
    Q_OBJECT
   protected:
    /// no-touchy!
    BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);

   public: /* types */
-    enum class Status
-    {
+    enum class Status {
        Present,
        Gone  // either nuked or invalidated
    };

   public:
    /// virtual destructor to make sure the destruction is COMPLETE
-    virtual ~BaseInstance() {};
+    virtual ~BaseInstance() {}

    virtual void saveNow() = 0;

@ -117,10 +117,7 @@ public:
    QString instanceRoot() const;

    /// Path to the instance's game root directory.
-    virtual QString gameRoot() const
-    {
-        return instanceRoot();
-    }
+    virtual QString gameRoot() const { return instanceRoot(); }

    /// Path to the instance's mods directory.
    virtual QString modsRoot() const = 0;
@ -151,10 +148,7 @@ public:
    void copyManagedPack(BaseInstance& other);

    /// guess log level from a line of game log
-    virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString &line, MessageLevel::Enum level)
-    {
-        return level;
-    };
+    virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString& line, MessageLevel::Enum level) { return level; }

    virtual QStringList extraArguments();

@ -189,8 +183,7 @@ public:
    virtual Task::Ptr createUpdateTask(Net::Mode mode) = 0;

    /// returns a valid launcher (task container)
-    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(
-            AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0;
+    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0;

    /// returns the current launch task (if any)
    shared_qobject_ptr<LaunchTask> getLaunchTask();
@ -222,45 +215,30 @@ public:
    virtual QString typeName() const = 0;

    void updateRuntimeContext();
-    RuntimeContext runtimeContext() const
-    {
-        return m_runtimeContext;
-    }
+    RuntimeContext runtimeContext() const { return m_runtimeContext; }

-    bool hasVersionBroken() const
-    {
-        return m_hasBrokenVersion;
-    }
+    bool hasVersionBroken() const { return m_hasBrokenVersion; }
    void setVersionBroken(bool value)
    {
-        if(m_hasBrokenVersion != value)
-        {
+        if (m_hasBrokenVersion != value) {
            m_hasBrokenVersion = value;
            emit propertiesChanged(this);
        }
    }

-    bool hasUpdateAvailable() const
-    {
-        return m_hasUpdate;
-    }
+    bool hasUpdateAvailable() const { return m_hasUpdate; }
    void setUpdateAvailable(bool value)
    {
-        if(m_hasUpdate != value)
-        {
+        if (m_hasUpdate != value) {
            m_hasUpdate = value;
            emit propertiesChanged(this);
        }
    }

-    bool hasCrashed() const
-    {
-        return m_crashed;
-    }
+    bool hasCrashed() const { return m_crashed; }
    void setCrashed(bool value)
    {
-        if(m_crashed != value)
-        {
+        if (m_crashed != value) {
            m_crashed = value;
            emit propertiesChanged(this);
        }
@ -270,6 +248,8 @@ public:
    virtual bool canEdit() const = 0;
    virtual bool canExport() const = 0;

+    virtual void populateLaunchMenu(QMenu* menu) = 0;
+
    bool reloadSettings();

    /**
@ -291,7 +271,7 @@ public:
   protected:
    void changeStatus(Status newStatus);

-    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); };
+    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); }

    bool isSpecificSettingsLoaded() const { return m_specific_settings_loaded; }
    void setSpecificSettingsLoaded(bool loaded) { m_specific_settings_loaded = loaded; }
@ -306,6 +286,8 @@ signals:

    void runningStatusChanged(bool running);

+    void profilerChanged();
+
    void statusChanged(Status from, Status to);

   protected slots:
@ -328,7 +310,6 @@ private: /* data */

    SettingsObjectWeakPtr m_global_settings;
    bool m_specific_settings_loaded = false;
-
 };

 Q_DECLARE_METATYPE(shared_qobject_ptr<BaseInstance>)
--- a/launcher/BaseVersion.h
+++ b/launcher/BaseVersion.h
@ -43,9 +43,8 @@ class BaseVersion {
     * the kind of version this is (Stable, Beta, Snapshot, whatever)
     */
    virtual QString typeString() const = 0;
-
-    virtual bool operator<(BaseVersion& a) { return name() < a.name(); };
-    virtual bool operator>(BaseVersion& a) { return name() > a.name(); };
+    virtual bool operator<(BaseVersion& a) { return name() < a.name(); }
+    virtual bool operator>(BaseVersion& a) { return name() > a.name(); }
 };

 Q_DECLARE_METATYPE(BaseVersion::Ptr)
--- a/launcher/BaseVersionList.cpp
+++ b/launcher/BaseVersionList.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -36,14 +36,11 @@
 #include "BaseVersionList.h"
 #include "BaseVersion.h"

-BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
-{
-}
+BaseVersionList::BaseVersionList(QObject* parent) : QAbstractListModel(parent) {}

 BaseVersion::Ptr BaseVersionList::findVersion(const QString& descriptor)
 {
-    for (int i = 0; i < count(); i++)
-    {
+    for (int i = 0; i < count(); i++) {
        if (at(i)->descriptor() == descriptor)
            return at(i);
    }
@ -68,8 +65,7 @@ QVariant BaseVersionList::data(const QModelIndex &index, int role) const

    BaseVersion::Ptr version = at(index.row());

-    switch (role)
-    {
+    switch (role) {
        case VersionPointerRole:
            return QVariant::fromValue(version);

--- a/launcher/BaseVersionList.h
+++ b/launcher/BaseVersionList.h
@ -15,13 +15,13 @@

 #pragma once

+#include <QAbstractListModel>
 #include <QObject>
 #include <QVariant>
-#include <QAbstractListModel>

 #include "BaseVersion.h"
-#include "tasks/Task.h"
 #include "QObjectPtr.h"
+#include "tasks/Task.h"

 /*!
 * \brief Class that each instance type's version list derives from.
@ -35,12 +35,10 @@
 * all have a default implementation, but they can be overridden by plugins to
 * change the behavior of the list.
 */
-class BaseVersionList : public QAbstractListModel
-{
+class BaseVersionList : public QAbstractListModel {
    Q_OBJECT
   public:
-    enum ModelRoles
-    {
+    enum ModelRoles {
        VersionPointerRole = Qt::UserRole,
        VersionRole,
        VersionIdRole,
@ -103,8 +101,7 @@ public:
     */
    virtual void sortVersions() = 0;

-protected
-slots:
+   protected slots:
    /*!
     * Updates this list with the given list of versions.
     * This is done by copying each version in the given list and inserting it
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@ -136,6 +136,15 @@ set(NET_SOURCES
    net/Validator.h
    net/Upload.cpp
    net/Upload.h
+    net/HeaderProxy.h
+    net/RawHeaderProxy.h
+    net/ApiHeaderProxy.h
+    net/ApiDownload.h
+    net/ApiDownload.cpp
+    net/ApiUpload.cpp
+    net/ApiUpload.h
+    net/NetRequest.cpp
+    net/NetRequest.h
 )

 # Game launch logic
@ -566,6 +575,9 @@ set(ATLAUNCHER_SOURCES
 )

 set(LINKEXE_SOURCES
+    WindowsConsole.cpp
+    WindowsConsole.h
+
    filelink/FileLink.h
    filelink/FileLink.cpp
    FileSystem.h
@ -762,6 +774,8 @@ SET(LAUNCHER_SOURCES
    ui/themes/ITheme.h
    ui/themes/SystemTheme.cpp
    ui/themes/SystemTheme.h
+    ui/themes/IconTheme.cpp
+    ui/themes/IconTheme.h
    ui/themes/ThemeManager.cpp
    ui/themes/ThemeManager.h
    ui/themes/CatPack.cpp
@ -962,6 +976,8 @@ SET(LAUNCHER_SOURCES
    ui/dialogs/ChooseProviderDialog.cpp
    ui/dialogs/ModUpdateDialog.cpp
    ui/dialogs/ModUpdateDialog.h
+    ui/dialogs/InstallLoaderDialog.cpp
+    ui/dialogs/InstallLoaderDialog.h

    # GUI - widgets
    ui/widgets/Common.cpp
@ -1026,6 +1042,14 @@ SET(LAUNCHER_SOURCES
    ui/instanceview/VisualGroup.h
 )

+if(WIN32)
+    set(LAUNCHER_SOURCES
+        WindowsConsole.cpp
+        WindowsConsole.h
+        ${LAUNCHER_SOURCES}
+    )
+endif()
+
 qt_wrap_ui(LAUNCHER_UI
    ui/MainWindow.ui
    ui/setupwizard/PasteWizardPage.ui
@ -1109,8 +1133,15 @@ if(WIN32)
    set(LAUNCHER_RCS ${CMAKE_CURRENT_BINARY_DIR}/../${Launcher_Branding_WindowsRC})
 endif()

+include(CompilerWarnings)
+
 # Add executable
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
+set_project_warnings(Launcher_logic
+    "${Launcher_MSVC_WARNINGS}"
+    "${Launcher_CLANG_WARNINGS}"
+    "${Launcher_GCC_WARNINGS}")
+target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
 target_include_directories(Launcher_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(Launcher_logic
    systeminfo
@ -1195,6 +1226,11 @@ install(TARGETS ${Launcher_Name}

 if(WIN32)
    add_library(filelink_logic STATIC ${LINKEXE_SOURCES})
+    set_project_warnings(filelink_logic
+    "${Launcher_MSVC_WARNINGS}"
+    "${Launcher_CLANG_WARNINGS}"
+    "${Launcher_GCC_WARNINGS}")
+
    target_include_directories(filelink_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
    target_link_libraries(filelink_logic
        systeminfo
--- a/launcher/Commandline.cpp
+++ b/launcher/Commandline.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -41,8 +41,7 @@
 * @file libutil/src/cmdutils.cpp
 */

-namespace Commandline
-{
+namespace Commandline {

 // commandline splitter
 QStringList splitArgs(QString args)
@ -51,19 +50,15 @@ QStringList splitArgs(QString args)
    QString current;
    bool escape = false;
    QChar inquotes;
-    for (int i = 0; i < args.length(); i++)
-    {
+    for (int i = 0; i < args.length(); i++) {
        QChar cchar = args.at(i);

        // \ escaped
-        if (escape)
-        {
+        if (escape) {
            current += cchar;
            escape = false;
            // in "quotes"
-        }
-        else if (!inquotes.isNull())
-        {
+        } else if (!inquotes.isNull()) {
            if (cchar == '\\')
                escape = true;
            else if (cchar == inquotes)
@ -71,18 +66,13 @@ QStringList splitArgs(QString args)
            else
                current += cchar;
            // otherwise
-        }
-        else
-        {
-            if (cchar == ' ')
-            {
-                if (!current.isEmpty())
-                {
+        } else {
+            if (cchar == ' ') {
+                if (!current.isEmpty()) {
                    argv << current;
                    current.clear();
                }
-            }
-            else if (cchar == '"' || cchar == '\'')
+            } else if (cchar == '"' || cchar == '\'')
                inquotes = cchar;
            else
                current += cchar;
@ -92,4 +82,4 @@ QStringList splitArgs(QString args)
        argv << current;
    return argv;
 }
-}
+}  // namespace Commandline
--- a/launcher/Commandline.h
+++ b/launcher/Commandline.h
@ -25,8 +25,7 @@
 * @brief commandline parsing and processing utilities
 */

-namespace Commandline
-{
+namespace Commandline {

 /**
 * @brief split a string into argv items like a shell would do
@ -34,4 +33,4 @@ namespace Commandline
 * @return a QStringList containing all arguments
 */
 QStringList splitArgs(QString args);
-}
+}  // namespace Commandline
--- a/launcher/DefaultVariable.h
+++ b/launcher/DefaultVariable.h
@ -1,13 +1,9 @@
 #pragma once

 template <typename T>
-class DefaultVariable
-{
+class DefaultVariable {
   public:
-    DefaultVariable(const T & value)
-    {
-        defaultValue = value;
-    }
+    DefaultVariable(const T& value) { defaultValue = value; }
    DefaultVariable<T>& operator=(const T& value)
    {
        currentValue = value;
@ -15,18 +11,10 @@ public:
        is_explicit = true;
        return *this;
    }
-    operator const T &() const
-    {
-        return is_default ? defaultValue : currentValue;
-    }
-    bool isDefault() const
-    {
-        return is_default;
-    }
-    bool isExplicit() const
-    {
-        return is_explicit;
-    }
+    operator const T&() const { return is_default ? defaultValue : currentValue; }
+    bool isDefault() const { return is_default; }
+    bool isExplicit() const { return is_explicit; }
+
   private:
    T currentValue;
    T defaultValue;
--- a/launcher/DesktopServices.cpp
+++ b/launcher/DesktopServices.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 dada513 <dada513@protonmail.com>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -33,40 +33,37 @@
 *      limitations under the License.
 */
 #include "DesktopServices.h"
-#include <QDir>
-#include <QDesktopServices>
-#include <QProcess>
 #include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QProcess>

 /**
 * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
 */
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)

-#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>

 template <typename T>
 bool IndirectOpen(T callable, qint64* pid_forked = nullptr)
 {
    auto pid = fork();
-    if(pid_forked)
-    {
+    if (pid_forked) {
        if (pid > 0)
            *pid_forked = pid;
        else
            *pid_forked = 0;
    }
-    if(pid == -1)
-    {
+    if (pid == -1) {
        qWarning() << "IndirectOpen failed to fork: " << errno;
        return false;
    }
    // child - do the stuff
-    if(pid == 0)
-    {
+    if (pid == 0) {
        // unset all this garbage so it doesn't get passed to the child process
        qunsetenv("LD_PRELOAD");
        qunsetenv("LD_LIBRARY_PATH");
@ -82,19 +79,14 @@ bool IndirectOpen(T callable, qint64 *pid_forked = nullptr)

        // die. now. do not clean up anything, it would just hang forever.
        _exit(status ? 0 : 1);
-    }
-    else
-    {
+    } else {
        // parent - assume it worked.
        int status;
-        while (waitpid(pid, &status, 0))
-        {
-            if(WIFEXITED(status))
-            {
+        while (waitpid(pid, &status, 0)) {
+            if (WIFEXITED(status)) {
                return WEXITSTATUS(status) == 0;
            }
-            if(WIFSIGNALED(status))
-            {
+            if (WIFSIGNALED(status)) {
                return false;
            }
        }
@ -104,26 +96,19 @@ bool IndirectOpen(T callable, qint64 *pid_forked = nullptr)
 #endif

 namespace DesktopServices {
-bool openDirectory(const QString &path, bool ensureExists)
+bool openDirectory(const QString& path, [[maybe_unused]] bool ensureExists)
 {
    qDebug() << "Opening directory" << path;
    QDir parentPath;
    QDir dir(path);
-    if (!dir.exists())
-    {
+    if (ensureExists && !dir.exists()) {
        parentPath.mkpath(dir.absolutePath());
    }
-    auto f = [&]()
-    {
-        return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
-    };
+    auto f = [&]() { return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isSandbox())
-    {
+    if (!isSandbox()) {
        return IndirectOpen(f);
-    }
-    else
-    {
+    } else {
        return f();
    }
 #else
@ -134,17 +119,11 @@ bool openDirectory(const QString &path, bool ensureExists)
 bool openFile(const QString& path)
 {
    qDebug() << "Opening file" << path;
-    auto f = [&]()
-    {
-        return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-    };
+    auto f = [&]() { return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isSandbox())
-    {
+    if (!isSandbox()) {
        return IndirectOpen(f);
-    }
-    else
-    {
+    } else {
        return f();
    }
 #else
@ -157,15 +136,9 @@ bool openFile(const QString &application, const QString &path, const QString &wo
    qDebug() << "Opening file" << path << "using" << application;
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
    // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-    if(!isSandbox())
-    {
-        return IndirectOpen([&]()
-        {
-            return QProcess::startDetached(application, QStringList() << path, workingDirectory);
-        }, pid);
-    }
-    else
-    {
+    if (!isSandbox()) {
+        return IndirectOpen([&]() { return QProcess::startDetached(application, QStringList() << path, workingDirectory); }, pid);
+    } else {
        return QProcess::startDetached(application, QStringList() << path, workingDirectory, pid);
    }
 #else
@ -177,16 +150,10 @@ bool run(const QString &application, const QStringList &args, const QString &wor
 {
    qDebug() << "Running" << application << "with args" << args.join(' ');
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isSandbox())
-    {
+    if (!isSandbox()) {
        // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-    return IndirectOpen([&]()
-    {
-        return QProcess::startDetached(application, args, workingDirectory);
-    }, pid);
-    }
-    else
-    {
+        return IndirectOpen([&]() { return QProcess::startDetached(application, args, workingDirectory); }, pid);
+    } else {
        return QProcess::startDetached(application, args, workingDirectory, pid);
    }
 #else
@ -197,17 +164,11 @@ bool run(const QString &application, const QStringList &args, const QString &wor
 bool openUrl(const QUrl& url)
 {
    qDebug() << "Opening URL" << url.toString();
-    auto f = [&]()
-    {
-        return QDesktopServices::openUrl(url);
-    };
+    auto f = [&]() { return QDesktopServices::openUrl(url); };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isSandbox())
-    {
+    if (!isSandbox()) {
        return IndirectOpen(f);
-    }
-    else
-    {
+    } else {
        return f();
    }
 #else
@ -238,4 +199,4 @@ bool isSandbox()
    return isSnap() || isFlatpak();
 }

-}
+}  // namespace DesktopServices
--- a/launcher/DesktopServices.h
+++ b/launcher/DesktopServices.h
@ -1,14 +1,13 @@
 #pragma once

-#include <QUrl>
 #include <QString>
+#include <QUrl>

 /**
 * This wraps around QDesktopServices and adds workarounds where needed
 * Use this instead of QDesktopServices!
 */
-namespace DesktopServices
-{
+namespace DesktopServices {
 /**
 * Open a file in whatever application is applicable
 */
@ -48,4 +47,4 @@ namespace DesktopServices
 * Determine whether the launcher is running in a sandboxed (Flatpak or Snap) environment
 */
 bool isSandbox();
-}
+}  // namespace DesktopServices
--- a/launcher/Exception.h
+++ b/launcher/Exception.h
@ -2,30 +2,17 @@

 #pragma once

-#include <QString>
 #include <QDebug>
+#include <QString>
 #include <exception>

-class Exception : public std::exception
-{
+class Exception : public std::exception {
   public:
-    Exception(const QString &message) : std::exception(), m_message(message)
-    {
-        qCritical() << "Exception:" << message;
-    }
-    Exception(const Exception &other)
-        : std::exception(), m_message(other.cause())
-    {
-    }
+    Exception(const QString& message) : std::exception(), m_message(message) { qCritical() << "Exception:" << message; }
+    Exception(const Exception& other) : std::exception(), m_message(other.cause()) {}
    virtual ~Exception() noexcept {}
-    const char *what() const noexcept
-    {
-        return m_message.toLatin1().constData();
-    }
-    QString cause() const
-    {
-        return m_message;
-    }
+    const char* what() const noexcept { return m_message.toLatin1().constData(); }
+    QString cause() const { return m_message; }

   private:
    QString m_message;
--- a/launcher/ExponentialSeries.h
+++ b/launcher/ExponentialSeries.h
@ -4,20 +4,16 @@
 template <typename T>
 inline void clamp(T& current, T min, T max)
 {
-    if (current < min)
-    {
+    if (current < min) {
        current = min;
-    }
-    else if(current > max)
-    {
+    } else if (current > max) {
        current = max;
    }
 }

 // List of numbers from min to max. Next is exponent times bigger than previous.

-class ExponentialSeries
-{
+class ExponentialSeries {
   public:
    ExponentialSeries(unsigned min, unsigned max, unsigned exponent = 2)
    {
@ -25,10 +21,7 @@ public:
        m_max = max;
        m_exponent = exponent;
    }
-    void reset()
-    {
-        m_current = m_min;
-    }
+    void reset() { m_current = m_min; }
    unsigned operator()()
    {
        unsigned retval = m_current;
--- a/launcher/FileIgnoreProxy.cpp
+++ b/launcher/FileIgnoreProxy.cpp
@ -267,10 +267,7 @@ bool FileIgnoreProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceP

 bool FileIgnoreProxy::ignoreFile(QFileInfo fileInfo) const
 {
-    auto fileName = fileInfo.fileName();
-    auto path = relPath(fileInfo.absoluteFilePath());
-    return std::any_of(m_ignoreFiles.cbegin(), m_ignoreFiles.cend(), [fileName](auto iFileName) { return fileName == iFileName; }) ||
-           m_ignoreFilePaths.covers(path);
+    return m_ignoreFiles.contains(fileInfo.fileName()) || m_ignoreFilePaths.covers(relPath(fileInfo.absoluteFilePath()));
 }

 bool FileIgnoreProxy::filterFile(const QString& fileName) const
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@ -779,7 +779,8 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
    }
 #if defined(Q_OS_MACOS)
    // Create the Application
-    QDir applicationDirectory = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation) + "/" + BuildConfig.LAUNCHER_NAME + " Instances/";
+    QDir applicationDirectory =
+        QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation) + "/" + BuildConfig.LAUNCHER_NAME + " Instances/";

    if (!applicationDirectory.mkpath(".")) {
        qWarning() << "Couldn't create application directory";
@ -843,7 +844,9 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
                  "    <key>CFBundleIconFile</key>\n"
                  "    <string>Icon.icns</string>\n"
                  "    <key>CFBundleName</key>\n"
-                  "    <string>" << name << "</string>\n"  // Name of the application
+                  "    <string>"
+               << name
+               << "</string>\n"  // Name of the application
                  "    <key>CFBundlePackageType</key>\n"
                  "    <string>APPL</string>\n"
                  "    <key>CFBundleShortVersionString</key>\n"
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@ -43,10 +43,10 @@
 #include <system_error>

 #include <QDir>
-#include <QPair>
 #include <QFlags>
 #include <QLocalServer>
 #include <QObject>
+#include <QPair>
 #include <QThread>

 namespace FS {
@ -112,8 +112,8 @@ class copy : public QObject {

    bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }

-    int totalCopied() { return m_copied; }
-    int totalFailed() { return m_failedPaths.length(); }
+    qsizetype totalCopied() { return m_copied; }
+    qsizetype totalFailed() { return m_failedPaths.length(); }
    QStringList failed() { return m_failedPaths; }

   signals:
@ -130,7 +130,7 @@ class copy : public QObject {
    bool m_whitelist = false;
    QDir m_src;
    QDir m_dst;
-    int m_copied;
+    qsizetype m_copied;
    QStringList m_failedPaths;
 };

@ -365,12 +365,12 @@ enum class FilesystemType {
 * QMap is ordered
 *
 */
-static const QMap<FilesystemType, QStringList> s_filesystem_type_names = {
-    {FilesystemType::FAT,        { "FAT" }},
+static const QMap<FilesystemType, QStringList> s_filesystem_type_names = { { FilesystemType::FAT, { "FAT" } },
                                                                           { FilesystemType::NTFS, { "NTFS" } },
                                                                           { FilesystemType::REFS, { "REFS" } },
                                                                           { FilesystemType::EXT_2_OLD, { "EXT_2_OLD", "EXT2_OLD" } },
-    {FilesystemType::EXT_2_3_4,  { "EXT2/3/4", "EXT_2_3_4", "EXT2", "EXT3", "EXT4" }},
+                                                                           { FilesystemType::EXT_2_3_4,
+                                                                             { "EXT2/3/4", "EXT_2_3_4", "EXT2", "EXT3", "EXT4" } },
                                                                           { FilesystemType::EXT, { "EXT" } },
                                                                           { FilesystemType::XFS, { "XFS" } },
                                                                           { FilesystemType::BTRFS, { "BTRFS" } },
@ -382,8 +382,7 @@ static const QMap<FilesystemType, QStringList> s_filesystem_type_names = {
                                                                           { FilesystemType::HFSX, { "HFSX" } },
                                                                           { FilesystemType::FUSEBLK, { "FUSEBLK" } },
                                                                           { FilesystemType::F2FS, { "F2FS" } },
-    {FilesystemType::UNKNOWN,    { "UNKNOWN" }}
-};
+                                                                           { FilesystemType::UNKNOWN, { "UNKNOWN" } } };

 /**
 * @brief Get the string name of Filesystem enum object
@ -475,8 +474,8 @@ class clone : public QObject {

    bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }

-    int totalCloned() { return m_cloned; }
-    int totalFailed() { return m_failedClones.length(); }
+    qsizetype totalCloned() { return m_cloned; }
+    qsizetype totalFailed() { return m_failedClones.length(); }

    QList<QPair<QString, QString>> failed() { return m_failedClones; }

@ -492,7 +491,7 @@ class clone : public QObject {
    bool m_whitelist = false;
    QDir m_src;
    QDir m_dst;
-    int m_cloned;
+    qsizetype m_cloned;
    QList<QPair<QString, QString>> m_failedClones;
 };

--- a/launcher/Filter.cpp
+++ b/launcher/Filter.cpp
@ -16,8 +16,13 @@ bool ExactFilter::accepts(const QString& value)
    return value == pattern;
 }

-RegexpFilter::RegexpFilter(const QString& regexp, bool invert)
-    :invert(invert)
+ExactIfPresentFilter::ExactIfPresentFilter(const QString& pattern) : pattern(pattern) {}
+bool ExactIfPresentFilter::accepts(const QString& value)
+{
+    return value.isEmpty() || value == pattern;
+}
+
+RegexpFilter::RegexpFilter(const QString& regexp, bool invert) : invert(invert)
 {
    pattern.setPattern(regexp);
    pattern.optimize();
--- a/launcher/Filter.h
+++ b/launcher/Filter.h
@ -1,41 +1,50 @@
 #pragma once

-#include <QString>
 #include <QRegularExpression>
+#include <QString>

-class Filter
-{
+class Filter {
   public:
    virtual ~Filter();
    virtual bool accepts(const QString& value) = 0;
 };

-class ContainsFilter: public Filter
-{
+class ContainsFilter : public Filter {
   public:
    ContainsFilter(const QString& pattern);
    virtual ~ContainsFilter();
    bool accepts(const QString& value) override;
+
   private:
    QString pattern;
 };

-class ExactFilter: public Filter
-{
+class ExactFilter : public Filter {
   public:
    ExactFilter(const QString& pattern);
    virtual ~ExactFilter();
    bool accepts(const QString& value) override;
+
   private:
    QString pattern;
 };

-class RegexpFilter: public Filter
-{
+class ExactIfPresentFilter : public Filter {
+   public:
+    ExactIfPresentFilter(const QString& pattern);
+    ~ExactIfPresentFilter() override = default;
+    bool accepts(const QString& value) override;
+
+   private:
+    QString pattern;
+};
+
+class RegexpFilter : public Filter {
   public:
    RegexpFilter(const QString& regexp, bool invert);
    virtual ~RegexpFilter();
    bool accepts(const QString& value) override;
+
   private:
    QRegularExpression pattern;
    bool invert = false;
--- a/launcher/GZip.cpp
+++ b/launcher/GZip.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -39,8 +39,7 @@

 bool GZip::unzip(const QByteArray& compressedBytes, QByteArray& uncompressedBytes)
 {
-    if (compressedBytes.size() == 0)
-    {
+    if (compressedBytes.size() == 0) {
        uncompressedBytes = compressedBytes;
        return true;
    }
@ -56,18 +55,15 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte

    bool done = false;

-    if (inflateInit2(&strm, (16 + MAX_WBITS)) != Z_OK)
-    {
+    if (inflateInit2(&strm, (16 + MAX_WBITS)) != Z_OK) {
        return false;
    }

    int err = Z_OK;

-    while (!done)
-    {
+    while (!done) {
        // If our output buffer is too small
-        if (strm.total_out >= uncompLength)
-        {
+        if (strm.total_out >= uncompLength) {
            uncompressedBytes.resize(uncompLength * 2);
            uncompLength *= 2;
        }
@ -79,14 +75,12 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte
        err = inflate(&strm, Z_SYNC_FLUSH);
        if (err == Z_STREAM_END)
            done = true;
-        else if (err != Z_OK)
-        {
+        else if (err != Z_OK) {
            break;
        }
    }

-    if (inflateEnd(&strm) != Z_OK || !done)
-    {
+    if (inflateEnd(&strm) != Z_OK || !done) {
        return false;
    }

@ -96,8 +90,7 @@ bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedByte

 bool GZip::zip(const QByteArray& uncompressedBytes, QByteArray& compressedBytes)
 {
-    if (uncompressedBytes.size() == 0)
-    {
+    if (uncompressedBytes.size() == 0) {
        compressedBytes = uncompressedBytes;
        return true;
    }
@ -109,8 +102,7 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
    z_stream zs;
    memset(&zs, 0, sizeof(zs));

-    if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (16 + MAX_WBITS), 8, Z_DEFAULT_STRATEGY) != Z_OK)
-    {
+    if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (16 + MAX_WBITS), 8, Z_DEFAULT_STRATEGY) != Z_OK) {
        return false;
    }

@ -122,11 +114,9 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)

    unsigned offset = 0;
    unsigned temp = 0;
-    do
-    {
+    do {
        auto remaining = compressedBytes.size() - offset;
-        if(remaining < 1)
-        {
+        if (remaining < 1) {
            compressedBytes.resize(compressedBytes.size() * 2);
        }
        zs.next_out = reinterpret_cast<Bytef*>((compressedBytes.data() + offset));
@ -137,13 +127,11 @@ bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)

    compressedBytes.resize(offset);

-    if (deflateEnd(&zs) != Z_OK)
-    {
+    if (deflateEnd(&zs) != Z_OK) {
        return false;
    }

-    if (ret != Z_STREAM_END)
-    {
+    if (ret != Z_STREAM_END) {
        return false;
    }
    return true;
--- a/launcher/GZip.h
+++ b/launcher/GZip.h
@ -1,10 +1,8 @@
 #pragma once
 #include <QByteArray>

-class GZip
-{
+class GZip {
   public:
    static bool unzip(const QByteArray& compressedBytes, QByteArray& uncompressedBytes);
    static bool zip(const QByteArray& uncompressedBytes, QByteArray& compressedBytes);
 };
-
--- a/launcher/InstanceCopyPrefs.cpp
+++ b/launcher/InstanceCopyPrefs.cpp
@ -6,17 +6,10 @@

 bool InstanceCopyPrefs::allTrue() const
 {
-    return copySaves &&
-        keepPlaytime &&
-        copyGameOptions &&
-        copyResourcePacks &&
-        copyShaderPacks &&
-        copyServers &&
-        copyMods &&
+    return copySaves && keepPlaytime && copyGameOptions && copyResourcePacks && copyShaderPacks && copyServers && copyMods &&
           copyScreenshots;
 }

-
 // Returns a single RegEx string of the selected folders/files to filter out (ex: ".minecraft/saves|.minecraft/server.dat")
 QString InstanceCopyPrefs::getSelectedFiltersAsRegex() const
 {
@ -33,16 +26,21 @@ QString InstanceCopyPrefs::getSelectedFiltersAsRegex(const QStringList& addition
        filters << "options.txt";

    if (!copyResourcePacks)
-        filters << "resourcepacks" << "texturepacks";
+        filters << "resourcepacks"
+                << "texturepacks";

    if (!copyShaderPacks)
        filters << "shaderpacks";

    if (!copyServers)
-        filters << "servers.dat" << "servers.dat_old" << "server-resource-packs";
+        filters << "servers.dat"
+                << "servers.dat_old"
+                << "server-resource-packs";

    if (!copyMods)
-        filters << "coremods" << "mods" << "config";
+        filters << "coremods"
+                << "mods"
+                << "config";

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

        FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);
--- a/launcher/InstanceCopyTask.h
+++ b/launcher/InstanceCopyTask.h
@ -11,8 +11,7 @@
 #include "settings/SettingsObject.h"
 #include "tasks/Task.h"

-class InstanceCopyTask : public InstanceTask
-{
+class InstanceCopyTask : public InstanceTask {
    Q_OBJECT
   public:
    explicit InstanceCopyTask(InstancePtr origInstance, const InstanceCopyPrefs& prefs);
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
 *
@ -45,11 +45,14 @@
 #include "icons/IconList.h"
 #include "icons/IconUtils.h"

-#include "modplatform/technic/TechnicPackProcessor.h"
-#include "modplatform/modrinth/ModrinthInstanceCreationTask.h"
 #include "modplatform/flame/FlameInstanceCreationTask.h"
+#include "modplatform/modrinth/ModrinthInstanceCreationTask.h"
+#include "modplatform/technic/TechnicPackProcessor.h"

 #include "settings/INISettingsObject.h"
+#include "tasks/Task.h"
+
+#include "net/ApiDownload.h"

 #include <QtConcurrentRun>
 #include <algorithm>
@ -88,24 +91,26 @@ void InstanceImportTask::executeTask()
        setStatus(tr("Downloading modpack:\n%1").arg(m_sourceUrl.toString()));
        m_downloadRequired = true;

-        const QString path(m_sourceUrl.host() + '/' + m_sourceUrl.path());
+        downloadFromUrl();
+    }
+}

+void InstanceImportTask::downloadFromUrl()
+{
+    const QString path = m_sourceUrl.host() + '/' + m_sourceUrl.path();
    auto entry = APPLICATION->metacache()->resolveEntry("general", path);
    entry->setStale(true);
-        m_archivePath = entry->getFullPath();
-
    m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
-        m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
+    m_archivePath = entry->getFullPath();

    connect(m_filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
    connect(m_filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propagateStepProgress);
    connect(m_filesNetJob.get(), &NetJob::failed, this, &InstanceImportTask::downloadFailed);
    connect(m_filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::downloadAborted);
-
    m_filesNetJob->start();
 }
-}

 void InstanceImportTask::downloadSucceeded()
 {
@ -138,8 +143,7 @@ void InstanceImportTask::processZipPack()

    // open the zip and find relevant files in it
    m_packZip.reset(new QuaZip(m_archivePath));
-    if (!m_packZip->open(QuaZip::mdUnzip))
-    {
+    if (!m_packZip->open(QuaZip::mdUnzip)) {
        emitFailed(tr("Unable to open supplied modpack zip file."));
        return;
    }
@ -153,22 +157,17 @@ void InstanceImportTask::processZipPack()

    // NOTE: Prioritize modpack platforms that aren't searched for recursively.
    // Especially Flame has a very common filename for its manifest, which may appear inside overrides for example
-    if(modrinthFound)
-    {
+    if (modrinthFound) {
        // process as Modrinth pack
        qDebug() << "Modrinth:" << modrinthFound;
        m_modpackType = ModpackType::Modrinth;
-    }
-    else if (technicFound)
-    {
+    } else if (technicFound) {
        // process as Technic pack
        qDebug() << "Technic:" << technicFound;
        extractDir.mkpath(".minecraft");
        extractDir.cd(".minecraft");
        m_modpackType = ModpackType::Technic;
-    }
-    else
-    {
+    } else {
        QStringList paths_to_ignore{ "overrides/" };

        if (QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg", paths_to_ignore); !mmcRoot.isNull()) {
@ -176,21 +175,22 @@ void InstanceImportTask::processZipPack()
            qDebug() << "MultiMC:" << mmcRoot;
            root = mmcRoot;
            m_modpackType = ModpackType::MultiMC;
-        } else if (QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json", paths_to_ignore); !flameRoot.isNull()) {
+        } else if (QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json", paths_to_ignore);
+                   !flameRoot.isNull()) {
            // process as Flame pack
            qDebug() << "Flame:" << flameRoot;
            root = flameRoot;
            m_modpackType = ModpackType::Flame;
        }
    }
-    if(m_modpackType == ModpackType::Unknown)
-    {
+    if (m_modpackType == ModpackType::Unknown) {
        emitFailed(tr("Archive does not contain a recognized modpack type."));
        return;
    }

    // make sure we extract just the pack
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
+    m_extractFuture =
+        QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
    connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &InstanceImportTask::extractFinished);
    m_extractFutureWatcher.setFuture(m_extractFuture);
 }
@ -210,37 +210,28 @@ void InstanceImportTask::extractFinished()

    qDebug() << "Fixing permissions for extracted pack files...";
    QDirIterator it(extractDir, QDirIterator::Subdirectories);
-    while (it.hasNext())
-    {
+    while (it.hasNext()) {
        auto filepath = it.next();
        QFileInfo file(filepath);
        auto permissions = QFile::permissions(filepath);
        auto origPermissions = permissions;
-        if(file.isDir())
-        {
+        if (file.isDir()) {
            // Folder +rwx for current user
            permissions |= QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser;
-        }
-        else
-        {
+        } else {
            // File +rw for current user
            permissions |= QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser;
        }
-        if(origPermissions != permissions)
-        {
-            if(!QFile::setPermissions(filepath, permissions))
-            {
+        if (origPermissions != permissions) {
+            if (!QFile::setPermissions(filepath, permissions)) {
                logWarning(tr("Could not fix permissions for %1").arg(filepath));
-            }
-            else
-            {
+            } else {
                qDebug() << "Fixed" << filepath;
            }
        }
    }

-    switch(m_modpackType)
-    {
+    switch (m_modpackType) {
        case ModpackType::MultiMC:
            processMultiMC();
            return;
@ -276,7 +267,8 @@ void InstanceImportTask::processFlame()
        if (original_instance_id_it != m_extra_info.constEnd())
            original_instance_id = original_instance_id_it.value();

-        inst_creation_task = makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+        inst_creation_task =
+            makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
    } else {
        // FIXME: Find a way to get IDs in directly imported ZIPs
        inst_creation_task = makeShared<FlameCreationTask>(m_stagingPath, m_globalSettings, m_parent, QString(), QString());
@ -362,7 +354,8 @@ void InstanceImportTask::processModrinth()
        if (original_instance_id_it != m_extra_info.constEnd())
            original_instance_id = original_instance_id_it.value();

-        inst_creation_task = new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+        inst_creation_task =
+            new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
    } else {
        QString pack_id;
        if (!m_sourceUrl.isEmpty()) {
--- a/launcher/InstanceImportTask.h
+++ b/launcher/InstanceImportTask.h
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -35,34 +35,29 @@

 #pragma once

-#include "InstanceTask.h"
-#include "net/NetJob.h"
-#include <QUrl>
 #include <QFuture>
 #include <QFutureWatcher>
-#include "settings/SettingsObject.h"
+#include <QUrl>
+#include "InstanceTask.h"
 #include "QObjectPtr.h"
 #include "modplatform/flame/PackManifest.h"
+#include "net/NetJob.h"
+#include "settings/SettingsObject.h"

 #include <optional>

 class QuaZip;
-namespace Flame
-{
+namespace Flame {
 class FileResolvingTask;
 }

-class InstanceImportTask : public InstanceTask
-{
+class InstanceImportTask : public InstanceTask {
    Q_OBJECT
   public:
    explicit InstanceImportTask(const QUrl sourceUrl, QWidget* parent = nullptr, QMap<QString, QString>&& extra_info = {});

    bool abort() override;
-    const QVector<Flame::File> &getBlockedFiles() const
-    {
-        return m_blockedMods;
-    }
+    const QVector<Flame::File>& getBlockedFiles() const { return m_blockedMods; }

   protected:
    //! Entry point for tasks.
@ -106,4 +101,5 @@ private: /* data */

    // FIXME: nuke
    QWidget* m_parent;
+    void downloadFromUrl();
 };
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -41,9 +41,9 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QMimeData>
+#include <QPair>
 #include <QSet>
 #include <QStack>
-#include <QPair>
 #include <QTextStream>
 #include <QThread>
 #include <QTimer>
@ -96,7 +96,11 @@ Qt::DropActions InstanceList::supportedDropActions() const
    return Qt::MoveAction;
 }

-bool InstanceList::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+bool InstanceList::canDropMimeData(const QMimeData* data,
+                                   [[maybe_unused]] Qt::DropAction action,
+                                   [[maybe_unused]] int row,
+                                   [[maybe_unused]] int column,
+                                   [[maybe_unused]] const QModelIndex& parent) const
 {
    if (data && data->hasFormat("application/x-instanceid")) {
        return true;
@ -104,7 +108,11 @@ bool InstanceList::canDropMimeData(const QMimeData* data, Qt::DropAction action,
    return false;
 }

-bool InstanceList::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+bool InstanceList::dropMimeData(const QMimeData* data,
+                                [[maybe_unused]] Qt::DropAction action,
+                                [[maybe_unused]] int row,
+                                [[maybe_unused]] int column,
+                                [[maybe_unused]] const QModelIndex& parent)
 {
    if (data && data->hasFormat("application/x-instanceid")) {
        return true;
@ -159,37 +167,29 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const
        return QVariant();
    }
    BaseInstance* pdata = static_cast<BaseInstance*>(index.internalPointer());
-    switch (role)
-    {
-    case InstancePointerRole:
-    {
+    switch (role) {
+        case InstancePointerRole: {
            QVariant v = QVariant::fromValue((void*)pdata);
            return v;
        }
-    case InstanceIDRole:
-    {
+        case InstanceIDRole: {
            return pdata->id();
        }
        case Qt::EditRole:
-    case Qt::DisplayRole:
-    {
+        case Qt::DisplayRole: {
            return pdata->name();
        }
-    case Qt::AccessibleTextRole:
-    {
+        case Qt::AccessibleTextRole: {
            return tr("%1 Instance").arg(pdata->name());
        }
-    case Qt::ToolTipRole:
-    {
+        case Qt::ToolTipRole: {
            return pdata->instanceRoot();
        }
-    case Qt::DecorationRole:
-    {
+        case Qt::DecorationRole: {
            return pdata->iconKey();
        }
        // HACK: see InstanceView.h in gui!
-    case GroupRole:
-    {
+        case GroupRole: {
            return getInstanceGroup(pdata->id());
        }
        default:
@ -325,11 +325,13 @@ bool InstanceList::trashInstance(const InstanceId& id)
    return true;
 }

-bool InstanceList::trashedSomething() {
+bool InstanceList::trashedSomething()
+{
    return !m_trashHistory.empty();
 }

-void InstanceList::undoTrashInstance() {
+void InstanceList::undoTrashInstance()
+{
    if (m_trashHistory.empty()) {
        qWarning() << "Nothing to recover from trash.";
        return;
@ -597,13 +599,11 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id)

    QString inst_type = instanceSettings->get("InstanceType").toString();

-    // NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix instance
-    if (inst_type == "OneSix" || inst_type.isEmpty())
-    {
+    // NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix
+    // instance
+    if (inst_type == "OneSix" || inst_type.isEmpty()) {
        inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot));
-    }
-    else
-    {
+    } else {
        inst.reset(new NullInstance(m_globalSettings, instanceSettings, instanceRoot));
    }
    qDebug() << "Loaded instance " << inst->name() << " from " << inst->instanceRoot();
@ -759,7 +759,7 @@ void InstanceList::instanceDirContentsChanged(const QString& path)
    emit instancesChanged();
 }

-void InstanceList::on_InstFolderChanged(const Setting& setting, QVariant value)
+void InstanceList::on_InstFolderChanged([[maybe_unused]] const Setting& setting, QVariant value)
 {
    QString newInstDir = QDir(value.toString()).canonicalPath();
    if (newInstDir != m_instDir) {
@ -787,12 +787,17 @@ class InstanceStaging : public Task {
    Q_OBJECT
    const unsigned minBackoff = 1;
    const unsigned maxBackoff = 16;
+
   public:
    InstanceStaging(InstanceList* parent, InstanceTask* child, QString stagingPath, InstanceName const& instanceName, QString groupName)
-        : m_parent(parent), backoff(minBackoff, maxBackoff), m_stagingPath(std::move(stagingPath)), m_instance_name(std::move(instanceName)), m_groupName(std::move(groupName))
+        : m_parent(parent)
+        , backoff(minBackoff, maxBackoff)
+        , m_stagingPath(std::move(stagingPath))
+        , m_instance_name(std::move(instanceName))
+        , m_groupName(std::move(groupName))
    {
        m_child.reset(child);
-        connect(child, &Task::succeeded, this, &InstanceStaging::childSucceded);
+        connect(child, &Task::succeeded, this, &InstanceStaging::childSucceeded);
        connect(child, &Task::failed, this, &InstanceStaging::childFailed);
        connect(child, &Task::aborted, this, &InstanceStaging::childAborted);
        connect(child, &Task::abortStatusChanged, this, &InstanceStaging::setAbortable);
@ -800,7 +805,7 @@ class InstanceStaging : public Task {
        connect(child, &Task::details, this, &InstanceStaging::setDetails);
        connect(child, &Task::progress, this, &InstanceStaging::setProgress);
        connect(child, &Task::stepProgress, this, &InstanceStaging::propagateStepProgress);
-        connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceded);
+        connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceeded);
    }

    virtual ~InstanceStaging(){};
@ -815,21 +820,17 @@ class InstanceStaging : public Task {

        return Task::abort();
    }
-    bool canAbort() const override
-    {
-        return (m_child && m_child->canAbort());
-    }
+    bool canAbort() const override { return (m_child && m_child->canAbort()); }

   protected:
    virtual void executeTask() override { m_child->start(); }
    QStringList warnings() const override { return m_child->warnings(); }

   private slots:
-    void childSucceded()
+    void childSucceeded()
    {
        unsigned sleepTime = backoff();
-        if (m_parent->commitStagedInstance(m_stagingPath, m_instance_name, m_groupName, *m_child.get()))
-        {
+        if (m_parent->commitStagedInstance(m_stagingPath, m_instance_name, m_groupName, *m_child.get())) {
            emitSucceeded();
            return;
        }
@ -847,10 +848,7 @@ class InstanceStaging : public Task {
        emitFailed(reason);
    }

-    void childAborted()
-    {
-        emitAborted();
-    }
+    void childAborted() { emitAborted(); }

   private:
    InstanceList* m_parent;
@ -892,7 +890,10 @@ QString InstanceList::getStagedInstancePath()
    return path;
 }

-bool InstanceList::commitStagedInstance(const QString& path, InstanceName const& instanceName, const QString& groupName, InstanceTask const& commiting)
+bool InstanceList::commitStagedInstance(const QString& path,
+                                        InstanceName const& instanceName,
+                                        const QString& groupName,
+                                        InstanceTask const& commiting)
 {
    QDir dir;
    QString instID;
--- a/launcher/InstanceList.h
+++ b/launcher/InstanceList.h
@ -15,12 +15,12 @@

 #pragma once

-#include <QObject>
 #include <QAbstractListModel>
-#include <QSet>
 #include <QList>
-#include <QStack>
+#include <QObject>
 #include <QPair>
+#include <QSet>
+#include <QStack>

 #include "BaseInstance.h"

@ -32,21 +32,9 @@ using InstanceId = QString;
 using GroupId = QString;
 using InstanceLocator = std::pair<InstancePtr, int>;

-enum class InstCreateError
-{
-    NoCreateError = 0,
-    NoSuchVersion,
-    UnknownCreateError,
-    InstExists,
-    CantCreateDir
-};
+enum class InstCreateError { NoCreateError = 0, NoSuchVersion, UnknownCreateError, InstExists, CantCreateDir };

-enum class GroupsState
-{
-    NotLoaded,
-    Steady,
-    Dirty
-};
+enum class GroupsState { NotLoaded, Steady, Dirty };

 struct TrashHistoryItem {
    QString id;
@ -55,8 +43,7 @@ struct TrashHistoryItem {
    QString groupName;
 };

-class InstanceList : public QAbstractListModel
-{
+class InstanceList : public QAbstractListModel {
    Q_OBJECT

   public:
@ -71,8 +58,7 @@ public:

    bool setData(const QModelIndex& index, const QVariant& value, int role) override;

-    enum AdditionalRoles
-    {
+    enum AdditionalRoles {
        GroupRole = Qt::UserRole,
        InstancePointerRole = 0x34B1CB48,  ///< Return pointer to real instance
        InstanceIDRole = 0x34B1CB49        ///< Return id if the instance
@ -82,21 +68,11 @@ public:
     * NoError Indicates that no error occurred.
     * UnknownError indicates that an unspecified error occurred.
     */
-    enum InstListError
-    {
-        NoError = 0,
-        UnknownError
-    };
+    enum InstListError { NoError = 0, UnknownError };

-    InstancePtr at(int i) const
-    {
-        return m_instances.at(i);
-    }
+    InstancePtr at(int i) const { return m_instances.at(i); }

-    int count() const
-    {
-        return m_instances.count();
-    }
+    int count() const { return m_instances.count(); }

    InstListError loadList();
    void saveNow();
--- a/launcher/InstancePageProvider.h
+++ b/launcher/InstancePageProvider.h
@ -1,31 +1,26 @@
 #pragma once
-#include "minecraft/MinecraftInstance.h"
 #include <FileSystem.h>
+#include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
 #include "ui/pages/BasePageProvider.h"
+#include "ui/pages/instance/InstanceSettingsPage.h"
 #include "ui/pages/instance/LogPage.h"
-#include "ui/pages/instance/VersionPage.h"
 #include "ui/pages/instance/ManagedPackPage.h"
 #include "ui/pages/instance/ModFolderPage.h"
-#include "ui/pages/instance/ResourcePackPage.h"
-#include "ui/pages/instance/TexturePackPage.h"
-#include "ui/pages/instance/ShaderPackPage.h"
 #include "ui/pages/instance/NotesPage.h"
-#include "ui/pages/instance/ScreenshotsPage.h"
-#include "ui/pages/instance/InstanceSettingsPage.h"
 #include "ui/pages/instance/OtherLogsPage.h"
-#include "ui/pages/instance/WorldListPage.h"
+#include "ui/pages/instance/ResourcePackPage.h"
+#include "ui/pages/instance/ScreenshotsPage.h"
 #include "ui/pages/instance/ServersPage.h"
-#include "ui/pages/instance/GameOptionsPage.h"
+#include "ui/pages/instance/ShaderPackPage.h"
+#include "ui/pages/instance/TexturePackPage.h"
+#include "ui/pages/instance/VersionPage.h"
+#include "ui/pages/instance/WorldListPage.h"

-class InstancePageProvider : public QObject, public BasePageProvider
-{
+class InstancePageProvider : protected QObject, public BasePageProvider {
    Q_OBJECT
   public:
-    explicit InstancePageProvider(InstancePtr parent)
-    {
-        inst = parent;
-    }
+    explicit InstancePageProvider(InstancePtr parent) { inst = parent; }

    virtual ~InstancePageProvider(){};
    virtual QList<BasePage*> getPages() override
@ -50,18 +45,14 @@ public:
        values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
        values.append(new InstanceSettingsPage(onesix.get()));
        auto logMatcher = inst->getLogFileMatcher();
-        if(logMatcher)
-        {
+        if (logMatcher) {
            values.append(new OtherLogsPage(inst->getLogFileRoot(), logMatcher));
        }
        return values;
    }

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

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

 bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget* parent)
 {
-    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegularExpression("-Xm[sx]"))
-        || jvmargs.contains("-XX-MaxHeapSize") || jvmargs.contains("-XX:InitialHeapSize"))
-    {
+    if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegularExpression("-Xm[sx]")) || jvmargs.contains("-XX-MaxHeapSize") ||
+        jvmargs.contains("-XX:InitialHeapSize")) {
        auto warnStr = QObject::tr(
-            "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" or \"-Xms\").\n"
+            "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" "
+            "or \"-Xms\").\n"
            "There are dedicated boxes for these in the settings (Java tab, in the Memory group at the top).\n"
            "This message will be displayed until you remove them from the JVM arguments.");
-        CustomMessageBox::selectable(
-            parent, QObject::tr("JVM arguments warning"),
-            warnStr,
-            QMessageBox::Warning)->exec();
+        CustomMessageBox::selectable(parent, QObject::tr("JVM arguments warning"), warnStr, QMessageBox::Warning)->exec();
        return false;
    }
    // block lunacy with passing required version to the JVM
    if (jvmargs.contains(QRegularExpression("-version:.*"))) {
        auto warnStr = QObject::tr(
-            "You tried to pass required Java version argument to the JVM (using \"-version:xxx\"). This is not safe and will not be allowed.\n"
+            "You tried to pass required Java version argument to the JVM (using \"-version:xxx\"). This is not safe and will not be "
+            "allowed.\n"
            "This message will be displayed until you remove this from the JVM arguments.");
-        CustomMessageBox::selectable(
-            parent, QObject::tr("JVM arguments warning"),
-            warnStr,
-            QMessageBox::Warning)->exec();
+        CustomMessageBox::selectable(parent, QObject::tr("JVM arguments warning"), warnStr, QMessageBox::Warning)->exec();
        return false;
    }
    return true;
 }

-void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaWasOk(QWidget* parent, const JavaCheckResult& result)
 {
    QString text;
-    text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
+    text += QObject::tr(
+                "Java test succeeded!<br />Platform reported: %1<br />Java version "
                "reported: %2<br />Java vendor "
-        "reported: %3<br />").arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
-    if (result.errorLog.size())
-    {
+                "reported: %3<br />")
+                .arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
+    if (result.errorLog.size()) {
        auto htmlError = result.errorLog;
        htmlError.replace('\n', "<br />");
        text += QObject::tr("<br />Warnings:<br /><font color=\"orange\">%1</font>").arg(htmlError);
@ -83,7 +79,7 @@ void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
    CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show();
 }

-void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaArgsWereBad(QWidget* parent, const JavaCheckResult& result)
 {
    auto htmlError = result.errorLog;
    QString text;
@ -93,7 +89,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
    CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
 }

-void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result)
 {
    QString text;
    text += QObject::tr(
@ -111,8 +107,7 @@ void JavaCommon::javaCheckNotFound(QWidget *parent)

 void JavaCommon::TestCheck::run()
 {
-    if (!JavaCommon::checkJVMArgs(m_args, m_parent))
-    {
+    if (!JavaCommon::checkJVMArgs(m_args, m_parent)) {
        emit finished();
        return;
    }
@ -129,8 +124,7 @@ void JavaCommon::TestCheck::run()

 void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
 {
-    if (result.validity != JavaCheckResult::Validity::Valid)
-    {
+    if (result.validity != JavaCheckResult::Validity::Valid) {
        javaBinaryWasBad(m_parent, result);
        emit finished();
        return;
@ -141,8 +135,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
    checker->m_args = m_args;
    checker->m_minMem = m_minMem;
    checker->m_maxMem = m_maxMem;
-    if (result.javaVersion.requiresPermGen())
-    {
+    if (result.javaVersion.requiresPermGen()) {
        checker->m_permGen = m_permGen;
    }
    checker->performCheck();
@ -150,8 +143,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)

 void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
 {
-    if (result.validity == JavaCheckResult::Validity::Valid)
-    {
+    if (result.validity == JavaCheckResult::Validity::Valid) {
        javaWasOk(m_parent, result);
        emit finished();
        return;
@ -159,4 +151,3 @@ void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
    javaArgsWereBad(m_parent, result);
    emit finished();
 }
-
--- a/launcher/JavaCommon.h
+++ b/launcher/JavaCommon.h
@ -6,27 +6,24 @@ class QWidget;
 /**
 * Common UI bits for the java pages to use.
 */
-namespace JavaCommon
-{
+namespace JavaCommon {
 bool checkJVMArgs(QString args, QWidget* parent);

 // Show a dialog saying that the Java binary was usable
-    void javaWasOk(QWidget *parent, JavaCheckResult result);
+void javaWasOk(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
+void javaArgsWereBad(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog saying that the Java binary was not usable
-    void javaBinaryWasBad(QWidget *parent, JavaCheckResult result);
+void javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result);
 // Show a dialog if we couldn't find Java Checker
 void javaCheckNotFound(QWidget* parent);

-    class TestCheck : public QObject
-    {
+class TestCheck : public QObject {
    Q_OBJECT
   public:
    TestCheck(QWidget* parent, QString path, QString args, int minMem, int maxMem, int permGen)
        : m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
-        {
-        }
+    {}
    virtual ~TestCheck(){};

    void run();
@ -47,4 +44,4 @@ namespace JavaCommon
    int m_maxMem = 0;
    int m_permGen = 64;
 };
-}
+}  // namespace JavaCommon
--- a/launcher/Json.cpp
+++ b/launcher/Json.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -37,11 +37,10 @@

 #include <QFile>

-#include "FileSystem.h"
 #include <math.h>
+#include "FileSystem.h"

-namespace Json
-{
+namespace Json {
 void write(const QJsonDocument& doc, const QString& filename)
 {
    FS::write(filename, doc.toJson());
@ -71,17 +70,13 @@ static bool isBinaryJson(const QByteArray &data)
 }
 QJsonDocument requireDocument(const QByteArray& data, const QString& what)
 {
-    if (isBinaryJson(data))
-    {
+    if (isBinaryJson(data)) {
        // FIXME: Is this needed?
        throw JsonException(what + ": Invalid JSON. Binary JSON unsupported");
-    }
-    else
-    {
+    } else {
        QJsonParseError error;
        QJsonDocument doc = QJsonDocument::fromJson(data, &error);
-        if (error.error != QJsonParseError::NoError)
-        {
+        if (error.error != QJsonParseError::NoError) {
            throw JsonException(what + ": Error parsing JSON: " + error.errorString());
        }
        return doc;
@ -93,16 +88,14 @@ QJsonDocument requireDocument(const QString &filename, const QString &what)
 }
 QJsonObject requireObject(const QJsonDocument& doc, const QString& what)
 {
-    if (!doc.isObject())
-    {
+    if (!doc.isObject()) {
        throw JsonException(what + " is not an object");
    }
    return doc.object();
 }
 QJsonArray requireArray(const QJsonDocument& doc, const QString& what)
 {
-    if (!doc.isArray())
-    {
+    if (!doc.isArray()) {
        throw JsonException(what + " is not an array");
    }
    return doc.array();
@ -110,19 +103,16 @@ QJsonArray requireArray(const QJsonDocument &doc, const QString &what)

 void writeString(QJsonObject& to, const QString& key, const QString& value)
 {
-    if (!value.isEmpty())
-    {
+    if (!value.isEmpty()) {
        to.insert(key, value);
    }
 }

 void writeStringList(QJsonObject& to, const QString& key, const QStringList& values)
 {
-    if (!values.isEmpty())
-    {
+    if (!values.isEmpty()) {
        QJsonArray array;
-        for(auto value: values)
-        {
+        for (auto value : values) {
            array.append(value);
        }
        to.insert(key, array);
@ -160,99 +150,98 @@ QJsonValue toJson<QVariant>(const QVariant &variant)
    return QJsonValue::fromVariant(variant);
 }

-
-template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what)
+template <>
+QByteArray requireIsType<QByteArray>(const QJsonValue& value, const QString& what)
 {
    const QString string = ensureIsType<QString>(value, what);
    // ensure that the string can be safely cast to Latin1
-    if (string != QString::fromLatin1(string.toLatin1()))
-    {
+    if (string != QString::fromLatin1(string.toLatin1())) {
        throw JsonException(what + " is not encodable as Latin1");
    }
    return QByteArray::fromHex(string.toLatin1());
 }

-template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what)
-{
-    if (!value.isArray())
+template <>
+QJsonArray requireIsType<QJsonArray>(const QJsonValue& value, const QString& what)
 {
+    if (!value.isArray()) {
        throw JsonException(what + " is not an array");
    }
    return value.toArray();
 }

-
-template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what)
-{
-    if (!value.isString())
+template <>
+QString requireIsType<QString>(const QJsonValue& value, const QString& what)
 {
+    if (!value.isString()) {
        throw JsonException(what + " is not a string");
    }
    return value.toString();
 }

-template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what)
-{
-    if (!value.isBool())
+template <>
+bool requireIsType<bool>(const QJsonValue& value, const QString& what)
 {
+    if (!value.isBool()) {
        throw JsonException(what + " is not a bool");
    }
    return value.toBool();
 }

-template<> double requireIsType<double>(const QJsonValue &value, const QString &what)
-{
-    if (!value.isDouble())
+template <>
+double requireIsType<double>(const QJsonValue& value, const QString& what)
 {
+    if (!value.isDouble()) {
        throw JsonException(what + " is not a double");
    }
    return value.toDouble();
 }

-template<> int requireIsType<int>(const QJsonValue &value, const QString &what)
+template <>
+int requireIsType<int>(const QJsonValue& value, const QString& what)
 {
    const double doubl = requireIsType<double>(value, what);
-    if (fmod(doubl, 1) != 0)
-    {
+    if (fmod(doubl, 1) != 0) {
        throw JsonException(what + " is not an integer");
    }
    return int(doubl);
 }

-template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what)
+template <>
+QDateTime requireIsType<QDateTime>(const QJsonValue& value, const QString& what)
 {
    const QString string = requireIsType<QString>(value, what);
    const QDateTime datetime = QDateTime::fromString(string, Qt::ISODate);
-    if (!datetime.isValid())
-    {
+    if (!datetime.isValid()) {
        throw JsonException(what + " is not a ISO formatted date/time value");
    }
    return datetime;
 }

-template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what)
+template <>
+QUrl requireIsType<QUrl>(const QJsonValue& value, const QString& what)
 {
    const QString string = ensureIsType<QString>(value, what);
-    if (string.isEmpty())
-    {
+    if (string.isEmpty()) {
        return QUrl();
    }
    const QUrl url = QUrl(string, QUrl::StrictMode);
-    if (!url.isValid())
-    {
+    if (!url.isValid()) {
        throw JsonException(what + " is not a correctly formatted URL");
    }
    return url;
 }

-template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what)
+template <>
+QDir requireIsType<QDir>(const QJsonValue& value, const QString& what)
 {
    const QString string = requireIsType<QString>(value, what);
    // FIXME: does not handle invalid characters!
    return QDir::current().absoluteFilePath(string);
 }

-template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what)
+template <>
+QUuid requireIsType<QUuid>(const QJsonValue& value, const QString& what)
 {
    const QString string = requireIsType<QString>(value, what);
    const QUuid uuid = QUuid(string);
@ -263,31 +252,31 @@ template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &wh
    return uuid;
 }

-template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what)
-{
-    if (!value.isObject())
+template <>
+QJsonObject requireIsType<QJsonObject>(const QJsonValue& value, const QString& what)
 {
+    if (!value.isObject()) {
        throw JsonException(what + " is not an object");
    }
    return value.toObject();
 }

-template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what)
-{
-    if (value.isNull() || value.isUndefined())
+template <>
+QVariant requireIsType<QVariant>(const QJsonValue& value, const QString& what)
 {
+    if (value.isNull() || value.isUndefined()) {
        throw JsonException(what + " is null or undefined");
    }
    return value.toVariant();
 }

-template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what)
-{
-    if (value.isNull() || value.isUndefined())
+template <>
+QJsonValue requireIsType<QJsonValue>(const QJsonValue& value, const QString& what)
 {
+    if (value.isNull() || value.isUndefined()) {
        throw JsonException(what + " is null or undefined");
    }
    return value;
 }

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

 #pragma once

-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
 #include <QDateTime>
-#include <QUrl>
 #include <QDir>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QUrl>
 #include <QUuid>
 #include <QVariant>
 #include <memory>

 #include "Exception.h"

-namespace Json
-{
-class JsonException : public ::Exception
-{
+namespace Json {
+class JsonException : public ::Exception {
   public:
    JsonException(const QString& message) : Exception(message) {}
 };
@ -101,8 +99,7 @@ template<typename T>
 QJsonArray toJsonArray(const QList<T>& container)
 {
    QJsonArray array;
-    for (const T item : container)
-    {
+    for (const T item : container) {
        array.append(toJson<T>(item));
    }
    return array;
@ -115,47 +112,56 @@ template <typename T>
 T requireIsType(const QJsonValue& value, const QString& what = "Value");

 /// @throw JsonException
-template<> double requireIsType<double>(const QJsonValue &value, const QString &what);
+template <>
+double requireIsType<double>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what);
+template <>
+bool requireIsType<bool>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> int requireIsType<int>(const QJsonValue &value, const QString &what);
+template <>
+int requireIsType<int>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what);
+template <>
+QJsonObject requireIsType<QJsonObject>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what);
+template <>
+QJsonArray requireIsType<QJsonArray>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what);
+template <>
+QJsonValue requireIsType<QJsonValue>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what);
+template <>
+QByteArray requireIsType<QByteArray>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what);
+template <>
+QDateTime requireIsType<QDateTime>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what);
+template <>
+QVariant requireIsType<QVariant>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what);
+template <>
+QString requireIsType<QString>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what);
+template <>
+QUuid requireIsType<QUuid>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what);
+template <>
+QDir requireIsType<QDir>(const QJsonValue& value, const QString& what);
 /// @throw JsonException
-template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what);
+template <>
+QUrl requireIsType<QUrl>(const QJsonValue& value, const QString& what);

 // the following functions are higher level functions, that make use of the above functions for
 // type conversion
 template <typename T>
 T ensureIsType(const QJsonValue& value, const T default_ = T(), const QString& what = "Value")
 {
-    if (value.isUndefined() || value.isNull())
-    {
+    if (value.isUndefined() || value.isNull()) {
        return default_;
    }
-    try
-    {
+    try {
        return requireIsType<T>(value, what);
-    }
-    catch (const JsonException &)
-    {
+    } catch (const JsonException&) {
        return default_;
    }
 }
@ -165,8 +171,7 @@ template <typename T>
 T requireIsType(const QJsonObject& parent, const QString& key, const QString& what = "__placeholder__")
 {
    const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
-    {
+    if (!parent.contains(key)) {
        throw JsonException(localWhat + "s parent does not contain " + localWhat);
    }
    return requireIsType<T>(parent.value(key), localWhat);
@ -176,8 +181,7 @@ template <typename T>
 T ensureIsType(const QJsonObject& parent, const QString& key, const T default_ = T(), const QString& what = "__placeholder__")
 {
    const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
-    {
+    if (!parent.contains(key)) {
        return default_;
    }
    return ensureIsType<T>(parent.value(key), default_, localWhat);
@ -188,8 +192,7 @@ QVector<T> requireIsArrayOf(const QJsonDocument &doc)
 {
    const QJsonArray array = requireArray(doc);
    QVector<T> out;
-    for (const QJsonValue val : array)
-    {
+    for (const QJsonValue val : array) {
        out.append(requireIsType<T>(val, "Document"));
    }
    return out;
@ -200,8 +203,7 @@ QVector<T> ensureIsArrayOf(const QJsonValue &value, const QString &what = "Value
 {
    const QJsonArray array = ensureIsType<QJsonArray>(value, QJsonArray(), what);
    QVector<T> out;
-    for (const QJsonValue val : array)
-    {
+    for (const QJsonValue val : array) {
        out.append(requireIsType<T>(val, what));
    }
    return out;
@ -210,8 +212,7 @@ QVector<T> ensureIsArrayOf(const QJsonValue &value, const QString &what = "Value
 template <typename T>
 QVector<T> ensureIsArrayOf(const QJsonValue& value, const QVector<T> default_, const QString& what = "Value")
 {
-    if (value.isUndefined())
-    {
+    if (value.isUndefined()) {
        return default_;
    }
    return ensureIsArrayOf<T>(value, what);
@ -222,20 +223,20 @@ template <typename T>
 QVector<T> requireIsArrayOf(const QJsonObject& parent, const QString& key, const QString& what = "__placeholder__")
 {
    const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
-    {
+    if (!parent.contains(key)) {
        throw JsonException(localWhat + "s parent does not contain " + localWhat);
    }
    return ensureIsArrayOf<T>(parent.value(key), localWhat);
 }

 template <typename T>
-QVector<T> ensureIsArrayOf(const QJsonObject &parent, const QString &key,
-                         const QVector<T> &default_ = QVector<T>(), const QString &what = "__placeholder__")
+QVector<T> ensureIsArrayOf(const QJsonObject& parent,
+                           const QString& key,
+                           const QVector<T>& default_ = QVector<T>(),
+                           const QString& what = "__placeholder__")
 {
    const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-    if (!parent.contains(key))
-    {
+    if (!parent.contains(key)) {
        return default_;
    }
    return ensureIsArrayOf<T>(parent.value(key), default_, localWhat);
@ -255,7 +256,8 @@ QVector<T> ensureIsArrayOf(const QJsonObject &parent, const QString &key,
    {                                                                                                                 \
        return requireIsType<TYPE>(parent, key, what);                                                                \
    }                                                                                                                 \
-    inline TYPE ensure##NAME(const QJsonObject &parent, const QString &key, const TYPE default_ = TYPE(), const QString &what = "__placeholder") \
+    inline TYPE ensure##NAME(const QJsonObject& parent, const QString& key, const TYPE default_ = TYPE(),             \
+                             const QString& what = "__placeholder")                                                   \
    {                                                                                                                 \
        return ensureIsType<TYPE>(parent, key, default_, what);                                                       \
    }
@ -276,5 +278,5 @@ JSON_HELPERFUNCTIONS(Variant, QVariant)

 #undef JSON_HELPERFUNCTIONS

-}
+}  // namespace Json
 using JSONValidationError = Json::JsonException;
--- a/launcher/KonamiCode.cpp
+++ b/launcher/KonamiCode.cpp
@ -1,42 +1,26 @@
 #include "KonamiCode.h"

-#include <array>
 #include <QDebug>
+#include <array>

 namespace {
-const std::array<Qt::Key, 10> konamiCode =
-{
-    {
-        Qt::Key_Up, Qt::Key_Up,
-        Qt::Key_Down, Qt::Key_Down,
-        Qt::Key_Left, Qt::Key_Right,
-        Qt::Key_Left, Qt::Key_Right,
-        Qt::Key_B, Qt::Key_A
-    }
-};
-}
-
-KonamiCode::KonamiCode(QObject* parent) : QObject(parent)
-{
+const std::array<Qt::Key, 10> konamiCode = { { Qt::Key_Up, Qt::Key_Up, Qt::Key_Down, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
+                                               Qt::Key_Left, Qt::Key_Right, Qt::Key_B, Qt::Key_A } };
 }

+KonamiCode::KonamiCode(QObject* parent) : QObject(parent) {}

 void KonamiCode::input(QEvent* event)
 {
-    if( event->type() == QEvent::KeyPress )
-    {
+    if (event->type() == QEvent::KeyPress) {
        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
        auto key = Qt::Key(keyEvent->key());
-        if(key == konamiCode[m_progress])
-        {
+        if (key == konamiCode[m_progress]) {
            m_progress++;
-        }
-        else
-        {
+        } else {
            m_progress = 0;
        }
-        if(m_progress == static_cast<int>(konamiCode.size()))
-        {
+        if (m_progress == static_cast<int>(konamiCode.size())) {
            m_progress = 0;
            emit triggered();
        }
--- a/launcher/KonamiCode.h
+++ b/launcher/KonamiCode.h
@ -2,8 +2,7 @@

 #include <QKeyEvent>

-class KonamiCode : public QObject
-{
+class KonamiCode : public QObject {
    Q_OBJECT
   public:
    KonamiCode(QObject* parent = 0);
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -34,39 +35,36 @@
 */

 #include "LaunchController.h"
-#include "minecraft/auth/AccountList.h"
 #include "Application.h"
+#include "minecraft/auth/AccountList.h"

-#include "ui/MainWindow.h"
 #include "ui/InstanceWindow.h"
+#include "ui/MainWindow.h"
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ProfileSelectDialog.h"
-#include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/EditAccountDialog.h"
+#include "ui/dialogs/ProfileSelectDialog.h"
 #include "ui/dialogs/ProfileSetupDialog.h"
+#include "ui/dialogs/ProgressDialog.h"

-#include <QLineEdit>
-#include <QInputDialog>
-#include <QStringList>
-#include <QHostInfo>
-#include <QList>
 #include <QHostAddress>
+#include <QHostInfo>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QList>
 #include <QPushButton>
+#include <QStringList>

 #include "BuildConfig.h"
 #include "JavaCommon.h"
-#include "tasks/Task.h"
-#include "minecraft/auth/AccountTask.h"
 #include "launch/steps/TextPrint.h"
+#include "minecraft/auth/AccountTask.h"
+#include "tasks/Task.h"

-LaunchController::LaunchController(QObject *parent) : Task(parent)
-{
-}
+LaunchController::LaunchController(QObject* parent) : Task(parent) {}

 void LaunchController::executeTask()
 {
-    if (!m_instance)
-    {
+    if (!m_instance) {
        emitFailed(tr("No instance specified!"));
        return;
    }
@ -87,26 +85,19 @@ void LaunchController::decideAccount()

    // Find an account to use.
    auto accounts = APPLICATION->accounts();
-    if (accounts->count() <= 0)
-    {
+    if (accounts->count() <= 0) {
        // Tell the user they need to log in at least one account in order to play.
-        auto reply = CustomMessageBox::selectable(
-            m_parentWidget,
-            tr("No Accounts"),
+        auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
                                                  tr("In order to play Minecraft, you must have at least one Microsoft or Mojang "
                                                     "account logged in. Mojang accounts can only be used offline. "
                                                     "Would you like to open the account manager to add an account now?"),
-            QMessageBox::Information,
-            QMessageBox::Yes | QMessageBox::No
-        )->exec();
+                                                  QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
+                         ->exec();

-        if (reply == QMessageBox::Yes)
-        {
+        if (reply == QMessageBox::Yes) {
            // Open the account manager.
            APPLICATION->ShowGlobalSettings(m_parentWidget, "accounts");
-        }
-        else if (reply == QMessageBox::No)
-        {
+        } else if (reply == QMessageBox::No) {
            // Do not open "profile select" dialog.
            return;
        }
@ -121,14 +112,10 @@ void LaunchController::decideAccount()
        m_accountToUse = accounts->at(instanceAccountIndex);
    }

-    if (!m_accountToUse)
-    {
+    if (!m_accountToUse) {
        // If no default account is set, ask the user which one to use.
-        ProfileSelectDialog selectDialog(
-            tr("Which account would you like to use?"),
-            ProfileSelectDialog::GlobalDefaultCheckbox,
-            m_parentWidget
-        );
+        ProfileSelectDialog selectDialog(tr("Which account would you like to use?"), ProfileSelectDialog::GlobalDefaultCheckbox,
+                                         m_parentWidget);

        selectDialog.exec();

@ -142,13 +129,12 @@ void LaunchController::decideAccount()
    }
 }

-
-void LaunchController::login() {
+void LaunchController::login()
+{
    decideAccount();

    // if no account is selected, we bail
-    if (!m_accountToUse)
-    {
+    if (!m_accountToUse) {
        emitFailed(tr("No account selected for launch."));
        return;
    }
@ -157,15 +143,11 @@ void LaunchController::login() {
    bool tryagain = true;
    unsigned int tries = 0;

-    while (tryagain)
-    {
+    while (tryagain) {
        if (tries > 0 && tries % 3 == 0) {
-            auto result = QMessageBox::question(
-                m_parentWidget,
-                tr("Continue launch?"),
-                tr("It looks like we couldn't launch after %1 tries. Do you want to continue trying?")
-                    .arg(tries)
-            );
+            auto result =
+                QMessageBox::question(m_parentWidget, tr("Continue launch?"),
+                                      tr("It looks like we couldn't launch after %1 tries. Do you want to continue trying?").arg(tries));

            if (result == QMessageBox::No) {
                emitAborted();
@ -201,21 +183,12 @@ void LaunchController::login() {

                    QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
                    QString usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
-                    QString name = QInputDialog::getText(
-                        m_parentWidget,
-                        tr("Player name"),
-                        message,
-                        QLineEdit::Normal,
-                        usedname,
-                        &ok
-                    );
-                    if (!ok)
-                    {
+                    QString name = QInputDialog::getText(m_parentWidget, tr("Player name"), message, QLineEdit::Normal, usedname, &ok);
+                    if (!ok) {
                        tryagain = false;
                        break;
                    }
-                    if (name.length())
-                    {
+                    if (name.length()) {
                        usedname = name;
                        APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
                    }
@ -226,13 +199,10 @@ void LaunchController::login() {
                    if (!m_accountToUse->hasProfile()) {
                        // Now handle setting up a profile name here...
                        ProfileSetupDialog dialog(m_accountToUse, m_parentWidget);
-                        if (dialog.exec() == QDialog::Accepted)
-                        {
+                        if (dialog.exec() == QDialog::Accepted) {
                            tryagain = true;
                            continue;
-                        }
-                        else
-                        {
+                        } else {
                            emitFailed(tr("Received undetermined session status during login."));
                            return;
                        }
@ -240,12 +210,13 @@ void LaunchController::login() {
                    // we own Minecraft, there is a profile, it's all ready to go!
                    launchInstance();
                    return;
-                }
-                else {
+                } else {
                    // play demo ?
                    QMessageBox box(m_parentWidget);
                    box.setWindowTitle(tr("Play demo?"));
-                    box.setText(tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play the demo?"));
+                    box.setText(
+                        tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play "
+                           "the demo?"));
                    box.setIcon(QMessageBox::Warning);
                    auto demoButton = box.addButton(tr("Play Demo"), QMessageBox::ButtonRole::YesRole);
                    auto cancelButton = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::NoRole);
@ -256,8 +227,7 @@ void LaunchController::login() {
                        // play demo here
                        m_session->MakeDemo();
                        launchInstance();
-                    }
-                    else {
+                    } else {
                        emitFailed(tr("Launch cancelled - account does not own Minecraft."));
                    }
                }
@ -272,8 +242,7 @@ void LaunchController::login() {
            case AccountState::Working: {
                // refresh is in progress, we need to wait for it to finish to proceed.
                ProgressDialog progDialog(m_parentWidget);
-                if (m_online)
-                {
+                if (m_online) {
                    progDialog.setSkipButton(true, tr("Play Offline"));
                }
                auto task = m_accountToUse->currentTask();
@ -288,37 +257,24 @@ void LaunchController::login() {
            */
            case AccountState::Expired: {
                auto errorString = tr("The account has expired and needs to be logged into manually again.");
-                QMessageBox::warning(
-                    m_parentWidget,
-                    tr("Account refresh failed"),
-                    errorString,
-                    QMessageBox::StandardButton::Ok,
-                    QMessageBox::StandardButton::Ok
-                );
+                QMessageBox::warning(m_parentWidget, tr("Account refresh failed"), errorString, QMessageBox::StandardButton::Ok,
+                                     QMessageBox::StandardButton::Ok);
                emitFailed(errorString);
                return;
            }
            case AccountState::Disabled: {
                auto errorString = tr("The launcher's client identification has changed. Please remove this account and add it again.");
-                QMessageBox::warning(
-                        m_parentWidget,
-                        tr("Client identification changed"),
-                        errorString,
-                        QMessageBox::StandardButton::Ok,
-                        QMessageBox::StandardButton::Ok
-                );
+                QMessageBox::warning(m_parentWidget, tr("Client identification changed"), errorString, QMessageBox::StandardButton::Ok,
+                                     QMessageBox::StandardButton::Ok);
                emitFailed(errorString);
                return;
            }
            case AccountState::Gone: {
-                auto errorString = tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account you migrated this one to.");
-                QMessageBox::warning(
-                    m_parentWidget,
-                    tr("Account gone"),
-                    errorString,
-                    QMessageBox::StandardButton::Ok,
-                    QMessageBox::StandardButton::Ok
-                );
+                auto errorString =
+                    tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account "
+                       "you migrated this one to.");
+                QMessageBox::warning(m_parentWidget, tr("Account gone"), errorString, QMessageBox::StandardButton::Ok,
+                                     QMessageBox::StandardButton::Ok);
                emitFailed(errorString);
                return;
            }
@ -332,24 +288,21 @@ void LaunchController::launchInstance()
    Q_ASSERT_X(m_instance != NULL, "launchInstance", "instance is NULL");
    Q_ASSERT_X(m_session.get() != nullptr, "launchInstance", "session is NULL");

-    if(!m_instance->reloadSettings())
-    {
+    if (!m_instance->reloadSettings()) {
        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't load the instance profile."));
        emitFailed(tr("Couldn't load the instance profile."));
        return;
    }

    m_launcher = m_instance->createLaunchTask(m_session, m_serverToJoin);
-    if (!m_launcher)
-    {
+    if (!m_launcher) {
        emitFailed(tr("Couldn't instantiate a launcher."));
        return;
    }

    auto console = qobject_cast<InstanceWindow*>(m_parentWidget);
    auto showConsole = m_instance->settings()->get("ShowConsole").toBool();
-    if(!console && showConsole)
-    {
+    if (!console && showConsole) {
        APPLICATION->showInstanceWindow(m_instance);
    }
    connect(m_launcher.get(), &LaunchTask::readyForLaunch, this, &LaunchController::readyForLaunch);
@ -387,11 +340,13 @@ void LaunchController::launchInstance()
        online_mode = m_demo ? "demo" : "offline";
    }

-    m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher));
+    m_launcher->prependStep(
+        makeShared<TextPrint>(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher));

    // Prepend Version
    {
-        auto versionString = QString("%1 version: %2 (%3)").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM);
+        auto versionString = QString("%1 version: %2 (%3)")
+                                 .arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM);
        m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), versionString + "\n\n", MessageLevel::Launcher));
    }
    m_launcher->start();
@ -399,37 +354,33 @@ void LaunchController::launchInstance()

 void LaunchController::readyForLaunch()
 {
-    if (!m_profiler)
-    {
+    if (!m_profiler) {
        m_launcher->proceed();
        return;
    }

    QString error;
-    if (!m_profiler->check(&error))
-    {
+    if (!m_profiler->check(&error)) {
        m_launcher->abort();
-        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't start profiler: %1").arg(error));
        emitFailed("Profiler startup failed!");
+        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Profiler check for %1 failed: %2").arg(m_profiler->name(), error));
        return;
    }
    BaseProfiler* profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);

-    connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message)
-    {
-        QMessageBox msg;
+    connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString& message) {
+        QMessageBox msg(m_parentWidget);
        msg.setText(tr("The game launch is delayed until you press the "
                       "button. This is the right time to setup the profiler, as the "
-                        "profiler server is running now.\n\n%1").arg(message));
+                       "profiler server is running now.\n\n%1")
+                        .arg(message));
        msg.setWindowTitle(tr("Waiting."));
        msg.setIcon(QMessageBox::Information);
-        msg.addButton(tr("Launch"), QMessageBox::AcceptRole);
-        msg.setModal(true);
+        msg.addButton(tr("&Launch"), QMessageBox::AcceptRole);
        msg.exec();
        m_launcher->proceed();
    });
-    connect(profilerInstance, &BaseProfiler::abortLaunch, [this](const QString & message)
-    {
+    connect(profilerInstance, &BaseProfiler::abortLaunch, [this](const QString& message) {
        QMessageBox msg;
        msg.setText(tr("Couldn't start the profiler: %1").arg(message));
        msg.setWindowTitle(tr("Error"));
@ -450,8 +401,7 @@ void LaunchController::onSucceeded()

 void LaunchController::onFailed(QString reason)
 {
-    if(m_instance->settings()->get("ShowConsoleOnError").toBool())
-    {
+    if (m_instance->settings()->get("ShowConsoleOnError").toBool()) {
        APPLICATION->showInstanceWindow(m_instance, "console");
    }
    emitFailed(reason);
@ -467,21 +417,18 @@ void LaunchController::onProgressRequested(Task* task)

 bool LaunchController::abort()
 {
-    if(!m_launcher)
-    {
+    if (!m_launcher) {
        return true;
    }
-    if(!m_launcher->canAbort())
-    {
+    if (!m_launcher->canAbort()) {
        return false;
    }
-    auto response = CustomMessageBox::selectable(
-            m_parentWidget, tr("Kill Minecraft?"),
+    auto response = CustomMessageBox::selectable(m_parentWidget, tr("Kill Minecraft?"),
                                                 tr("This can cause the instance to get corrupted and should only be used if Minecraft "
                                                    "is frozen for some reason"),
-            QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)->exec();
-    if (response == QMessageBox::Yes)
-    {
+                                                 QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)
+                        ->exec();
+    if (response == QMessageBox::Yes) {
        return m_launcher->abort();
    }
    return false;
--- a/launcher/LaunchController.h
+++ b/launcher/LaunchController.h
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -34,16 +34,15 @@
 */

 #pragma once
-#include <QObject>
 #include <BaseInstance.h>
 #include <tools/BaseProfiler.h>
+#include <QObject>

-#include "minecraft/launch/MinecraftServerTarget.h"
 #include "minecraft/auth/MinecraftAccount.h"
+#include "minecraft/launch/MinecraftServerTarget.h"

 class InstanceWindow;
-class LaunchController: public Task
-{
+class LaunchController : public Task {
    Q_OBJECT
   public:
    void executeTask() override;
@ -51,42 +50,23 @@ public:
    LaunchController(QObject* parent = nullptr);
    virtual ~LaunchController(){};

-    void setInstance(InstancePtr instance) {
-        m_instance = instance;
-    }
+    void setInstance(InstancePtr instance) { m_instance = instance; }

-    InstancePtr instance() {
-        return m_instance;
-    }
+    InstancePtr instance() { return m_instance; }

-    void setOnline(bool online) {
-        m_online = online;
-    }
+    void setOnline(bool online) { m_online = online; }

-    void setDemo(bool demo) {
-        m_demo = demo;
-    }
+    void setDemo(bool demo) { m_demo = demo; }

-    void setProfiler(BaseProfilerFactory *profiler) {
-        m_profiler = profiler;
-    }
+    void setProfiler(BaseProfilerFactory* profiler) { m_profiler = profiler; }

-    void setParentWidget(QWidget * widget) {
-        m_parentWidget = widget;
-    }
+    void setParentWidget(QWidget* widget) { m_parentWidget = widget; }

-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) {
-        m_serverToJoin = std::move(serverToJoin);
-    }
+    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }

-    void setAccountToUse(MinecraftAccountPtr accountToUse) {
-        m_accountToUse = std::move(accountToUse);
-    }
+    void setAccountToUse(MinecraftAccountPtr accountToUse) { m_accountToUse = std::move(accountToUse); }

-    QString id()
-    {
-        return m_instance->id();
-    }
+    QString id() { return m_instance->id(); }

    bool abort() override;

--- a/launcher/LoggedProcess.cpp
+++ b/launcher/LoggedProcess.cpp
@ -51,8 +51,7 @@ LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)

 LoggedProcess::~LoggedProcess()
 {
-    if(m_is_detachable)
-    {
+    if (m_is_detachable) {
        setProcessState(QProcess::NotRunning);
    }
 }
@ -66,13 +65,8 @@ QStringList LoggedProcess::reprocess(const QByteArray& data, QTextDecoder& decod
        m_leftover_line = "";
    }

-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, QString::SkipEmptyParts);
-#else
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, Qt::SkipEmptyParts);
-#endif
+    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed);

-    if (!str.endsWith(QChar::LineFeed))
    m_leftover_line = lines.takeLast();
    return lines;
 }
@ -95,16 +89,12 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
    m_exit_code = exit_code;

    // based on state, send signals
-    if (!m_is_aborting)
-    {
-        if (status == QProcess::NormalExit)
-        {
+    if (!m_is_aborting) {
+        if (status == QProcess::NormalExit) {
            //: Message displayed on instance exit
            emit log({ tr("Process exited with code %1.").arg(exit_code) }, MessageLevel::Launcher);
            changeState(LoggedProcess::Finished);
-        }
-        else
-        {
+        } else {
            //: Message displayed on instance crashed
            if (exit_code == -1)
                emit log({ tr("Process crashed.") }, MessageLevel::Launcher);
@ -112,9 +102,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
                emit log({ tr("Process crashed with exitcode %1.").arg(exit_code) }, MessageLevel::Launcher);
            changeState(LoggedProcess::Crashed);
        }
-    }
-    else
-    {
+    } else {
        //: Message displayed after the instance exits due to kill request
        emit log({ tr("Process was killed by user.") }, MessageLevel::Error);
        changeState(LoggedProcess::Aborted);
@ -123,10 +111,8 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)

 void LoggedProcess::on_error(QProcess::ProcessError error)
 {
-    switch(error)
-    {
-        case QProcess::FailedToStart:
-        {
+    switch (error) {
+        case QProcess::FailedToStart: {
            emit log({ tr("The process failed to start.") }, MessageLevel::Fatal);
            changeState(LoggedProcess::FailedToStart);
            break;
@ -167,23 +153,18 @@ LoggedProcess::State LoggedProcess::state() const

 void LoggedProcess::on_stateChange(QProcess::ProcessState state)
 {
-    switch(state)
-    {
+    switch (state) {
        case QProcess::NotRunning:
            break;  // let's not - there are too many that handle this already.
-        case QProcess::Starting:
-        {
-            if(m_state != LoggedProcess::NotRunning)
-            {
+        case QProcess::Starting: {
+            if (m_state != LoggedProcess::NotRunning) {
                qWarning() << "Wrong state change for process from state" << m_state << "to" << (int)LoggedProcess::Starting;
            }
            changeState(LoggedProcess::Starting);
            return;
        }
-        case QProcess::Running:
-        {
-            if(m_state != LoggedProcess::Starting)
-            {
+        case QProcess::Running: {
+            if (m_state != LoggedProcess::Starting) {
                qWarning() << "Wrong state change for process from state" << m_state << "to" << (int)LoggedProcess::Running;
            }
            changeState(LoggedProcess::Running);
--- a/launcher/LoggedProcess.h
+++ b/launcher/LoggedProcess.h
@ -43,20 +43,10 @@
 * This is a basic process.
 * It has line-based logging support and hides some of the nasty bits.
 */
-class LoggedProcess : public QProcess
-{
+class LoggedProcess : public QProcess {
    Q_OBJECT
   public:
-    enum State
-    {
-        NotRunning,
-        Starting,
-        FailedToStart,
-        Running,
-        Finished,
-        Crashed,
-        Aborted
-    };
+    enum State { NotRunning, Starting, FailedToStart, Running, Finished, Crashed, Aborted };

   public:
    explicit LoggedProcess(QObject* parent = 0);
@ -77,7 +67,6 @@ public slots:
     */
    void kill();

-
   private slots:
    void on_stdErr();
    void on_stdOut();
--- a/launcher/MMCTime.cpp
+++ b/launcher/MMCTime.cpp
@ -16,31 +16,31 @@
 */

 #include <MMCTime.h>
+#include <qobject.h>

-#include <QObject>
 #include <QDateTime>
+#include <QObject>
 #include <QTextStream>

-QString Time::prettifyDuration(int64_t duration) {
+QString Time::prettifyDuration(int64_t duration, bool noDays)
+{
    int seconds = (int)(duration % 60);
    duration /= 60;
    int minutes = (int)(duration % 60);
    duration /= 60;
-    int hours = (int) (duration % 24);
-    int days = (int) (duration / 24);
-    if((hours == 0)&&(days == 0))
-    {
+    int hours = (int)(noDays ? duration : (duration % 24));
+    int days = (int)(noDays ? 0 : (duration / 24));
+    if ((hours == 0) && (days == 0)) {
        return QObject::tr("%1min %2s").arg(minutes).arg(seconds);
    }
-    if (days == 0)
-    {
+    if (days == 0) {
        return QObject::tr("%1h %2min").arg(hours).arg(minutes);
    }
    return QObject::tr("%1d %2h %3min").arg(days).arg(hours).arg(minutes);
 }

-QString Time::humanReadableDuration(double duration, int precision) {
-
+QString Time::humanReadableDuration(double duration, int precision)
+{
    using days = std::chrono::duration<int, std::ratio<86400>>;

    QString outStr;
--- a/launcher/MMCTime.h
+++ b/launcher/MMCTime.h
@ -20,7 +20,7 @@

 namespace Time {

-QString prettifyDuration(int64_t duration);
+QString prettifyDuration(int64_t duration, bool noDays = false);

 /**
 * @brief Returns a string with short form time duration ie. `2days 1h3m4s56.0ms`.
@ -31,4 +31,4 @@ QString prettifyDuration(int64_t duration);
 * @return QString
 */
 QString humanReadableDuration(double duration, int precision = 0);
-}
+}  // namespace Time
--- a/launcher/MTPixmapCache.h
+++ b/launcher/MTPixmapCache.h
@ -1,10 +1,10 @@
 #pragma once

 #include <QCoreApplication>
+#include <QDebug>
 #include <QPixmapCache>
 #include <QThread>
 #include <QTime>
-#include <QDebug>

 #define GET_TYPE()                                                          \
    Qt::ConnectionType type;                                                \
--- a/launcher/MangoHud.cpp
+++ b/launcher/MangoHud.cpp
@ -16,15 +16,25 @@
 *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#include <QStringList>
+#include <QDebug>
 #include <QDir>
 #include <QString>
+#include <QStringList>
 #include <QSysInfo>
 #include <QtGlobal>

-#include "MangoHud.h"
 #include "FileSystem.h"
 #include "Json.h"
+#include "MangoHud.h"
+
+#ifdef __GLIBC__
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#define UNDEF_GNU_SOURCE
+#endif
+#include <dlfcn.h>
+#include <linux/limits.h>
+#endif

 namespace MangoHud {

@ -106,4 +116,37 @@ QString getLibraryString()

    return QString();
 }
+
+QString findLibrary(QString libName)
+{
+#ifdef __GLIBC__
+    const char* library = libName.toLocal8Bit().constData();
+
+    void* handle = dlopen(library, RTLD_NOW);
+    if (!handle) {
+        qCritical() << "dlopen() failed:" << dlerror();
+        return {};
+    }
+
+    char path[PATH_MAX];
+    if (dlinfo(handle, RTLD_DI_ORIGIN, path) == -1) {
+        qCritical() << "dlinfo() failed:" << dlerror();
+        dlclose(handle);
+        return {};
+    }
+
+    auto fullPath = FS::PathCombine(QString(path), libName);
+
+    dlclose(handle);
+    return fullPath;
+#else
+    qWarning() << "MangoHud::findLibrary is not implemented on this platform";
+    return {};
+#endif
+}
 }  // namespace MangoHud
+
+#ifdef UNDEF_GNU_SOURCE
+#undef _GNU_SOURCE
+#undef UNDEF_GNU_SOURCE
+#endif
--- a/launcher/MangoHud.h
+++ b/launcher/MangoHud.h
@ -24,4 +24,6 @@
 namespace MangoHud {

 QString getLibraryString();
-}
+
+QString findLibrary(QString libName);
+}  // namespace MangoHud
--- a/launcher/Markdown.h
+++ b/launcher/Markdown.h
@ -18,7 +18,7 @@

 #pragma once

-#include <QString>
 #include <cmark.h>
+#include <QString>

 QString markdownToHTML(const QString& markdown);
--- a/launcher/MessageLevel.cpp
+++ b/launcher/MessageLevel.cpp
@ -26,8 +26,7 @@ MessageLevel::Enum MessageLevel::fromLine(QString &line)
 {
    // Level prefix
    int endmark = line.indexOf("]!");
-    if (line.startsWith("!![") && endmark != -1)
-    {
+    if (line.startsWith("!![") && endmark != -1) {
        auto level = MessageLevel::getLevel(line.left(endmark).mid(3));
        line = line.mid(endmark + 2);
        return level;
--- a/launcher/MessageLevel.h
+++ b/launcher/MessageLevel.h
@ -6,10 +6,8 @@
 * @brief the MessageLevel Enum
 * defines what level a log message is
 */
-namespace MessageLevel
-{
-enum Enum
-{
+namespace MessageLevel {
+enum Enum {
    Unknown,  /**< No idea what this is or where it came from */
    StdOut,   /**< Undetermined stderr messages */
    StdErr,   /**< Undetermined stdout messages */
@ -25,4 +23,4 @@ MessageLevel::Enum getLevel(const QString &levelName);

 /* Get message level from a line. Line is modified if it was successful. */
 MessageLevel::Enum fromLine(QString& line);
-}
+}  // namespace MessageLevel
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -37,8 +38,7 @@
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"

-class NullInstance: public BaseInstance
-{
+class NullInstance : public BaseInstance {
    Q_OBJECT
   public:
    NullInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir)
@ -47,78 +47,30 @@ public:
        setVersionBroken(true);
    }
    virtual ~NullInstance(){};
-    void saveNow() override
-    {
-    }
-    void loadSpecificSettings() override
-    {
-        setSpecificSettingsLoaded(true);
-    }
-    QString getStatusbarDescription() override
-    {
-        return tr("Unknown instance type");
-    };
-    QSet< QString > traits() const override
-    {
-        return {};
-    };
-    QString instanceConfigFolder() const override
-    {
-        return instanceRoot();
-    };
-    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override
-    {
-        return nullptr;
-    }
-    shared_qobject_ptr< Task > createUpdateTask(Net::Mode mode) override
-    {
-        return nullptr;
-    }
-    QProcessEnvironment createEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QProcessEnvironment createLaunchEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QMap<QString, QString> getVariables() override
-    {
-        return QMap<QString, QString>();
-    }
-    IPathMatcher::Ptr getLogFileMatcher() override
-    {
-        return nullptr;
-    }
-    QString getLogFileRoot() override
-    {
-        return instanceRoot();
-    }
-    QString typeName() const override
-    {
-        return "Null";
-    }
-    bool canExport() const override
-    {
-        return false;
-    }
-    bool canEdit() const override
-    {
-        return false;
-    }
-    bool canLaunch() const override
-    {
-        return false;
-    }
+    void saveNow() override {}
+    void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
+    QString getStatusbarDescription() override { return tr("Unknown instance type"); };
+    QSet<QString> traits() const override { return {}; };
+    QString instanceConfigFolder() const override { return instanceRoot(); };
+    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override { return nullptr; }
+    shared_qobject_ptr<Task> createUpdateTask([[maybe_unused]] Net::Mode mode) override { return nullptr; }
+    QProcessEnvironment createEnvironment() override { return QProcessEnvironment(); }
+    QProcessEnvironment createLaunchEnvironment() override { return QProcessEnvironment(); }
+    QMap<QString, QString> getVariables() override { return QMap<QString, QString>(); }
+    IPathMatcher::Ptr getLogFileMatcher() override { return nullptr; }
+    QString getLogFileRoot() override { return instanceRoot(); }
+    QString typeName() const override { return "Null"; }
+    bool canExport() const override { return false; }
+    bool canEdit() const override { return false; }
+    bool canLaunch() const override { return false; }
+    void populateLaunchMenu(QMenu* menu) override {}
    QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override
    {
        QStringList out;
        out << "Null instance - placeholder.";
        return out;
    }
-    QString modsRoot() const override {
-        return QString();
-    }
+    QString modsRoot() const override { return QString(); }
    void updateRuntimeContext()
    {
        // NOOP
--- a/launcher/ProblemProvider.h
+++ b/launcher/ProblemProvider.h
@ -1,41 +1,29 @@
 #pragma once

-enum class ProblemSeverity
-{
-    None,
-    Warning,
-    Error
-};
+#include <QList>
+#include <QString>

-struct PatchProblem
-{
+enum class ProblemSeverity { None, Warning, Error };
+
+struct PatchProblem {
    ProblemSeverity m_severity;
    QString m_description;
 };

-class ProblemProvider
-{
+class ProblemProvider {
   public:
-    virtual ~ProblemProvider() {};
+    virtual ~ProblemProvider() {}
    virtual const QList<PatchProblem> getProblems() const = 0;
    virtual ProblemSeverity getProblemSeverity() const = 0;
 };

-class ProblemContainer : public ProblemProvider
-{
+class ProblemContainer : public ProblemProvider {
   public:
-    const QList<PatchProblem> getProblems() const override
-    {
-        return m_problems;
-    }
-    ProblemSeverity getProblemSeverity() const override
-    {
-        return m_problemSeverity;
-    }
+    const QList<PatchProblem> getProblems() const override { return m_problems; }
+    ProblemSeverity getProblemSeverity() const override { return m_problemSeverity; }
    virtual void addProblem(ProblemSeverity severity, const QString& description)
    {
-        if(severity > m_problemSeverity)
-        {
+        if (severity > m_problemSeverity) {
            m_problemSeverity = severity;
        }
        m_problems.append({ severity, description });
--- a/launcher/QVariantUtils.h
+++ b/launcher/QVariantUtils.h
@ -36,35 +36,34 @@

 #pragma once

-
-#include <QVariant>
 #include <QList>
+#include <QVariant>

 namespace QVariantUtils {

 template <typename T>
-inline QList<T> toList(QVariant src) {
+inline QList<T> toList(QVariant src)
+{
    QVariantList variantList = src.toList();

    QList<T> list_t;
    list_t.reserve(variantList.size());
-    for (const QVariant& v : variantList)
-    {
+    for (const QVariant& v : variantList) {
        list_t.append(v.value<T>());
    }
    return list_t;
 }

 template <typename T>
-inline QVariant fromList(QList<T> val) {
+inline QVariant fromList(QList<T> val)
+{
    QVariantList variantList;
    variantList.reserve(val.size());
-    for (const T& v : val)
-    {
+    for (const T& v : val) {
        variantList.append(v);
    }

    return variantList;
 }

-}
+}  // namespace QVariantUtils
--- a/launcher/RWStorage.h
+++ b/launcher/RWStorage.h
@ -1,12 +1,11 @@
 #pragma once
-#include <QWriteLocker>
-#include <QReadLocker>
 #include <QMap>
+#include <QReadLocker>
 #include <QSet>
+#include <QWriteLocker>

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

-#include <QRegularExpression>
 #include <QDebug>
+#include <QRegularExpression>

-RecursiveFileSystemWatcher::RecursiveFileSystemWatcher(QObject *parent)
-    : QObject(parent), m_watcher(new QFileSystemWatcher(this))
+RecursiveFileSystemWatcher::RecursiveFileSystemWatcher(QObject* parent) : QObject(parent), m_watcher(new QFileSystemWatcher(this))
 {
-    connect(m_watcher, &QFileSystemWatcher::fileChanged, this,
-            &RecursiveFileSystemWatcher::fileChange);
-    connect(m_watcher, &QFileSystemWatcher::directoryChanged, this,
-            &RecursiveFileSystemWatcher::directoryChange);
+    connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &RecursiveFileSystemWatcher::fileChange);
+    connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &RecursiveFileSystemWatcher::directoryChange);
 }

 void RecursiveFileSystemWatcher::setRootDir(const QDir& root)
@ -18,8 +15,7 @@ void RecursiveFileSystemWatcher::setRootDir(const QDir &root)
    disable();
    m_root = root;
    setFiles(scanRecursive(m_root));
-    if (wasEnabled)
-    {
+    if (wasEnabled) {
        enable();
    }
 }
@ -28,16 +24,14 @@ void RecursiveFileSystemWatcher::setWatchFiles(const bool watchFiles)
    bool wasEnabled = m_isEnabled;
    disable();
    m_watchFiles = watchFiles;
-    if (wasEnabled)
-    {
+    if (wasEnabled) {
        enable();
    }
 }

 void RecursiveFileSystemWatcher::enable()
 {
-    if (m_isEnabled)
-    {
+    if (m_isEnabled) {
        return;
    }
    Q_ASSERT(m_root != QDir::root());
@ -46,8 +40,7 @@ void RecursiveFileSystemWatcher::enable()
 }
 void RecursiveFileSystemWatcher::disable()
 {
-    if (!m_isEnabled)
-    {
+    if (!m_isEnabled) {
        return;
    }
    m_isEnabled = false;
@ -57,8 +50,7 @@ void RecursiveFileSystemWatcher::disable()

 void RecursiveFileSystemWatcher::setFiles(const QStringList& files)
 {
-    if (files != m_files)
-    {
+    if (files != m_files) {
        m_files = files;
        emit filesChanged();
    }
@ -67,14 +59,11 @@ void RecursiveFileSystemWatcher::setFiles(const QStringList &files)
 void RecursiveFileSystemWatcher::addFilesToWatcherRecursive(const QDir& dir)
 {
    m_watcher->addPath(dir.absolutePath());
-    for (const QString &directory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
-    {
+    for (const QString& directory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
        addFilesToWatcherRecursive(dir.absoluteFilePath(directory));
    }
-    if (m_watchFiles)
-    {
-        for (const QFileInfo &info : dir.entryInfoList(QDir::Files))
-        {
+    if (m_watchFiles) {
+        for (const QFileInfo& info : dir.entryInfoList(QDir::Files)) {
            m_watcher->addPath(info.absoluteFilePath());
        }
    }
@ -82,19 +71,15 @@ void RecursiveFileSystemWatcher::addFilesToWatcherRecursive(const QDir &dir)
 QStringList RecursiveFileSystemWatcher::scanRecursive(const QDir& directory)
 {
    QStringList ret;
-    if(!m_matcher)
-    {
+    if (!m_matcher) {
        return {};
    }
-    for (const QString &dir : directory.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden))
-    {
+    for (const QString& dir : directory.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden)) {
        ret.append(scanRecursive(directory.absoluteFilePath(dir)));
    }
-    for (const QString &file : directory.entryList(QDir::Files | QDir::Hidden))
-    {
+    for (const QString& file : directory.entryList(QDir::Files | QDir::Hidden)) {
        auto relPath = m_root.relativeFilePath(directory.absoluteFilePath(file));
-        if (m_matcher->matches(relPath))
-        {
+        if (m_matcher->matches(relPath)) {
            ret.append(relPath);
        }
    }
@ -105,7 +90,7 @@ void RecursiveFileSystemWatcher::fileChange(const QString &path)
 {
    emit fileChanged(path);
 }
-void RecursiveFileSystemWatcher::directoryChange(const QString &path)
+void RecursiveFileSystemWatcher::directoryChange([[maybe_unused]] const QString& path)
 {
    setFiles(scanRecursive(m_root));
 }
--- a/launcher/RecursiveFileSystemWatcher.h
+++ b/launcher/RecursiveFileSystemWatcher.h
@ -1,37 +1,24 @@
 #pragma once

-#include <QFileSystemWatcher>
 #include <QDir>
+#include <QFileSystemWatcher>
 #include "pathmatcher/IPathMatcher.h"

-class RecursiveFileSystemWatcher : public QObject
-{
+class RecursiveFileSystemWatcher : public QObject {
    Q_OBJECT
   public:
    RecursiveFileSystemWatcher(QObject* parent);

    void setRootDir(const QDir& root);
-    QDir rootDir() const
-    {
-        return m_root;
-    }
+    QDir rootDir() const { return m_root; }

    // WARNING: setting this to true may be bad for performance
    void setWatchFiles(const bool watchFiles);
-    bool watchFiles() const
-    {
-        return m_watchFiles;
-    }
+    bool watchFiles() const { return m_watchFiles; }

-    void setMatcher(IPathMatcher::Ptr matcher)
-    {
-        m_matcher = matcher;
-    }
+    void setMatcher(IPathMatcher::Ptr matcher) { m_matcher = matcher; }

-    QStringList files() const
-    {
-        return m_files;
-    }
+    QStringList files() const { return m_files; }

   signals:
    void filesChanged();
--- a/launcher/ResourceDownloadTask.cpp
+++ b/launcher/ResourceDownloadTask.cpp
@ -24,6 +24,8 @@
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"

+#include "net/ApiDownload.h"
+
 ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
                                           ModPlatform::IndexedVersion version,
                                           const std::shared_ptr<ResourceFolderModel> packs,
@ -51,7 +53,7 @@ ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
        }
    }

-    m_filesNetJob->addNetAction(Net::Download::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
    connect(m_filesNetJob.get(), &NetJob::succeeded, this, &ResourceDownloadTask::downloadSucceeded);
    connect(m_filesNetJob.get(), &NetJob::progress, this, &ResourceDownloadTask::downloadProgressChanged);
    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propagateStepProgress);
--- a/launcher/RuntimeContext.h
+++ b/launcher/RuntimeContext.h
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
--- a/launcher/SeparatorPrefixTree.h
+++ b/launcher/SeparatorPrefixTree.h
@ -1,26 +1,18 @@
 #pragma once
-#include <QString>
 #include <QMap>
+#include <QString>
 #include <QStringList>

 template <char Tseparator>
-class SeparatorPrefixTree
-{
+class SeparatorPrefixTree {
   public:
-    SeparatorPrefixTree(QStringList paths)
-    {
-        insert(paths);
-    }
+    SeparatorPrefixTree(QStringList paths) { insert(paths); }

-    SeparatorPrefixTree(bool contained = false)
-    {
-        m_contained = contained;
-    }
+    SeparatorPrefixTree(bool contained = false) { m_contained = contained; }

    void insert(QStringList paths)
    {
-        for(auto &path: paths)
-        {
+        for (auto& path : paths) {
            insert(path);
        }
    }
@ -29,16 +21,12 @@ public:
    SeparatorPrefixTree& insert(QString path)
    {
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            children[path] = SeparatorPrefixTree(true);
            return children[path];
-        }
-        else
-        {
+        } else {
            auto prefix = path.left(sepIndex);
-            if(!children.contains(prefix))
-            {
+            if (!children.contains(prefix)) {
                children[prefix] = SeparatorPrefixTree(false);
            }
            return children[prefix].insert(path.mid(sepIndex + 1));
@ -56,26 +44,20 @@ public:
    bool covers(QString path) const
    {
        // if we found some valid node, it's good enough. the tree covers the path
-        if(m_contained)
-        {
+        if (m_contained) {
            return true;
        }
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            auto found = children.find(path);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return false;
            }
            return (*found).covers(QString());
-        }
-        else
-        {
+        } else {
            auto prefix = path.left(sepIndex);
            auto found = children.find(prefix);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return false;
            }
            return (*found).covers(path.mid(sepIndex + 1));
@ -86,38 +68,30 @@ public:
    QString cover(QString path) const
    {
        // if we found some valid node, it's good enough. the tree covers the path
-        if(m_contained)
-        {
+        if (m_contained) {
            return QString("");
        }
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            auto found = children.find(path);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return QString();
            }
            auto nested = (*found).cover(QString());
-            if(nested.isNull())
-            {
+            if (nested.isNull()) {
                return nested;
            }
            if (nested.isEmpty())
                return path;
            return path + Tseparator + nested;
-        }
-        else
-        {
+        } else {
            auto prefix = path.left(sepIndex);
            auto found = children.find(prefix);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return QString();
            }
            auto nested = (*found).cover(path.mid(sepIndex + 1));
-            if(nested.isNull())
-            {
+            if (nested.isNull()) {
                return nested;
            }
            if (nested.isEmpty())
@ -130,21 +104,16 @@ public:
    bool exists(QString path) const
    {
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            auto found = children.find(path);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return false;
            }
            return true;
-        }
-        else
-        {
+        } else {
            auto prefix = path.left(sepIndex);
            auto found = children.find(prefix);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return false;
            }
            return (*found).exists(path.mid(sepIndex + 1));
@ -155,21 +124,16 @@ public:
    const SeparatorPrefixTree* find(QString path) const
    {
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            auto found = children.find(path);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return nullptr;
            }
            return &(*found);
-        }
-        else
-        {
+        } else {
            auto prefix = path.left(sepIndex);
            auto found = children.find(prefix);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return nullptr;
            }
            return (*found).find(path.mid(sepIndex + 1));
@ -177,70 +141,48 @@ public:
    }

    /// is this a leaf node?
-    bool leaf() const
-    {
-        return children.isEmpty();
-    }
+    bool leaf() const { return children.isEmpty(); }

    /// is this node actually contained in the tree, or is it purely structural?
-    bool contained() const
-    {
-        return m_contained;
-    }
+    bool contained() const { return m_contained; }

    /// Remove a path from the tree
-    bool remove(QString path)
-    {
-        return removeInternal(path) != Failed;
-    }
+    bool remove(QString path) { return removeInternal(path) != Failed; }

    /// Clear all children of this node tree node
-    void clear()
-    {
-        children.clear();
-    }
+    void clear() { children.clear(); }

    QStringList toStringList() const
    {
        QStringList collected;
        // collecting these is more expensive.
        auto iter = children.begin();
-        while(iter != children.end())
-        {
+        while (iter != children.end()) {
            QStringList list = iter.value().toStringList();
-            for(int i = 0; i < list.size(); i++)
-            {
+            for (int i = 0; i < list.size(); i++) {
                list[i] = iter.key() + Tseparator + list[i];
            }
            collected.append(list);
-            if((*iter).m_contained)
-            {
+            if ((*iter).m_contained) {
                collected.append(iter.key());
            }
            iter++;
        }
        return collected;
    }
+
   private:
-    enum Removal
-    {
-        Failed,
-        Succeeded,
-        HasChildren
-    };
+    enum Removal { Failed, Succeeded, HasChildren };
    Removal removeInternal(QString path = QString())
    {
-        if(path.isEmpty())
-        {
-            if(!m_contained)
-            {
+        if (path.isEmpty()) {
+            if (!m_contained) {
                // remove all children - we are removing a prefix
                clear();
                return Succeeded;
            }
            m_contained = false;
-            if(children.size())
-            {
+            if (children.size()) {
                return HasChildren;
            }
            return Succeeded;
@ -248,42 +190,32 @@ private:
        Removal remStatus = Failed;
        QString childToRemove;
        auto sepIndex = path.indexOf(Tseparator);
-        if(sepIndex == -1)
-        {
+        if (sepIndex == -1) {
            childToRemove = path;
            auto found = children.find(childToRemove);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return Failed;
            }
            remStatus = (*found).removeInternal();
-        }
-        else
-        {
+        } else {
            childToRemove = path.left(sepIndex);
            auto found = children.find(childToRemove);
-            if(found == children.end())
-            {
+            if (found == children.end()) {
                return Failed;
            }
            remStatus = (*found).removeInternal(path.mid(sepIndex + 1));
        }
-        switch (remStatus)
-        {
+        switch (remStatus) {
            case Failed:
-            case HasChildren:
-            {
+            case HasChildren: {
                return remStatus;
            }
-            case Succeeded:
-            {
+            case Succeeded: {
                children.remove(childToRemove);
-                if(m_contained)
-                {
+                if (m_contained) {
                    return HasChildren;
                }
-                if(children.size())
-                {
+                if (children.size()) {
                    return HasChildren;
                }
                return Succeeded;
--- a/launcher/SkinUtils.cpp
+++ b/launcher/SkinUtils.cpp
@ -14,17 +14,16 @@
 */

 #include "SkinUtils.h"
-#include "net/HttpMetaCache.h"
 #include "Application.h"
+#include "net/HttpMetaCache.h"

 #include <QFile>
-#include <QPainter>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
+#include <QPainter>

-namespace SkinUtils
-{
+namespace SkinUtils {
 /*
 * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise
 */
@ -32,12 +31,15 @@ QPixmap getFaceFromCache(QString username, int height, int width)
 {
    QFile fskin(APPLICATION->metacache()->resolveEntry("skins", username + ".png")->getFullPath());

-    if (fskin.exists())
-    {
+    if (fskin.exists()) {
        QPixmap skinTexture(fskin.fileName());
-        if(!skinTexture.isNull())
-        {
+        if (!skinTexture.isNull()) {
            QPixmap skin = QPixmap(8, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            skin.fill(QColorConstants::Transparent);
+#else
+            skin.fill(QColor(0, 0, 0, 0));
+#endif
            QPainter painter(&skin);
            painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
            painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));
@ -47,4 +49,4 @@ QPixmap getFaceFromCache(QString username, int height, int width)

    return QPixmap();
 }
-}
+}  // namespace SkinUtils
--- a/launcher/SkinUtils.h
+++ b/launcher/SkinUtils.h
@ -17,7 +17,6 @@

 #include <QPixmap>

-namespace SkinUtils
-{
+namespace SkinUtils {
 QPixmap getFaceFromCache(QString id, int height = 64, int width = 64);
 }
--- a/launcher/StringUtils.h
+++ b/launcher/StringUtils.h
@ -77,6 +77,5 @@ QString truncateUrlHumanFriendly(QUrl &url, int max_len, bool hard_limit = false

 QString humanReadableFileSize(double bytes, bool use_si = false, int decimal_points = 1);

-
 QString getRandomAlphaNumeric();
 }  // namespace StringUtils
--- a/launcher/Usable.h
+++ b/launcher/Usable.h
@ -12,27 +12,19 @@ class Usable;
 *
 * @see UseLock
 */
-class Usable
-{
+class Usable {
    friend class UseLock;
+
   public:
-    std::size_t useCount() const
-    {
-        return m_useCount;
-    }
-    bool isInUse() const
-    {
-        return m_useCount > 0;
-    }
+    virtual ~Usable() {}
+
+    std::size_t useCount() const { return m_useCount; }
+    bool isInUse() const { return m_useCount > 0; }
+
   protected:
-    virtual void decrementUses()
-    {
-        m_useCount--;
-    }
-    virtual void incrementUses()
-    {
-        m_useCount++;
-    }
+    virtual void decrementUses() { m_useCount--; }
+    virtual void incrementUses() { m_useCount++; }
+
   private:
    std::size_t m_useCount = 0;
 };
@ -42,19 +34,15 @@ private:
 *
 * @see Usable
 */
-class UseLock
-{
+class UseLock {
   public:
-    UseLock(shared_qobject_ptr<Usable> usable)
-        : m_usable(usable)
+    UseLock(shared_qobject_ptr<Usable> usable) : m_usable(usable)
    {
        // this doesn't use shared pointer use count, because that wouldn't be correct. this count is separate.
        m_usable->incrementUses();
    }
-    ~UseLock()
-    {
-        m_usable->decrementUses();
-    }
+    ~UseLock() { m_usable->decrementUses(); }
+
   private:
    shared_qobject_ptr<Usable> m_usable;
 };
--- a/launcher/Version.cpp
+++ b/launcher/Version.cpp
@ -117,12 +117,14 @@ QDebug operator<<(QDebug debug, const Version& v)

    bool first = true;
    for (auto s : v.m_sections) {
-        if (!first) debug.nospace() << ", ";
+        if (!first)
+            debug.nospace() << ", ";
        debug.nospace() << s.m_fullString;
        first = false;
    }

-    debug.nospace() << " ]" << " }";
+    debug.nospace() << " ]"
+                    << " }";

    return debug;
 }
--- a/launcher/Version.h
+++ b/launcher/Version.h
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
@ -63,7 +63,7 @@ class Version {
    struct Section {
        explicit Section(QString fullString) : m_fullString(std::move(fullString))
        {
-            int cutoff = m_fullString.size();
+            qsizetype cutoff = m_fullString.size();
            for (int i = 0; i < m_fullString.size(); i++) {
                if (!m_fullString[i].isDigit()) {
                    cutoff = i;
@ -150,14 +150,8 @@ class Version {
            return m_fullString < other.m_fullString;
        }

-        inline bool operator!=(const Section& other) const
-        {
-            return !(*this == other);
-        }
-        inline bool operator>(const Section &other) const
-        {
-            return !(*this < other || *this == other);
-        }
+        inline bool operator!=(const Section& other) const { return !(*this == other); }
+        inline bool operator>(const Section& other) const { return !(*this < other || *this == other); }
    };

   private:
@ -166,5 +160,3 @@ class Version {

    void parse();
 };
-
-
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@ -35,14 +35,13 @@
 */

 #include "VersionProxyModel.h"
-#include "Application.h"
-#include <QSortFilterProxyModel>
-#include <QPixmapCache>
 #include <Version.h>
 #include <meta/VersionList.h>
+#include <QPixmapCache>
+#include <QSortFilterProxyModel>
+#include "Application.h"

-class VersionFilterModel : public QSortFilterProxyModel
-{
+class VersionFilterModel : public QSortFilterProxyModel {
    Q_OBJECT
   public:
    VersionFilterModel(VersionProxyModel* parent) : QSortFilterProxyModel(parent)
@ -61,22 +60,18 @@ public:
        if (!search.isEmpty() && !sourceModel()->data(idx, BaseVersionList::VersionRole).toString().contains(search, Qt::CaseInsensitive))
            return false;

-        for (auto it = filters.begin(); it != filters.end(); ++it)
-        {
+        for (auto it = filters.begin(); it != filters.end(); ++it) {
            auto data = sourceModel()->data(idx, it.key());
            auto match = data.toString();
-            if(!it.value()->accepts(match))
-            {
+            if (!it.value()->accepts(match)) {
                return false;
            }
        }
        return true;
    }

-    void filterChanged()
-    {
-        invalidateFilter();
-    }
+    void filterChanged() { invalidateFilter(); }
+
   private:
    VersionProxyModel* m_parent;
 };
@ -109,10 +104,8 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
    if (orientation != Qt::Horizontal)
        return QVariant();
    auto column = m_columns[section];
-    if(role == Qt::DisplayRole)
-    {
-        switch(column)
-        {
+    if (role == Qt::DisplayRole) {
+        switch (column) {
            case Name:
                return tr("Version");
            case ParentVersion:
@ -128,11 +121,8 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
            case Time:
                return tr("Released");
        }
-    }
-    else if(role == Qt::ToolTipRole)
-    {
-        switch(column)
-        {
+    } else if (role == Qt::ToolTipRole) {
+        switch (column) {
            case Name:
                return tr("The name of the version.");
            case ParentVersion:
@ -154,23 +144,17 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,

 QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
 {
-    if(!index.isValid())
-    {
+    if (!index.isValid()) {
        return QVariant();
    }
    auto column = m_columns[index.column()];
    auto parentIndex = mapToSource(index);
-    switch(role)
-    {
-        case Qt::DisplayRole:
-        {
-            switch(column)
-            {
-                case Name:
-                {
+    switch (role) {
+        case Qt::DisplayRole: {
+            switch (column) {
+                case Name: {
                    QString version = sourceModel()->data(parentIndex, BaseVersionList::VersionRole).toString();
-                    if(version == m_currentVersion)
-                    {
+                    if (version == m_currentVersion) {
                        return tr("%1 (installed)").arg(version);
                    }
                    return version;
@ -191,18 +175,14 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                    return QVariant();
            }
        }
-        case Qt::ToolTipRole:
-        {
-            if(column == Name && hasRecommended) 
-            {
+        case Qt::ToolTipRole: {
+            if (column == Name && hasRecommended) {
                auto value = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
-                if(value.toBool())
-                {
+                if (value.toBool()) {
                    return tr("Recommended");
                } else if (hasLatest) {
                    auto value = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
-                    if(value.toBool())
-                    {
+                    if (value.toBool()) {
                        return tr("Latest");
                    }
                }
@ -210,31 +190,22 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                return sourceModel()->data(parentIndex, BaseVersionList::VersionIdRole);
            }
        }
-        case Qt::DecorationRole:
-        {
-            switch(column)
-            {
-                case Name:
-                {
-                    if(hasRecommended)
-                    {
-                        auto value = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
-                        if(value.toBool())
-                        {
+        case Qt::DecorationRole: {
+            switch (column) {
+                case Name: {
+                    if (hasRecommended) {
+                        auto recommenced = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
+                        if (recommenced.toBool()) {
                            return APPLICATION->getThemedIcon("star");
-                        }
-                        else if(hasLatest)
-                        {
-                            auto value = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
-                            if(value.toBool())
-                            {
+                        } else if (hasLatest) {
+                            auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
+                            if (latest.toBool()) {
                                return APPLICATION->getThemedIcon("bug");
                            }
                        }
                        QPixmap pixmap;
                        QPixmapCache::find("placeholder", &pixmap);
-                        if(!pixmap)
-                        {
+                        if (!pixmap) {
                            QPixmap px(16, 16);
                            px.fill(Qt::transparent);
                            QPixmapCache::insert("placeholder", px);
@ -243,16 +214,13 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
                        return pixmap;
                    }
                }
-                default:
-                {
+                default: {
                    return QVariant();
                }
            }
        }
-        default:
-        {
-            if(roles.contains((BaseVersionList::ModelRoles)role))
-            {
+        default: {
+            if (roles.contains((BaseVersionList::ModelRoles)role)) {
                return sourceModel()->data(parentIndex, role);
            }
            return QVariant();
@ -260,15 +228,14 @@ QVariant VersionProxyModel::data(const QModelIndex &index, int role) const
    }
 }

-QModelIndex VersionProxyModel::parent(const QModelIndex &child) const
+QModelIndex VersionProxyModel::parent([[maybe_unused]] const QModelIndex& child) const
 {
    return QModelIndex();
 }

 QModelIndex VersionProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
 {
-    if(sourceIndex.isValid())
-    {
+    if (sourceIndex.isValid()) {
        return index(sourceIndex.row(), 0);
    }
    return QModelIndex();
@ -276,8 +243,7 @@ QModelIndex VersionProxyModel::mapFromSource(const QModelIndex &sourceIndex) con

 QModelIndex VersionProxyModel::mapToSource(const QModelIndex& proxyIndex) const
 {
-    if(proxyIndex.isValid())
-    {
+    if (proxyIndex.isValid()) {
        return sourceModel()->index(proxyIndex.row(), 0);
    }
    return QModelIndex();
@ -286,8 +252,7 @@ QModelIndex VersionProxyModel::mapToSource(const QModelIndex &proxyIndex) const
 QModelIndex VersionProxyModel::index(int row, int column, const QModelIndex& parent) const
 {
    // no trees here... shoo
-    if(parent.isValid())
-    {
+    if (parent.isValid()) {
        return QModelIndex();
    }
    if (row < 0 || row >= sourceModel()->rowCount())
@ -304,15 +269,13 @@ int VersionProxyModel::columnCount(const QModelIndex &parent) const

 int VersionProxyModel::rowCount(const QModelIndex& parent) const
 {
-    if(sourceModel())
-    {
+    if (sourceModel()) {
        return sourceModel()->rowCount(parent);
    }
    return 0;
 }

-void VersionProxyModel::sourceDataChanged(const QModelIndex &source_top_left,
-                                          const QModelIndex &source_bottom_right)
+void VersionProxyModel::sourceDataChanged(const QModelIndex& source_top_left, const QModelIndex& source_bottom_right)
 {
    if (source_top_left.parent() != source_bottom_right.parent())
        return;
@ -329,16 +292,14 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel *replacingRaw)
    beginResetModel();

    m_columns.clear();
-    if(!replacing)
-    {
+    if (!replacing) {
        roles.clear();
        filterModel->setSourceModel(replacing);
        return;
    }

    roles = replacing->providesRoles();
-    if(roles.contains(BaseVersionList::VersionRole))
-    {
+    if (roles.contains(BaseVersionList::VersionRole)) {
        m_columns.push_back(Name);
    }
    /*
@ -347,32 +308,25 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel *replacingRaw)
        m_columns.push_back(ParentVersion);
    }
    */
-    if(roles.contains(BaseVersionList::ArchitectureRole))
-    {
+    if (roles.contains(BaseVersionList::ArchitectureRole)) {
        m_columns.push_back(Architecture);
    }
-    if(roles.contains(BaseVersionList::PathRole))
-    {
+    if (roles.contains(BaseVersionList::PathRole)) {
        m_columns.push_back(Path);
    }
-    if(roles.contains(Meta::VersionList::TimeRole))
-    {
+    if (roles.contains(Meta::VersionList::TimeRole)) {
        m_columns.push_back(Time);
    }
-    if(roles.contains(BaseVersionList::BranchRole))
-    {
+    if (roles.contains(BaseVersionList::BranchRole)) {
        m_columns.push_back(Branch);
    }
-    if(roles.contains(BaseVersionList::TypeRole))
-    {
+    if (roles.contains(BaseVersionList::TypeRole)) {
        m_columns.push_back(Type);
    }
-    if(roles.contains(BaseVersionList::RecommendedRole))
-    {
+    if (roles.contains(BaseVersionList::RecommendedRole)) {
        hasRecommended = true;
    }
-    if(roles.contains(BaseVersionList::LatestRole))
-    {
+    if (roles.contains(BaseVersionList::LatestRole)) {
        hasLatest = true;
    }
    filterModel->setSourceModel(replacing);
@ -382,16 +336,13 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel *replacingRaw)

 QModelIndex VersionProxyModel::getRecommended() const
 {
-    if(!roles.contains(BaseVersionList::RecommendedRole))
-    {
+    if (!roles.contains(BaseVersionList::RecommendedRole)) {
        return index(0, 0);
    }
    int recommended = 0;
-    for (int i = 0; i < rowCount(); i++)
-    {
+    for (int i = 0; i < rowCount(); i++) {
        auto value = sourceModel()->data(mapToSource(index(i, 0)), BaseVersionList::RecommendedRole);
-        if (value.toBool())
-        {
+        if (value.toBool()) {
            recommended = i;
        }
    }
@ -401,16 +352,13 @@ QModelIndex VersionProxyModel::getRecommended() const
 QModelIndex VersionProxyModel::getVersion(const QString& version) const
 {
    int found = -1;
-    for (int i = 0; i < rowCount(); i++)
-    {
+    for (int i = 0; i < rowCount(); i++) {
        auto value = sourceModel()->data(mapToSource(index(i, 0)), BaseVersionList::VersionRole);
-        if (value.toString() == version)
-        {
+        if (value.toString() == version) {
            found = i;
        }
    }
-    if(found == -1)
-    {
+    if (found == -1) {
        return QModelIndex();
    }
    return index(found, 0);
@ -429,7 +377,8 @@ void VersionProxyModel::setFilter(const BaseVersionList::ModelRoles column, Filt
    filterModel->filterChanged();
 }

-void VersionProxyModel::setSearch(const QString &search) {
+void VersionProxyModel::setSearch(const QString& search)
+{
    m_search = search;
    filterModel->filterChanged();
 }
@ -459,7 +408,9 @@ void VersionProxyModel::sourceRowsAboutToBeInserted(const QModelIndex& parent, i
    beginInsertRows(parent, first, last);
 }

-void VersionProxyModel::sourceRowsInserted(const QModelIndex& parent, int first, int last)
+void VersionProxyModel::sourceRowsInserted([[maybe_unused]] const QModelIndex& parent,
+                                           [[maybe_unused]] int first,
+                                           [[maybe_unused]] int last)
 {
    endInsertRows();
 }
@ -469,7 +420,7 @@ void VersionProxyModel::sourceRowsAboutToBeRemoved(const QModelIndex& parent, in
    beginRemoveRows(parent, first, last);
 }

-void VersionProxyModel::sourceRowsRemoved(const QModelIndex& parent, int first, int last)
+void VersionProxyModel::sourceRowsRemoved([[maybe_unused]] const QModelIndex& parent, [[maybe_unused]] int first, [[maybe_unused]] int last)
 {
    endRemoveRows();
 }
--- a/launcher/VersionProxyModel.h
+++ b/launcher/VersionProxyModel.h
@ -6,21 +6,10 @@

 class VersionFilterModel;

-class VersionProxyModel: public QAbstractProxyModel
-{
+class VersionProxyModel : public QAbstractProxyModel {
    Q_OBJECT
   public:
-
-    enum Column
-    {
-        Name,
-        ParentVersion,
-        Branch,
-        Type,
-        Architecture,
-        Path,
-        Time
-    };
+    enum Column { Name, ParentVersion, Branch, Type, Architecture, Path, Time };
    typedef QHash<BaseVersionList::ModelRoles, std::shared_ptr<Filter>> FilterMap;

   public:
--- a/launcher/WatchLock.h
+++ b/launcher/WatchLock.h
@ -1,20 +1,15 @@

 #pragma once

-#include <QString>
 #include <QFileSystemWatcher>
+#include <QString>

-struct WatchLock
-{
-    WatchLock(QFileSystemWatcher * watcher, const QString& directory)
-        : m_watcher(watcher), m_directory(directory)
+struct WatchLock {
+    WatchLock(QFileSystemWatcher* watcher, const QString& directory) : m_watcher(watcher), m_directory(directory)
    {
        m_watcher->removePath(m_directory);
    }
-    ~WatchLock()
-    {
-        m_watcher->addPath(m_directory);
-    }
+    ~WatchLock() { m_watcher->addPath(m_directory); }
    QFileSystemWatcher* m_watcher;
    QString m_directory;
 };
--- a/launcher/WindowsConsole.cpp
+++ b/launcher/WindowsConsole.cpp
@ -0,0 +1,128 @@
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <fcntl.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+#include <iostream>
+
+void RedirectHandle(DWORD handle, FILE* stream, const char* mode)
+{
+    HANDLE stdHandle = GetStdHandle(handle);
+    if (stdHandle != INVALID_HANDLE_VALUE) {
+        int fileDescriptor = _open_osfhandle((intptr_t)stdHandle, _O_TEXT);
+        if (fileDescriptor != -1) {
+            FILE* file = _fdopen(fileDescriptor, mode);
+            if (file != NULL) {
+                int dup2Result = _dup2(_fileno(file), _fileno(stream));
+                if (dup2Result == 0) {
+                    setvbuf(stream, NULL, _IONBF, 0);
+                }
+            }
+        }
+    }
+}
+
+// taken from https://stackoverflow.com/a/25927081
+// getting a proper output to console with redirection support on windows is apparently hell
+void BindCrtHandlesToStdHandles(bool bindStdIn, bool bindStdOut, bool bindStdErr)
+{
+    // Re-initialize the C runtime "FILE" handles with clean handles bound to "nul". We do this because it has been
+    // observed that the file number of our standard handle file objects can be assigned internally to a value of -2
+    // when not bound to a valid target, which represents some kind of unknown internal invalid state. In this state our
+    // call to "_dup2" fails, as it specifically tests to ensure that the target file number isn't equal to this value
+    // before allowing the operation to continue. We can resolve this issue by first "re-opening" the target files to
+    // use the "nul" device, which will place them into a valid state, after which we can redirect them to our target
+    // using the "_dup2" function.
+    if (bindStdIn) {
+        FILE* dummyFile;
+        freopen_s(&dummyFile, "nul", "r", stdin);
+    }
+    if (bindStdOut) {
+        FILE* dummyFile;
+        freopen_s(&dummyFile, "nul", "w", stdout);
+    }
+    if (bindStdErr) {
+        FILE* dummyFile;
+        freopen_s(&dummyFile, "nul", "w", stderr);
+    }
+
+    // Redirect unbuffered stdin from the current standard input handle
+    if (bindStdIn) {
+        RedirectHandle(STD_INPUT_HANDLE, stdin, "r");
+    }
+
+    // Redirect unbuffered stdout to the current standard output handle
+    if (bindStdOut) {
+        RedirectHandle(STD_OUTPUT_HANDLE, stdout, "w");
+    }
+
+    // Redirect unbuffered stderr to the current standard error handle
+    if (bindStdErr) {
+        RedirectHandle(STD_ERROR_HANDLE, stderr, "w");
+    }
+
+    // Clear the error state for each of the C++ standard stream objects. We need to do this, as attempts to access the
+    // standard streams before they refer to a valid target will cause the iostream objects to enter an error state. In
+    // versions of Visual Studio after 2005, this seems to always occur during startup regardless of whether anything
+    // has been read from or written to the targets or not.
+    if (bindStdIn) {
+        std::wcin.clear();
+        std::cin.clear();
+    }
+    if (bindStdOut) {
+        std::wcout.clear();
+        std::cout.clear();
+    }
+    if (bindStdErr) {
+        std::wcerr.clear();
+        std::cerr.clear();
+    }
+}
+
+bool AttachWindowsConsole()
+{
+    auto stdinType = GetFileType(GetStdHandle(STD_INPUT_HANDLE));
+    auto stdoutType = GetFileType(GetStdHandle(STD_OUTPUT_HANDLE));
+    auto stderrType = GetFileType(GetStdHandle(STD_ERROR_HANDLE));
+
+    bool bindStdIn = false;
+    bool bindStdOut = false;
+    bool bindStdErr = false;
+
+    if (stdinType == FILE_TYPE_CHAR || stdinType == FILE_TYPE_UNKNOWN) {
+        bindStdIn = true;
+    }
+    if (stdoutType == FILE_TYPE_CHAR || stdoutType == FILE_TYPE_UNKNOWN) {
+        bindStdOut = true;
+    }
+    if (stderrType == FILE_TYPE_CHAR || stderrType == FILE_TYPE_UNKNOWN) {
+        bindStdErr = true;
+    }
+
+    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+        BindCrtHandlesToStdHandles(bindStdIn, bindStdOut, bindStdErr);
+        return true;
+    }
+
+    return false;
+}
--- a/launcher/WindowsConsole.h
+++ b/launcher/WindowsConsole.h
@ -0,0 +1,25 @@
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+void BindCrtHandlesToStdHandles(bool bindStdIn, bool bindStdOut, bool bindStdErr);
+bool AttachWindowsConsole();
--- a/launcher/filelink/FileLink.cpp
+++ b/launcher/filelink/FileLink.cpp
@ -37,11 +37,7 @@
 #include <sys.h>

 #if defined Q_OS_WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <stdio.h>
-#include <windows.h>
+#include "WindowsConsole.h"
 #endif

 // Snippet from https://github.com/gulrak/filesystem#using-it-as-single-file-header
@ -67,21 +63,7 @@ FileLinkApp::FileLinkApp(int& argc, char** argv) : QCoreApplication(argc, argv),
 {
 #if defined Q_OS_WIN32
    // attach the parent console
-    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
-        // if attach succeeds, reopen and sync all the i/o
-        if (freopen("CON", "w", stdout)) {
-            std::cout.sync_with_stdio();
-        }
-        if (freopen("CON", "w", stderr)) {
-            std::cerr.sync_with_stdio();
-        }
-        if (freopen("CON", "r", stdin)) {
-            std::cin.sync_with_stdio();
-        }
-        auto out = GetStdHandle(STD_OUTPUT_HANDLE);
-        DWORD written;
-        const char* endline = "\n";
-        WriteConsole(out, endline, strlen(endline), &written, NULL);
+    if (AttachWindowsConsole()) {
        consoleAttached = true;
    }
 #endif
@ -188,7 +170,7 @@ void FileLinkApp::runLink()
            FS::LinkResult result = { src_path, dst_path, QString::fromStdString(os_err.message()), os_err.value() };
            m_path_results.append(result);
        } else {
-            FS::LinkResult result = { src_path, dst_path };
+            FS::LinkResult result = { src_path, dst_path, "", 0 };
            m_path_results.append(result);
        }
    }
@ -248,7 +230,7 @@ void FileLinkApp::readPathPairs()
    in >> numLinks;
    qDebug() << "numLinks" << numLinks;

-    for (int i = 0; i < numLinks; i++) {
+    for (quint32 i = 0; i < numLinks; i++) {
        FS::LinkPair pair;
        in >> pair.src;
        in >> pair.dst;
@ -271,7 +253,6 @@ FileLinkApp::~FileLinkApp()
        fclose(stdout);
        fclose(stdin);
        fclose(stderr);
-        FreeConsole();
    }
 #endif
 }
--- a/launcher/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -35,13 +36,14 @@

 #include "IconList.h"
 #include <FileSystem.h>
-#include <QMap>
-#include <QEventLoop>
-#include <QMimeData>
-#include <QUrl>
-#include <QFileSystemWatcher>
-#include <QSet>
 #include <QDebug>
+#include <QEventLoop>
+#include <QFileSystemWatcher>
+#include <QMap>
+#include <QMimeData>
+#include <QSet>
+#include <QUrl>
+#include "icons/IconUtils.h"

 #define MAX_SIZE 1024

@ -50,17 +52,14 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *paren
    QSet<QString> builtinNames;

    // add builtin icons
-    for(auto & builtinPath: builtinPaths)
-    {
+    for (auto& builtinPath : builtinPaths) {
        QDir instance_icons(builtinPath);
        auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
-        for (auto file_info : file_info_list)
-        {
+        for (auto file_info : file_info_list) {
            builtinNames.insert(file_info.completeBaseName());
        }
    }
-    for(auto & builtinName : builtinNames)
-    {
+    for (auto& builtinName : builtinNames) {
        addThemeIcon(builtinName);
    }

@ -78,17 +77,14 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *paren
 void IconList::sortIconList()
 {
    qDebug() << "Sorting icon list...";
-    std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) {
-        return a.m_key.localeAwareCompare(b.m_key) < 0;
-    });
+    std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) { return a.m_key.localeAwareCompare(b.m_key) < 0; });
    reindex();
 }

 void IconList::directoryChanged(const QString& path)
 {
    QDir new_dir(path);
-    if(m_dir.absolutePath() != new_dir.absolutePath())
-    {
+    if (m_dir.absolutePath() != new_dir.absolutePath()) {
        m_dir.setPath(path);
        m_dir.refresh();
        if (is_watching)
@ -100,8 +96,7 @@ void IconList::directoryChanged(const QString &path)
            return;
    m_dir.refresh();
    auto new_list = m_dir.entryList(QDir::Files, QDir::Name);
-    for (auto it = new_list.begin(); it != new_list.end(); it++)
-    {
+    for (auto it = new_list.begin(); it != new_list.end(); it++) {
        QString& foo = (*it);
        foo = m_dir.filePath(foo);
    }
@ -111,8 +106,7 @@ void IconList::directoryChanged(const QString &path)
    auto new_set = new_list.toSet();
 #endif
    QList<QString> current_list;
-    for (auto &it : icons)
-    {
+    for (auto& it : icons) {
        if (!it.has(IconType::FileBased))
            continue;
        current_list.push_back(it.m_images[IconType::FileBased].filename);
@ -129,38 +123,33 @@ void IconList::directoryChanged(const QString &path)
    QSet<QString> to_add = new_set;
    to_add -= current_set;

-    for (auto remove : to_remove)
-    {
+    for (auto remove : to_remove) {
        qDebug() << "Removing " << remove;
        QFileInfo rmfile(remove);
        QString key = rmfile.completeBaseName();

        QString suffix = rmfile.suffix();
        // The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
-        if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
+        if (!IconUtils::isIconSuffix(suffix))
            key = rmfile.fileName();

        int idx = getIconIndex(key);
        if (idx == -1)
            continue;
        icons[idx].remove(IconType::FileBased);
-        if (icons[idx].type() == IconType::ToBeDeleted)
-        {
+        if (icons[idx].type() == IconType::ToBeDeleted) {
            beginRemoveRows(QModelIndex(), idx, idx);
            icons.remove(idx);
            reindex();
            endRemoveRows();
-        }
-        else
-        {
+        } else {
            dataChanged(index(idx), index(idx));
        }
        m_watcher->removePath(remove);
        emit iconUpdated(key);
    }

-    for (auto add : to_add)
-    {
+    for (auto add : to_add) {
        qDebug() << "Adding " << add;

        QFileInfo addfile(add);
@ -168,11 +157,10 @@ void IconList::directoryChanged(const QString &path)

        QString suffix = addfile.suffix();
        // The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
-        if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
+        if (!IconUtils::isIconSuffix(suffix))
            key = addfile.fileName();

-        if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased))
-        {
+        if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased)) {
            m_watcher->addPath(add);
            emit iconUpdated(key);
        }
@ -213,12 +201,9 @@ void IconList::startWatching()
    auto abs_path = m_dir.absolutePath();
    FS::ensureFolderPathExists(abs_path);
    is_watching = m_watcher->addPath(abs_path);
-    if (is_watching)
-    {
+    if (is_watching) {
        qDebug() << "Started watching " << abs_path;
-    }
-    else
-    {
+    } else {
        qDebug() << "Failed to start watching " << abs_path;
    }
 }
@ -241,7 +226,11 @@ Qt::DropActions IconList::supportedDropActions() const
    return Qt::CopyAction;
 }

-bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent)
+bool IconList::dropMimeData(const QMimeData* data,
+                            Qt::DropAction action,
+                            [[maybe_unused]] int row,
+                            [[maybe_unused]] int column,
+                            [[maybe_unused]] const QModelIndex& parent)
 {
    if (action == Qt::IgnoreAction)
        return true;
@ -250,12 +239,10 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
        return false;

    // files dropped from outside?
-    if (data->hasUrls())
-    {
+    if (data->hasUrls()) {
        auto urls = data->urls();
        QStringList iconFiles;
-        for (auto url : urls)
-        {
+        for (auto url : urls) {
            // only local files may be dropped...
            if (!url.isLocalFile())
                continue;
@ -270,9 +257,6 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
 Qt::ItemFlags IconList::flags(const QModelIndex& index) const
 {
    Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
-    if (index.isValid())
-        return Qt::ItemIsDropEnabled | defaultFlags;
-    else
    return Qt::ItemIsDropEnabled | defaultFlags;
 }

@ -286,8 +270,7 @@ QVariant IconList::data(const QModelIndex &index, int role) const
    if (row < 0 || row >= icons.size())
        return QVariant();

-    switch (role)
-    {
+    switch (role) {
        case Qt::DecorationRole:
            return icons[row].icon();
        case Qt::DisplayRole:
@ -307,19 +290,7 @@ int IconList::rowCount(const QModelIndex &parent) const
 void IconList::installIcons(const QStringList& iconFiles)
 {
    for (QString file : iconFiles)
-    {
-        QFileInfo fileinfo(file);
-        if (!fileinfo.isReadable() || !fileinfo.isFile())
-            continue;
-        QString target = FS::PathCombine(getDirectory(), fileinfo.fileName());
-
-        QString suffix = fileinfo.suffix();
-        if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
-            continue;
-
-        if (!QFile::copy(file, target))
-            continue;
-    }
+        installIcon(file, {});
 }

 void IconList::installIcon(const QString& file, const QString& name)
@ -328,19 +299,17 @@ void IconList::installIcon(const QString &file, const QString &name)
    if (!fileinfo.isReadable() || !fileinfo.isFile())
        return;

-    QString target = FS::PathCombine(getDirectory(), name);
+    if (!IconUtils::isIconSuffix(fileinfo.suffix()))
+        return;

+    QString target = FS::PathCombine(getDirectory(), name.isEmpty() ? fileinfo.fileName() : name);
    QFile::copy(file, target);
 }

 bool IconList::iconFileExists(const QString& key) const
 {
    auto iconEntry = icon(key);
-    if(!iconEntry)
-    {
-        return false;
-    }
-    return iconEntry->has(IconType::FileBased);
+    return iconEntry && iconEntry->has(IconType::FileBased);
 }

 const MMCIcon* IconList::icon(const QString& key) const
@ -353,32 +322,23 @@ const MMCIcon *IconList::icon(const QString &key) const

 bool IconList::deleteIcon(const QString& key)
 {
-    if (!iconFileExists(key))
-        return false;
-
-    return QFile::remove(icon(key)->getFilePath());
+    return iconFileExists(key) && QFile::remove(icon(key)->getFilePath());
 }

 bool IconList::trashIcon(const QString& key)
 {
-    if (!iconFileExists(key))
-        return false;
-
-    return FS::trash(icon(key)->getFilePath(), nullptr);
+    return iconFileExists(key) && FS::trash(icon(key)->getFilePath(), nullptr);
 }

 bool IconList::addThemeIcon(const QString& key)
 {
    auto iter = name_index.find(key);
-    if (iter != name_index.end())
-    {
+    if (iter != name_index.end()) {
        auto& oldOne = icons[*iter];
        oldOne.replace(Builtin, key);
        dataChanged(index(*iter), index(*iter));
        return true;
    }
-    else
-    {
    // add a new icon
    beginInsertRows(QModelIndex(), icons.size(), icons.size());
    {
@ -392,7 +352,6 @@ bool IconList::addThemeIcon(const QString& key)
    endInsertRows();
    return true;
 }
-}

 bool IconList::addIcon(const QString& key, const QString& name, const QString& path, const IconType type)
 {
@ -401,15 +360,12 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p
    if (icon.isNull())
        return false;
    auto iter = name_index.find(key);
-    if (iter != name_index.end())
-    {
+    if (iter != name_index.end()) {
        auto& oldOne = icons[*iter];
        oldOne.replace(type, icon, path);
        dataChanged(index(*iter), index(*iter));
        return true;
    }
-    else
-    {
    // add a new icon
    beginInsertRows(QModelIndex(), icons.size(), icons.size());
    {
@ -423,7 +379,6 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p
    endInsertRows();
    return true;
 }
-}

 void IconList::saveIcon(const QString& key, const QString& path, const char* format) const
 {
@ -432,13 +387,11 @@ void IconList::saveIcon(const QString &key, const QString &path, const char * fo
    pixmap.save(path, format);
 }

-
 void IconList::reindex()
 {
    name_index.clear();
    int i = 0;
-    for (auto &iter : icons)
-    {
+    for (auto& iter : icons) {
        name_index[iter.m_key] = i;
        i++;
    }
@ -472,5 +425,3 @@ QString IconList::getDirectory() const
 {
    return m_dir.absolutePath();
 }
-
-//#include "IconList.moc"
--- a/launcher/icons/IconList.h
+++ b/launcher/icons/IconList.h
@ -1,4 +1,24 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
 *
 *      Licensed under the Apache License, Version 2.0 (the "License");
 *      you may not use this file except in compliance with the License.
@ -12,13 +32,12 @@
 *      See the License for the specific language governing permissions and
 *      limitations under the License.
 */
-
 #pragma once

-#include <QMutex>
 #include <QAbstractListModel>
-#include <QFile>
 #include <QDir>
+#include <QFile>
+#include <QMutex>
 #include <QtGui/QIcon>
 #include <memory>

@ -29,8 +48,7 @@

 class QFileSystemWatcher;

-class IconList : public QAbstractListModel
-{
+class IconList : public QAbstractListModel {
    Q_OBJECT
   public:
    explicit IconList(const QStringList& builtinPaths, QString path, QObject* parent = 0);
@ -80,6 +98,7 @@ public slots:
   protected slots:
    void fileChanged(const QString& path);
    void SettingChanged(const Setting& setting, QVariant value);
+
   private:
    shared_qobject_ptr<QFileSystemWatcher> m_watcher;
    bool is_watching;
--- a/launcher/icons/IconUtils.cpp
+++ b/launcher/icons/IconUtils.cpp
@ -1,25 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "IconUtils.h"

-#include "FileSystem.h"
 #include <QDirIterator>
-
-#include <array>
+#include "FileSystem.h"

 namespace {
-std::array<const char *, 6> validIconExtensions = {{
-    "svg",
-    "png",
-    "ico",
-    "gif",
-    "jpg",
-    "jpeg"
-}};
+static const QStringList validIconExtensions = { { "svg", "png", "ico", "gif", "jpg", "jpeg" } };
 }

 namespace IconUtils {

-QString findBestIconIn(const QString &folder, const QString & iconKey) {
-    int best_found = validIconExtensions.size();
+QString findBestIconIn(const QString& folder, const QString& iconKey)
+{
    QString best_filename;

    QDirIterator it(folder, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::NoIteratorFlags);
@ -27,36 +53,20 @@ QString findBestIconIn(const QString &folder, const QString & iconKey) {
        it.next();
        auto fileInfo = it.fileInfo();

-        if(fileInfo.completeBaseName() != iconKey)
-            continue;
-
-        auto extension = fileInfo.suffix();
-
-        for(int i = 0; i < best_found; i++) {
-            if(extension == validIconExtensions[i]) {
-                best_found = i;
-                qDebug() << i << " : " << fileInfo.fileName();
-                best_filename = fileInfo.fileName();
+        if (fileInfo.completeBaseName() == iconKey && isIconSuffix(fileInfo.suffix()))
+            return fileInfo.absoluteFilePath();
    }
-        }
-    }
-    return FS::PathCombine(folder, best_filename);
+    return {};
 }

-QString getIconFilter() {
-    QString out;
-    QTextStream stream(&out);
-    stream << '(';
-    for(size_t i = 0; i < validIconExtensions.size() - 1; i++) {
-        if(i > 0) {
-            stream << " ";
-        }
-        stream << "*." << validIconExtensions[i];
-    }
-    stream << " *." << validIconExtensions[validIconExtensions.size() - 1];
-    stream << ')';
-    return out;
+QString getIconFilter()
+{
+    return "(*." + validIconExtensions.join(" *.") + ")";
 }

+bool isIconSuffix(QString suffix)
+{
+    return validIconExtensions.contains(suffix);
 }

+}  // namespace IconUtils
--- a/launcher/icons/IconUtils.h
+++ b/launcher/icons/IconUtils.h
@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once

 #include <QString>
@ -10,4 +45,5 @@ QString findBestIconIn(const QString &folder, const QString & iconKey);
 // Get icon file type filter for file browser dialogs
 QString getIconFilter();

-}
+bool isIconSuffix(QString suffix);
+}  // namespace IconUtils
--- a/launcher/icons/MMCIcon.cpp
+++ b/launcher/icons/MMCIcon.cpp
@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@ -40,8 +41,7 @@
 IconType operator--(IconType& t, int)
 {
    IconType temp = t;
-    switch (t)
-    {
+    switch (t) {
        case IconType::Builtin:
            t = IconType::ToBeDeleted;
            break;
@ -52,8 +52,7 @@ IconType operator--(IconType &t, int)
            t = IconType::Transient;
            break;
        default:
-    {
-    }
+            break;
    }
    return temp;
 }
@ -90,10 +89,8 @@ void MMCIcon::remove(IconType rm_type)
 {
    m_images[rm_type].filename = QString();
    m_images[rm_type].icon = QIcon();
-    for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--)
-    {
-        if (m_images[iter].present())
-        {
+    for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--) {
+        if (m_images[iter].present()) {
            m_current_type = iter;
            return;
        }
@ -103,8 +100,7 @@ void MMCIcon::remove(IconType rm_type)

 void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
 {
-    if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
-    {
+    if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
        m_current_type = new_type;
    }
    m_images[new_type].icon = icon;
@ -114,8 +110,7 @@ void MMCIcon::replace(IconType new_type, QIcon icon, QString path)

 void MMCIcon::replace(IconType new_type, const QString& key)
 {
-    if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
-    {
+    if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
        m_current_type = new_type;
    }
    m_images[new_type].icon = QIcon();
@ -131,7 +126,6 @@ QString MMCIcon::getFilePath() const
    return m_images[m_current_type].filename;
 }

-
 bool MMCIcon::isBuiltIn() const
 {
    return m_current_type == IconType::Builtin;
--- a/launcher/icons/MMCIcon.h
+++ b/launcher/icons/MMCIcon.h
@ -1,4 +1,24 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
 *
 *      Licensed under the Apache License, Version 2.0 (the "License");
 *      you may not use this file except in compliance with the License.
@ -12,34 +32,21 @@
 *      See the License for the specific language governing permissions and
 *      limitations under the License.
 */
-
 #pragma once
-#include <QString>
 #include <QDateTime>
 #include <QIcon>
+#include <QString>

-enum IconType : unsigned
-{
-    Builtin,
-    Transient,
-    FileBased,
-    ICONS_TOTAL,
-    ToBeDeleted
-};
+enum IconType : unsigned { Builtin, Transient, FileBased, ICONS_TOTAL, ToBeDeleted };

-struct MMCImage
-{
+struct MMCImage {
    QIcon icon;
    QString key;
    QString filename;
-    bool present() const
-    {
-        return !icon.isNull() || !key.isEmpty();
-    }
+    bool present() const { return !icon.isNull() || !key.isEmpty(); }
 };

-struct MMCIcon
-{
+struct MMCIcon {
    QString m_key;
    QString m_name;
    MMCImage m_images[ICONS_TOTAL];
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -35,26 +35,23 @@

 #include "JavaChecker.h"

-#include <QFile>
-#include <QProcess>
-#include <QMap>
 #include <QDebug>
+#include <QFile>
+#include <QMap>
+#include <QProcess>

-#include "JavaUtils.h"
-#include "FileSystem.h"
-#include "Commandline.h"
 #include "Application.h"
+#include "Commandline.h"
+#include "FileSystem.h"
+#include "JavaUtils.h"

-JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
-{
-}
+JavaChecker::JavaChecker(QObject* parent) : QObject(parent) {}

 void JavaChecker::performCheck()
 {
    QString checkerJar = JavaUtils::getJavaCheckPath();

-    if (checkerJar.isEmpty())
-    {
+    if (checkerJar.isEmpty()) {
        qDebug() << "Java checker library could not be found. Please check your installation.";
        return;
    }
@ -62,21 +59,17 @@ void JavaChecker::performCheck()
    QStringList args;

    process.reset(new QProcess());
-    if(m_args.size())
-    {
+    if (m_args.size()) {
        auto extraArgs = Commandline::splitArgs(m_args);
        args.append(extraArgs);
    }
-    if(m_minMem != 0)
-    {
+    if (m_minMem != 0) {
        args << QString("-Xms%1m").arg(m_minMem);
    }
-    if(m_maxMem != 0)
-    {
+    if (m_maxMem != 0) {
        args << QString("-Xmx%1m").arg(m_maxMem);
    }
-    if(m_permGen != 64)
-    {
+    if (m_permGen != 64) {
        args << QString("-XX:PermSize=%1m").arg(m_permGen);
    }

@ -130,8 +123,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
    qWarning() << "STDERR" << m_stderr;
    qDebug() << "Java checker finished with status" << status << "exit code" << exitcode;

-    if (status == QProcess::CrashExit || exitcode == 1)
-    {
+    if (status == QProcess::CrashExit || exitcode == 1) {
        result.validity = JavaCheckResult::Validity::Errored;
        emit checkFinished(result);
        return;
@ -146,8 +138,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 #else
    QStringList lines = m_stdout.split("\n", QString::SkipEmptyParts);
 #endif
-    for(QString line : lines)
-    {
+    for (QString line : lines) {
        line = line.trimmed();
        // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux
        if (line.contains("/bedrock/strata")) {
@ -159,18 +150,14 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 #else
        auto parts = line.split('=', QString::SkipEmptyParts);
 #endif
-        if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
-        {
+        if (parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty()) {
            continue;
-        }
-        else
-        {
+        } else {
            results.insert(parts[0], parts[1]);
        }
    }

-    if(!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success)
-    {
+    if (!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success) {
        result.validity = JavaCheckResult::Validity::ReturnedInvalidData;
        emit checkFinished(result);
        return;
@ -181,7 +168,6 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
    auto java_vendor = results["java.vendor"];
    bool is_64 = os_arch == "x86_64" || os_arch == "amd64" || os_arch == "aarch64" || os_arch == "arm64";

-
    result.validity = JavaCheckResult::Validity::Valid;
    result.is_64bit = is_64;
    result.mojangPlatform = is_64 ? "64" : "32";
@ -194,8 +180,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)

 void JavaChecker::error(QProcess::ProcessError err)
 {
-    if(err == QProcess::FailedToStart)
-    {
+    if (err == QProcess::FailedToStart) {
        qDebug() << "Java checker has failed to start.";
        qDebug() << "Process environment:";
        qDebug() << process->environment();
@ -216,8 +201,7 @@ void JavaChecker::error(QProcess::ProcessError err)
 void JavaChecker::timeout()
 {
    // NO MERCY. NO ABUSE.
-    if(process)
-    {
+    if (process) {
        qDebug() << "Java checker has been killed by timeout.";
        process->kill();
    }
--- a/launcher/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@ -9,8 +9,7 @@

 class JavaChecker;

-struct JavaCheckResult
-{
+struct JavaCheckResult {
    QString path;
    QString mojangPlatform;
    QString realPlatform;
@ -20,18 +19,12 @@ struct JavaCheckResult
    QString errorLog;
    bool is_64bit = false;
    int id;
-    enum class Validity
-    {
-        Errored,
-        ReturnedInvalidData,
-        Valid
-    } validity = Validity::Errored;
+    enum class Validity { Errored, ReturnedInvalidData, Valid } validity = Validity::Errored;
 };

 typedef shared_qobject_ptr<QProcess> QProcessPtr;
 typedef shared_qobject_ptr<JavaChecker> JavaCheckerPtr;
-class JavaChecker : public QObject
-{
+class JavaChecker : public QObject {
    Q_OBJECT
   public:
    explicit JavaChecker(QObject* parent = 0);
@ -46,13 +39,13 @@ public:

   signals:
    void checkFinished(JavaCheckResult result);
+
   private:
    QProcessPtr process;
    QTimer killTimer;
    QString m_stdout;
    QString m_stderr;
-public
-slots:
+   public slots:
    void timeout();
    void finished(int exitcode, QProcess::ExitStatus);
    void error(QProcess::ProcessError);
--- a/launcher/java/JavaCheckerJob.cpp
+++ b/launcher/java/JavaCheckerJob.cpp
@ -20,14 +20,12 @@
 void JavaCheckerJob::partFinished(JavaCheckResult result)
 {
    num_finished++;
-    qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/"
-                << javacheckers.size();
+    qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/" << javacheckers.size();
    setProgress(num_finished, javacheckers.size());

    javaresults.replace(result.id, result);

-    if (num_finished == javacheckers.size())
-    {
+    if (num_finished == javacheckers.size()) {
        emitSucceeded();
    }
 }
@ -35,8 +33,7 @@ void JavaCheckerJob::partFinished(JavaCheckResult result)
 void JavaCheckerJob::executeTask()
 {
    qDebug() << m_job_name.toLocal8Bit() << " started.";
-    for (auto iter : javacheckers)
-    {
+    for (auto iter : javacheckers) {
        javaresults.append(JavaCheckResult());
        connect(iter.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
        iter->performCheck();
--- a/launcher/java/JavaCheckerJob.h
+++ b/launcher/java/JavaCheckerJob.h
@ -23,8 +23,7 @@ class JavaCheckerJob;
 typedef shared_qobject_ptr<JavaCheckerJob> JavaCheckerJobPtr;

 // FIXME: this just seems horribly redundant
-class JavaCheckerJob : public Task
-{
+class JavaCheckerJob : public Task {
    Q_OBJECT
   public:
    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name){};
@ -34,18 +33,14 @@ public:
    {
        javacheckers.append(base);
        // if this is already running, the action needs to be started right away!
-        if (isRunning())
-        {
+        if (isRunning()) {
            setProgress(num_finished, javacheckers.size());
            connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
            base->performCheck();
        }
        return true;
    }
-    QList<JavaCheckResult> getResults()
-    {
-        return javaresults;
-    }
+    QList<JavaCheckResult> getResults() { return javaresults; }

   private slots:
    void partFinished(JavaCheckResult result);
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@ -39,14 +39,12 @@

 #include <QDebug>

-#include "java/JavaInstallList.h"
 #include "java/JavaCheckerJob.h"
+#include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 #include "minecraft/VersionFilterData.h"

-JavaInstallList::JavaInstallList(QObject *parent) : BaseVersionList(parent)
-{
-}
+JavaInstallList::JavaInstallList(QObject* parent) : BaseVersionList(parent) {}

 Task::Ptr JavaInstallList::getLoadTask()
 {
@ -56,8 +54,7 @@ Task::Ptr JavaInstallList::getLoadTask()

 Task::Ptr JavaInstallList::getCurrentTask()
 {
-    if(m_status == Status::InProgress)
-    {
+    if (m_status == Status::InProgress) {
        return m_loadTask;
    }
    return nullptr;
@ -65,8 +62,7 @@ Task::Ptr JavaInstallList::getCurrentTask()

 void JavaInstallList::load()
 {
-    if(m_status != Status::InProgress)
-    {
+    if (m_status != Status::InProgress) {
        m_status = Status::InProgress;
        m_loadTask.reset(new JavaListLoadTask(this));
        m_loadTask->start();
@ -97,8 +93,7 @@ QVariant JavaInstallList::data(const QModelIndex &index, int role) const
        return QVariant();

    auto version = std::dynamic_pointer_cast<JavaInstall>(m_vlist[index.row()]);
-    switch (role)
-    {
+    switch (role) {
        case SortRole:
            return -index.row();
        case VersionPointerRole:
@ -123,14 +118,12 @@ BaseVersionList::RoleList JavaInstallList::providesRoles() const
    return { VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, ArchitectureRole };
 }

-
 void JavaInstallList::updateListData(QList<BaseVersion::Ptr> versions)
 {
    beginResetModel();
    m_vlist = versions;
    sortVersions();
-    if(m_vlist.size())
-    {
+    if (m_vlist.size()) {
        auto best = std::dynamic_pointer_cast<JavaInstall>(m_vlist[0]);
        best->recommended = true;
    }
@ -159,9 +152,7 @@ JavaListLoadTask::JavaListLoadTask(JavaInstallList *vlist) : Task()
    m_currentRecommended = NULL;
 }

-JavaListLoadTask::~JavaListLoadTask()
-{
-}
+JavaListLoadTask::~JavaListLoadTask() {}

 void JavaListLoadTask::executeTask()
 {
@ -176,8 +167,7 @@ void JavaListLoadTask::executeTask()

    qDebug() << "Probing the following Java paths: ";
    int id = 0;
-    for(QString candidate : candidate_paths)
-    {
+    for (QString candidate : candidate_paths) {
        qDebug() << " " << candidate;

        auto candidate_checker = new JavaChecker();
@ -197,10 +187,8 @@ void JavaListLoadTask::javaCheckerFinished()
    auto results = m_job->getResults();

    qDebug() << "Found the following valid Java installations:";
-    for(JavaCheckResult result : results)
-    {
-        if(result.validity == JavaCheckResult::Validity::Valid)
-        {
+    for (JavaCheckResult result : results) {
+        if (result.validity == JavaCheckResult::Validity::Valid) {
            JavaInstallPtr javaVersion(new JavaInstall());

            javaVersion->id = result.javaVersion;
@ -213,13 +201,11 @@ void JavaListLoadTask::javaCheckerFinished()
    }

    QList<BaseVersion::Ptr> javas_bvp;
-    for (auto java : candidates)
-    {
+    for (auto java : candidates) {
        // qDebug() << java->id << java->arch << " at " << java->path;
        BaseVersion::Ptr bp_java = std::dynamic_pointer_cast<BaseVersion>(java);

-        if (bp_java)
-        {
+        if (bp_java) {
            javas_bvp.append(java);
        }
    }
--- a/launcher/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@ -15,8 +15,8 @@

 #pragma once

-#include <QObject>
 #include <QAbstractListModel>
+#include <QObject>

 #include "BaseVersionList.h"
 #include "tasks/Task.h"
@ -28,15 +28,10 @@

 class JavaListLoadTask;

-class JavaInstallList : public BaseVersionList
-{
+class JavaInstallList : public BaseVersionList {
    Q_OBJECT
-    enum class Status
-    {
-        NotDone,
-        InProgress,
-        Done
-    };
+    enum class Status { NotDone, InProgress, Done };
+
   public:
    explicit JavaInstallList(QObject* parent = 0);

@ -62,8 +57,7 @@ protected:
    QList<BaseVersion::Ptr> m_vlist;
 };

-class JavaListLoadTask : public Task
-{
+class JavaListLoadTask : public Task {
    Q_OBJECT

   public:
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
 *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
@ -33,24 +33,21 @@
 *      limitations under the License.
 */

-#include <QStringList>
-#include <QString>
 #include <QDir>
+#include <QString>
 #include <QStringList>

 #include <settings/Setting.h>

 #include <QDebug>
-#include "java/JavaUtils.h"
-#include "java/JavaInstallList.h"
-#include "FileSystem.h"
 #include "Application.h"
+#include "FileSystem.h"
+#include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"

 #define IBUS "@im=ibus"

-JavaUtils::JavaUtils()
-{
-}
+JavaUtils::JavaUtils() {}

 QString stripVariableEntries(QString name, QString target, QString remove)
 {
@ -65,8 +62,7 @@ QString stripVariableEntries(QString name, QString target, QString remove)
    for (QString item : toRemove) {
        bool removed = targetItems.removeOne(item);
        if (!removed)
-            qWarning() << "Entry" << item
-                << "could not be stripped from variable" << name;
+            qWarning() << "Entry" << item << "could not be stripped from variable" << name;
    }
    return targetItems.join(delimiter);
 }
@ -77,20 +73,10 @@ QProcessEnvironment CleanEnviroment()
    QProcessEnvironment rawenv = QProcessEnvironment::systemEnvironment();
    QProcessEnvironment env;

-    QStringList ignored =
-    {
-        "JAVA_ARGS",
-        "CLASSPATH",
-        "CONFIGPATH",
-        "JAVA_HOME",
-        "JRE_HOME",
-        "_JAVA_OPTIONS",
-        "JAVA_OPTIONS",
-        "JAVA_TOOL_OPTIONS"
-    };
+    QStringList ignored = { "JAVA_ARGS", "CLASSPATH",     "CONFIGPATH",   "JAVA_HOME",
+                            "JRE_HOME",  "_JAVA_OPTIONS", "JAVA_OPTIONS", "JAVA_TOOL_OPTIONS" };

-    QStringList stripped =
-    {
+    QStringList stripped = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
        "LD_LIBRARY_PATH",
        "LD_PRELOAD",
@ -98,12 +84,10 @@ QProcessEnvironment CleanEnviroment()
        "QT_PLUGIN_PATH",
        "QT_FONTPATH"
    };
-    for(auto key: rawenv.keys())
-    {
+    for (auto key : rawenv.keys()) {
        auto value = rawenv.value(key);
        // filter out dangerous java crap
-        if(ignored.contains(key))
-        {
+        if (ignored.contains(key)) {
            qDebug() << "Env: ignoring" << key << value;
            continue;
        }
@ -111,13 +95,11 @@ QProcessEnvironment CleanEnviroment()
        // These are used to strip the original variables
        // 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_"))
-        {
+        if (key.startsWith("LAUNCHER_")) {
            qDebug() << "Env: ignoring" << key << value;
            continue;
        }
-        if(stripped.contains(key))
-        {
+        if (stripped.contains(key)) {
            QString newValue = stripVariableEntries(key, value, rawenv.value("LAUNCHER_" + key));

            qDebug() << "Env: stripped" << key << value << "to" << newValue;
@ -125,8 +107,7 @@ QProcessEnvironment CleanEnviroment()
 #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))
-        {
+        if (key == "XMODIFIERS" && value.contains(IBUS)) {
            QString save = value;
            value.replace(IBUS, "");
            qDebug() << "Env: stripped" << IBUS << "from" << save << ":" << value;
@ -137,8 +118,7 @@ QProcessEnvironment CleanEnviroment()
    }
 #ifdef Q_OS_LINUX
    // HACK: Workaround for QTBUG-42500
-    if(!env.contains("LD_LIBRARY_PATH"))
-    {
+    if (!env.contains("LD_LIBRARY_PATH")) {
        env.insert("LD_LIBRARY_PATH", "");
    }
 #endif
@ -186,8 +166,7 @@ QStringList addJavasFromEnv(QList<QString> javas)
 #else
    QList<QString> javaPaths = env.split(QLatin1String(":"));
 #endif
-    for(QString i : javaPaths)
-    {
+    for (QString i : javaPaths) {
        javas.append(i);
    };
    return javas;
@ -205,9 +184,8 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
        archType = "32";

    HKEY jreKey;
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().c_str(), 0,
-                      KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) == ERROR_SUCCESS)
-    {
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().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.

@ -215,35 +193,26 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
        DWORD subKeyNameSize, numSubKeys, retCode;

        // Get the number of subkeys
-        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
-                        NULL, NULL);
+        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

        // Iterate until RegEnumKeyEx fails
-        if (numSubKeys > 0)
-        {
-            for (DWORD i = 0; i < numSubKeys; i++)
-            {
+        if (numSubKeys > 0) {
+            for (DWORD i = 0; i < numSubKeys; i++) {
                subKeyNameSize = 255;
-                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
-                                        NULL);
+                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL, NULL);
                QString newSubkeyName = QString::fromWCharArray(subKeyName);
-                if (retCode == ERROR_SUCCESS)
-                {
+                if (retCode == ERROR_SUCCESS) {
                    // Now open the registry key for the version that we just got.
                    QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;

                    HKEY newKey;
-                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0,
-                                      KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
-                    {
+                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &newKey) ==
+                        ERROR_SUCCESS) {
                        // Read the JavaHome value to find where Java is installed.
                        DWORD valueSz = 0;
-                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL,
-                                             &valueSz) == ERROR_SUCCESS)
-                        {
+                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL, &valueSz) == ERROR_SUCCESS) {
                            WCHAR* value = new WCHAR[valueSz];
-                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE *)value,
-                                             &valueSz);
+                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE*)value, &valueSz);

                            QString newValue = QString::fromWCharArray(value);
                            delete[] value;
@ -253,8 +222,7 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString

                            javaVersion->id = newSubkeyName;
                            javaVersion->arch = archType;
-                            javaVersion->path =
-                                QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
+                            javaVersion->path = QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
                            javas.append(javaVersion);
                        }

@ -275,66 +243,56 @@ QList<QString> JavaUtils::FindJavaPaths()
    QList<JavaInstallPtr> java_candidates;

    // Oracle
-    QList<JavaInstallPtr> JRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
-    QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
-    QList<JavaInstallPtr> JRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
-    QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
+    QList<JavaInstallPtr> JRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
+    QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");
+    QList<JavaInstallPtr> JRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment", "JavaHome");
+    QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit", "JavaHome");

    // Oracle for Java 9 and newer
-    QList<JavaInstallPtr> NEWJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
-    QList<JavaInstallPtr> NEWJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
-    QList<JavaInstallPtr> NEWJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
-    QList<JavaInstallPtr> NEWJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
+    QList<JavaInstallPtr> NEWJRE64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
+    QList<JavaInstallPtr> NEWJDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");
+    QList<JavaInstallPtr> NEWJRE32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JRE", "JavaHome");
+    QList<JavaInstallPtr> NEWJDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JDK", "JavaHome");

    // AdoptOpenJDK
-    QList<JavaInstallPtr> ADOPTOPENJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTOPENJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");

    // Eclipse Foundation
-    QList<JavaInstallPtr> FOUNDATIONJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> FOUNDATIONJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> FOUNDATIONJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> FOUNDATIONJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");

    // Eclipse Adoptium
-    QList<JavaInstallPtr> ADOPTIUMJRE32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJRE64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJDK32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
-    QList<JavaInstallPtr> ADOPTIUMJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJRE32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJRE64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JRE", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJDK32s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> ADOPTIUMJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");

    // Microsoft
-    QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");
+    QList<JavaInstallPtr> MICROSOFTJDK64s =
+        this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");

    // Azul Zulu
-    QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
-    QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
+    QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");
+    QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath");

    // BellSoft Liberica
-    QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
-    QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey(
-        KEY_WOW64_32KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
+    QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");
+    QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath");

    // List x64 before x86
    java_candidates.append(JRE64s);
@ -371,10 +329,8 @@ QList<QString> JavaUtils::FindJavaPaths()
    java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));

    QList<QString> candidates;
-    for(JavaInstallPtr java_candidate : java_candidates)
-    {
-        if(!candidates.contains(java_candidate->path))
-        {
+    for (JavaInstallPtr java_candidate : java_candidates) {
+        if (!candidates.contains(java_candidate->path)) {
            candidates.append(java_candidate->path);
        }
    }
@ -414,14 +370,12 @@ QList<QString> JavaUtils::FindJavaPaths()
 {
    QList<QString> javas;
    javas.append(this->GetDefaultJava()->path);
-    auto scanJavaDir = [&](const QString & dirPath)
-    {
+    auto scanJavaDir = [&](const QString& dirPath) {
        QDir dir(dirPath);
        if (!dir.exists())
            return;
        auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-        for(auto & entry: entries)
-        {
+        for (auto& entry : entries) {
            QString prefix;
            prefix = entry.canonicalFilePath();
            javas.append(FS::PathCombine(prefix, "jre/bin/java"));
@ -430,8 +384,7 @@ QList<QString> JavaUtils::FindJavaPaths()
    };
    // java installed in a snap is installed in the standard directory, but underneath $SNAP
    auto snap = qEnvironmentVariable("SNAP");
-    auto scanJavaDirs = [&](const QString & dirPath)
-    {
+    auto scanJavaDirs = [&](const QString& dirPath) {
        scanJavaDir(dirPath);
        if (!snap.isNull()) {
            scanJavaDir(snap + dirPath);
--- a/launcher/java/JavaUtils.h
+++ b/launcher/java/JavaUtils.h
@ -27,8 +27,7 @@
 QString stripVariableEntries(QString name, QString target, QString remove);
 QProcessEnvironment CleanEnviroment();

-class JavaUtils : public QObject
-{
+class JavaUtils : public QObject {
    Q_OBJECT
   public:
    JavaUtils();
--- a/Show More
+++ b/Show More