From 1b95061bcf111020ac5245db3598cc57f6aa1d6c Mon Sep 17 00:00:00 2001
From: Luna <93695520+LunaisLazier@users.noreply.github.com>
Date: Wed, 2 Oct 2024 23:20:49 -0500
Subject: [PATCH] Adjust branding to that of ShatteredPrism
---
.github/ISSUE_TEMPLATE/bug_report.yml | 14 +-
.github/ISSUE_TEMPLATE/rfc.yml | 16 +-
.github/ISSUE_TEMPLATE/suggestion.yml | 12 +-
.github/workflows/build.yml | 66 +--
.github/workflows/trigger_release.yml | 65 +--
CMakeLists.txt | 6 +-
README.md | 110 +---
...ml => org.lunaislazier.ShatteredPrism.yml} | 12 +-
flatpak/{fjordlauncher => shatteredprism} | 2 +-
launcher/Application.cpp | 10 +-
.../resources/multimc/scalable/launcher.svg | 52 +-
launcher/ui/dialogs/AboutDialog.cpp | 13 +-
launcher/ui/pages/global/APIPage.ui | 2 +-
.../ui/pages/modplatform/flame/FlamePage.ui | 20 +-
launcher/ui/themes/CatPack.cpp | 2 +-
launcher/updater/PrismExternalUpdater.cpp | 2 +-
.../updater/prismupdater/PrismUpdater.cpp | 18 +-
program_info/CMakeLists.txt | 42 +-
program_info/fjordlauncher.icns | Bin 35338 -> 0 bytes
program_info/fjordlauncher.ico | Bin 372526 -> 0 bytes
program_info/fjordlauncher.qrc | 2 +-
...enicons.fjord.sh => genicons.shattered.sh} | 40 +-
...org.lunaislazier.ShatteredPrism Source.svg | 51 ++
...org.lunaislazier.ShatteredPrism.bigsur.svg | 4 +
...rg.lunaislazier.ShatteredPrism.desktop.in} | 2 +-
...naislazier.ShatteredPrism.metainfo.xml.in} | 12 +-
.../org.lunaislazier.ShatteredPrism.svg | 51 ++
.../org.unmojang.FjordLauncher.Source.svg | 323 ------------
.../org.unmojang.FjordLauncher.bigsur.svg | 487 ------------------
program_info/org.unmojang.FjordLauncher.svg | 1 -
program_info/shatteredprism-header-black.svg | 48 ++
program_info/shatteredprism-header.svg | 48 ++
...ordlauncher.6.scd => shatteredprism.6.scd} | 20 +-
program_info/shatteredprism.icns | Bin 0 -> 819348 bytes
program_info/shatteredprism.ico | Bin 0 -> 150129 bytes
...manifest.in => shatteredprism.manifest.in} | 2 +-
...ordlauncher.rc.in => shatteredprism.rc.in} | 10 +-
37 files changed, 469 insertions(+), 1096 deletions(-)
rename flatpak/{org.unmojang.FjordLauncher.yml => org.lunaislazier.ShatteredPrism.yml} (94%)
rename flatpak/{fjordlauncher => shatteredprism} (92%)
delete mode 100644 program_info/fjordlauncher.icns
delete mode 100644 program_info/fjordlauncher.ico
rename program_info/{genicons.fjord.sh => genicons.shattered.sh} (51%)
mode change 100755 => 100644
create mode 100644 program_info/org.lunaislazier.ShatteredPrism Source.svg
create mode 100644 program_info/org.lunaislazier.ShatteredPrism.bigsur.svg
rename program_info/{org.unmojang.FjordLauncher.desktop.in => org.lunaislazier.ShatteredPrism.desktop.in} (92%)
mode change 100755 => 100644
rename program_info/{org.unmojang.FjordLauncher.metainfo.xml.in => org.lunaislazier.ShatteredPrism.metainfo.xml.in} (75%)
create mode 100644 program_info/org.lunaislazier.ShatteredPrism.svg
delete mode 100644 program_info/org.unmojang.FjordLauncher.Source.svg
delete mode 100644 program_info/org.unmojang.FjordLauncher.bigsur.svg
delete mode 100644 program_info/org.unmojang.FjordLauncher.svg
create mode 100644 program_info/shatteredprism-header-black.svg
create mode 100644 program_info/shatteredprism-header.svg
rename program_info/{fjordlauncher.6.scd => shatteredprism.6.scd} (75%)
create mode 100644 program_info/shatteredprism.icns
create mode 100644 program_info/shatteredprism.ico
rename program_info/{fjordlauncher.manifest.in => shatteredprism.manifest.in} (92%)
rename program_info/{fjordlauncher.rc.in => shatteredprism.rc.in} (69%)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 86ebee052..4fb4dab7a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.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
diff --git a/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml
index 1c157a9e4..25075de84 100644
--- a/.github/ISSUE_TEMPLATE/rfc.yml
+++ b/.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
diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml
index 13a03005b..17487f004 100644
--- a/.github/ISSUE_TEMPLATE/suggestion.yml
+++ b/.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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e46d66318..87ed762ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -376,7 +376,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 }}'
@@ -384,8 +384,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'
@@ -393,25 +393,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:
@@ -453,7 +453,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
}
@@ -494,7 +494,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
}
@@ -507,10 +507,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.shatteredprism.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
@@ -529,7 +529,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
@@ -541,9 +541,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.unmojang.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'
@@ -572,57 +572,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 != ''
@@ -645,8 +645,8 @@ jobs:
if: inputs.build_type == 'Debug'
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
- bundle: "Fjord Launcher.flatpak"
- manifest-path: flatpak/org.unmojang.FjordLauncher.yml
+ bundle: "Shattered Prism.flatpak"
+ manifest-path: flatpak/org.lunaislazier.ShatteredPrism.yml
nix:
name: Nix (${{ matrix.system }})
@@ -691,9 +691,9 @@ jobs:
- name: Build debug package
if: ${{ inputs.build_type == 'Debug' }}
run: |
- nix build --print-build-logs .#fjordlauncher-debug
+ nix build --print-build-logs .#shatteredprism-debug
- name: Build release package
if: ${{ inputs.build_type != 'Debug' }}
run: |
- nix build --print-build-logs .#fjordlauncher
+ nix build --print-build-logs .#shatteredprism
diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index e1edcca13..d2bcb9507 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -1,6 +1,7 @@
name: Build Application and Make Release
on:
+ workflow_dispatch:
push:
tags:
- "*"
@@ -36,7 +37,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
@@ -45,38 +46,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
@@ -87,23 +88,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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbcb9e6c..336d2f4a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_M
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.")
@@ -204,7 +204,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.")
@@ -350,7 +350,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 #######################################
diff --git a/README.md b/README.md
index f185fb8b4..24dc366c4 100644
--- a/README.md
+++ b/README.md
@@ -1,104 +1,40 @@
-# Fjord Launcher
+
+
+
+
+
+
+
-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.
+
+ ShatteredPrism is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
+ This is a fork of PrismLauncher and is not endorsed by it.
+
-## Advantages of this fork over Prism Launcher
+# Advantages over PrismLauncher
-- [Support for alternative auth servers](doc/alternative-auth-servers.md)
+- Completely DRM-Free.
+- In-App FTB Modpack Downloading restored.
+- Support 3rd Party Auth Servers(courtesy of [this project](https://github.com/fn2006/PollyMC/)).
-- Ability to download FTB modpacks from within the launcher
-
-## 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, it is currently the **only** way to contact anyone regarding this project.
-#### Windows (Manual)
+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.
-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.
-### macOS
+## License [](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-bin # binary package
-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
diff --git a/flatpak/org.unmojang.FjordLauncher.yml b/flatpak/org.lunaislazier.ShatteredPrism.yml
similarity index 94%
rename from flatpak/org.unmojang.FjordLauncher.yml
rename to flatpak/org.lunaislazier.ShatteredPrism.yml
index d1c418151..564b22c85 100644
--- a/flatpak/org.unmojang.FjordLauncher.yml
+++ b/flatpak/org.lunaislazier.ShatteredPrism.yml
@@ -1,11 +1,11 @@
-id: org.unmojang.FjordLauncher
+id: org.lunaislazier.ShatteredPrism
runtime: org.kde.Platform
runtime-version: 6.7
sdk: org.kde.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.openjdk17
-command: fjordlauncher
+command: shatteredprism
finish-args:
- --share=ipc
- --socket=x11
@@ -27,7 +27,7 @@ modules:
# Needed for proper Wayland support
- libdecor.json
- - name: fjordlauncher
+ - name: shatteredprism
buildsystem: cmake-ninja
builddir: true
config-opts:
@@ -135,10 +135,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
diff --git a/flatpak/fjordlauncher b/flatpak/shatteredprism
similarity index 92%
rename from flatpak/fjordlauncher
rename to flatpak/shatteredprism
index 5e2960993..3deaef236 100644
--- a/flatpak/fjordlauncher
+++ b/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 "$@"
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 9aa613589..3ddead52d 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -948,7 +948,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()) {
@@ -962,7 +962,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"
@@ -998,7 +998,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);
@@ -1029,7 +1029,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())
@@ -1249,7 +1249,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);
diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg
index 60914ff57..8bc67bd15 100644
--- a/launcher/resources/multimc/scalable/launcher.svg
+++ b/launcher/resources/multimc/scalable/launcher.svg
@@ -1 +1,51 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index d4225f06c..7db724624 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -72,7 +72,18 @@ QString getCreditsHtml()
stream << "
\n";
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
- stream << "
\n").arg(getGitHub("lunaislazier"));
+ stream << " \n";
+
+ //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
+ stream << "
\n").arg(getWebsite("https://twitter.com/LichenOnaWall"));
+ stream << " \n";
+
+ //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
+ stream << "
+
Fjord Launcher
+