From 61f9a329ea931845335d28a346002cf19d0d028e Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 27 Mar 2022 16:21:58 -0400 Subject: [PATCH] 2.3.3 --- VERSION | 2 +- docs/CHANGELOG.md | 4 ++ launcher/CMakeLists.txt | 17 +++++--- .../available-feature-flags | 0 ...om.thebrokenrail.MCPIRebornClient.desktop} | 6 +-- ...thebrokenrail.MCPIRebornClient.appdata.xml | 41 ++++++++++++++++++ .../com.thebrokenrail.MCPIReborn.png | Bin ...com.thebrokenrail.MCPIRebornServer.desktop | 8 ++++ ...thebrokenrail.MCPIRebornServer.appdata.xml | 38 ++++++++++++++++ scripts/generate-appimage-builder-yaml.js | 2 +- 10 files changed, 108 insertions(+), 10 deletions(-) rename launcher/{client-data => data/client}/lib/minecraft-pi-reborn-client/available-feature-flags (100%) rename launcher/{client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop => data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop} (62%) create mode 100644 launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml rename launcher/{client-data/share/icons/hicolor/scalable/apps => data}/com.thebrokenrail.MCPIReborn.png (100%) create mode 100755 launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop create mode 100644 launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml diff --git a/VERSION b/VERSION index f90b1afc0..0bee604df 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.2 +2.3.3 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f1771c714..70c7cb4fd 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +**2.3.3** +* Add More Blocks To Expanded Creative Inventory +* Add AppStream Metadata + **2.3.2** * Simplify Launch Sequence * Add More Blocks To Expanded Creative Inventory diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 734670138..f1779fb9e 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -12,13 +12,20 @@ if(BUILD_NATIVE_COMPONENTS) # Install install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}") install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}") + set(ICON_PATH "data/com.thebrokenrail.MCPIReborn.png") + set(ICON_TARGET_PATH "share/icons/hicolor/scalable/apps") if(NOT MCPI_SERVER_MODE) - install(DIRECTORY "client-data/" DESTINATION ".") - else() - set(ICON_PATH "share/icons/hicolor/scalable/apps") + install(DIRECTORY "data/client/" DESTINATION ".") install( - FILES "client-data/${ICON_PATH}/com.thebrokenrail.MCPIReborn.png" - DESTINATION "${ICON_PATH}" + FILES "${ICON_PATH}" + DESTINATION "${ICON_TARGET_PATH}" + RENAME "com.thebrokenrail.MCPIRebornClient.png" + ) + else() + install(DIRECTORY "data/server/" DESTINATION ".") + install( + FILES "${ICON_PATH}" + DESTINATION "${ICON_TARGET_PATH}" RENAME "com.thebrokenrail.MCPIRebornServer.png" ) endif() diff --git a/launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags b/launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags similarity index 100% rename from launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags rename to launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags diff --git a/launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop similarity index 62% rename from launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop rename to launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop index c05013118..3ad70d114 100755 --- a/launcher/client-data/share/applications/com.thebrokenrail.MCPIReborn.desktop +++ b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Name=Minecraft: Pi Edition: Reborn +Name=Minecraft: Pi Edition: Reborn (Client) Comment=Fun with Blocks -Icon=com.thebrokenrail.MCPIReborn +Icon=com.thebrokenrail.MCPIRebornClient StartupNotify=false StartupWMClass=Minecraft: Pi Edition: Reborn Exec=minecraft-pi-reborn-client Terminal=false Type=Application -Categories=Application;Game; +Categories=Game; diff --git a/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml new file mode 100644 index 000000000..32771f962 --- /dev/null +++ b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml @@ -0,0 +1,41 @@ + + + com.thebrokenrail.MCPIRebornClient + Minecraft: Pi Edition: Reborn (Client) + CC0-1.0 + Fun with Blocks +

Minecraft: Pi Edition Modding Project.

NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.

 + https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn + + https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png + + com.thebrokenrail.MCPIRebornClient.desktop + + com.thebrokenrail.MCPIRebornClient.desktop + + LicenseRef-proprietary + TheBrokenRail & Mojang AB + + moderate + none + none + none + none + none + none + none + none + none + none + none + none + intense + none + none + none + none + none + none + + + diff --git a/launcher/client-data/share/icons/hicolor/scalable/apps/com.thebrokenrail.MCPIReborn.png b/launcher/data/com.thebrokenrail.MCPIReborn.png similarity index 100% rename from launcher/client-data/share/icons/hicolor/scalable/apps/com.thebrokenrail.MCPIReborn.png rename to launcher/data/com.thebrokenrail.MCPIReborn.png diff --git a/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop new file mode 100755 index 000000000..623c9cb60 --- /dev/null +++ b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Minecraft: Pi Edition: Reborn (Server) +Comment=Fun with Blocks +Icon=com.thebrokenrail.MCPIRebornServer +Exec=/bin/sh -c "cd ~/.minecraft-pi && minecraft-pi-reborn-server" +Terminal=true +Type=Application +Categories=Game; diff --git a/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml new file mode 100644 index 000000000..4efe8e8e3 --- /dev/null +++ b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml @@ -0,0 +1,38 @@ + + + com.thebrokenrail.MCPIRebornServer + Minecraft: Pi Edition: Reborn (Server) + CC0-1.0 + Fun with Blocks +

Minecraft: Pi Edition Modding Project.

NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.

 + https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn + com.thebrokenrail.MCPIRebornServer.desktop + + com.thebrokenrail.MCPIRebornServer.desktop + + LicenseRef-proprietary + TheBrokenRail & Mojang AB + + moderate + none + none + none + none + none + none + none + none + none + none + none + none + intense + none + none + none + none + none + none + + + diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js index e2c1aa8c9..6698214de 100755 --- a/scripts/generate-appimage-builder-yaml.js +++ b/scripts/generate-appimage-builder-yaml.js @@ -8,7 +8,7 @@ const mode = process.argv[2]; const arch = process.argv[3]; // Data -const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : ''}`; +const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : 'Client'}`; const name = `minecraft-pi-reborn-${mode}`; const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`;