feat: auto install modpack & choise nickname

Related: https://github.com/yushijinhun/authlib-injector/issues/270

.github/workflows/build.yml

@@ -39,9 +39,6 @@ on:
       APPLE_NOTARIZE_PASSWORD:
         description: Password used for notarizing macOS builds
         required: false
-      CACHIX_AUTH_TOKEN:
-        description: Private token for authenticating against Cachix cache
-        required: false
       GPG_PRIVATE_KEY:
         description: Private key for AppImage signing
         required: false
@@ -68,6 +65,9 @@ jobs:
             qt_arch: ""
             qt_version: "6.5.3"
             qt_modules: "qt5compat qtimageformats qtnetworkauth"
+            linuxdeploy_hash: "4648f278ab3ef31f819e67c30d50f462640e5365a77637d7e6f2ad9fd0b4522a linuxdeploy-x86_64.AppImage"
+            linuxdeploy_qt_hash: "15106be885c1c48a021198e7e1e9a48ce9d02a86dd0a1848f00bdbf3c1c92724  linuxdeploy-plugin-qt-x86_64.AppImage"
+            appimageupdate_hash: "f1747cf60058e99f1bb9099ee9787d16c10241313b7acec81810ea1b1e568c11  AppImageUpdate-x86_64.AppImage"
 
           - os: windows-2022
             name: "Windows-MinGW-w64"
@@ -80,9 +80,9 @@ jobs:
             architecture: "x64"
             vcvars_arch: "amd64"
             qt_ver: 6
-            qt_host: windows
+            qt_host: "windows"
-            qt_arch: ""
+            qt_arch: "win64_msvc2022_64"
-            qt_version: "6.7.3"
+            qt_version: "6.8.1"
             qt_modules: "qt5compat qtimageformats qtnetworkauth"
             nscurl_tag: "v24.9.26.122"
             nscurl_sha256: "AEE6C4BE3CB6455858E9C1EE4B3AFE0DB9960FA03FE99CCDEDC28390D57CCBB0"
@@ -93,9 +93,9 @@ jobs:
             architecture: "arm64"
             vcvars_arch: "amd64_arm64"
             qt_ver: 6
-            qt_host: windows
+            qt_host: "windows"
-            qt_arch: "win64_msvc2019_arm64"
+            qt_arch: "win64_msvc2022_arm64_cross_compiled"
-            qt_version: "6.7.3"
+            qt_version: "6.8.1"
             qt_modules: "qt5compat qtimageformats qtnetworkauth"
             nscurl_tag: "v24.9.26.122"
             nscurl_sha256: "AEE6C4BE3CB6455858E9C1EE4B3AFE0DB9960FA03FE99CCDEDC28390D57CCBB0"
@@ -106,7 +106,7 @@ jobs:
             qt_ver: 6
             qt_host: mac
             qt_arch: ""
-            qt_version: "6.7.3"
+            qt_version: "6.8.1"
             qt_modules: "qt5compat qtimageformats qtnetworkauth"
 
           - os: macos-14
@@ -216,14 +216,14 @@ jobs:
 
       - name: Install host Qt (Windows MSVC arm64)
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: "==3.1.*"
           py7zrversion: ">=0.20.2"
           version: ${{ matrix.qt_version }}
           host: "windows"
           target: "desktop"
-          arch: ""
+          arch: ${{ matrix.qt_arch }}
           modules: ${{ matrix.qt_modules }}
           cache: ${{ inputs.is_qt_cached }}
           cache-key-prefix: host-qt-arm64-windows
@@ -232,7 +232,7 @@ jobs:
 
       - name: Install Qt (macOS, Linux & Windows MSVC)
         if: matrix.msystem == ''
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: "==3.1.*"
           py7zrversion: ">=0.20.2"
@@ -252,19 +252,26 @@ jobs:
 
       - name: Prepare AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
+        env:
+          APPIMAGEUPDATE_HASH: ${{ matrix.appimageupdate_hash }}
+          LINUXDEPLOY_HASH: ${{ matrix.linuxdeploy_hash }}
+          LINUXDEPLOY_QT_HASH: ${{ matrix.linuxdeploy_qt_hash }}
         run: |
