From cb2f9b4e14971a8629f7d2fce9aa47f5ad2eb28b Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Sat, 4 May 2024 00:08:42 -0400 Subject: [PATCH] Crude s/PollyMC/Fjord Launcher --- CMakeLists.txt | 6 +-- COPYING.md | 6 +-- README.md | 30 ++++++------- flatpak/{pollymc => fjordlauncher} | 2 +- ...yMC.yml => org.unmojang.FjordLauncher.yml} | 12 ++--- launcher/Application.cpp | 8 ++-- .../breeze_light/scalable/launcher.svg | 2 +- .../resources/multimc/scalable/launcher.svg | 2 +- launcher/ui/pages/global/APIPage.ui | 2 +- launcher/ui/pages/global/AccountListPage.cpp | 3 +- launcher/updater/PrismExternalUpdater.cpp | 2 +- .../updater/prismupdater/PrismUpdater.cpp | 18 ++++---- nix/dev.nix | 2 +- nix/distribution.nix | 22 ++++----- nix/pkg/default.nix | 8 ++-- nix/pkg/wrapper.nix | 10 ++--- program_info/CMakeLists.txt | 42 +++++++++--------- ...ack.svg => fjordlauncher-header-black.svg} | 2 +- ...ce.svg => fjordlauncher-header.Source.svg} | 12 ++--- ...mc-header.svg => fjordlauncher-header.svg} | 2 +- .../{pollymc.6.scd => fjordlauncher.6.scd} | 20 ++++----- .../{pollymc.icns => fjordlauncher.icns} | Bin .../{pollymc.ico => fjordlauncher.ico} | Bin ....manifest.in => fjordlauncher.manifest.in} | 2 +- .../{pollymc.qrc => fjordlauncher.qrc} | 2 +- .../{pollymc.rc.in => fjordlauncher.rc.in} | 10 ++--- ... => org.unmojang.FjordLauncher Source.svg} | 2 +- ... => org.unmojang.FjordLauncher.bigsur.svg} | 2 +- ... => org.unmojang.FjordLauncher.desktop.in} | 4 +- ...rg.unmojang.FjordLauncher.metainfo.xml.in} | 12 ++--- ...yMC.svg => org.unmojang.FjordLauncher.svg} | 2 +- program_info/prismlauncher.qrc | 2 +- 32 files changed, 126 insertions(+), 125 deletions(-) rename flatpak/{pollymc => fjordlauncher} (92%) rename flatpak/{org.fn2006.PollyMC.yml => org.unmojang.FjordLauncher.yml} (95%) rename program_info/{pollymc-header-black.svg => fjordlauncher-header-black.svg} (99%) rename program_info/{pollymc-header.Source.svg => fjordlauncher-header.Source.svg} (94%) rename program_info/{pollymc-header.svg => fjordlauncher-header.svg} (99%) rename program_info/{pollymc.6.scd => fjordlauncher.6.scd} (74%) rename program_info/{pollymc.icns => fjordlauncher.icns} (100%) rename program_info/{pollymc.ico => fjordlauncher.ico} (100%) rename program_info/{pollymc.manifest.in => fjordlauncher.manifest.in} (92%) rename program_info/{pollymc.qrc => fjordlauncher.qrc} (62%) rename program_info/{pollymc.rc.in => fjordlauncher.rc.in} (71%) rename program_info/{org.fn2006.PollyMC Source.svg => org.unmojang.FjordLauncher Source.svg} (98%) rename program_info/{org.fn2006.PollyMC.bigsur.svg => org.unmojang.FjordLauncher.bigsur.svg} (99%) rename program_info/{org.fn2006.PollyMC.desktop.in => org.unmojang.FjordLauncher.desktop.in} (89%) rename program_info/{org.fn2006.PollyMC.metainfo.xml.in => org.unmojang.FjordLauncher.metainfo.xml.in} (76%) rename program_info/{org.fn2006.PollyMC.svg => org.unmojang.FjordLauncher.svg} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c1d13f6a..ca5ca62c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,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/fn2006/PollyMC" CACHE STRING "Base github URL for the updater.") +set(Launcher_UPDATER_GITHUB_REPO "https://github.com/unmojang/FjordLauncher" 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.") @@ -201,7 +201,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/fn2006/PollyMC/issues" CACHE STRING "URL for the bug tracker.") +set(Launcher_BUG_TRACKER_URL "https://github.com/unmojang/FjordLauncher/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.") @@ -341,7 +341,7 @@ include(ECMQtDeclareLoggingCategory) ####################################### Program Info ####################################### -set(Launcher_APP_BINARY_NAME "pollymc" CACHE STRING "Name of the Launcher binary") +set(Launcher_APP_BINARY_NAME "fjordlauncher" CACHE STRING "Name of the Launcher binary") add_subdirectory(program_info) ####################################### Install layout ####################################### diff --git a/COPYING.md b/COPYING.md index 2bd98e17d..f1253ccb1 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,7 +1,7 @@ -## PollyMC +## Fjord Launcher - PollyMC - Minecraft Launcher - Copyright (C) 2022-2023 PollyMC Contributors + Fjord Launcher - Minecraft Launcher + Copyright (C) 2022-2023 Fjord Launcher 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 diff --git a/README.md b/README.md index 2bb25949e..4059af4b2 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@

