From 722194405a8333a70b44cc204dabc8a590a6b3fd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 18 Oct 2022 09:01:48 +0200 Subject: [PATCH] refactor: initial rebrand Signed-off-by: Sefa Eyeoglu --- .gitmodules | 6 +-- BUILD.md | 4 +- CMakeLists.txt | 30 +++++------ CODE_OF_CONDUCT.md | 2 +- buildconfig/BuildConfig.h | 4 +- flake.lock | 16 +++--- flake.nix | 8 +-- launcher/Application.cpp | 2 +- launcher/java/JavaUtils.cpp | 2 +- launcher/main.cpp | 2 +- launcher/ui/pages/global/LauncherPage.cpp | 2 +- launcher/ui/pages/modplatform/ImportPage.ui | 2 +- .../ui/pages/modplatform/flame/FlamePage.ui | 2 +- nix/default.nix | 14 ++--- program_info/CMakeLists.txt | 44 ++++++++-------- program_info/README.md | 4 +- program_info/genicons.sh | 48 +++++++++--------- ...rg.prismlauncher.PrismLauncher.Source.svg} | 0 ...rg.prismlauncher.PrismLauncher.bigsur.svg} | 0 ...rg.prismlauncher.PrismLauncher.desktop.in} | 6 +-- ...ismlauncher.PrismLauncher.metainfo.xml.in} | 30 +++++------ ...vg => org.prismlauncher.PrismLauncher.svg} | 0 ...ack.svg => prismlauncher-header-black.svg} | 0 ...ce.svg => prismlauncher-header.Source.svg} | 0 ...mc-header.svg => prismlauncher-header.svg} | 0 .../{polymc.6.scd => prismlauncher.6.scd} | 0 .../{polymc.icns => prismlauncher.icns} | Bin .../{polymc.ico => prismlauncher.ico} | Bin ....manifest.in => prismlauncher.manifest.in} | 2 +- .../{polymc.qrc => prismlauncher.qrc} | 2 +- .../{polymc.rc.in => prismlauncher.rc.in} | 10 ++-- 31 files changed, 121 insertions(+), 121 deletions(-) rename program_info/{org.polymc.PolyMC.Source.svg => org.prismlauncher.PrismLauncher.Source.svg} (100%) rename program_info/{org.polymc.PolyMC.bigsur.svg => org.prismlauncher.PrismLauncher.bigsur.svg} (100%) rename program_info/{org.polymc.PolyMC.desktop.in => org.prismlauncher.PrismLauncher.desktop.in} (76%) rename program_info/{org.polymc.PolyMC.metainfo.xml.in => org.prismlauncher.PrismLauncher.metainfo.xml.in} (55%) rename program_info/{org.polymc.PolyMC.svg => org.prismlauncher.PrismLauncher.svg} (100%) rename program_info/{polymc-header-black.svg => prismlauncher-header-black.svg} (100%) rename program_info/{polymc-header.Source.svg => prismlauncher-header.Source.svg} (100%) rename program_info/{polymc-header.svg => prismlauncher-header.svg} (100%) rename program_info/{polymc.6.scd => prismlauncher.6.scd} (100%) rename program_info/{polymc.icns => prismlauncher.icns} (100%) rename program_info/{polymc.ico => prismlauncher.ico} (100%) rename program_info/{polymc.manifest.in => prismlauncher.manifest.in} (92%) rename program_info/{polymc.qrc => prismlauncher.qrc} (60%) rename program_info/{polymc.rc.in => prismlauncher.rc.in} (66%) diff --git a/.gitmodules b/.gitmodules index efd5de29..d620faab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "depends/libnbtplusplus"] - path = libraries/libnbtplusplus - url = https://github.com/PolyMC/libnbtplusplus.git [submodule "libraries/quazip"] path = libraries/quazip url = https://github.com/stachenov/quazip.git @@ -10,3 +7,6 @@ [submodule "libraries/filesystem"] path = libraries/filesystem url = https://github.com/gulrak/filesystem +[submodule "libraries/libnbtplusplus"] + path = libraries/libnbtplusplus + url = https://github.com/PlaceholderMC/libnbtplusplus.git diff --git a/BUILD.md b/BUILD.md index 8a76b68b..4d9fb76f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,5 +1,5 @@ # Build Instructions -Build instructions are available on [the website](https://polymc.org/wiki/development/build-instructions/). +Build instructions are available on [the website](https://prismlauncher.org/wiki/development/build-instructions/). -If you would like to contribute or fix an issue with the Build instructions you can do so [here](https://github.com/PolyMC/polymc.github.io/blob/master/src/wiki/development/build-instructions.md). +If you would like to contribute or fix an issue with the Build instructions you can do so [here](https://github.com/PlaceholderMC/website/blob/master/src/wiki/development/build-instructions.md). diff --git a/CMakeLists.txt b/CMakeLists.txt index caecddbd..8b3f0251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,9 +71,9 @@ endif() ##################################### Set Application options ##################################### ######## Set URLs ######## -set(Launcher_NEWS_RSS_URL "https://polymc.org/feed/feed.xml" CACHE STRING "URL to fetch PolyMC's news RSS feed from.") -set(Launcher_NEWS_OPEN_URL "https://polymc.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'") -set(Launcher_HELP_URL "https://polymc.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help") +set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch PrismLauncher's news RSS feed from.") +set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'") +set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help") ######## Set version numbers ######## set(Launcher_VERSION_MAJOR 5) @@ -90,25 +90,25 @@ set(Launcher_BUILD_PLATFORM "" CACHE STRING "A short string identifying the plat set(Launcher_UPDATER_BASE "" CACHE STRING "Base URL for the updater.") # The metadata server -set(Launcher_META_URL "https://meta.polymc.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.") +set(Launcher_META_URL "https://meta.prismlauncher.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.") # Imgur API Client ID 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/PolyMC/PolyMC/issues" CACHE STRING "URL for the bug tracker.") +set(Launcher_BUG_TRACKER_URL "https://github.com/PrismLauncher/PrismLauncher/issues" CACHE STRING "URL for the bug tracker.") # Translations Platform URL -set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/polymc/polymc/" CACHE STRING "URL for the translations platform.") +set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/prismlauncher/" CACHE STRING "URL for the translations platform.") # Matrix Space -set(Launcher_MATRIX_URL "https://matrix.to/#/#polymc:matrix.org" CACHE STRING "URL to the Matrix Space") +set(Launcher_MATRIX_URL "https://matrix.to/#/#prismlauncher:matrix.org" CACHE STRING "URL to the Matrix Space") # Discord URL -set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.") +set(Launcher_DISCORD_URL "https://discord.gg/prismlauncher" CACHE STRING "URL for the Discord guild.") # Subreddit URL -set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PolyMCLauncher/" CACHE STRING "URL for the subreddit.") +set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PrismLauncher/" CACHE STRING "URL for the subreddit.") # Builds set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules") @@ -123,12 +123,12 @@ set(Launcher_QT_VERSION_MAJOR "5" CACHE STRING "Major Qt version to build agains # By using this key in your builds you accept the terms of use laid down in # https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use -set(Launcher_MSA_CLIENT_ID "549033b2-1532-4d4e-ae77-1bbaa46f9d74" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application") +set(Launcher_MSA_CLIENT_ID "" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application") # By using this key in your builds you accept the terms and conditions laid down in # https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions # NOTE: CurseForge requires you to change this if you make any kind of derivative work. -set(Launcher_CURSEFORGE_API_KEY "$2a$10$1Oqr2MX3O4n/ilhFGc597u8tfI3L2Hyr9/rtWDAMRjghSQV2QUuxq" CACHE STRING "API key for the CurseForge platform") +set(Launcher_CURSEFORGE_API_KEY "" CACHE STRING "API key for the CurseForge platform") #### Check the current Git commit and branch @@ -199,7 +199,7 @@ endif() ####################################### Program Info ####################################### -set(Launcher_APP_BINARY_NAME "polymc" CACHE STRING "Name of the Launcher binary") +set(Launcher_APP_BINARY_NAME "prismlauncher" CACHE STRING "Name of the Launcher binary") add_subdirectory(program_info) ####################################### Install layout ####################################### @@ -223,14 +223,14 @@ if(UNIX AND APPLE) # Mac bundle settings set(MACOSX_BUNDLE_BUNDLE_NAME "${Launcher_Name}") set(MACOSX_BUNDLE_INFO_STRING "${Launcher_Name}: A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.polymc.${Launcher_Name}") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.prismlauncher.${Launcher_Name}") set(MACOSX_BUNDLE_BUNDLE_VERSION "${Launcher_VERSION_NAME}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${Launcher_VERSION_NAME}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}") set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns) set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2021-2022 ${Launcher_Copyright}") - set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "idALcUIazingvKSSsEa9U7coDVxZVx/ORpOEE/QtJfg=") - set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://polymc.org/feed/appcast.xml") + set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "") + set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml") set(MACOSX_SPARKLE_DOWNLOAD_URL "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz" CACHE STRING "URL to Sparkle release archive") set(MACOSX_SPARKLE_SHA256 "bf6ac1caa9f8d321d5784859c88da874f28412f37fb327bc21b7b14c5d61ef94" CACHE STRING "SHA256 checksum for Sparkle release archive") diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7bbd01da..defa2170 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -63,7 +63,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement via email at -[polymc-enforcement@scrumplex.net](mailto:polymc-enforcement@scrumplex.net) (Email +[coc@scrumplex.net](mailto:coc@scrumplex.net) (Email address subject to change). All complaints will be reviewed and investigated promptly and fairly. diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index de66cec4..ef384ed2 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -140,8 +140,8 @@ class Config { QString LIBRARY_BASE = "https://libraries.minecraft.net/"; QString AUTH_BASE = "https://authserver.mojang.com/"; QString IMGUR_BASE_URL = "https://api.imgur.com/3/"; - QString FMLLIBS_BASE_URL = "https://files.polymc.org/fmllibs/"; - QString TRANSLATIONS_BASE_URL = "https://i18n.polymc.org/"; + QString FMLLIBS_BASE_URL = "https://files.prismlauncher.org/fmllibs/"; // FIXME: move into CMakeLists + QString TRANSLATIONS_BASE_URL = "https://i18n.prismlauncher.org/"; // FIXME: move into CMakeLists QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/"; diff --git a/flake.lock b/flake.lock index a72286bb..8d04df4b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,24 +21,24 @@ "locked": { "lastModified": 1650031308, "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", - "owner": "PolyMC", + "owner": "PlaceholderMC", "repo": "libnbtplusplus", "rev": "2203af7eeb48c45398139b583615134efd8d407f", "type": "github" }, "original": { - "owner": "PolyMC", + "owner": "PlaceholderMC", "repo": "libnbtplusplus", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1658119717, - "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "lastModified": 1666057921, + "narHash": "sha256-VpQqtXdj6G7cH//SvoprjR7XT3KS7p+tCVebGK1N6tE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "rev": "88eab1e431cabd0ed621428d8b40d425a07af39f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "tomlplusplus": { "flake": false, "locked": { - "lastModified": 1664034574, - "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=", + "lastModified": 1666026506, + "narHash": "sha256-YE0u5M9mfGPNTakFrNTBt4BSvJUr2gkJN41COnPMvh8=", "owner": "marzer", "repo": "tomlplusplus", - "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170", + "rev": "c8780a5b8e8d2f8ff1fd747a3a89b7becebfdee9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 93192725..c6207999 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; - libnbtplusplus = { url = "github:PolyMC/libnbtplusplus"; flake = false; }; + libnbtplusplus = { url = "github:PlaceholderMC/libnbtplusplus"; flake = false; }; tomlplusplus = { url = "github:marzer/tomlplusplus"; flake = false; }; }; @@ -23,14 +23,14 @@ pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system}); packagesFn = pkgs: rec { - polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; }; - polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; }; + prismlauncher = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; }; + prismlauncher-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; }; }; in { packages = forAllSystems (system: let packages = packagesFn pkgs.${system}; in - packages // { default = packages.polymc; } + packages // { default = packages.prismlauncher; } ); overlay = final: packagesFn; diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 968dd08e..4841ca53 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1157,7 +1157,7 @@ void Application::setIconTheme(const QString& name) QIcon Application::getThemedIcon(const QString& name) { if(name == "logo") { - return QIcon(":/org.polymc.PolyMC.svg"); + return QIcon(":/org.prismlauncher.PrismLauncher.svg"); // FIXME: Make this a BuildConfig variable } return QIcon::fromTheme(name); } diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 2f91605b..6096e812 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -174,7 +174,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava() QStringList addJavasFromEnv(QList javas) { - auto env = qEnvironmentVariable("POLYMC_JAVA_PATHS"); + auto env = qEnvironmentVariable("PRISMLAUNCHER_JAVA_PATHS"); // FIXME: use launcher name from buildconfig #if defined(Q_OS_WIN32) QList javaPaths = env.replace("\\", "/").split(QLatin1String(";")); diff --git a/launcher/main.cpp b/launcher/main.cpp index 85fe1260..c6a7614c 100644 --- a/launcher/main.cpp +++ b/launcher/main.cpp @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(multimc); Q_INIT_RESOURCE(backgrounds); Q_INIT_RESOURCE(documents); - Q_INIT_RESOURCE(polymc); + Q_INIT_RESOURCE(prismlauncher); Q_INIT_RESOURCE(pe_dark); Q_INIT_RESOURCE(pe_light); diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp index 73ef0024..1e5df5b2 100644 --- a/launcher/ui/pages/global/LauncherPage.cpp +++ b/launcher/ui/pages/global/LauncherPage.cpp @@ -151,7 +151,7 @@ void LauncherPage::on_instDirBrowseBtn_clicked() "This is known to cause problems. " "After a restart the launcher might break, " "because it will no longer have access to that directory.\n\n" - "Granting PolyMC access to it via Flatseal is recommended.")); + "Granting %1 access to it via Flatseal is recommended.").arg(BuildConfig.LAUNCHER_DISPLAYNAME)); warning.setInformativeText( tr("Do you want to proceed anyway?")); warning.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/launcher/ui/pages/modplatform/ImportPage.ui b/launcher/ui/pages/modplatform/ImportPage.ui index 0a50e871..3583cf90 100644 --- a/launcher/ui/pages/modplatform/ImportPage.ui +++ b/launcher/ui/pages/modplatform/ImportPage.ui @@ -60,7 +60,7 @@ - - PolyMC / MultiMC exported instances (ZIP) + - Prism Launcher, PolyMC or MultiMC exported instances (ZIP) Qt::AlignCenter diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.ui b/launcher/ui/pages/modplatform/flame/FlamePage.ui index aab16421..1a3d0225 100644 --- a/launcher/ui/pages/modplatform/flame/FlamePage.ui +++ b/launcher/ui/pages/modplatform/flame/FlamePage.ui @@ -19,7 +19,7 @@ - Note: CurseForge allows creators to block access to third-party tools like PolyMC. As such, you may need to manually download some mods to be able to install a modpack. + Note: CurseForge allows creators to block access to third-party tools like Prism Launcher. As such, you may need to manually download some mods to be able to install a modpack. Qt::AlignCenter diff --git a/nix/default.nix b/nix/default.nix index 19136cad..c8b4f7cc 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -38,14 +38,14 @@ let libGL ]; - # This variable will be passed to Minecraft by PolyMC + # This variable will be passed to Minecraft by Prism Launcher gameLibraryPath = libpath + ":/run/opengl-driver/lib"; javaPaths = lib.makeSearchPath "bin/java" ([ jdk jdk8 ] ++ extraJDKs); in stdenv.mkDerivation rec { - pname = "polymc"; + pname = "prismlauncher"; inherit version; src = lib.cleanSource self; @@ -77,17 +77,17 @@ stdenv.mkDerivation rec { # we have to check if the system is NixOS before adding stdenv.cc.cc.lib (#923) postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapQtApp $out/bin/polymc \ + wrapQtApp $out/bin/prismlauncher \ --run '[ -f /etc/NIXOS ] && export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"' \ --prefix LD_LIBRARY_PATH : ${gameLibraryPath} \ - --prefix POLYMC_JAVA_PATHS : ${javaPaths} \ + --prefix PRISMLAUNCHER_JAVA_PATHS : ${javaPaths} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; meta = with lib; { - homepage = "https://polymc.org/"; - downloadPage = "https://polymc.org/download/"; - changelog = "https://github.com/PolyMC/PolyMC/releases"; + homepage = "https://prismlauncher.org/"; + downloadPage = "https://prismlauncher.org/download/"; + changelog = "https://github.com/PrismLauncher/PrismLauncher/releases"; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index ac8ea6ce..4d7c224d 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -8,44 +8,44 @@ if(UNIX) endif() endif() -set(Launcher_CommonName "PolyMC") +set(Launcher_CommonName "PrismLauncher") -set(Launcher_Copyright "PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") +set(Launcher_Copyright "Prism Launcher Contributors\\n© 2012-2021 MultiMC Contributors") set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) -set(Launcher_Domain "polymc.org" PARENT_SCOPE) +set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE) set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) -set(Launcher_DisplayName "${Launcher_CommonName}" PARENT_SCOPE) +set(Launcher_DisplayName "Prism Launcher" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE) -set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE) -set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE) -set(Launcher_DesktopFileName "org.polymc.PolyMC.desktop" PARENT_SCOPE) +set(Launcher_ConfigFile "prismlauncher.cfg" PARENT_SCOPE) +set(Launcher_Git "https://github.com/PlaceholderMC/PrismLauncher" PARENT_SCOPE) +set(Launcher_DesktopFileName "org.prismlauncher.PrismLauncher.desktop" PARENT_SCOPE) -set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE) -set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE) -set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE) -set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE) -set(Launcher_Branding_ICO "program_info/polymc.ico") +set(Launcher_Desktop "program_info/org.prismlauncher.PrismLauncher.desktop" PARENT_SCOPE) +set(Launcher_MetaInfo "program_info/org.prismlauncher.PrismLauncher.metainfo.xml" PARENT_SCOPE) +set(Launcher_SVG "program_info/org.prismlauncher.PrismLauncher.svg" PARENT_SCOPE) +set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE) +set(Launcher_Branding_ICO "program_info/prismlauncher.ico") set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE) -set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE) -set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE) +set(Launcher_Branding_WindowsRC "program_info/prismlauncher.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.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop) -configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml) -configure_file(polymc.rc.in polymc.rc @ONLY) -configure_file(polymc.manifest.in polymc.manifest @ONLY) -configure_file(polymc.ico polymc.ico COPYONLY) +configure_file(org.prismlauncher.PrismLauncher.desktop.in org.prismlauncher.PrismLauncher.desktop) +configure_file(org.prismlauncher.PrismLauncher.metainfo.xml.in org.prismlauncher.PrismLauncher.metainfo.xml) +configure_file(prismlauncher.rc.in prismlauncher.rc @ONLY) +configure_file(prismlauncher.manifest.in prismlauncher.manifest @ONLY) +configure_file(prismlauncher.ico prismlauncher.ico COPYONLY) configure_file(win_install.nsi.in win_install.nsi @ONLY) if(SCDOC_FOUND) - set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/polymc.6.scd") - set(out_man "${CMAKE_CURRENT_BINARY_DIR}/polymc.6") + set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/prismlauncher.6.scd") + set(out_man "${CMAKE_CURRENT_BINARY_DIR}/prismlauncher.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/polymc.6" PARENT_SCOPE) + set(Launcher_ManPage "program_info/prismlauncher.6" PARENT_SCOPE) endif() diff --git a/program_info/README.md b/program_info/README.md index 421ef1f9..8fc81a19 100644 --- a/program_info/README.md +++ b/program_info/README.md @@ -1,6 +1,6 @@ -# PolyMC Program Info +# PrismLauncher Program Info -This is PolyMC's program info which contains information about: +This is PrismLauncher's program info which contains information about: - Application name and logo (and branding in general) - Various URLs and API endpoints diff --git a/program_info/genicons.sh b/program_info/genicons.sh index 313bdb53..bfe756d8 100755 --- a/program_info/genicons.sh +++ b/program_info/genicons.sh @@ -2,38 +2,38 @@ # ICO -inkscape -w 16 -h 16 -o polymc_16.png org.polymc.PolyMC.svg -inkscape -w 24 -h 24 -o polymc_24.png org.polymc.PolyMC.svg -inkscape -w 32 -h 32 -o polymc_32.png org.polymc.PolyMC.svg -inkscape -w 48 -h 48 -o polymc_48.png org.polymc.PolyMC.svg -inkscape -w 64 -h 64 -o polymc_64.png org.polymc.PolyMC.svg -inkscape -w 128 -h 128 -o polymc_128.png org.polymc.PolyMC.svg +inkscape -w 16 -h 16 -o prismlauncher_16.png org.prismlauncher.PrismLauncher.svg +inkscape -w 24 -h 24 -o prismlauncher_24.png org.prismlauncher.PrismLauncher.svg +inkscape -w 32 -h 32 -o prismlauncher_32.png org.prismlauncher.PrismLauncher.svg +inkscape -w 48 -h 48 -o prismlauncher_48.png org.prismlauncher.PrismLauncher.svg +inkscape -w 64 -h 64 -o prismlauncher_64.png org.prismlauncher.PrismLauncher.svg +inkscape -w 128 -h 128 -o prismlauncher_128.png org.prismlauncher.PrismLauncher.svg -convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico +convert prismlauncher_128.png prismlauncher_64.png prismlauncher_48.png prismlauncher_32.png prismlauncher_24.png prismlauncher_16.png prismlauncher.ico -rm -f polymc_*.png +rm -f prismlauncher_*.png -inkscape -w 1024 -h 1024 -o polymc_1024.png org.polymc.PolyMC.bigsur.svg +inkscape -w 1024 -h 1024 -o prismlauncher_1024.png org.prismlauncher.PrismLauncher.bigsur.svg -mkdir polymc.iconset +mkdir prismlauncher.iconset -sips -z 16 16 polymc_1024.png --out polymc.iconset/icon_16x16.png -sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_16x16@2x.png -sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_32x32.png -sips -z 64 64 polymc_1024.png --out polymc.iconset/icon_32x32@2x.png -sips -z 128 128 polymc_1024.png --out polymc.iconset/icon_128x128.png -sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_128x128@2x.png -sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_256x256.png -sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_256x256@2x.png -sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_512x512.png -cp polymc_1024.png polymc.iconset/icon_512x512@2x.png +sips -z 16 16 prismlauncher_1024.png --out prismlauncher.iconset/icon_16x16.png +sips -z 32 32 prismlauncher_1024.png --out prismlauncher.iconset/icon_16x16@2x.png +sips -z 32 32 prismlauncher_1024.png --out prismlauncher.iconset/icon_32x32.png +sips -z 64 64 prismlauncher_1024.png --out prismlauncher.iconset/icon_32x32@2x.png +sips -z 128 128 prismlauncher_1024.png --out prismlauncher.iconset/icon_128x128.png +sips -z 256 256 prismlauncher_1024.png --out prismlauncher.iconset/icon_128x128@2x.png +sips -z 256 256 prismlauncher_1024.png --out prismlauncher.iconset/icon_256x256.png +sips -z 512 512 prismlauncher_1024.png --out prismlauncher.iconset/icon_256x256@2x.png +sips -z 512 512 prismlauncher_1024.png --out prismlauncher.iconset/icon_512x512.png +cp prismlauncher_1024.png prismlauncher.iconset/icon_512x512@2x.png -iconutil -c icns polymc.iconset +iconutil -c icns prismlauncher.iconset -rm -f polymc_*.png -rm -rf polymc.iconset +rm -f prismlauncher_*.png +rm -rf prismlauncher.iconset for dir in ../launcher/resources/*/scalable do - cp -v org.polymc.PolyMC.svg $dir/launcher.svg + cp -v org.prismlauncher.PrismLauncher.svg $dir/launcher.svg done diff --git a/program_info/org.polymc.PolyMC.Source.svg b/program_info/org.prismlauncher.PrismLauncher.Source.svg similarity index 100% rename from program_info/org.polymc.PolyMC.Source.svg rename to program_info/org.prismlauncher.PrismLauncher.Source.svg diff --git a/program_info/org.polymc.PolyMC.bigsur.svg b/program_info/org.prismlauncher.PrismLauncher.bigsur.svg similarity index 100% rename from program_info/org.polymc.PolyMC.bigsur.svg rename to program_info/org.prismlauncher.PrismLauncher.bigsur.svg diff --git a/program_info/org.polymc.PolyMC.desktop.in b/program_info/org.prismlauncher.PrismLauncher.desktop.in similarity index 76% rename from program_info/org.polymc.PolyMC.desktop.in rename to program_info/org.prismlauncher.PrismLauncher.desktop.in index e6d88909..63a6b586 100644 --- a/program_info/org.polymc.PolyMC.desktop.in +++ b/program_info/org.prismlauncher.PrismLauncher.desktop.in @@ -1,12 +1,12 @@ [Desktop Entry] Version=1.0 -Name=PolyMC +Name=Prism 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@ StartupNotify=true -Icon=org.polymc.PolyMC +Icon=org.prismlauncher.PrismLauncher Categories=Game; Keywords=game;minecraft;launcher;mc; -StartupWMClass=PolyMC +StartupWMClass=PrismLauncher diff --git a/program_info/org.polymc.PolyMC.metainfo.xml.in b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in similarity index 55% rename from program_info/org.polymc.PolyMC.metainfo.xml.in rename to program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in index ef5a7d93..2e10f7be 100644 --- a/program_info/org.polymc.PolyMC.metainfo.xml.in +++ b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in @@ -1,19 +1,19 @@ - org.polymc.PolyMC + org.prismlauncher.PrismLauncher - org.polymc.PolyMC + org.prismlauncher.PrismLauncher - org.polymc.PolyMC.desktop - PolyMC - PolyMC + org.prismlauncher.PrismLauncher.desktop + PrismLauncher + PrismLauncher 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://polymc.org/ - https://polymc.org/wiki/ + https://prismlauncher.org/ + https://prismlauncher.org/wiki/ -

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