-          wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+          wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20250213-2/linuxdeploy-x86_64.AppImage"
-          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/1-alpha-20250213-1/linuxdeploy-plugin-qt-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"
+          wget "https://github.com/AppImageCommunity/AppImageUpdate/releases/download/2.0.0-alpha-1-20241225/AppImageUpdate-x86_64.AppImage"
+
+          sha256sum -c - <<< "$LINUXDEPLOY_HASH"
+          sha256sum -c - <<< "$LINUXDEPLOY_QT_HASH"
+          sha256sum -c - <<< "$APPIMAGEUPDATE_HASH"
 
           sudo apt install libopengl0 libfuse2
 
       - name: Add QT_HOST_PATH var (Windows MSVC arm64)
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
         run: |
-          echo "QT_HOST_PATH=${{ github.workspace }}\HostQt\Qt\${{ matrix.qt_version }}\msvc2019_64" >> $env:GITHUB_ENV
+          echo "QT_HOST_PATH=${{ github.workspace }}\HostQt\Qt\${{ matrix.qt_version }}\msvc2022_64" >> $env:GITHUB_ENV
 
       - name: Setup java (macOS)
         if: runner.os == 'macOS'
@@ -629,76 +636,3 @@ jobs:
         shell: msys2 {0}
         run: |
           ccache -s
-
-  flatpak:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
-      options: --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        if: inputs.build_type == 'Debug'
-        with:
-          submodules: true
-
-      - name: Set short version
-        shell: bash
-        run: echo "VERSION=${GITHUB_SHA::7}" >> $GITHUB_ENV
-
-      - name: Build Flatpak (Linux)
-        if: inputs.build_type == 'Debug'
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak
-          manifest-path: flatpak/org.lunaislazier.ShatteredPrism.yml
-
-  nix:
-    name: Nix (${{ matrix.system }})
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-22.04
-            system: x86_64-linux
-
-          - os: macos-13
-            system: x86_64-darwin
-
-          - os: macos-14
-            system: aarch64-darwin
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v30
-
-        # For PRs
-      - name: Setup Nix Magic Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
-
-        # For in-tree builds
-      - name: Setup Cachix
-        uses: cachix/cachix-action@v15
-        with:
-          name: unmojang
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
-      - name: Run flake checks
-        run: |
-          nix flake check --print-build-logs --show-trace
-
-      - name: Build debug package
-        if: ${{ inputs.build_type == 'Debug' }}
-        run: |
-          nix build --print-build-logs .#shatteredprism-debug
-
-      - name: Build release package
-        if: ${{ inputs.build_type != 'Debug' }}
-        run: |
-          nix build --print-build-logs .#shatteredprism

.github/workflows/flatpak.yml

