From f1520e75c5405e8260c688320fb6d403cca513f1 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 30 Nov 2021 21:40:02 -0500 Subject: [PATCH] Rename Package --- CMakeLists.txt | 2 +- Dockerfile | 4 ++-- Jenkinsfile | 4 ++-- README.md | 2 +- debian/client-amd64 | 2 +- debian/client-arm64 | 2 +- debian/client-armhf | 2 +- debian/server-amd64 | 2 +- debian/server-arm64 | 2 +- debian/server-armhf | 2 +- docs/DEDICATED_SERVER.md | 6 +++--- docs/INSTALL.md | 4 ++-- docs/SOUND.md | 2 +- .../available-feature-flags | 0 .../applications/minecraft-pi-reborn-client.desktop | 10 ---------- .../minecraft-pi-reborn-legacy-client.desktop | 10 ++++++++++ ...nt.png => minecraft-pi-reborn-legacy-client.png} | Bin launcher/src/client/launcher.cpp | 2 +- mods/src/compat/compat.c | 2 +- scripts/test.sh | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) rename launcher/client-data/lib/{minecraft-pi-reborn-client => minecraft-pi-reborn-legacy-client}/available-feature-flags (100%) delete mode 100755 launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop create mode 100755 launcher/client-data/share/applications/minecraft-pi-reborn-legacy-client.desktop rename launcher/client-data/share/icons/hicolor/scalable/apps/{minecraft-pi-reborn-client.png => minecraft-pi-reborn-legacy-client.png} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfe9097e..80b44691 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ endif() include(cmake/util.cmake) # Specify Variant Name -set(MCPI_VARIANT_NAME "minecraft-pi-reborn") +set(MCPI_VARIANT_NAME "minecraft-pi-reborn-legacy") if(MCPI_SERVER_MODE) set(MCPI_VARIANT_NAME "${MCPI_VARIANT_NAME}-server") else() diff --git a/Dockerfile b/Dockerfile index 96baa5f7..1f7fc6dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim # Copy DEB -ADD ./out/minecraft-pi-reborn-server_*_amd64.deb /root +ADD ./out/minecraft-pi-reborn-legacy-server_*_amd64.deb /root # Install RUN \ @@ -18,4 +18,4 @@ WORKDIR /data # Setup Entrypoint ENTRYPOINT ["/usr/bin/tini", "--"] -CMD ["minecraft-pi-reborn-server"] +CMD ["minecraft-pi-reborn-legacy-server"] diff --git a/Jenkinsfile b/Jenkinsfile index 6072b6a3..63fa4fbb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,11 +22,11 @@ pipeline { stage('Publish') { steps { sh 'apt-get update && apt-get install -y docker.io' - sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-server .' + sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-legacy-server .' withCredentials([usernamePassword(credentialsId: 'docker_hub_login', usernameVariable: 'DOCKER_HUB_USERNAME', passwordVariable: 'DOCKER_HUB_PASSWORD')]) { sh 'docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"' } - sh 'docker push thebrokenrail/minecraft-pi-reborn-server' + sh 'docker push thebrokenrail/minecraft-pi-reborn-legacy-server' } } } diff --git a/README.md b/README.md index c5b0efeb..39c4ac4d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Start Screen