+

PrismLauncher 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
    • @@ -27,28 +27,28 @@ - The main PolyMC window - https://polymc.org/img/screenshots/LauncherDark.png + The main PrismLauncher window + https://prismlauncher.org/img/screenshots/LauncherDark.png Modpack installation - https://polymc.org/img/screenshots/ModpackInstallDark.png + https://prismlauncher.org/img/screenshots/ModpackInstallDark.png Mod installation - https://polymc.org/img/screenshots/ModInstallDark.png + https://prismlauncher.org/img/screenshots/ModInstallDark.png Mod updating - https://polymc.org/img/screenshots/ModUpdateDark.png + https://prismlauncher.org/img/screenshots/ModUpdateDark.png Instance management - https://polymc.org/img/screenshots/PropertiesDark.png + https://prismlauncher.org/img/screenshots/PropertiesDark.png Cat :) - https://polymc.org/img/screenshots/LauncherCatDark.png + https://prismlauncher.org/img/screenshots/LauncherCatDark.png diff --git a/program_info/org.polymc.PolyMC.svg b/program_info/org.prismlauncher.PrismLauncher.svg similarity index 100% rename from program_info/org.polymc.PolyMC.svg rename to program_info/org.prismlauncher.PrismLauncher.svg diff --git a/program_info/polymc-header-black.svg b/program_info/prismlauncher-header-black.svg similarity index 100% rename from program_info/polymc-header-black.svg rename to program_info/prismlauncher-header-black.svg diff --git a/program_info/polymc-header.Source.svg b/program_info/prismlauncher-header.Source.svg similarity index 100% rename from program_info/polymc-header.Source.svg rename to program_info/prismlauncher-header.Source.svg diff --git a/program_info/polymc-header.svg b/program_info/prismlauncher-header.svg similarity index 100% rename from program_info/polymc-header.svg rename to program_info/prismlauncher-header.svg diff --git a/program_info/polymc.6.scd b/program_info/prismlauncher.6.scd similarity index 100% rename from program_info/polymc.6.scd rename to program_info/prismlauncher.6.scd diff --git a/program_info/polymc.icns b/program_info/prismlauncher.icns similarity index 100% rename from program_info/polymc.icns rename to program_info/prismlauncher.icns diff --git a/program_info/polymc.ico b/program_info/prismlauncher.ico similarity index 100% rename from program_info/polymc.ico rename to program_info/prismlauncher.ico diff --git a/program_info/polymc.manifest.in b/program_info/prismlauncher.manifest.in similarity index 92% rename from program_info/polymc.manifest.in rename to program_info/prismlauncher.manifest.in index b85b6d46..1d764445 100644 --- a/program_info/polymc.manifest.in +++ b/program_info/prismlauncher.manifest.in @@ -1,6 +1,6 @@ - + diff --git a/program_info/polymc.qrc b/program_info/prismlauncher.qrc similarity index 60% rename from program_info/polymc.qrc rename to program_info/prismlauncher.qrc index 9ea695de..4f326c2b 100644 --- a/program_info/polymc.qrc +++ b/program_info/prismlauncher.qrc @@ -1,6 +1,6 @@ - org.polymc.PolyMC.svg + org.prismlauncher.PrismLauncher.svg diff --git a/program_info/polymc.rc.in b/program_info/prismlauncher.rc.in similarity index 66% rename from program_info/polymc.rc.in rename to program_info/prismlauncher.rc.in index be51ad71..07f7aede 100644 --- a/program_info/polymc.rc.in +++ b/program_info/prismlauncher.rc.in @@ -3,8 +3,8 @@ #endif #include -IDI_ICON1 ICON DISCARDABLE "polymc.ico" -1 RT_MANIFEST "polymc.manifest" +IDI_ICON1 ICON DISCARDABLE "prismlauncher.ico" +1 RT_MANIFEST "prismlauncher.manifest" VS_VERSION_INFO VERSIONINFO FILEVERSION @Launcher_VERSION_NAME4_COMMA@ @@ -15,10 +15,10 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "MultiMC & PolyMC Contributors" - VALUE "FileDescription", "PolyMC" + VALUE "CompanyName", "MultiMC & Prism Launcher Contributors" + VALUE "FileDescription", "Prism Launcher" VALUE "FileVersion", "@Launcher_VERSION_NAME4@" - VALUE "ProductName", "PolyMC" + VALUE "ProductName", "Prism Launcher" VALUE "ProductVersion", "@Launcher_VERSION_NAME4@" END END