@@ -0,0 +1,62 @@
+name: Flatpak
+
+on:
+  push:
+    paths-ignore:
+      - "**.md"
+      - "**/LICENSE"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".markdownlint**"
+      - "nix/**"
+    # We don't do anything with these artifacts on releases. They go to Flathub
+    tags-ignore:
+      - "*"
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - "**/LICENSE"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".markdownlint**"
+      - "nix/**"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build (${{ matrix.arch }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+
+    runs-on: ${{ matrix.os }}
+
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      options: --privileged
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set short version
+        shell: bash
+        run: |
+          echo "VERSION=${GITHUB_SHA::7}" >> "$GITHUB_ENV"
+
+      - name: Build Flatpak
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak
+          manifest-path: flatpak/org.lunaislazier.ShatteredPrism.yml
+          arch: ${{ matrix.arch }}

.github/workflows/nix.yml

@@ -0,0 +1,88 @@
+name: Nix
+
+on:
+  push:
+    paths-ignore:
+      - "**.md"
+      - "**/LICENSE"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".markdownlint**"
+      - "flatpak/**"
+    tags:
+      - "*"
+  pull_request_target:
+    paths-ignore:
+      - "**.md"
+      - "**/LICENSE"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".markdownlint**"
+      - "flatpak/**"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  DEBUG: ${{ github.ref_type != 'tag' }}
+  USE_DETERMINATE: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  build:
+    name: Build (${{ matrix.system }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            system: x86_64-linux
+
+          - os: ubuntu-22.04-arm
+            system: aarch64-linux
+
+          - os: macos-13
+            system: x86_64-darwin
+
+          - os: macos-14
+            system: aarch64-darwin
+
+    runs-on: ${{ matrix.os }}
+
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v16
+        with:
+          determinate: ${{ env.USE_DETERMINATE }}
+
+        # For PRs
+      - name: Setup Nix Magic Cache
+        if: ${{ env.USE_DETERMINATE }}
+        uses: DeterminateSystems/flakehub-cache-action@v1
+
+        # For in-tree builds
+      - name: Setup Cachix
+        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        uses: cachix/cachix-action@v15
+        with:
+          name: lunaislazier
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
+      - name: Run Flake checks
+        run: |
+          nix flake check --print-build-logs --show-trace
+
+      - name: Build debug package
+        if: ${{ env.DEBUG }}
+        run: |
+          nix build --print-build-logs .#shatteredprism-debug
+
+      - name: Build release package
+        if: ${{ !env.DEBUG }}
+        run: |
+          nix build --print-build-logs .#shatteredprism

.github/workflows/trigger_builds.yml

@@ -38,6 +38,5 @@ jobs:
       APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
       APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
       APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
-      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}

.github/workflows/trigger_release.yml

@@ -23,7 +23,6 @@ jobs:
       APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
       APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
       APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
-      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}
 

.github/workflows/winget.yml

@@ -1,15 +0,0 @@
-name: Publish to WinGet
-on:
-  release:
-    types: [released]
-
-jobs:
-  publish:
-    runs-on: windows-latest
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: PrismLauncher.PrismLauncher
-          version: ${{ github.event.release.tag_name }}
-          installers-regex: 'PrismLauncher-Windows-MSVC(:?-arm64|-Legacy)?-Setup-.+\.exe$'
-          token: ${{ secrets.WINGET_TOKEN }}

.gitignore

@@ -47,8 +47,12 @@ run/
 
 # Nix/NixOS
 .direnv/
-.pre-commit-config.yaml
+## Used when manually invoking stdenv phases
+outputs/
+## Regular artifacts
 result
+result-*
+repl-result-*
 
 # Flatpak
 .flatpak-builder

.markdownlint.yaml

@@ -4,6 +4,9 @@ MD012: false
 # MD013/line-length - Line length
 MD013: false
 
+# MD022/blanks-around-headings
+MD022: false
+
 # MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
 MD024:
   siblings-only: true

CMakeLists.txt

@@ -78,6 +78,13 @@ else()
     # ATL's pack list needs more than the default 1 Mib stack on windows
     if(WIN32)
         set(CMAKE_EXE_LINKER_FLAGS "-Wl,--stack,8388608 ${CMAKE_EXE_LINKER_FLAGS}")
+
+        # -ffunction-sections and -fdata-sections help reduce binary size
+        # -mguard=cf enables Control Flow Guard
+        # TODO: Look into -gc-sections to further reduce binary size
+        foreach(lang C CXX)
+            set("CMAKE_${lang}_FLAGS_RELEASE" "-ffunction-sections -fdata-sections -mguard=cf")
+        endforeach()
     endif()
 endif()
 
@@ -106,14 +113,14 @@ if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebI
         else()
             # AppleClang and Clang
             message(STATUS "Address Sanitizer available on Clang")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=null")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=null")
         endif()
     elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         # GCC
         message(STATUS "Address Sanitizer available on GCC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover")
         link_libraries("asan")
     elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
         message(STATUS "Address Sanitizer available on MSVC")
@@ -181,7 +188,7 @@ set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE S
 
 ######## Set version numbers ########
 set(Launcher_VERSION_MAJOR 1)
-set(Launcher_VERSION_MINOR 6)
+set(Launcher_VERSION_MINOR 7)
 
 set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}")
 set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.0.0")

