feat: auto install modpack & choise nickname

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,9 +6,9 @@ body:
   attributes:
     value: |
       Before submitting a bug report, please make sure you have read this *entire* form, and that:
-      * You have read the [Fjord Launcher wiki](https://fjordlauncher.org/wiki/) and it has not answered your question.
+      * You have read the [Prism Launcher wiki](https://prismlauncher.org/wiki/) and it has not answered your question.
       * Your bug is not caused by Minecraft or any mods you have installed.
-      * Your issue has not been reported before, [make sure to use the search function!](https://github.com/unmojang/FjordLauncher/issues)
+      * Your issue has not been reported before, [make sure to use the search function!](https://github.com/lunaislazier/ShatteredPrism/issues)
 
       **Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance.
 - type: dropdown
@@ -23,15 +23,15 @@ body:
     - Other
 - type: textarea
   attributes:
-    label: Version of Fjord Launcher
-    description: The version of Fjord Launcher used in the bug report.
-    placeholder: Fjord Launcher 5.1
+    label: Version of Shattered Prism
+    description: The version of Shattered Prism used in the bug report.
+    placeholder: Shattered Prism 1.3
   validations:
     required: true
 - type: textarea
   attributes:
     label: Version of Qt
-    description: The version of Qt used in the bug report. You can find it in Help -> About Fjord Launcher -> About Qt.
+    description: The version of Qt used in the bug report. You can find it in Help -> About Shattered Prism -> About Qt.
     placeholder: Qt 6.3.0
   validations:
     required: true
@@ -39,7 +39,7 @@ body:
   attributes:
     label: Description of bug
     description: What did you expect to happen, what happened, and why is it incorrect?
-    placeholder: The parrot button should show a parrot, but it showed a cat instead!
+    placeholder: The cat button should show a cat, but it showed a parrot instead!
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/rfc.yml

@@ -6,38 +6,38 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a larger change for Fjord Launcher.
+      ### Use this form to suggest a larger change for Shattered Prism.
 - type: textarea
   attributes:
     label: Goal
     description: Short description, 1-2 sentences.
-    placeholder: Remove the parrot from the launcher.
+    placeholder: Remove the cat from the launcher.
   validations:
     required: true
 - type: textarea
   attributes:
     label: Motivation
     description: |
-      Introduce the topic. If this is a not-well-known section of Fjord Launcher, a detailed explanation of the background is recommended.
+      Introduce the topic. If this is a not-well-known section of Shattered Prism, a detailed explanation of the background is recommended.
       Some example points of discussion:
        - What specific problems are you facing right now that you're trying to address?
        - Are there any previous discussions? Link to them and summarize them (don't force your readers to read them though!).
        - Is there any precedent set by other software? If so, link to resources.
-    placeholder: I don't like parrots. I think many users also don't like parrots.
+    placeholder: I don't like cats. I think many users also don't like cats.
   validations:
     required: true
 - type: textarea
   attributes:
     label: Specification
     description: A concrete, thorough explanation of what is being planned.
-    placeholder: Remove the parrot button and all references to the parrot from the codebase. Including resource files.
+    placeholder: Remove the cat button and all references to the cat from the codebase. Including resource files.
   validations:
     required: true
 - type: textarea
   attributes:
     label: Drawbacks
     description: Carefully consider every possible objection and issue with your proposal. This section should be updated as feedback comes in from discussion.
-    placeholder: Some users might like parrots.
+    placeholder: Some users might like cats.
   validations:
     required: true
 - type: textarea
@@ -47,14 +47,14 @@ body:
       Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed? 
       Be careful here -- an RFC with a lot of remaining questions is likely to be stalled. 
       If your RFC is mostly unresolved questions and not too much substance, it may not be ready.
-    placeholder: Do a lot of users care about the parrot?
+    placeholder: Do a lot of users care about the cat?
   validations:
     required: true
 - type: textarea
   attributes:
     label: Alternatives Considered
     description: A list of alternatives, that have been considered and offer equal or similar features to the proposed change.
-    placeholder: Maybe the parrot could be replaced with a dog?
+    placeholder: Maybe the cat could be replaced with a dog?
   validations:
     required: true
 - type: checkboxes

.github/ISSUE_TEMPLATE/suggestion.yml

@@ -5,26 +5,26 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a feature for Fjord Launcher.
+      ### Use this form to suggest a feature for Shattered Prism.
 - type: input
   attributes:
     label: Role
-    description: In what way do you use Fjord Launcher that needs this feature?
+    description: In what way do you use Shattered Prism that needs this feature?
     placeholder: I play modded Minecraft.
   validations:
     required: true
 - type: input
   attributes:
     label: Suggestion
-    description: What do you want Fjord Launcher to do?
-    placeholder: I want the parrot button to squawk.
+    description: What do you want Shattered Prism to do?
+    placeholder: I want the cat button to meow.
   validations:
     required: true
 - type: input
   attributes:
     label: Benefit
-    description: Why do you need Fjord Launcher to do this?
-    placeholder: so that I can always hear a parrot when I need to.
+    description: Why do you need Shattered Prism to do this?
+    placeholder: so that I can always hear a cat when I need to.
   validations:
     required: true
 - type: checkboxes

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 Hey there! Thanks for your contribution.
 
 Please make sure that your commits are signed off first.
-If you don't know how that works, check out our contribution guidelines: https://github.com/unmojang/FjordLauncher/blob/develop/CONTRIBUTING.md#signing-your-work
+If you don't know how that works, check out our contribution guidelines: https://github.com/lunaislazier/ShatteredPrism/blob/develop/CONTRIBUTING.md#signing-your-work
 If you already created your commits, you can run `git rebase --signoff develop` to retroactively sign-off all your commits and `git push --force` to override what you have pushed already.
 
 Note that signing and signing-off are two different things!

.github/workflows/build.yml

@@ -383,7 +383,7 @@ jobs:
           cmake --install ${{ env.BUILD_DIR }}
 
           cd ${{ env.INSTALL_DIR }}
-          chmod +x "FjordLauncher.app/Contents/MacOS/fjordlauncher"
+          chmod +x "ShatteredPrism.app/Contents/MacOS/ShatteredPrism"
 
           if [ -n '${{ secrets.APPLE_CODESIGN_ID }}' ]; then
             APPLE_CODESIGN_ID='${{ secrets.APPLE_CODESIGN_ID }}'
@@ -391,8 +391,8 @@ jobs:
             APPLE_CODESIGN_ID='-'
           fi
 
-          sudo codesign --sign "$APPLE_CODESIGN_ID" --deep --force --entitlements "../program_info/App.entitlements" --options runtime "FjordLauncher.app/Contents/MacOS/fjordlauncher"
-          mv "FjordLauncher.app" "Fjord Launcher.app"
+          sudo codesign --sign "$APPLE_CODESIGN_ID" --deep --force --entitlements "../program_info/App.entitlements" --options runtime "ShatteredPrism.app/Contents/MacOS/ShatteredPrism"
+          mv "ShatteredPrism.app" "Shattered Prism.app"
 
       - name: Notarize (macOS)
         if: runner.os == 'macOS'
@@ -400,25 +400,25 @@ jobs:
           cd ${{ env.INSTALL_DIR }}
 
           if [ -n '${{ secrets.APPLE_NOTARIZE_PASSWORD }}' ]; then
-            ditto -c -k --sequesterRsrc --keepParent "Fjord Launcher.app" ../FjordLauncher.zip
-            xcrun notarytool submit ../FjordLauncher.zip \
+            ditto -c -k --sequesterRsrc --keepParent "Shattered Prism.app" ../ShatteredPrism.zip
+            xcrun notarytool submit ../ShatteredPrism.zip \
               --wait --progress \
               --apple-id '${{ secrets.APPLE_NOTARIZE_APPLE_ID }}' \
               --team-id '${{ secrets.APPLE_NOTARIZE_TEAM_ID }}' \
               --password '${{ secrets.APPLE_NOTARIZE_PASSWORD }}'
 
-            xcrun stapler staple "Fjord Launcher.app"
+            xcrun stapler staple "Shattered Prism.app"
           else
             echo ":warning: Skipping notarization as credentials are not present." >> $GITHUB_STEP_SUMMARY
           fi
-          ditto -c -k --sequesterRsrc --keepParent "Fjord Launcher.app" ../FjordLauncher.zip
+          ditto -c -k --sequesterRsrc --keepParent "Shattered Prism.app" ../ShatteredPrism.zip
 
       - name: Make Sparkle signature (macOS)
         if: matrix.name == 'macOS'
         run: |
           if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then
             echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem
-            signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FjordLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
+            signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/ShatteredPrism.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
             rm ed25519-priv.pem
             cat >> $GITHUB_STEP_SUMMARY << EOF
           ### Artifact Information :information_source:
@@ -460,7 +460,7 @@ jobs:
           if (Get-Content ./codesign.pfx){
             cd ${{ env.INSTALL_DIR }}
             # We ship the exact same executable for portable and non-portable editions, so signing just once is fine
-            SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com fjordlauncher.exe fjordlauncher_updater.exe fjordlauncher_filelink.exe 
+           SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com ShatteredPrism.exe ShatteredPrism_updater.exe ShatteredPrism_filelink.exe
           } else {
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
@@ -501,7 +501,7 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           if (Get-Content ./codesign.pfx){
-            SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com FjordLauncher-Setup.exe
+            SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com ShatteredPrism-Setup.exe
           } else {
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
@@ -514,10 +514,10 @@ jobs:
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
 
-          mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.unmojang.FjordLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.fjordlauncher.FjordLauncher.appdata.xml
+          mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.lunaislazier.ShatteredPrism.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.lunaislazier.ShatteredPrism.appdata.xml
           export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated
 
-          export OUTPUT="FjordLauncher-Linux-x86_64.AppImage"
+          export OUTPUT="ShatteredPrism-Linux-x86_64.AppImage"
 
           chmod +x linuxdeploy-*.AppImage
 
@@ -536,7 +536,7 @@ jobs:
           chmod +x AppImageUpdate-x86_64.AppImage
           cp AppImageUpdate-x86_64.AppImage ${{ env.INSTALL_APPIMAGE_DIR }}/usr/bin
 
-          export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|FjordLauncher-Linux-x86_64.AppImage.zsync" 
+          export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|ShatteredPrism-Linux-x86_64.AppImage.zsync" 
 
           if [ '${{ secrets.GPG_PRIVATE_KEY_ID }}' != '' ]; then
             export SIGN=1
@@ -548,9 +548,9 @@ jobs:
             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.unmojang.FjordLauncher.svg
+          ./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.lunaislazier.ShatteredPrism.svg
 
-          mv "FjordLauncher-Linux-x86_64.AppImage" "FjordLauncher-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
+          mv "ShatteredPrism-Linux-x86_64.AppImage" "ShatteredPrism-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
 
       - name: Package (Linux, portable)
         if: runner.os == 'Linux'
@@ -569,7 +569,7 @@ jobs:
 
           for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt
           cd ${{ env.INSTALL_PORTABLE_DIR }}
-          tar -czf ../FjordLauncher-portable.tar.gz *
+          tar -czf ../ShatteredPrism-portable.tar.gz *
 
       ##
       # UPLOAD BUILDS
@@ -579,57 +579,57 @@ jobs:
         if: runner.os == 'macOS'
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher.zip
+          name: ShatteredPrism-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ShatteredPrism.zip
 
       - name: Upload binary zip (Windows)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
+          name: ShatteredPrism-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_DIR }}/**
 
       - name: Upload binary zip (Windows, portable)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
+          name: ShatteredPrism-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_PORTABLE_DIR }}/**
 
       - name: Upload installer (Windows)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher-Setup.exe
+          name: ShatteredPrism-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ShatteredPrism-Setup.exe
 
       - name: Upload binary tarball (Linux, portable, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher-portable.tar.gz
+          name: ShatteredPrism-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ShatteredPrism-portable.tar.gz
 
       - name: Upload binary tarball (Linux, portable, Qt 6)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher-portable.tar.gz
+          name: ShatteredPrism-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ShatteredPrism-portable.tar.gz
 
       - name: Upload AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
         uses: actions/upload-artifact@v4
         with:
-          name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
-          path: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
+          name: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
+          path: ShatteredPrism-${{ 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@v4
         with:
-          name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
-          path: FjordLauncher-Linux-x86_64.AppImage.zsync
+          name: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
+          path: ShatteredPrism-Linux-x86_64.AppImage.zsync
 
       - name: ccache stats (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != ''

.github/workflows/flatpak.yml

@@ -57,6 +57,6 @@ jobs:
       - name: Build Flatpak
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak
-          manifest-path: flatpak/org.unmojang.FjordLauncher.yml
+          bundle: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak
+          manifest-path: flatpak/org.lunaislazier.ShatteredPrism.yml
           arch: ${{ matrix.arch }}

.github/workflows/nix.yml

@@ -70,7 +70,7 @@ jobs:
         if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
         uses: cachix/cachix-action@v15
         with:
-          name: unmojang
+          name: lunaislazier
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - name: Run Flake checks
@@ -80,9 +80,9 @@ jobs:
       - name: Build debug package
         if: ${{ env.DEBUG }}
         run: |
-          nix build --print-build-logs .#fjordlauncher-debug
+          nix build --print-build-logs .#shatteredprism-debug
 
       - name: Build release package
         if: ${{ !env.DEBUG }}
         run: |
-          nix build --print-build-logs .#fjordlauncher
+          nix build --print-build-logs .#shatteredprism

.github/workflows/publish.yml

@@ -1,45 +0,0 @@
-name: Publish
-
-on:
-  release:
-    types: [ released ]
-
-permissions:
-  contents: read
-
-jobs:
-  flakehub:
-    name: FlakeHub
-
-    runs-on: ubuntu-latest
-
-    permissions:
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-          
-      - name: Install Nix
-        uses: cachix/install-nix-action@v30
-
-      - name: Publish on FlakeHub
-        uses: determinatesystems/flakehub-push@v5
-        with:
-          visibility: "public"
-
-  winget:
-    name: Winget
-
-    runs-on: windows-latest
-
-    steps:
-      - name: Publish on Winget
-        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 }}

.github/workflows/trigger_release.yml

@@ -1,6 +1,7 @@
 name: Build Application and Make Release
 
 on:
+ workflow_dispatch:
   push:
     tags:
       - "*"
@@ -35,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: "true"
-          path: "FjordLauncher-source"
+          path: "ShatteredPrism-source"
       - name: Download artifacts
         uses: actions/download-artifact@v4
       - name: Grab and store version
@@ -44,38 +45,38 @@ jobs:
           echo "VERSION=$tag_name" >> $GITHUB_ENV
       - name: Package artifacts properly
         run: |
-          mv ${{ github.workspace }}/FjordLauncher-source FjordLauncher-${{ env.VERSION }}
-          mv FjordLauncher-Linux-Qt6-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
-          mv FjordLauncher-Linux-Qt5-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
-          mv FjordLauncher-*.AppImage/FjordLauncher-*.AppImage FjordLauncher-Linux-x86_64.AppImage
-          mv FjordLauncher-*.AppImage.zsync/FjordLauncher-*.AppImage.zsync FjordLauncher-Linux-x86_64.AppImage.zsync
-          mv FjordLauncher-macOS-Legacy*/FjordLauncher.zip FjordLauncher-macOS-Legacy-${{ env.VERSION }}.zip
-          mv FjordLauncher-macOS*/FjordLauncher.zip FjordLauncher-macOS-${{ env.VERSION }}.zip
+          mv ${{ github.workspace }}/ShatteredPrism-source ShatteredPrism-${{ env.VERSION }}
+          mv ShatteredPrism-Linux-Qt6-Portable*/ShatteredPrism-portable.tar.gz ShatteredPrism-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
+          mv ShatteredPrism-Linux-Qt5-Portable*/ShatteredPrism-portable.tar.gz ShatteredPrism-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
+          mv ShatteredPrism-*.AppImage/ShatteredPrism-*.AppImage ShatteredPrism-Linux-x86_64.AppImage
+          mv ShatteredPrism-*.AppImage.zsync/ShatteredPrism-*.AppImage.zsync ShatteredPrism-Linux-x86_64.AppImage.zsync
+          mv ShatteredPrism-macOS-Legacy*/ShatteredPrism.zip ShatteredPrism-macOS-Legacy-${{ env.VERSION }}.zip
+          mv ShatteredPrism-macOS*/ShatteredPrism.zip ShatteredPrism-macOS-${{ env.VERSION }}.zip
 
-          tar --exclude='.git' -czf FjordLauncher-${{ env.VERSION }}.tar.gz FjordLauncher-${{ env.VERSION }}
+          tar --exclude='.git' -czf ShatteredPrism-${{ env.VERSION }}.tar.gz ShatteredPrism-${{ env.VERSION }}
 
-          for d in FjordLauncher-Windows-MSVC*; do
+          for d in ShatteredPrism-Windows-MSVC*; do
             cd "${d}" || continue
             LEGACY="$(echo -n ${d} | grep -o Legacy || true)"
             ARM64="$(echo -n ${d} | grep -o arm64 || true)"
             INST="$(echo -n ${d} | grep -o Setup || true)"
             PORT="$(echo -n ${d} | grep -o Portable || true)"
-            NAME="FjordLauncher-Windows-MSVC"
+            NAME="ShatteredPrism-Windows-MSVC"
             test -z "${LEGACY}" || NAME="${NAME}-Legacy"
             test -z "${ARM64}" || NAME="${NAME}-arm64"
             test -z "${PORT}" || NAME="${NAME}-Portable"
-            test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
+            test -z "${INST}" || mv ShatteredPrism-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
             test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
             cd ..
           done
 
-          for d in FjordLauncher-Windows-MinGW-w64*; do
+          for d in ShatteredPrism-Windows-MinGW-w64*; do
             cd "${d}" || continue
             INST="$(echo -n ${d} | grep -o Setup || true)"
             PORT="$(echo -n ${d} | grep -o Portable || true)"
-            NAME="FjordLauncher-Windows-MinGW-w64"
+            NAME="ShatteredPrism-Windows-MinGW-w64"
             test -z "${PORT}" || NAME="${NAME}-Portable"
-            test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
+            test -z "${INST}" || mv ShatteredPrism-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
             test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
             cd ..
           done
@@ -86,23 +87,23 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ github.ref }}
-          name: Fjord Launcher ${{ env.VERSION }}
+          name: Shattered Prism ${{ env.VERSION }}
           draft: true
           prerelease: false
           files: |
-            FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
-            FjordLauncher-Linux-x86_64.AppImage
-            FjordLauncher-Linux-x86_64.AppImage.zsync
-            FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
-            FjordLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe
-            FjordLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe
-            FjordLauncher-Windows-MSVC-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MSVC-Portable-${{ env.VERSION }}.zip
-            FjordLauncher-Windows-MSVC-Setup-${{ env.VERSION }}.exe
-            FjordLauncher-macOS-${{ env.VERSION }}.zip
-            FjordLauncher-macOS-Legacy-${{ env.VERSION }}.zip
-            FjordLauncher-${{ env.VERSION }}.tar.gz
+            ShatteredPrism-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
+            ShatteredPrism-Linux-x86_64.AppImage
+            ShatteredPrism-Linux-x86_64.AppImage.zsync
+            ShatteredPrism-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
+            ShatteredPrism-Windows-MinGW-w64-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe
+            ShatteredPrism-Windows-MSVC-arm64-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe
+            ShatteredPrism-Windows-MSVC-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MSVC-Portable-${{ env.VERSION }}.zip
+            ShatteredPrism-Windows-MSVC-Setup-${{ env.VERSION }}.exe
+            ShatteredPrism-macOS-${{ env.VERSION }}.zip
+            ShatteredPrism-macOS-Legacy-${{ env.VERSION }}.zip
+            ShatteredPrism-${{ env.VERSION }}.tar.gz

.github/workflows/update-flake.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   update-flake:
-    if: github.repository == 'unmojang/FjordLauncher'
+    if: github.repository == 'lunaislazier/ShatteredPrism'
     runs-on: ubuntu-latest
 
     steps:

.markdownlint.yaml

@@ -1,6 +1,12 @@
+# MD012/no-multiple-blanks - Multiple consecutive blank lines
+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

@@ -187,19 +187,18 @@ set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CAC
 set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for FML Libraries.")
 
 ######## Set version numbers ########
-set(Launcher_VERSION_MAJOR 9)
-set(Launcher_VERSION_MINOR 3)
-set(Launcher_VERSION_PATCH 0)
+set(Launcher_VERSION_MAJOR 1)
+set(Launcher_VERSION_MINOR 7)
 
-set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}")
-set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}.0")
-set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_MINOR},${Launcher_VERSION_PATCH},0")
+set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}")
+set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.0.0")
+set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_MINOR},0,0")
 
 # Build platform.
 set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
 
 # Github repo URL with releases for updater