-PollyMC logo -PollyMC logo +Fjord Launcher logo +Fjord Launcher logo

-PollyMC is a **fork** of Prism Launcher. It is **not** endorsed by or affiliated with PolyMC or Prism launcher. +Fjord Launcher is a **fork** of Prism Launcher. It is **not** endorsed by or affiliated with PolyMC or Prism launcher.

Advantages of this fork over regular Prism:

Offline mode doesn't require an account. -[Alternative auth server support](https://github.com/fn2006/PollyMC/wiki/Alternative-Auth-Servers). +[Alternative auth server support](https://github.com/unmojang/FjordLauncher/wiki/Alternative-Auth-Servers). Ability to download FTB modpacks from within the launcher. @@ -21,39 +21,39 @@ You **will not** open an issue in the Prism Launcher repo. You **will not** open an issue in the PolyMC repo. -You **will not** ask about PollyMC in the Prism Launcher discord. +You **will not** ask about Fjord Launcher in the Prism Launcher discord. -You **will not** ask about PollyMC in the PolyMC discord. +You **will not** ask about Fjord Launcher in the PolyMC discord. -You **will** open an issue [here](https://github.com/fn2006/PollyMC/issues). +You **will** open an issue [here](https://github.com/unmojang/FjordLauncher/issues). -You **will** start a discussion [here](https://github.com/fn2006/PollyMC/discussions). +You **will** start a discussion [here](https://github.com/unmojang/FjordLauncher/discussions).

Installation

Windows