README.md

@@ -8,10 +8,13 @@
 
 <p align="center">
   Shattered Prism is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.<br />
-  <br />This is a <b>fork</b> of PrismLauncher and is <b>not</b> endorsed by it.
+  <br />This is a <b>fork</b> of FjordLauncher and is <b>not</b> endorsed by it or Prism.
 </p>
 
-# Why does this exist?
+## Why does this exist?
+
+This project was originally a direct fork of upstream Prism, but spent most of it's time as a small group-oriented continuation of fn2006's PollyMC, except with continued support for Microsoft authentication and being without branding that would get it confused for a uh... *similarly named project*. Luckily though, [@evan-goode](https://github.com/evan-goode) eventually created Fjord and this project has been based upon it ever since!
+## Differences from PrismLauncher
 
 - Fully removed PrismLauncher's DRM.
 - Restores the ability to download modpacks from FTB.
@@ -25,10 +28,11 @@
 
 ## Community & Support
 
-Feel free to create a GitHub issue if you find a bug or want to suggest something, it is currently the **only** way to contact anyone regarding this project.
+Feel free to create a GitHub issue if you find a bug or want to suggest something.
 
-Do **not** ask for support on any of the official PrismLauncher channels as they cannot be held responsible for any issues caused by the changes made.
+For any other project-related inquiries, reach me at either my [Bluesky](https://bsky.app/profile/moonlitvtuber.org) or [Twitter](https://twitter.com/lunasc_ope).
 
+Do **not** ask for support on any of the official PrismLauncher channels, please refer to the FjordLauncher ones **only** if the issue is shared between these two projects.
 
 ## License [![https://github.com/PrismLauncher/PrismLauncher/blob/develop/LICENSE](https://img.shields.io/github/license/PrismLauncher/PrismLauncher?label=License&logo=gnu&color=C4282D)](LICENSE)
 

default.nix

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

flake.nix

@@ -15,28 +15,6 @@
       url = "github:PrismLauncher/libnbtplusplus";
       flake = false;
     };
-
-    nix-filter.url = "github:numtide/nix-filter";
-
-    /*
-      Inputs below this are optional and can be removed
-
-      ```
-      {
-        inputs.shatteredprism = {
-          url = "github:lunaislazier/ShatteredPrism";
-          inputs = {
-            flake-compat.follows = "";
-          };
-        };
-      }
-      ```
-    */
-
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
   };
 
   outputs =
@@ -44,9 +22,8 @@
       self,
       nixpkgs,
       libnbtplusplus,
-      nix-filter,
-      ...
     }:
+
     let
       inherit (nixpkgs) lib;
 
@@ -58,27 +35,108 @@
       forAllSystems = lib.genAttrs systems;
       nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});
     in