-set(Launcher_UPDATER_GITHUB_REPO "https://github.com/unmojang/FjordLauncher" CACHE STRING "Base github URL for the updater.")
+set(Launcher_UPDATER_GITHUB_REPO "https://github.com/lunaislazier/ShatteredPrism" CACHE STRING "Base github URL for the updater.")
 
 # Name to help updater identify valid artifacts
 set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
@@ -211,7 +210,7 @@ set(Launcher_META_URL "https://meta.unmojang.org/v1/" CACHE STRING "URL to fetch
 set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
 
 # Bug tracker URL
-set(Launcher_BUG_TRACKER_URL "https://github.com/unmojang/FjordLauncher/issues" CACHE STRING "URL for the bug tracker.")
+set(Launcher_BUG_TRACKER_URL "https://github.com/lunaislazier/ShatteredPrism/issues" CACHE STRING "URL for the bug tracker.")
 
 # Translations Platform URL
 set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
@@ -357,7 +356,7 @@ include(ECMQtDeclareLoggingCategory)
 
 ####################################### Program Info #######################################
 
-set(Launcher_APP_BINARY_NAME "fjordlauncher" CACHE STRING "Name of the Launcher binary")
+set(Launcher_APP_BINARY_NAME "shatteredprism" CACHE STRING "Name of the Launcher binary")
 add_subdirectory(program_info)
 
 ####################################### Install layout #######################################

COPYING.md

@@ -1,3 +1,37 @@
+## Shattered Prism
+
+     Shattered Prism - Minecraft Launcher
+     Copyright (C) 2024-2025 Shattered Prism Contributors
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, version 3.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     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.
+
 ## Fjord Launcher
 
      Fjord Launcher - Minecraft Launcher

README.md

@@ -1,103 +1,44 @@
-# <img src="./program_info/org.unmojang.FjordLauncher.svg" alt="Fjord Launcher logo" width="96"/> Fjord Launcher
+<p align="center">
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="/program_info/shatteredprism-header.svg">
+  <source media="(prefers-color-scheme: light)" srcset="/program_info/shatteredprism-header.svg">
+  <img alt="ShatteredPrism" src="/program_info/shatteredprism-header.svg" width="40%">
+</picture>
+</p>
 
-Fjord Launcher is a **fork** of [Prism Launcher](https://github.com/PrismLauncher/PrismLauncher). It was based on [PollyMC](https://github.com/fn2006/PollyMC), which is now unmaintained. It is **not** endorsed by or affiliated with Prism Launcher or PollyMC.
+<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 FjordLauncher and is <b>not</b> endorsed by it or Prism.
+</p>
 
-## Advantages of this fork over Prism Launcher
+## Why does this exist?
 
-- [Support for alternative auth servers](doc/alternative-auth-servers.md)
+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
 
-- Ability to download FTB modpacks from within the launcher
+- Fully removed PrismLauncher's DRM.
+- Restores the ability to download modpacks from FTB.
+- [Support for alternative auth servers](doc/alternative-auth-servers.md).
 
-## Having a problem with the launcher?
-
-You **will not** open an issue in the Prism Launcher repo.
-
-You **will not** ask about Fjord Launcher in the Prism Launcher discord.
-
-You **will** ask in #fjord-launcher in our [Matrix space](https://matrix.to/#/#unmojang:matrix.org).
-
-You **will** open an issue [here](https://github.com/unmojang/FjordLauncher/issues).
 
 ## Installation
 
-### Windows
+- Downloads can be found on the [GitHub Releases](https://github.com/LunaisLazier/ShatteredPrism/releases).
+- Last build status can be found in the [GitHub Actions](https://github.com/LunaisLazier/ShatteredPrism/actions) tab (this also includes the pull requests status).
 
-#### [Scoop](https://scoop.sh) (recommended)
+## Community & Support
 
-```PowerShell
-scoop bucket add unmojang https://github.com/unmojang/scoop-unmojang
-scoop install unmojang/fjordlauncher
-```
+Feel free to create a GitHub issue if you find a bug or want to suggest something.
 
-#### Windows (Manual)
+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).
 
-You can get installers or portable builds from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest), MSVC builds are recommended over MinGW builds, but there's no real difference.
+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.
 
-### macOS
+## License [![https://github.com/PrismLauncher/PrismLauncher/blob/develop/LICENSE](https://img.shields.io/github/license/PrismLauncher/PrismLauncher?label=License&logo=gnu&color=C4282D)](LICENSE)
 
-#### [Homebrew](https://brew.sh) (recommended)
+All launcher code is available under the GPL-3.0-only license.
 
-```Shell
-brew tap unmojang/homebrew-unmojang
-brew install --cask fjordlauncher
-```
-
-#### macOS (Manual)
-
-There are builds for macOS in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
-
-### Flatpak
-
-```Shell
-flatpak remote-add --user --if-not-exists unmojang https://unmojang.github.io/unmojang-flatpak/index.flatpakrepo
-flatpak install org.unmojang.FjordLauncher
-```
-
-### Arch Linux
-
-Fjord Launcher is [available](https://aur.archlinux.org/packages?O=0&K=fjordlauncher) from the AUR:
-
-```Shell
-paru -S fjordlauncher
-paru -S fjordlauncher-git # build latest Git commit from source
-```
-
-`fjordlauncher` is available in [Chaotic-AUR](https://aur.chaotic.cx/).
-
-The `fjordlauncher-bin` AUR package is broken; see [https://github.com/unmojang/FjordLauncher/issues/20](https://github.com/unmojang/FjordLauncher/issues/20).
-
-### Debian/Ubuntu
-
-Install from the MPR with [Mist](https://docs.makedeb.org/using-the-mpr/mist-the-mpr-cli/#installing-mist):
-
-```Shell
-mist install fjordlauncher
-mist install fjordlauncher-git # build latest Git commit from source
-```
-
-### Nix
-
-This repository contains a Nix flake:
-
-```Shell
-nix run github:unmojang/FjordLauncher
-```
-
-See [nix/README.md](nix/README.md) for details.
-
-### Gentoo
-
-Install from the [unmojang overlay](https://github.com/unmojang/unmojang-overlay):
-
-```Shell
-eselect repository add unmojang-overlay git https://github.com/unmojang/unmojang-overlay
-emerge --sync unmojang-overlay
-emerge -av games-action/fjordlauncher
-```
-
-### Other Linux
-
-AppImages are available in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
+The logo and related assets are under the CC BY-NC-SA 4.0 license.
 
 ## Building
 

buildconfig/BuildConfig.cpp.in

@@ -58,7 +58,6 @@ Config::Config()
     // Version information
     VERSION_MAJOR = @Launcher_VERSION_MAJOR@;
     VERSION_MINOR = @Launcher_VERSION_MINOR@;
-    VERSION_PATCH = @Launcher_VERSION_PATCH@;
 
     BUILD_PLATFORM = "@Launcher_BUILD_PLATFORM@";
     BUILD_ARTIFACT = "@Launcher_BUILD_ARTIFACT@";
@@ -137,7 +136,7 @@ Config::Config()
 
 QString Config::versionString() const
 {
-    return QString("%1.%2.%3").arg(VERSION_MAJOR).arg(VERSION_MINOR).arg(VERSION_PATCH);
+    return QString("%1.%2").arg(VERSION_MAJOR).arg(VERSION_MINOR);
 }
 
 QString Config::printableVersionString() const

buildconfig/BuildConfig.h

@@ -59,8 +59,6 @@ class Config {
     int VERSION_MAJOR;
     /// The minor version number.
     int VERSION_MINOR;
-    /// The patch version number.
-    int VERSION_PATCH;
 
     /**
      * The version channel

cmake/MacOSXBundleInfo.plist.in

@@ -7,7 +7,7 @@
     <key>NSMicrophoneUsageDescription</key>
     <string>A Minecraft mod wants to access your microphone.</string>
     <key>NSDownloadsFolderUsageDescription</key>
-    <string>Fjord uses access to your Downloads folder to help you more quickly add mods that can't be automatically downloaded to your instance. You can change where Fjord scans for downloaded mods in Settings or the prompt that appears.</string>
+    <string>Shattered Prism uses access to your Downloads folder to help you more quickly add mods that can't be automatically downloaded to your instance. You can change where Shattered Prism scans for downloaded mods in Settings or the prompt that appears.</string>
     <key>NSLocalNetworkUsageDescription</key>
     <string>Minecraft uses the local network to find and connect to LAN servers.</string>
     <key>NSPrincipalClass</key>
@@ -57,7 +57,7 @@
                 <string>mrpack</string>
             </array>
             <key>CFBundleTypeName</key>
-            <string>Fjord Launcher instance</string>
+            <string>Shattered Prism instance</string>
             <key>CFBundleTypeOSTypes</key>
             <array>
                 <string>TEXT</string>
@@ -83,10 +83,10 @@
         </dict>
         <dict>
             <key>CFBundleURLName</key>
-            <string>FjordLauncher</string>
+            <string>ShatteredPrism</string>
             <key>CFBundleURLSchemes</key>
             <array>
-            <string>fjordlauncher</string>
+            <string>shatteredprism</string>
             </array>
         </dict>
     </array>

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "libnbtplusplus": {
       "flake": false,
       "locked": {
@@ -16,13 +32,28 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1731533336,
+        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743827369,
-        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "42a1c966be226125b48c384171c44c651c236c22",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
@@ -34,7 +65,9 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "libnbtplusplus": "libnbtplusplus",
+        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -90,7 +90,7 @@
           packages' = self.packages.${system};
 
           # Re-use our package wrapper to wrap our development environment
-          qt-wrapper-env = packages'.fjordlauncher.overrideAttrs (old: {
+          qt-wrapper-env = packages'.shatteredprism.overrideAttrs (old: {
             name = "qt-wrapper-env";
 
             # Required to use script-based makeWrapper below
@@ -114,7 +114,7 @@
 
         {
           default = pkgs.mkShell {
-            inputsFrom = [ packages'.fjordlauncher-unwrapped ];
+            inputsFrom = [ packages'.shatteredprism-unwrapped ];
 
             packages = with pkgs; [
               ccache
@@ -122,7 +122,7 @@
             ];
 
             cmakeBuildType = "Debug";
-            cmakeFlags = [ "-GNinja" ] ++ packages'.fjordlauncher.cmakeFlags;
+            cmakeFlags = [ "-GNinja" ] ++ packages'.shatteredprism.cmakeFlags;
             dontFixCmake = true;
 
             shellHook = ''
@@ -144,14 +144,14 @@
       formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
 
       overlays.default = final: prev: {
-        fjordlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
+        shatteredprism-unwrapped = prev.callPackage ./nix/unwrapped.nix {
           inherit
             libnbtplusplus
             self
             ;
         };
 
-        fjordlauncher = final.callPackage ./nix/wrapper.nix { };
+        shatteredprism = final.callPackage ./nix/wrapper.nix { };
       };
 
       packages = forAllSystems (
@@ -161,12 +161,12 @@
           pkgs = nixpkgsFor.${system};
 
           # Build a scope from our overlay
-          fjordPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
+          shatteredPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
 
           # Grab our packages from it and set the default
           packages = {
-            inherit (fjordPackages) fjordlauncher-unwrapped fjordlauncher;
-            default = fjordPackages.fjordlauncher;
+            inherit (shatteredPackages) shatteredprism-unwrapped shatteredprism;
+            default = shatteredPackages.shatteredprism;
           };
         in
 
@@ -184,11 +184,11 @@
         in
 
         {
-          fjordlauncher-debug = packages'.fjordlauncher.override {
-            fjordlauncher-unwrapped = legacyPackages'.fjordlauncher-unwrapped-debug;
+          shatteredprism-debug = packages'.shatteredprism.override {
+            shatteredprism-unwrapped = legacyPackages'.shatteredprism-unwrapped-debug;
           };
 
-          fjordlauncher-unwrapped-debug = packages'.fjordlauncher-unwrapped.overrideAttrs {
+          shatteredprism-unwrapped-debug = packages'.shatteredprism-unwrapped.overrideAttrs {
             cmakeBuildType = "Debug";
             dontStrip = true;
           };

flatpak/org.lunaislazier.ShatteredPrism.yml

@@ -1,11 +1,11 @@
-id: org.unmojang.FjordLauncher
+id: org.lunaislazier.ShatteredPrism
 runtime: org.kde.Platform
 runtime-version: '6.8'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk17
 
-command: fjordlauncher
+command: shatteredprism
 finish-args:
   - --share=ipc
   - --socket=x11
@@ -36,7 +36,7 @@ modules:
   # Text to Speech in the game
   - flite.json
 
-  - name: fjordlauncher
+  - name: shatteredprism
     buildsystem: cmake-ninja
     builddir: true
     config-opts:
@@ -142,10 +142,10 @@ modules:
     buildsystem: simple
     build-commands:
       - install -Dm755 prime-run /app/bin/prime-run
-      - mv /app/bin/fjordlauncher /app/bin/fjordrun
-      - install -Dm755 fjordlauncher /app/bin/fjordlauncher
+      - mv /app/bin/shatteredprism /app/bin/shatteredrun
+      - install -Dm755 shatteredprism /app/bin/shatteredprism
     sources:
       - type: file
         path: prime-run
       - type: file
-        path: fjordlauncher
+        path: shatteredprism

flatpak/shared-modules

@@ -1 +1 @@
-Subproject commit f5d368a31d6ef046eb2955c74ec6f54f32ed5c4e
+Subproject commit f2b0c16a2a217a1822ce5a6538ba8f755ed1dd32

flatpak/shatteredprism

@@ -8,4 +8,4 @@ done
 export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
 export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
 
-exec /app/bin/fjordrun "$@"
+exec /app/bin/shatteredrun "$@"

launcher/Application.cpp

@@ -160,13 +160,14 @@
 
 #if defined Q_OS_WIN32
 #include <windows.h>
-#include <QStyleHints>
 #include "WindowsConsole.h"
 #endif
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 
+#include "onimai.h"
+
 static const QLatin1String liveCheckFile("live.check");
 
 PixmapCache* PixmapCache::s_instance = nullptr;
@@ -232,7 +233,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     setApplicationDisplayName(QString("%1 %2").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString()));
     setApplicationVersion(BuildConfig.printableVersionString() + "\n" + BuildConfig.GIT_COMMIT);
     setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPFILENAME);
-    m_startTime = QDateTime::currentDateTime();
+    startTime = QDateTime::currentDateTime();
 
     // Don't quit on hiding the last window
     this->setQuitOnLastWindowClosed(false);
@@ -933,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
@@ -950,7 +953,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
     // check update locks
     {
-        auto update_log_path = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log");
+        auto update_log_path = FS::PathCombine(m_dataPath, "logs", "shatteredprism_update.log");
 
         auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock"));
         if (update_lock.exists()) {
@@ -964,7 +967,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                               "\n"
                               "This likely means that a update attempt failed. Please ensure your installation is in working order before "
                               "proceeding.\n"
-                              "Check the Fjord Launcher updater log at: \n"
+                              "Check the Shattered Prism updater log at: \n"
                               "%7\n"
                               "for details on the last update attempt.\n"
                               "\n"
@@ -1000,7 +1003,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                               "\n"
                               "Please ensure your installation is in working order before "
                               "proceeding.\n"
-                              "Check the Fjord Launcher updater log at: \n"
+                              "Check the Shattered Prism updater log at: \n"
                               "%1\n"
                               "for details on the last update attempt.")
                                .arg(update_log_path);
@@ -1031,7 +1034,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
             auto infoMsg = tr("Update succeeded\n"
                               "\n"
                               "You are now running %1 .\n"
-                              "Check the Fjord Launcher updater log at: \n"
+                              "Check the Shattered Prism updater log at: \n"
                               "%2\n"
                               "for details.")
                                .arg(BuildConfig.printableVersionString())
@@ -1118,22 +1121,15 @@ bool Application::createSetupWizard()
     bool validWidgets = m_themeManager->isValidApplicationTheme(settings()->get("ApplicationTheme").toString());
     bool validIcons = m_themeManager->isValidIconTheme(settings()->get("IconTheme").toString());
     bool login = !m_accounts->anyAccountIsValid() && capabilities() & Application::SupportsMSA;
+    login = false;
     bool themeInterventionRequired = !validWidgets || !validIcons;
     bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired || askjava || login;
     if (wizardRequired) {
         // set default theme after going into theme wizard
         if (!validIcons)
             settings()->set("IconTheme", QString("pe_colored"));
-        if (!validWidgets) {
-#if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-            const QString style =
-                QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark ? QStringLiteral("dark") : QStringLiteral("bright");
-#else
-            const QString style = QStringLiteral("system");
-#endif
-
-            settings()->set("ApplicationTheme", style);
-        }
+        if (!validWidgets)
+            settings()->set("ApplicationTheme", QString("system"));
 
         m_themeManager->applyCurrentlySelectedTheme(true);
 
@@ -1200,9 +1196,6 @@ bool Application::event(QEvent* event)
 #endif
 
     if (event->type() == QEvent::FileOpen) {
-        if (!m_mainWindow) {
-            showMainWindow(false);
-        }
         auto ev = static_cast<QFileOpenEvent*>(event);
         m_mainWindow->processURLs({ ev->url() });
     }
@@ -1262,7 +1255,7 @@ void Application::performMainStartupAction()
             msgBox.setWindowTitle(tr("Fetch CurseForge Core API key?"));
             msgBox.setText(tr("Would you like to fetch the official CurseForge app's API key now?"));
             msgBox.setInformativeText(
-                tr("Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Fjord Launcher "
+                tr("Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Shattered Prism "
                    "to download all mods in a modpack without you needing to download any of them manually."));
             msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
             msgBox.setDefaultButton(QMessageBox::Yes);
@@ -1361,9 +1354,6 @@ void Application::messageReceived(const QByteArray& message)
             qWarning() << "Received" << command << "message without a zip path/URL.";
             return;
         }
-        if (!m_mainWindow) {
-            showMainWindow(false);
-        }
         m_mainWindow->processURLs({ normalizeImportUrl(url) });
     } else if (command == "launch") {
         QString id = received.args["id"];

launcher/Application.h

@@ -112,7 +112,7 @@ class Application : public QApplication {
 
     std::shared_ptr<SettingsObject> settings() const { return m_settings; }
 
-    qint64 timeSinceStart() const { return m_startTime.msecsTo(QDateTime::currentDateTime()); }
+    qint64 timeSinceStart() const { return startTime.msecsTo(QDateTime::currentDateTime()); }
 
     QIcon getThemedIcon(const QString& name);
 
@@ -236,7 +236,7 @@ class Application : public QApplication {
     bool shouldExitNow() const;
 
    private:
-    QDateTime m_startTime;
+    QDateTime startTime;
 
     shared_qobject_ptr<QNetworkAccessManager> m_network;
 

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
@@ -238,8 +239,6 @@ set(MINECRAFT_SOURCES
     minecraft/auth/AuthFlow.cpp
     minecraft/auth/AuthFlow.h
 
-    minecraft/auth/steps/AuthlibInjectorMetadataStep.cpp
-    minecraft/auth/steps/AuthlibInjectorMetadataStep.h
     minecraft/auth/steps/EntitlementsStep.cpp
     minecraft/auth/steps/EntitlementsStep.h
     minecraft/auth/steps/GetSkinStep.cpp
@@ -387,10 +386,6 @@ set(MINECRAFT_SOURCES
     minecraft/AssetsUtils.cpp
 
     # Minecraft skins
-    minecraft/skins/AuthlibInjectorTextureDelete.cpp
-    minecraft/skins/AuthlibInjectorTextureDelete.h
-    minecraft/skins/AuthlibInjectorTextureUpload.cpp
-    minecraft/skins/AuthlibInjectorTextureUpload.h
     minecraft/skins/CapeChange.cpp
     minecraft/skins/CapeChange.h
     minecraft/skins/SkinUpload.cpp
@@ -1066,6 +1061,8 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/CopyInstanceDialog.h
     ui/dialogs/CustomMessageBox.cpp
     ui/dialogs/CustomMessageBox.h
+    ui/dialogs/EditAccountDialog.cpp
+    ui/dialogs/EditAccountDialog.h
     ui/dialogs/ExportInstanceDialog.cpp
     ui/dialogs/ExportInstanceDialog.h
     ui/dialogs/ExportPackDialog.cpp
@@ -1255,6 +1252,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/OfflineLoginDialog.ui
     ui/dialogs/AuthlibInjectorLoginDialog.ui
     ui/dialogs/AboutDialog.ui
+    ui/dialogs/EditAccountDialog.ui
     ui/dialogs/ReviewMessageBox.ui
     ui/dialogs/ScrollMessageBox.ui
     ui/dialogs/BlockedModsDialog.ui

launcher/GetAuthlibInjectorApiLocation.cpp

@@ -72,8 +72,7 @@ auto GetAuthlibInjectorApiLocation::Sink::finalize(QNetworkReply& reply) -> Task
         qDebug() << "X-Authlib-Injector-API-Location header not found!";
     }
 
-    const auto& encodedUrl = url.toEncoded(QUrl::FullyEncoded);
-    m_outer.m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_outer.m_username, encodedUrl));
+    m_outer.m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_outer.m_username, url.toString()));
     return Task::State::Succeeded;
 }
 

launcher/InstanceImportTask.cpp

@@ -159,7 +159,7 @@ void InstanceImportTask::processZipPack()
     }
 
     QuaZipDir packZipDir(packZip.get());
-    qDebug() << "Attempting to determine instance type";
+    qDebug() << "Attempting to determine instance type ";
 
     QString root;
 
@@ -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

@@ -30,26 +30,31 @@ struct InstanceName {
 };
 
 class InstanceTask : public Task, public InstanceName {
-    Q_OBJECT
-   public:
-    InstanceTask();
-    ~InstanceTask() override = default;
+  Q_OBJECT
+ public:
+  InstanceTask();
+  ~InstanceTask() override = default;
 
-    void setParentSettings(SettingsObjectPtr settings) { m_globalSettings = settings; }
+  void setParentSettings(SettingsObjectPtr settings) { m_globalSettings = settings; }
 
-    void setStagingPath(const QString& stagingPath) { m_stagingPath = stagingPath; }
+  void setStagingPath(const QString& stagingPath) { m_stagingPath = stagingPath; }
 
-    void setIcon(const QString& icon) { m_instIcon = icon; }
+  void setIcon(const QString& icon) { m_instIcon = icon; }
 
-    void setGroup(const QString& group) { m_instGroup = group; }
-    QString group() const { return m_instGroup; }
+  void setGroup(const QString& group) { m_instGroup = group; }
+  QString group() const { return m_instGroup; }
 
-    [[nodiscard]] bool shouldConfirmUpdate() const { return m_confirm_update; }
-    void setConfirmUpdate(bool confirm) { m_confirm_update = confirm; }
+  [[nodiscard]] bool shouldConfirmUpdate() const { return m_confirm_update; }
+  void setConfirmUpdate(bool confirm) { m_confirm_update = confirm; }
 
-    bool shouldOverride() const { return m_override_existing; }
+  bool shouldOverride() const { return m_override_existing; }
 
-    [[nodiscard]] QString originalInstanceID() const { return m_original_instance_id; };
+  [[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/LaunchController.cpp

@@ -92,8 +92,8 @@ void LaunchController::decideAccount()
     if (accounts->count() <= 0 || !accounts->anyAccountIsValid()) {
         // 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"),
-                                                  tr("In order to play Minecraft, you must have at least one Microsoft "
-                                                     "account which owns Minecraft logged in. "
+                                                  tr("In order to play Minecraft, you must choose a username or "
+                                                     "have an account logged in. "
                                                      "Would you like to open the account manager to add an account now?"),
                                                   QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
                          ->exec();

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