Newbyte/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Rename Package

Browse Source
This commit is contained in:
TheBrokenRail 2021-11-30 21:40:02 -05:00
parent 3259299058
commit f1520e75c5
20 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -37,7 +37,7 @@ endif()
include(cmake/util.cmake) include(cmake/util.cmake)
# Specify Variant Name # Specify Variant Name
set(MCPI_VARIANT_NAME "minecraft-pi-reborn") set(MCPI_VARIANT_NAME "minecraft-pi-reborn-legacy")
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
set(MCPI_VARIANT_NAME "${MCPI_VARIANT_NAME}-server") set(MCPI_VARIANT_NAME "${MCPI_VARIANT_NAME}-server")
else() else()

4
Dockerfile
View File

@ -1,7 +1,7 @@
FROM debian:bullseye-slim FROM debian:bullseye-slim
# Copy DEB # Copy DEB
ADD ./out/minecraft-pi-reborn-server_*_amd64.deb /root ADD ./out/minecraft-pi-reborn-legacy-server_*_amd64.deb /root
# Install # Install
RUN \ RUN \
@ -18,4 +18,4 @@ WORKDIR /data
# Setup Entrypoint # Setup Entrypoint
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["minecraft-pi-reborn-server"] CMD ["minecraft-pi-reborn-legacy-server"]

4
Jenkinsfile vendored
View File

@ -22,11 +22,11 @@ pipeline {
stage('Publish') { stage('Publish') {
steps { steps {
sh 'apt-get update && apt-get install -y docker.io' 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')]) { 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 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'
} }
} }
} }

2
README.md
View File

@ -2,7 +2,7 @@
<img alt="Start Screen" src="images/start.png"> <img alt="Start Screen" src="images/start.png">
</p> </p>
# Minecraft: Pi Edition: Reborn # Minecraft: Pi Edition: Reborn Legacy
Minecraft: Pi Edition Modding Project Minecraft: Pi Edition Modding Project
## Documentation ## Documentation

2
debian/client-amd64 vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-client Package: minecraft-pi-reborn-legacy-client
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

2
debian/client-arm64 vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-client Package: minecraft-pi-reborn-legacy-client
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

2
debian/client-armhf vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-client Package: minecraft-pi-reborn-legacy-client
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

2
debian/server-amd64 vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-server Package: minecraft-pi-reborn-legacy-server
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

2
debian/server-arm64 vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-server Package: minecraft-pi-reborn-legacy-server
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

2
debian/server-armhf vendored
View File

@ -1,4 +1,4 @@
Package: minecraft-pi-reborn-server Package: minecraft-pi-reborn-legacy-server
Version: ${VERSION} Version: ${VERSION}
Maintainer: TheBrokenRail <connor24nolan@live.com> Maintainer: TheBrokenRail <connor24nolan@live.com>
Description: Fun with Blocks Description: Fun with Blocks

6
docs/DEDICATED_SERVER.md
View File

@ -1,15 +1,15 @@
# Dedicated Server # 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. 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 ## Setup
### Debian Package ### 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 ### 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 ## Server Limitations
* Player data is not saved because of limitations with MCPE LAN worlds * Player data is not saved because of limitations with MCPE LAN worlds

4
docs/INSTALL.md
View File

@ -1,5 +1,5 @@
# Manual Installation # 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 ## Supported Distributions
* Ubuntu 20.04+ * Ubuntu 20.04+
@ -9,7 +9,7 @@
### Name Format ### Name Format
``` ```
minecraft-pi-reborn-<Variant>_X.Y.Z_<Architecture> minecraft-pi-reborn-legacy-<Variant>_X.Y.Z_<Architecture>
``` ```
### Picking A Variant ### Picking A Variant

2
docs/SOUND.md
View File

@ -1,7 +1,7 @@
# Sound # 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. 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. [^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. [^2]: This isn't a hard limit, an MCPE v0.8.1 APK would probably work, but don't rely on it.

0
launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags → launcher/client-data/lib/minecraft-pi-reborn-legacy-client/available-feature-flags
View File

10
launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop
View File

@ -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;

10
launcher/client-data/share/applications/minecraft-pi-reborn-legacy-client.desktop Executable file
View File

@ -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;

0
launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-client.png → launcher/client-data/share/icons/hicolor/scalable/apps/minecraft-pi-reborn-legacy-client.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

2
launcher/src/client/launcher.cpp
View File

@ -107,7 +107,7 @@ static void run_zenity_and_set_env(const char *env_name, std::vector<std::string
std::vector<std::string> full_command; std::vector<std::string> full_command;
full_command.push_back("zenity"); full_command.push_back("zenity");
full_command.push_back("--class"); 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()); full_command.insert(full_command.end(), command.begin(), command.end());
// Convert To C Array // Convert To C Array
const char *full_command_array[full_command.size() + 1]; const char *full_command_array[full_command.size() + 1];

2
mods/src/compat/compat.c
View File

@ -17,7 +17,7 @@
// Custom Title // Custom Title
HOOK(SDL_WM_SetCaption, void, (__attribute__((unused)) const char *title, const char *icon)) { HOOK(SDL_WM_SetCaption, void, (__attribute__((unused)) const char *title, const char *icon)) {
ensure_SDL_WM_SetCaption(); 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 // Mouse Cursor Is Always Invisible In Vanilla MCPI

2
scripts/test.sh
View File

@ -11,4 +11,4 @@ mkdir -p build/test
# Run Test # Run Test
cd build/test cd build/test
minecraft-pi-reborn-server --only-generate minecraft-pi-reborn-legacy-server --only-generate