+
     {
       checks = forAllSystems (
         system:
+
         let
-          checks' = nixpkgsFor.${system}.callPackage ./nix/checks.nix { inherit self; };
+          pkgs = nixpkgsFor.${system};
+          llvm = pkgs.llvmPackages_19;
         in
-        lib.filterAttrs (_: lib.isDerivation) checks'
+
+        {
+          formatting =
+            pkgs.runCommand "check-formatting"
+              {
+                nativeBuildInputs = with pkgs; [
+                  deadnix
+                  llvm.clang-tools
+                  markdownlint-cli
+                  nixfmt-rfc-style
+                  statix
+                ];
+              }
+              ''
+                cd ${self}
+
+                echo "Running clang-format...."
+                clang-format --dry-run --style='file' --Werror */**.{c,cc,cpp,h,hh,hpp}
+
+                echo "Running deadnix..."
+                deadnix --fail
+
+                echo "Running markdownlint..."
+                markdownlint --dot .
+
+                echo "Running nixfmt..."
+                find -type f -name '*.nix' -exec nixfmt --check {} +
+
+                echo "Running statix"
+                statix check .
+
+                touch $out
+              '';
+        }
       );
 
       devShells = forAllSystems (
         system:
+
         let
           pkgs = nixpkgsFor.${system};
+          llvm = pkgs.llvmPackages_19;
+
+          packages' = self.packages.${system};
+
+          # Re-use our package wrapper to wrap our development environment
+          qt-wrapper-env = packages'.shatteredprism.overrideAttrs (old: {
+            name = "qt-wrapper-env";
+
+            # Required to use script-based makeWrapper below
+            strictDeps = true;
+
+            # We don't need/want the unwrapped Fjord package
+            paths = [ ];
+
+            nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
+              # Ensure the wrapper is script based so it can be sourced
+              pkgs.makeWrapper
+            ];
+
+            # Inspired by https://discourse.nixos.org/t/python-qt-woes/11808/10
+            buildCommand = ''
+              makeQtWrapper ${lib.getExe pkgs.runtimeShellPackage} "$out"
+              sed -i '/^exec/d' "$out"
+            '';
+          });
         in
+
         {
           default = pkgs.mkShell {
-            inputsFrom = [ self.packages.${system}.shatteredprism-unwrapped ];
+            inputsFrom = [ packages'.shatteredprism-unwrapped ];
-            buildInputs = with pkgs; [
+
+            packages = with pkgs; [
               ccache
-              ninja
+              llvm.clang-tools
             ];
+
+            cmakeBuildType = "Debug";
+            cmakeFlags = [ "-GNinja" ] ++ packages'.shatteredprism.cmakeFlags;
+            dontFixCmake = true;
+
+            shellHook = ''
+              echo "Sourcing ${qt-wrapper-env}"
+              source ${qt-wrapper-env}
+
+              git submodule update --init --force
+
+              if [ ! -f compile_commands.json ]; then
+                cmakeConfigurePhase
+                cd ..
+                ln -s "$cmakeBuildDir"/compile_commands.json compile_commands.json
+              fi
+            '';
           };
         }
       );
@@ -89,7 +147,6 @@
         shatteredprism-unwrapped = prev.callPackage ./nix/unwrapped.nix {
           inherit
             libnbtplusplus
-            nix-filter
             self
             ;
         };
@@ -99,6 +156,7 @@
 
       packages = forAllSystems (
         system:
+
         let
           pkgs = nixpkgsFor.${system};
 
@@ -111,6 +169,7 @@
             default = shatteredPackages.shatteredprism;
           };
         in
+
         # Only output them if they're available on the current system
         lib.filterAttrs (_: lib.meta.availableOn pkgs.stdenv.hostPlatform) packages
       );
@@ -118,16 +177,18 @@
       # We put these under legacyPackages as they are meant for CI, not end user consumption
       legacyPackages = forAllSystems (
         system:
+
         let
-          shatteredPackages = self.packages.${system};
+          packages' = self.packages.${system};
-          legacyPackages = self.legacyPackages.${system};
+          legacyPackages' = self.legacyPackages.${system};
         in
+
         {
-          shatteredprism-debug = shatteredPackages.shatteredprism.override {
+          shatteredprism-debug = packages'.shatteredprism.override {
-            shatteredprism-unwrapped = legacyPackages.shatteredprism-unwrapped-debug;
+            shatteredprism-unwrapped = legacyPackages'.shatteredprism-unwrapped-debug;
           };
 
-          shatteredprism-unwrapped-debug = shatteredPackages.shatteredprism-unwrapped.overrideAttrs {
+          shatteredprism-unwrapped-debug = packages'.shatteredprism-unwrapped.overrideAttrs {
             cmakeBuildType = "Debug";
             dontStrip = true;
           };

launcher/Application.cpp

@@ -166,6 +166,8 @@
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 
+#include "onimai.h"
+
 static const QLatin1String liveCheckFile("live.check");
 
 PixmapCache* PixmapCache::s_instance = nullptr;
@@ -932,6 +934,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     connect(this, &Application::clickedOnDock, [this]() { this->showMainWindow(); });
 #endif
 
+    onimaiLoadLauncher(this);
+
     connect(this, &Application::aboutToQuit, [this]() {
         if (m_instances) {
             // save any remaining instance state

launcher/BaseInstance.cpp

@@ -58,6 +58,8 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
     m_global_settings = globalSettings;
     m_rootDir = rootDir;
 
+    qDebug() << "BaseInstance: " << rootDir;
+
     m_settings->registerSetting("name", "Unnamed Instance");
     m_settings->registerSetting("iconKey", "default");
     m_settings->registerSetting("notes", "");

launcher/CMakeLists.txt

@@ -5,6 +5,7 @@ project(application)
 ######## Sources and headers ########
 
 set(CORE_SOURCES
+        onimai.cpp
     # LOGIC - Base classes and infrastructure
     BaseInstaller.h
     BaseInstaller.cpp

launcher/InstanceImportTask.cpp

@@ -244,6 +244,8 @@ void InstanceImportTask::extractFinished()
         }
     }
 
+    qDebug() << "extractFinished " << static_cast<int>(m_modpackType);
+
     switch (m_modpackType) {
         case ModpackType::MultiMC:
             processMultiMC();
@@ -326,6 +328,8 @@ void InstanceImportTask::processMultiMC()
     QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(configPath);
 
+    qDebug() << "processMultiMC: " << m_stagingPath;
+
     NullInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
 
     // reset time played on import... because packs.
@@ -334,6 +338,8 @@ void InstanceImportTask::processMultiMC()
     // set a new nice name
     instance.setName(name());
 
+    qDebug() << "processMultiMC2 " << instance.instanceRoot() << name();
+
     // if the icon was specified by user, use that. otherwise pull icon from the pack
     if (m_instIcon != "default") {
         instance.setIconKey(m_instIcon);

launcher/InstanceList.cpp

@@ -449,6 +449,7 @@ QList<InstanceId> InstanceList::discoverInstances()
         out.append(id);
         qDebug() << "Found instance ID" << id;
     }
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     instanceSet = QSet<QString>(out.begin(), out.end());
 #else
@@ -977,6 +978,7 @@ QString InstanceList::getStagedInstancePath()
 #ifdef Q_OS_WIN32
     SetFileAttributesA(tempRoot.toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
 #endif
+    qDebug() << "get Debug" << result;
     return result;
 }
 
@@ -994,7 +996,7 @@ bool InstanceList::commitStagedInstance(const QString& path,
     auto should_override = commiting.shouldOverride();
 
     if (should_override) {
-        instID = commiting.originalInstanceID();
+        instID = instanceName.modifiedName();
     } else {
         instID = FS::DirNameFromString(instanceName.modifiedName(), m_instDir);
     }
@@ -1010,6 +1012,7 @@ bool InstanceList::commitStagedInstance(const QString& path,
                 qWarning() << "Failed to override" << path << "to" << destination;
                 return false;
             }
+            FS::deletePath(path);
         } else {
             if (!FS::move(path, destination)) {
                 qWarning() << "Failed to move" << path << "to" << destination;

launcher/InstanceTask.h

@@ -51,6 +51,11 @@ class InstanceTask : public Task, public InstanceName {
 
   [[nodiscard]] QString originalInstanceID() const { return m_original_instance_id; };
 
+  void setShouldOverride(bool should)
+  {
+   m_override_existing = should;
+  }
+
    protected:
     void setOverride(bool override, QString instance_id_to_override = {})
     {

launcher/Logging.cpp

@@ -0,0 +1,7 @@
+// This file was generated by ecm_qt_declare_logging_category(): DO NOT EDIT!
+
+#include "Logging.h"
+
+
+Q_LOGGING_CATEGORY(authCredentials, "launcher.auth.credentials", QtWarningMsg)
+

launcher/Logging.h

@@ -0,0 +1,11 @@
+// This file was generated by ecm_qt_declare_logging_category(): DO NOT EDIT!
+
+#ifndef ECM_QLOGGINGCATEGORY_AUTHCREDENTIALS_LOGGING_H
+#define ECM_QLOGGINGCATEGORY_AUTHCREDENTIALS_LOGGING_H
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(authCredentials)
+
+
+#endif