0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism

Browse Source
This commit is contained in:
fn2006
2022-11-01 18:48:31 +00:00
parent 0f581efda5 d8044ababe
commit 44a5130926
56 changed files with 671 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
program_info/CMakeLists.txt
View File

@@ -23,9 +23,9 @@ 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_Desktop "program_info/org.fn2006.PollyMC.desktop" PARENT_SCOPE)
set(Launcher_Desktop "program_info/${Launcher_DesktopFileName}" 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_SVG "program_info/${Launcher_SVGFileName}" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE)
set(Launcher_Branding_ICO "program_info/pollymc.ico")
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)

4
program_info/README.md
View File

@@ -1,6 +1,6 @@
# PrismLauncher Program Info
# Prism Launcher Program Info
This is PrismLauncher's program info which contains information about:
This is Prism Launcher's program info which contains information about:
- Application name and logo (and branding in general)
- Various URLs and API endpoints

86
program_info/genicons.sh
View File

@@ -1,39 +1,73 @@
#/bin/bash
#!/bin/bash
# ICO
svg2png() {
input_file="$1"
output_file="$2"
width="$3"
height="$4"
inkscape -w 16 -h 16 -o pollymc_16.png org.fn2006.PollyMC.svg
inkscape -w 24 -h 24 -o pollymc_24.png org.fn2006.PollyMC.svg
inkscape -w 32 -h 32 -o pollymc_32.png org.fn2006.PollyMC.svg
inkscape -w 48 -h 48 -o pollymc_48.png org.fn2006.PollyMC.svg
inkscape -w 64 -h 64 -o pollymc_64.png org.fn2006.PollyMC.svg
inkscape -w 128 -h 128 -o pollymc_128.png org.fn2006.PollyMC.svg
inkscape -w "$width" -h "$height" -o "$output_file" "$input_file"
}
convert pollymc_128.png pollymc_64.png pollymc_48.png pollymc_32.png pollymc_24.png pollymc_16.png pollymc.ico
sipsresize() {
input_file="$1"
output_file="$2"
width="$3"
height="$4"
rm -f pollymc_*.png
sips -z "$width" "$height" "$input_file" --out "$output_file"
}
inkscape -w 1024 -h 1024 -o pollymc_1024.png org.fn2006.PollyMC.bigsur.svg
if command -v "inkscape" && command -v "icotool"; then
# Windows ICO
d=$(mktemp -d)
mkdir pollymc.iconset
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_16.png" 16 16
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_24.png" 24 24
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_32.png" 32 32
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_48.png" 48 48
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_64.png" 64 64
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_128.png" 128 128
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_256.png" 256 256
magick pollymc_1024.png -resize 16x16 pollymc.iconset/icon_16x16.png
magick pollymc_1024.png -resize 32x32 pollymc.iconset/icon_16x16@2x.png
magick pollymc_1024.png -resize 32x32 pollymc.iconset/icon_32x32.png
magick pollymc_1024.png -resize 64x64 pollymc.iconset/icon_32x32@2x.png
magick pollymc_1024.png -resize 128x128 pollymc.iconset/icon_128x128.png
magick pollymc_1024.png -resize 256x256 pollymc.iconset/icon_128x128@2x.png
magick pollymc_1024.png -resize 256x256 pollymc.iconset/icon_256x256.png
magick pollymc_1024.png -resize 512x512 pollymc.iconset/icon_256x256@2x.png
magick pollymc_1024.png -resize 512x512 pollymc.iconset/icon_512x512.png
cp pollymc_1024.png pollymc.iconset/icon_512x512@2x.png
rm prismlauncher.ico && icotool -o prismlauncher.ico -c \
"$d/prismlauncher_256.png" \
"$d/prismlauncher_128.png" \
"$d/prismlauncher_64.png" \
"$d/prismlauncher_48.png" \
"$d/prismlauncher_32.png" \
"$d/prismlauncher_24.png" \
"$d/prismlauncher_16.png"
else
echo "ERROR: Windows icons were NOT generated!" >&2
echo "ERROR: requires inkscape and icotool in PATH"
fi
icnsify -i pollymc_1024.png -o pollymc.icns
if command -v "inkscape" && command -v "sips" && command -v "iconutil"; then
# macOS ICNS
d=$(mktemp -d)
rm -f pollymc_*.png
rm -rf pollymc.iconset
d="$d/prismlauncher.iconset"
mkdir -p "$d"
svg2png org.prismlauncher.PrismLauncher.bigsur.svg "$d/icon_512x512@2x.png" 1024 1024
sipsresize "$d/icon_512x512@2.png" "$d/icon_16x16.png" 16 16
sipsresize "$d/icon_512x512@2.png" "$d/icon_16x16@2.png" 32 32
sipsresize "$d/icon_512x512@2.png" "$d/icon_32x32.png" 32 32
sipsresize "$d/icon_512x512@2.png" "$d/icon_32x32@2.png" 64 64
sipsresize "$d/icon_512x512@2.png" "$d/icon_128x128.png" 128 128
sipsresize "$d/icon_512x512@2.png" "$d/icon_128x128@2.png" 256 256
sipsresize "$d/icon_512x512@2.png" "$d/icon_256x256.png" 256 256
sipsresize "$d/icon_512x512@2.png" "$d/icon_256x256@2.png" 512 512
iconutil -c icns "$d"
else
echo "ERROR: macOS icons were NOT generated!" >&2
echo "ERROR: requires inkscape, sips and iconutil in PATH"
fi
# replace icon in themes
for dir in ../launcher/resources/*/scalable
do
cp -v org.fn2006.PollyMC.svg $dir/launcher.svg
cp -v org.prismlauncher.PrismLauncher.svg "$dir/launcher.svg"
done

4
program_info/org.prismlauncher.PrismLauncher.desktop.in
View File

@@ -7,6 +7,6 @@ Terminal=false
Exec=@Launcher_APP_BINARY_NAME@
StartupNotify=true
Icon=org.prismlauncher.PrismLauncher
Categories=Game;
Keywords=game;minecraft;launcher;mc;
Categories=Game;ActionGame;AdventureGame;Simulation;
Keywords=game;minecraft;launcher;mc;multimc;polymc;
StartupWMClass=PrismLauncher

20
program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
View File

@@ -1,33 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>org.prismlauncher.PrismLauncher</id>
<provides>
<id>org.prismlauncher.PrismLauncher</id>
</provides>
<launchable type="desktop-id">org.prismlauncher.PrismLauncher.desktop</launchable>
<name>PrismLauncher</name>
<developer_name>PrismLauncher</developer_name>
<name>Prism Launcher</name>
<developer_name>Prism Launcher Contributors</developer_name>
<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>
<project_license>GPL-3.0-only</project_license>
<url type="homepage">https://prismlauncher.org/</url>
<url type="help">https://prismlauncher.org/wiki/</url>
<url type="bugtracker">https://github.com/PrismLauncher/PrismLauncher/issues</url>
<url type="contact">https://discord.gg/prismlauncher</url>
<url type="vcs-browser">https://github.com/PrismLauncher/PrismLauncher</url>
<url type="contribute">https://github.com/PrismLauncher/PrismLauncher/blob/develop/CONTRIBUTING.md</url>
<url type="translate">https://hosted.weblate.org/projects/prismlauncher/launcher</url>
<description>
<p>PrismLauncher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
<p>Prism Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
<p>Features:</p>
<ul>
<li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
<li>Control your java settings</li>
<li>Control your Java settings</li>
<li>Manage worlds and resource packs from the launcher</li>
<li>See logs and other details easily</li>
<li>Kill Minecraft in case of a crash/freeze</li>
<li>Isolate minecraft instances to keep everything clean</li>
<li>Isolate Minecraft instances to keep everything clean</li>
<li>Install and update mods directly from the launcher</li>
</ul>
</description>
<screenshots>
<screenshot type="default">
<caption>The main PrismLauncher window</caption>
<caption>The main Prism Launcher window</caption>
<image type="source" width="976" height="764">https://prismlauncher.org/img/screenshots/LauncherDark.png</image>
</screenshot>
<screenshot>

BIN
program_info/prismlauncher.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 364 KiB

2
program_info/prismlauncher.manifest.in
View File

@@ -10,7 +10,7 @@
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
</dependentAssembly>
</dependency>
<description>Custom Minecraft launcher for managing multiple installs.</description>

4
program_info/win_install.nsi.in
View File

@@ -4,7 +4,7 @@
Unicode true
Name "@Launcher_CommonName@"
Name "@Launcher_DisplayName@"
InstallDir "$LOCALAPPDATA\Programs\@Launcher_CommonName@"
InstallDirRegKey HKCU "Software\@Launcher_CommonName@" "InstallDir"
RequestExecutionLevel user
@@ -113,7 +113,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
;--------------------------------
; The stuff to install
Section "@Launcher_CommonName@"
Section "@Launcher_DisplayName@"
SectionIn RO