-You can get installers or portable builds from the [releases section](https://github.com/fn2006/PollyMC/releases/latest), MSVC builds are recommended over MinGW builds but there's no real difference. +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.

Scoop Installer

-If you prefer Scoop over traditional methods of installing Windows programs, [TechPro424](https://github.com/TechPro424) maintains a Scoop bucket that provides PollyMC. +If you prefer Scoop over traditional methods of installing Windows programs, [TechPro424](https://github.com/TechPro424) maintains a Scoop bucket that provides Fjord Launcher. -To install PollyMC from Scoop: +To install Fjord Launcher from Scoop: First run `scoop bucket add TechPro424 https://github.com/TechPro424/scoop-bucket` to add the bucket to your system. -Then run `scoop install TechPro424/pollymc`. +Then run `scoop install TechPro424/fjordlauncher`.

Linux

-You can get the launcher as an AppImage, a Flatpak or a portable binary from the [releases section](https://github.com/fn2006/PollyMC/releases/latest). +You can get the launcher as an AppImage, a Flatpak or a portable binary from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest). -Alternatively, PollyMC is also available on the [AUR](https://aur.archlinux.org/packages?O=0&K=pollymc). +Alternatively, Fjord Launcher is also available on the [AUR](https://aur.archlinux.org/packages?O=0&K=fjordlauncher).

MacOS

-There are builds for MacOS in the [releases section](https://github.com/fn2006/PollyMC/releases/latest). +There are builds for MacOS in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).

To build the launcher yourself, follow [the instructions on the Prism Launcher website](https://prismlauncher.org/wiki/development/build-instructions) but clone this repo instead. diff --git a/flatpak/pollymc b/flatpak/fjordlauncher similarity index 92% rename from flatpak/pollymc rename to flatpak/fjordlauncher index 84813bccf..5e2960993 100644 --- a/flatpak/pollymc +++ b/flatpak/fjordlauncher @@ -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/pollyrun "$@" +exec /app/bin/fjordrun "$@" diff --git a/flatpak/org.fn2006.PollyMC.yml b/flatpak/org.unmojang.FjordLauncher.yml similarity index 95% rename from flatpak/org.fn2006.PollyMC.yml rename to flatpak/org.unmojang.FjordLauncher.yml index 49edd436f..bbadf2991 100644 --- a/flatpak/org.fn2006.PollyMC.yml +++ b/flatpak/org.unmojang.FjordLauncher.yml @@ -1,4 +1,4 @@ -id: org.fn2006.PollyMC +id: org.unmojang.FjordLauncher runtime: org.kde.Platform runtime-version: 5.15-23.08 sdk: org.kde.Sdk @@ -13,7 +13,7 @@ add-extensions: autodelete: false directory: utils/gamescope -command: pollymc +command: fjordlauncher finish-args: - --share=ipc - --socket=x11 @@ -36,7 +36,7 @@ modules: # Needed for proper Wayland support - libdecor.json - - name: pollymc + - name: fjordlauncher buildsystem: cmake-ninja builddir: true config-opts: @@ -154,10 +154,10 @@ modules: buildsystem: simple build-commands: - install -Dm755 prime-run /app/bin/prime-run - - mv /app/bin/pollymc /app/bin/pollyrun - - install -Dm755 pollymc /app/bin/pollymc + - mv /app/bin/fjordlauncher /app/bin/fjordrun + - install -Dm755 fjordlauncher /app/bin/fjordlauncher sources: - type: file path: prime-run - type: file - path: pollymc + path: fjordlauncher diff --git a/launcher/Application.cpp b/launcher/Application.cpp index f3caf4623..9840f6d70 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -908,7 +908,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv) // check update locks { - auto update_log_path = FS::PathCombine(m_dataPath, "logs", "pollymc_update.log"); + auto update_log_path = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log"); auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock")); if (update_lock.exists()) { @@ -922,7 +922,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 PollyMC updater log at: \n" + "Check the Fjord Launcher updater log at: \n" "%7\n" "for details on the last update attempt.\n" "\n" @@ -959,7 +959,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv) "\n" "Please ensure your installation is in working order before " "proceeding.\n" - "Check the PollyMC updater log at: \n" + "Check the Fjord Launcher updater log at: \n" "%1\n" "for details on the last update attempt.") .arg(update_log_path); @@ -991,7 +991,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 PollyMC updater log at: \n" + "Check the Fjord Launcher updater log at: \n" "%1\n" "for details.") .arg(BuildConfig.printableVersionString()) diff --git a/launcher/resources/breeze_light/scalable/launcher.svg b/launcher/resources/breeze_light/scalable/launcher.svg index 64f8da749..77fb9a484 100644 --- a/launcher/resources/breeze_light/scalable/launcher.svg +++ b/launcher/resources/breeze_light/scalable/launcher.svg @@ -8,7 +8,7 @@ version="1.1" id="svg99" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" - sodipodi:docname="org.fn2006.PollyMC.svg" + sodipodi:docname="org.unmojang.FjordLauncher.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index 64f8da749..77fb9a484 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -8,7 +8,7 @@ version="1.1" id="svg99" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" - sodipodi:docname="org.fn2006.PollyMC.svg" + sodipodi:docname="org.unmojang.FjordLauncher.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui index 9e9e3a81a..bd18050ef 100644 --- a/launcher/ui/pages/global/APIPage.ui +++ b/launcher/ui/pages/global/APIPage.ui @@ -294,7 +294,7 @@ - <html><head/><body><p>Note: you probably don't need to set this if CurseForge already works.</p><p><span style=" font-weight:700;">Using the Official Curseforge Launcher's key may break Curseforge's Terms of service, but should allow PollyMC to download all mods in a modpack without you needing to download any of them manually.</span></p></body></html> + <html><head/><body><p>Note: you probably don't need to set this if CurseForge already works.</p><p><span style=" font-weight:700;">Using the Official Curseforge Launcher's key may break Curseforge's Terms of service, but should allow Fjord Launcher to download all mods in a modpack without you needing to download any of them manually.</span></p></body></html> true diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index 60c1178ca..a1f398cd3 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -155,7 +155,8 @@ void AccountListPage::on_actionAddAuthlibInjector_triggered() MinecraftAccountPtr account = AuthlibInjectorLoginDialog::newAccount( this, tr("Please enter your username (sometimes an email address), password, and the URL of your API server." "
" - "See this page on the PollyMC wiki for a " + "See this page on the Fjord " + "Launcher wiki for a " "list of common API servers.

" "

" "Caution! Your username and password will be sent to the authentication server you specify!")); diff --git a/launcher/updater/PrismExternalUpdater.cpp b/launcher/updater/PrismExternalUpdater.cpp index 8c4ab3c32..d334a8c35 100644 --- a/launcher/updater/PrismExternalUpdater.cpp +++ b/launcher/updater/PrismExternalUpdater.cpp @@ -57,7 +57,7 @@ PrismExternalUpdater::PrismExternalUpdater(QWidget* parent, const QString& appDi priv = new PrismExternalUpdater::Private(); priv->appDir = QDir(appDir); priv->dataDir = QDir(dataDir); - auto settings_file = priv->dataDir.absoluteFilePath("pollymc_update.cfg"); + auto settings_file = priv->dataDir.absoluteFilePath("fjordlauncher_update.cfg"); priv->settings = std::make_unique(settings_file, QSettings::Format::IniFormat); priv->allowBeta = priv->settings->value("allow_beta", false).toBool(); priv->autoCheck = priv->settings->value("auto_check", false).toBool(); diff --git a/launcher/updater/prismupdater/PrismUpdater.cpp b/launcher/updater/prismupdater/PrismUpdater.cpp index 108078eca..b369fc1c2 100644 --- a/launcher/updater/prismupdater/PrismUpdater.cpp +++ b/launcher/updater/prismupdater/PrismUpdater.cpp @@ -218,11 +218,11 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar // Command line parsing QCommandLineParser parser; - parser.setApplicationDescription(QObject::tr("An auto-updater for PollyMC")); + parser.setApplicationDescription(QObject::tr("An auto-updater for Fjord Launcher")); parser.addOptions( { { { "d", "dir" }, tr("Use a custom path as application root (use '.' for current directory)."), tr("directory") }, - { { "V", "pollymc-version" }, + { { "V", "fjordlauncher-version" }, tr("Use this version as the installed launcher version. (provided because stdout can not be reliably captured on windows)"), tr("installed launcher version") }, { { "I", "install-version" }, "Install a specific version.", tr("version name") }, @@ -285,7 +285,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar m_selectUI = parser.isSet("select-ui"); m_allowDowngrade = parser.isSet("allow-downgrade"); - auto version = parser.value("pollymc-version"); + auto version = parser.value("fjordlauncher-version"); if (!version.isEmpty()) { if (version.contains('-')) { auto index = version.indexOf('-'); @@ -346,7 +346,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar #endif } - m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "pollymc_update.log"); + m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log"); { // setup logging FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs")); @@ -576,7 +576,7 @@ void PrismUpdaterApp::run() if (m_isFlatpak) { showFatalErrorMessage(tr("Updating flatpack not supported"), tr("Actions outside of checking if an update is available are not " - "supported when running the flatpak version of PollyMC.")); + "supported when running the flatpak version of Fjord Launcher.")); return; } if (m_isAppimage) { @@ -1101,13 +1101,13 @@ void PrismUpdaterApp::backupAppDir() if (file_list.isEmpty()) { // best guess if (BuildConfig.BUILD_ARTIFACT.toLower() == "linux") { - file_list.append({ "PollyMC", "bin", "share", "lib" }); + file_list.append({ "FjordLauncher", "bin", "share", "lib" }); } else { // windows by process of elimination file_list.append({ "jars", - "pollymc.exe", - "pollymc_filelink.exe", - "pollymc_updater.exe", + "fjordlauncher.exe", + "fjordlauncher_filelink.exe", + "fjordlauncher_updater.exe", "qtlogging.ini", "imageformats", "iconengines", diff --git a/nix/dev.nix b/nix/dev.nix index aafa6d7af..f79483179 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -27,7 +27,7 @@ ${config.pre-commit.installationScript} ''; - inputsFrom = [config.packages.pollymc-unwrapped]; + inputsFrom = [config.packages.fjordlauncher-unwrapped]; buildInputs = with pkgs; [ccache ninja]; }; diff --git a/nix/distribution.nix b/nix/distribution.nix index 0becce8a2..b642125d4 100644 --- a/nix/distribution.nix +++ b/nix/distribution.nix @@ -13,12 +13,12 @@ in { inherit (ourPackages) - pollymc-qt5-unwrapped - pollymc-qt5 - pollymc-unwrapped - pollymc + fjordlauncher-qt5-unwrapped + fjordlauncher-qt5 + fjordlauncher-unwrapped + fjordlauncher ; - default = ourPackages.pollymc; + default = ourPackages.fjordlauncher; }; }; @@ -49,16 +49,16 @@ inherit version; }; in { - pollymc-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs; + fjordlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs; - pollymc-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix { - pollymc-unwrapped = final.pollymc-qt5-unwrapped; + fjordlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix { + fjordlauncher-unwrapped = final.fjordlauncher-qt5-unwrapped; }; - pollymc-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs; + fjordlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs; - pollymc = prev.qt6Packages.callPackage ./pkg/wrapper.nix { - inherit (final) pollymc-unwrapped; + fjordlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix { + inherit (final) fjordlauncher-unwrapped; }; }; }; diff --git a/nix/pkg/default.nix b/nix/pkg/default.nix index 39a16ed3e..deeda683d 100644 --- a/nix/pkg/default.nix +++ b/nix/pkg/default.nix @@ -22,7 +22,7 @@ }: assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; stdenv.mkDerivation rec { - pname = "pollymc-unwrapped"; + pname = "fjordlauncher-unwrapped"; inherit version; src = lib.cleanSource self; @@ -58,8 +58,8 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on dontWrapQtApps = true; meta = with lib; { - mainProgram = "pollymc"; - homepage = "https://github.com/fn2006/PollyMC/"; + mainProgram = "fjordlauncher"; + homepage = "https://github.com/unmojang/FjordLauncher/"; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with @@ -67,7 +67,7 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on their associated options with a simple interface. ''; platforms = with platforms; linux ++ darwin; - changelog = "https://github.com/fn2006/PollyMC/releases/tag/${version}"; + changelog = "https://github.com/unmojang/FjordLauncher/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [fn2006]; }; diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix index 9d52ee7bc..ac2ae7a2a 100644 --- a/nix/pkg/wrapper.nix +++ b/nix/pkg/wrapper.nix @@ -2,7 +2,7 @@ lib, stdenv, symlinkJoin, - pollymc-unwrapped, + fjordlauncher-unwrapped, wrapQtAppsHook, addOpenGLRunpath, qtbase, # needed for wrapQtAppsHook @@ -29,14 +29,14 @@ additionalLibs ? [], additionalPrograms ? [], }: let - pollymcFinal = pollymc-unwrapped.override { + fjordlauncherFinal = fjordlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; }; in symlinkJoin { - name = "pollymc-${pollymcFinal.version}"; + name = "fjordlauncher-${fjordlauncherFinal.version}"; - paths = [pollymcFinal]; + paths = [fjordlauncherFinal]; nativeBuildInputs = [ wrapQtAppsHook @@ -92,5 +92,5 @@ in "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; - inherit (pollymcFinal) meta; + inherit (fjordlauncherFinal) meta; } diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index 0b2db6495..7c0f43dc2 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -8,49 +8,49 @@ if(UNIX) endif() endif() -set(Launcher_CommonName "PollyMC") -set(Launcher_DisplayName "PollyMC") +set(Launcher_CommonName "FjordLauncher") +set(Launcher_DisplayName "Fjord Launcher") set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) -set(Launcher_Copyright "© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") -set(Launcher_Copyright_Mac "© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE) +set(Launcher_Copyright "© 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") +set(Launcher_Copyright_Mac "© 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE) set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) set(Launcher_Domain "" PARENT_SCOPE) set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE) -set(Launcher_ConfigFile "pollymc.cfg" PARENT_SCOPE) -set(Launcher_Git "https://github.com/fn2006/PollyMC" PARENT_SCOPE) -set(Launcher_DesktopFileName "org.fn2006.PollyMC.desktop" PARENT_SCOPE) -set(Launcher_SVGFileName "org.fn2006.PollyMC.svg" PARENT_SCOPE) +set(Launcher_ConfigFile "fjordlauncher.cfg" PARENT_SCOPE) +set(Launcher_Git "https://github.com/unmojang/FjordLauncher" PARENT_SCOPE) +set(Launcher_DesktopFileName "org.unmojang.FjordLauncher.desktop" PARENT_SCOPE) +set(Launcher_SVGFileName "org.unmojang.FjordLauncher.svg" PARENT_SCOPE) -set(Launcher_Desktop "program_info/org.fn2006.PollyMC.desktop" PARENT_SCOPE) +set(Launcher_Desktop "program_info/org.unmojang.FjordLauncher.desktop" PARENT_SCOPE) set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE) -set(Launcher_MetaInfo "program_info/org.fn2006.PollyMC.metainfo.xml" PARENT_SCOPE) -set(Launcher_SVG "program_info/org.fn2006.PollyMC.svg" PARENT_SCOPE) +set(Launcher_MetaInfo "program_info/org.unmojang.FjordLauncher.metainfo.xml" PARENT_SCOPE) +set(Launcher_SVG "program_info/org.unmojang.FjordLauncher.svg" PARENT_SCOPE) set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE) -set(Launcher_Branding_ICO "program_info/pollymc.ico") +set(Launcher_Branding_ICO "program_info/fjordlauncher.ico") set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE) -set(Launcher_Branding_WindowsRC "program_info/pollymc.rc" PARENT_SCOPE) +set(Launcher_Branding_WindowsRC "program_info/fjordlauncher.rc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/prismlauncher.qrc" PARENT_SCOPE) set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE) -configure_file(org.fn2006.PollyMC.desktop.in org.fn2006.PollyMC.desktop) -configure_file(org.fn2006.PollyMC.metainfo.xml.in org.fn2006.PollyMC.metainfo.xml) -configure_file(pollymc.rc.in pollymc.rc @ONLY) -configure_file(pollymc.manifest.in pollymc.manifest @ONLY) -configure_file(pollymc.ico pollymc.ico COPYONLY) +configure_file(org.unmojang.FjordLauncher.desktop.in org.unmojang.FjordLauncher.desktop) +configure_file(org.unmojang.FjordLauncher.metainfo.xml.in org.unmojang.FjordLauncher.metainfo.xml) +configure_file(fjordlauncher.rc.in fjordlauncher.rc @ONLY) +configure_file(fjordlauncher.manifest.in fjordlauncher.manifest @ONLY) +configure_file(fjordlauncher.ico fjordlauncher.ico COPYONLY) configure_file(win_install.nsi.in win_install.nsi @ONLY) if(SCDOC_FOUND) - set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/pollymc.6.scd") - set(out_man "${CMAKE_CURRENT_BINARY_DIR}/pollymc.6") + set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/fjordlauncher.6.scd") + set(out_man "${CMAKE_CURRENT_BINARY_DIR}/fjordlauncher.6") add_custom_command( DEPENDS "${in_scd}" OUTPUT "${out_man}" COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}" ) add_custom_target(man ALL DEPENDS ${out_man}) - set(Launcher_ManPage "program_info/pollymc.6" PARENT_SCOPE) + set(Launcher_ManPage "program_info/fjordlauncher.6" PARENT_SCOPE) endif() diff --git a/program_info/pollymc-header-black.svg b/program_info/fjordlauncher-header-black.svg similarity index 99% rename from program_info/pollymc-header-black.svg rename to program_info/fjordlauncher-header-black.svg index 9289d1381..7bdba8a2c 100644 --- a/program_info/pollymc-header-black.svg +++ b/program_info/fjordlauncher-header-black.svg @@ -7,7 +7,7 @@ version="1.1" viewBox="0 0 376.77 135.47" id="svg866" - sodipodi:docname="pollymc-header-black.svg" + sodipodi:docname="fjordlauncher-header-black.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" diff --git a/program_info/pollymc-header.Source.svg b/program_info/fjordlauncher-header.Source.svg similarity index 94% rename from program_info/pollymc-header.Source.svg rename to program_info/fjordlauncher-header.Source.svg index f05a73b93..c8b7f9d9e 100644 --- a/program_info/pollymc-header.Source.svg +++ b/program_info/fjordlauncher-header.Source.svg @@ -7,7 +7,7 @@ version="1.1" viewBox="0 0 376.77 135.47" id="svg866" - sodipodi:docname="pollymc-header.Source.svg" + sodipodi:docname="fjordlauncher-header.Source.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -101,13 +101,13 @@ d="M 3,11 H 61 V 57 H 3 Z m 41,35 v 6 h 12 v -6 z m -12,3 v 3 H 44 V 49 Z M 54,28 v 18 h 2 V 28 Z" />PollyMCFjord Launchertrue - + diff --git a/program_info/pollymc.qrc b/program_info/fjordlauncher.qrc similarity index 62% rename from program_info/pollymc.qrc rename to program_info/fjordlauncher.qrc index 44558322a..8702f3eca 100644 --- a/program_info/pollymc.qrc +++ b/program_info/fjordlauncher.qrc @@ -1,6 +1,6 @@ - org.fn2006.PollyMC.svg + org.unmojang.FjordLauncher.svg diff --git a/program_info/pollymc.rc.in b/program_info/fjordlauncher.rc.in similarity index 71% rename from program_info/pollymc.rc.in rename to program_info/fjordlauncher.rc.in index 19a9f3455..549f7faf8 100644 --- a/program_info/pollymc.rc.in +++ b/program_info/fjordlauncher.rc.in @@ -3,8 +3,8 @@ #endif #include -IDI_ICON1 ICON DISCARDABLE "pollymc.ico" -1 RT_MANIFEST "pollymc.manifest" +IDI_ICON1 ICON DISCARDABLE "fjordlauncher.ico" +1 RT_MANIFEST "fjordlauncher.manifest" VS_VERSION_INFO VERSIONINFO FILEVERSION @Launcher_VERSION_NAME4_COMMA@ @@ -15,10 +15,10 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "MultiMC & Prism Launcher & PollyMC Contributors" - VALUE "FileDescription", "PollyMC" + VALUE "CompanyName", "MultiMC & Prism Launcher & Fjord Launcher Contributors" + VALUE "FileDescription", "Fjord Launcher" VALUE "FileVersion", "@Launcher_VERSION_NAME4@" - VALUE "ProductName", "PollyMC" + VALUE "ProductName", "Fjord Launcher" VALUE "ProductVersion", "@Launcher_VERSION_NAME4@" END END diff --git a/program_info/org.fn2006.PollyMC Source.svg b/program_info/org.unmojang.FjordLauncher Source.svg similarity index 98% rename from program_info/org.fn2006.PollyMC Source.svg rename to program_info/org.unmojang.FjordLauncher Source.svg index d09ac6eae..0e51207c9 100644 --- a/program_info/org.fn2006.PollyMC Source.svg +++ b/program_info/org.unmojang.FjordLauncher Source.svg @@ -8,7 +8,7 @@ version="1.1" id="svg99" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" - sodipodi:docname="org.fn2006.PollyMC Source.svg" + sodipodi:docname="org.unmojang.FjordLauncher Source.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/program_info/org.fn2006.PollyMC.bigsur.svg b/program_info/org.unmojang.FjordLauncher.bigsur.svg similarity index 99% rename from program_info/org.fn2006.PollyMC.bigsur.svg rename to program_info/org.unmojang.FjordLauncher.bigsur.svg index e3bd46154..06d7c2c81 100644 --- a/program_info/org.fn2006.PollyMC.bigsur.svg +++ b/program_info/org.unmojang.FjordLauncher.bigsur.svg @@ -6,7 +6,7 @@ fill="none" version="1.1" id="svg1070" - sodipodi:docname="org.fn2006.PollyMC.bigsur.svg" + sodipodi:docname="org.unmojang.FjordLauncher.bigsur.svg" xml:space="preserve" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" diff --git a/program_info/org.fn2006.PollyMC.desktop.in b/program_info/org.unmojang.FjordLauncher.desktop.in similarity index 89% rename from program_info/org.fn2006.PollyMC.desktop.in rename to program_info/org.unmojang.FjordLauncher.desktop.in index fa1c44e57..c06ebb96e 100755 --- a/program_info/org.fn2006.PollyMC.desktop.in +++ b/program_info/org.unmojang.FjordLauncher.desktop.in @@ -1,12 +1,12 @@ [Desktop Entry] Version=1.0 -Name=PollyMC +Name=Fjord Launcher Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. Type=Application Terminal=false Exec=@Launcher_APP_BINARY_NAME@ %U StartupNotify=true -Icon=org.fn2006.PollyMC +Icon=org.unmojang.FjordLauncher Categories=Game;ActionGame;AdventureGame;Simulation; Keywords=game;minecraft;mc; StartupWMClass=PrismLauncher diff --git a/program_info/org.fn2006.PollyMC.metainfo.xml.in b/program_info/org.unmojang.FjordLauncher.metainfo.xml.in similarity index 76% rename from program_info/org.fn2006.PollyMC.metainfo.xml.in rename to program_info/org.unmojang.FjordLauncher.metainfo.xml.in index 6e35079fd..853e0a010 100644 --- a/program_info/org.fn2006.PollyMC.metainfo.xml.in +++ b/program_info/org.unmojang.FjordLauncher.metainfo.xml.in @@ -1,16 +1,16 @@ - org.fn2006.PollyMC - org.fn2006.PollyMC.desktop - PollyMC + org.unmojang.FjordLauncher + org.unmojang.FjordLauncher.desktop + Fjord Launcher fn2006 A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once CC0-1.0 GPL-3.0-only - https://github.com/fn2006/PollyMC - https://github.com/fn2006/PollyMC/issues + https://github.com/unmojang/FjordLauncher + https://github.com/unmojang/FjordLauncher/issues -

PollyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.

+

Fjord Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.

Features:

  • Easily install game modifications, such as Fabric, Forge and Quilt
    • diff --git a/program_info/org.fn2006.PollyMC.svg b/program_info/org.unmojang.FjordLauncher.svg similarity index 98% rename from program_info/org.fn2006.PollyMC.svg rename to program_info/org.unmojang.FjordLauncher.svg index 64f8da749..77fb9a484 100644 --- a/program_info/org.fn2006.PollyMC.svg +++ b/program_info/org.unmojang.FjordLauncher.svg @@ -8,7 +8,7 @@ version="1.1" id="svg99" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" - sodipodi:docname="org.fn2006.PollyMC.svg" + sodipodi:docname="org.unmojang.FjordLauncher.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/program_info/prismlauncher.qrc b/program_info/prismlauncher.qrc index 44558322a..8702f3eca 100644 --- a/program_info/prismlauncher.qrc +++ b/program_info/prismlauncher.qrc @@ -1,6 +1,6 @@ - org.fn2006.PollyMC.svg + org.unmojang.FjordLauncher.svg