Fix overlooked branding errors

This commit is contained in:
Luna 2024-10-19 03:35:58 -05:00
parent 707f9026f3
commit a03b3d8c7a
5 changed files with 39 additions and 33 deletions

View File

@ -2,7 +2,7 @@
Hey there! Thanks for your contribution. Hey there! Thanks for your contribution.
Please make sure that your commits are signed off first. 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. 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! Note that signing and signing-off are two different things!

View File

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

View File

@ -1,8 +1,8 @@
# Fjord Launcher Nix Packaging # Shattered Prism Nix Packaging
## Installing a stable release (nixpkgs) ## Installing a stable release (nixpkgs)
Fjord Launcher is packaged in [nixpkgs](https://github.com/NixOS/nixpkgs/) since 22.11. Shattered Prism is packaged in [nixpkgs](https://github.com/NixOS/nixpkgs/) since 22.11.
See [Package variants](#package-variants) for a list of available packages. See [Package variants](#package-variants) for a list of available packages.
@ -28,7 +28,7 @@ Example (NixOS):
### Installing the package directly ### Installing the package directly
After adding `github:unmojang/FjordLauncher` to your flake inputs, you can access the flake's `packages` output. After adding `github:lunaislazier/ShatteredPrism` to your flake inputs, you can access the flake's `packages` output.
Example: Example:
@ -37,10 +37,10 @@ Example:
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
fjordlauncher = { shatteredprism = {
url = "github:unmojang/FjordLauncher"; url = "github:lunaislazier/ShatteredPrism";
# Optional: Override the nixpkgs input of fjordlauncher to use the same revision as the rest of your flake # Optional: Override the nixpkgs input of shatteredprism to use the same revision as the rest of your flake
# Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache # Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache
# #
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
@ -51,7 +51,7 @@ Example:
}; };
outputs = outputs =
{ nixpkgs, fjordlauncher, ... }: { nixpkgs, shatteredprism, ... }:
{ {
nixosConfigurations.foo = nixpkgs.lib.nixosSystem { nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
modules = [ modules = [
@ -60,7 +60,7 @@ Example:
( (
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ fjordlauncher.packages.${pkgs.system}.fjordlauncher ]; environment.systemPackages = [ shatteredprism.packages.${pkgs.system}.shatteredprism ];
} }
) )
]; ];
@ -72,7 +72,7 @@ Example:
### Using the overlay ### Using the overlay
Alternatively, if you don't want to use our `packages` output, you can add our overlay to your nixpkgs instance. Alternatively, if you don't want to use our `packages` output, you can add our overlay to your nixpkgs instance.
This will ensure Fjord is built with your system's packages. This will ensure Shattered Prism is built with your system's packages.
> [!WARNING] > [!WARNING]
> Depending on what revision of nixpkgs your system uses, this may result in binaries that differ from the above `packages` output > Depending on what revision of nixpkgs your system uses, this may result in binaries that differ from the above `packages` output
@ -85,10 +85,10 @@ Example:
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
fjordlauncher = { shatteredprism = {
url = "github:unmojang/FjordLauncher"; url = "github:lunaislazier/ShatteredPrism";
# Optional: Override the nixpkgs input of fjordlauncher to use the same revision as the rest of your flake # Optional: Override the nixpkgs input of shatteredprism to use the same revision as the rest of your flake
# Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache # Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache
# #
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
@ -99,7 +99,7 @@ Example:
}; };
outputs = outputs =
{ nixpkgs, fjordlauncher, ... }: { nixpkgs, shatteredprism, ... }:
{ {
nixosConfigurations.foo = nixpkgs.lib.nixosSystem { nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
modules = [ modules = [
@ -108,9 +108,9 @@ Example:
( (
{ pkgs, ... }: { pkgs, ... }:
{ {
nixpkgs.overlays = [ fjordlauncher.overlays.default ]; nixpkgs.overlays = [ shatteredprism.overlays.default ];
environment.systemPackages = [ pkgs.fjordlauncher ]; environment.systemPackages = [ pkgs.shatteredprism ];
} }
) )
]; ];
@ -126,11 +126,11 @@ You can simply call the default package of this flake.
Example: Example:
```shell ```shell
nix run github:unmojang/FjordLauncher nix run github:lunaislazier/ShatteredPrism
nix shell github:unmojang/FjordLauncher nix shell github:lunaislazier/ShatteredPrism
nix profile install github:unmojang/FjordLauncher nix profile install github:lunaislazier/ShatteredPrism
``` ```
## Installing a development release (without flakes) ## Installing a development release (without flakes)
@ -163,8 +163,8 @@ Example:
{ {
environment.systemPackages = [ environment.systemPackages = [
(import ( (import (
builtins.fetchTarball "https://github.com/FjordLauncher/FjordLauncher/archive/develop.tar.gz" builtins.fetchTarball "https://github.com/ShatteredPrism/ShatteredPrism/archive/develop.tar.gz"
)).packages.${pkgs.system}.fjordlauncher )).packages.${pkgs.system}.shatteredprism
]; ];
} }
``` ```
@ -172,7 +172,7 @@ Example:
### Using the overlay (`fetchTarball`) ### Using the overlay (`fetchTarball`)
Alternatively, if you don't want to use our `packages` output, you can add our overlay to your instance of nixpkgs. Alternatively, if you don't want to use our `packages` output, you can add our overlay to your instance of nixpkgs.
This results in Fjord using your system's libraries This results in Shattered Prism using your system's libraries
Example: Example:
@ -181,11 +181,11 @@ Example:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ( (import (
builtins.fetchTarball "https://github.com/FjordLauncher/FjordLauncher/archive/develop.tar.gz" builtins.fetchTarball "https://github.com/ShatteredPrism/ShatteredPrism/archive/develop.tar.gz"
)).overlays.default )).overlays.default
]; ];
environment.systemPackages = [ pkgs.fjordlauncher ]; environment.systemPackages = [ pkgs.shatteredprism ];
} }
``` ```
@ -196,23 +196,23 @@ You can add this repository as a channel and install its packages that way.
Example: Example:
```shell ```shell
nix-channel --add https://github.com/unmojang/FjordLauncher/archive/develop.tar.gz fjordlauncher nix-channel --add https://github.com/lunaislazier/ShatteredPrism/archive/develop.tar.gz shatteredprism
nix-channel --update fjordlauncher nix-channel --update shatteredprism
nix-env -iA fjordlauncher.fjordlauncher nix-env -iA shatteredprism.shatteredprism
``` ```
## Package variants ## Package variants
Both Nixpkgs and this repository offer the following packages: Both Nixpkgs and this repository offer the following packages:
- `fjordlauncher` - The preferred build, wrapped with everything necessary to run the launcher and Minecraft - `shatteredprism` - The preferred build, wrapped with everything necessary to run the launcher and Minecraft
- `fjordlauncher-unwrapped` - A minimal build that allows for advanced customization of the launcher's runtime environment - `shatteredprism-unwrapped` - A minimal build that allows for advanced customization of the launcher's runtime environment
### Customizing wrapped packages ### Customizing wrapped packages
The wrapped package (`fjordlauncher`) offers some build parameters to further customize the launcher's environment. The wrapped package (`shatteredprism`) offers some build parameters to further customize the launcher's environment.
The following parameters can be overridden: The following parameters can be overridden:
@ -220,7 +220,7 @@ The following parameters can be overridden:
- `additionalPrograms` (default: `[ ]`) Additional libraries that will be added to `PATH` - `additionalPrograms` (default: `[ ]`) Additional libraries that will be added to `PATH`
- `controllerSupport` (default: `isLinux`) Turn on/off support for controllers on Linux (macOS will always have this) - `controllerSupport` (default: `isLinux`) Turn on/off support for controllers on Linux (macOS will always have this)
- `gamemodeSupport` (default: `isLinux`) Turn on/off support for [Feral GameMode](https://github.com/FeralInteractive/gamemode) on Linux - `gamemodeSupport` (default: `isLinux`) Turn on/off support for [Feral GameMode](https://github.com/FeralInteractive/gamemode) on Linux
- `jdks` (default: `[ jdk21 jdk17 jdk8 ]`) Java runtimes added to `FJORDLAUNCHER_JAVA_PATHS` variable - `jdks` (default: `[ jdk21 jdk17 jdk8 ]`) Java runtimes added to `SHATTEREDPRISM_JAVA_PATHS` variable
- `msaClientID` (default: `null`, requires full rebuild!) Client ID used for Microsoft Authentication - `msaClientID` (default: `null`, requires full rebuild!) Client ID used for Microsoft Authentication
- `textToSpeechSupport` (default: `isLinux`) Turn on/off support for text-to-speech on Linux (macOS will always have this) - `textToSpeechSupport` (default: `isLinux`) Turn on/off support for text-to-speech on Linux (macOS will always have this)
- `withWaylandGLFW` (default: `isLinux`) Build with support for native Wayland via a custom GLFW - `withWaylandGLFW` (default: `isLinux`) Build with support for native Wayland via a custom GLFW

View File

@ -3,7 +3,7 @@
<id>org.lunaislazier.ShatteredPrism</id> <id>org.lunaislazier.ShatteredPrism</id>
<launchable type="desktop-id">org.lunaislazier.ShatteredPrism.desktop</launchable> <launchable type="desktop-id">org.lunaislazier.ShatteredPrism.desktop</launchable>
<name>Shattered Prism</name> <name>Shattered Prism</name>
<developer_name>fn2006</developer_name> <developer_name>lunaislazier</developer_name>
<summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary> <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-only</project_license> <project_license>GPL-3.0-only</project_license>

View File

@ -0,0 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/">
<file>org.lunaislazier.ShatteredPrism.svg</file>
</qresource>
</RCC>