-# Minecraft: Pi Edition: Reborn +# Minecraft: Pi Edition: Reborn Legacy Minecraft: Pi Edition Modding Project ## Documentation diff --git a/debian/client-amd64 b/debian/client-amd64 index ae126547..91c7cdf1 100644 --- a/debian/client-amd64 +++ b/debian/client-amd64 @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-client +Package: minecraft-pi-reborn-legacy-client Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/debian/client-arm64 b/debian/client-arm64 index d89a362a..e5ec3763 100644 --- a/debian/client-arm64 +++ b/debian/client-arm64 @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-client +Package: minecraft-pi-reborn-legacy-client Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/debian/client-armhf b/debian/client-armhf index 7d98f969..32ab6ba1 100644 --- a/debian/client-armhf +++ b/debian/client-armhf @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-client +Package: minecraft-pi-reborn-legacy-client Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/debian/server-amd64 b/debian/server-amd64 index 4ef2278f..4b78dde8 100644 --- a/debian/server-amd64 +++ b/debian/server-amd64 @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-server +Package: minecraft-pi-reborn-legacy-server Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/debian/server-arm64 b/debian/server-arm64 index 5bd4d13f..f5076cde 100644 --- a/debian/server-arm64 +++ b/debian/server-arm64 @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-server +Package: minecraft-pi-reborn-legacy-server Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/debian/server-armhf b/debian/server-armhf index 697b4ec3..f08108d2 100644 --- a/debian/server-armhf +++ b/debian/server-armhf @@ -1,4 +1,4 @@ -Package: minecraft-pi-reborn-server +Package: minecraft-pi-reborn-legacy-server Version: ${VERSION} Maintainer: TheBrokenRail Description: Fun with Blocks diff --git a/docs/DEDICATED_SERVER.md b/docs/DEDICATED_SERVER.md index 0720e6d3..ba1564a2 100644 --- a/docs/DEDICATED_SERVER.md +++ b/docs/DEDICATED_SERVER.md @@ -1,15 +1,15 @@ # Dedicated Server The dedicated server is a version of Minecraft: Pi Edition modified to run in a headless environment. It loads settings from a ``server.properties`` file. -This server is also compatible with MCPE Alpha v0.6.1. +This server is also compatible with MCPE Alpha v0.5.0. ## Setup ### Debian Package -To use, install and run ``minecraft-pi-reborn-server``. It will generate the world and ``server.properties`` in the current directory. +To use, install and run ``minecraft-pi-reborn-legacy-server``. It will generate the world and ``server.properties`` in the current directory. ### Docker Image -An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-server). +An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-legacy-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-legacy-server). ## Server Limitations * Player data is not saved because of limitations with MCPE LAN worlds diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 1d63d43f..d0692a66 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -1,5 +1,5 @@ # Manual Installation -[Download Packages Here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/) +[Download Packages Here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/) ## Supported Distributions * Ubuntu 20.04+ @@ -9,7 +9,7 @@ ### Name Format ``` -minecraft-pi-reborn-_X.Y.Z_ +minecraft-pi-reborn-legacy-_X.Y.Z_ ``` ### Picking A Variant diff --git a/docs/SOUND.md b/docs/SOUND.md index f438a1d8..4d5b020f 100644 --- a/docs/SOUND.md +++ b/docs/SOUND.md @@ -1,7 +1,7 @@ # Sound One of MCPI-Reborn's main modifications is a sound-engine since MCPI doesn't include one by default[^1]. However, it can't be used out-of-box because MCPI doesn't contain any sound data and MCPI-Reborn can't include it because of copyright. -MCPE's sound data can be extracted from any MCPE v0.6.1[^2] APK file, just place its `libminecraftpe.so` into `~/.minecraft-pi/overrides` and you should have sound! +MCPE's sound data can be extracted from any MCPE v0.5.0[^2] APK file, just place its `libminecraftpe.so` into `~/.minecraft-pi/overrides` and you should have sound! [^1]: The mute button is just leftover code from MCPE, it doesn't actually do anything in un-modded MCPI, however it is connected to MCPI-Reborn's sound-engine. [^2]: This isn't a hard limit, an MCPE v0.8.1 APK would probably work, but don't rely on it. diff --git a/launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags b/launcher/client-data/lib/minecraft-pi-reborn-legacy-client/available-feature-flags similarity index 100% rename from launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags rename to launcher/client-data/lib/minecraft-pi-reborn-legacy-client/available-feature-flags diff --git a/launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop b/launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop deleted file mode 100755 index 2a809dab..00000000 --- a/launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Minecraft: Pi Edition: Reborn -Comment=Fun with Blocks -Icon=minecraft-pi-reborn-client -StartupNotify=false -StartupWMClass=Minecraft: Pi Edition: Reborn -Exec=minecraft-pi-reborn-client -Terminal=false -Type=Application -Categories=Application;Game; diff --git a/launcher/client-data/share/applications/minecraft-pi-reborn-legacy-client.desktop b/launcher/client-data/share/applications/minecraft-pi-reborn-legacy-client.desktop new file mode 100755 index 00000000..ca196ea5 --- /dev/null +++ b/launcher/client-data/share/applications/minecraft-pi-reborn-legacy-client.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Minecraft: Pi Edition: Reborn Legacy +Comment=Fun with Blocks +Icon=minecraft-pi-reborn-legacy-client +StartupNotify=false +StartupWMClass=Minecraft: Pi Edition: Reborn Legacy +Exec=minecraft-pi-reborn-legacy-client +Terminal=false +Type=Application +Categories=Application;Game; diff --git a/launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-client.png b/launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-legacy-client.png similarity index 100% rename from launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-client.png rename to launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-legacy-client.png diff --git a/launcher/src/client/launcher.cpp b/launcher/src/client/launcher.cpp index e4d67239..b927ba7a 100644 --- a/launcher/src/client/launcher.cpp +++ b/launcher/src/client/launcher.cpp @@ -107,7 +107,7 @@ static void run_zenity_and_set_env(const char *env_name, std::vector full_command; full_command.push_back("zenity"); full_command.push_back("--class"); - full_command.push_back("Minecraft: Pi Edition: Reborn"); + full_command.push_back("Minecraft: Pi Edition: Reborn Legacy"); full_command.insert(full_command.end(), command.begin(), command.end()); // Convert To C Array const char *full_command_array[full_command.size() + 1]; diff --git a/mods/src/compat/compat.c b/mods/src/compat/compat.c index 511c436e..f4cb5af4 100644 --- a/mods/src/compat/compat.c +++ b/mods/src/compat/compat.c @@ -17,7 +17,7 @@ // Custom Title HOOK(SDL_WM_SetCaption, void, (__attribute__((unused)) const char *title, const char *icon)) { ensure_SDL_WM_SetCaption(); - (*real_SDL_WM_SetCaption)("Minecraft: Pi Edition: Reborn", icon); + (*real_SDL_WM_SetCaption)("Minecraft: Pi Edition: Reborn Legacy", icon); } // Mouse Cursor Is Always Invisible In Vanilla MCPI diff --git a/scripts/test.sh b/scripts/test.sh index 75407580..2bc32a68 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -11,4 +11,4 @@ mkdir -p build/test # Run Test cd build/test -minecraft-pi-reborn-server --only-generate +minecraft-pi-reborn-legacy-server --only-generate