dimaguy/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Pull Requests Activity

Rename Package

Browse Source
This commit is contained in:
TheBrokenRail 2021-11-30 21:40:02 -05:00
parent a30eeba2fd
commit 51c12db49c
14 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -39,7 +39,7 @@ if(NOT MCPI_HEADLESS_MODE)
endif() endif()
# App ID # App ID
set(DEFAULT_APP_ID "com.thebrokenrail.MCPIReborn") set(DEFAULT_APP_ID "com.thebrokenrail.MCPIRebornLegacy")
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
string(APPEND DEFAULT_APP_ID "Server") string(APPEND DEFAULT_APP_ID "Server")
else() else()
@ -48,7 +48,7 @@ endif()
set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID") set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID")
# App Title # App Title
set(MCPI_APP_BASE_TITLE "Minecraft: Pi Edition: Reborn" CACHE STRING "Base App Title") set(MCPI_APP_BASE_TITLE "Minecraft: Pi Edition: Reborn Legacy" CACHE STRING "Base App Title")
set(DEFAULT_APP_TITLE "${MCPI_APP_BASE_TITLE}") set(DEFAULT_APP_TITLE "${MCPI_APP_BASE_TITLE}")
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
string(APPEND DEFAULT_APP_TITLE " (Server)") string(APPEND DEFAULT_APP_TITLE " (Server)")
@ -58,7 +58,7 @@ endif()
set(MCPI_APP_TITLE "${DEFAULT_APP_TITLE}" CACHE STRING "App Title") set(MCPI_APP_TITLE "${DEFAULT_APP_TITLE}" CACHE STRING "App Title")
# 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)
string(APPEND MCPI_VARIANT_NAME "-server") string(APPEND MCPI_VARIANT_NAME "-server")
else() else()
@ -211,7 +211,7 @@ if(BUILD_ARM_COMPONENTS)
# Compile Flags # Compile Flags
"${COMPILE_FLAGS_SETUP}\n" "${COMPILE_FLAGS_SETUP}\n"
# Log # Log
"message(STATUS \"Using Reborn SDK v${MCPI_VERSION}\")\n" "message(STATUS \"Using Reborn Legacy SDK v${MCPI_VERSION}\")\n"
# Include Targets # Include Targets
"include(\"\${CMAKE_CURRENT_LIST_DIR}/sdk-targets.cmake\")\n" "include(\"\${CMAKE_CURRENT_LIST_DIR}/sdk-targets.cmake\")\n"
) )

2
Dockerfile
View File

@ -16,4 +16,4 @@ WORKDIR /data
# Setup Entrypoint # Setup Entrypoint
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/app/usr/bin/minecraft-pi-reborn-server"] CMD ["/app/usr/bin/minecraft-pi-reborn-legacy-server"]

4
Jenkinsfile vendored
View File

@ -24,11 +24,11 @@ pipeline {
sh 'apt-get update && apt-get install -y docker.io' sh 'apt-get update && apt-get install -y docker.io'
sh 'rm -rf ./out/server-amd64' sh 'rm -rf ./out/server-amd64'
sh './scripts/build.sh server amd64' sh './scripts/build.sh server amd64'
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

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[^1]. This server is also compatible with MCPE Alpha v0.5.0[^1].
## 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

2
docs/INSTALL.md
View File

@ -1,7 +1,7 @@
# Installation # Installation
## AppImage ## AppImage
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/).
### System Requirements ### System Requirements
* Debian Buster/Ubuntu 18.04 Or Higher * Debian Buster/Ubuntu 18.04 Or Higher

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.

4
example-mods/README.md
View File

@ -8,12 +8,12 @@ This is an example of a mod that can be built using the modding SDK.
## The SDK ## The SDK
The modding SDK is a collection of exported CMake targets that allows anyone to create their own MCPI mod! The modding SDK is a collection of exported CMake targets that allows anyone to create their own MCPI mod!
The SDK is copied to ``~/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake`` whenever MCPI-Reborn is started. The SDK is copied to ``~/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake`` whenever MCPI-Reborn is started.
## How do I use this? ## How do I use this?
```sh ```sh
mkdir build mkdir build
cd build cd build
cmake .. cmake ..
cp libexpanded-creative.so ~/.minecraft-pi/mods cp libexpanded-creative.so ~/.minecraft-pi/legacy-mods
``` ```

2
example-mods/chat-commands/CMakeLists.txt
View File

@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
project(chat-commands) project(chat-commands)
# Include SDK # Include SDK
include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake") include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
# Build # Build
add_library(chat-commands SHARED chat-commands.cpp) add_library(chat-commands SHARED chat-commands.cpp)

2
example-mods/expanded-creative/CMakeLists.txt
View File

@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
project(expanded-creative) project(expanded-creative)
# Include SDK # Include SDK
include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake") include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
# Build # Build
add_library(expanded-creative SHARED expanded-creative.cpp) add_library(expanded-creative SHARED expanded-creative.cpp)

2
example-mods/recipes/CMakeLists.txt
View File

@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
project(recipes) project(recipes)
# Include SDK # Include SDK
include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake") include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
# Build # Build
add_library(recipes SHARED recipes.cpp) add_library(recipes SHARED recipes.cpp)

4
launcher/src/bootstrap.c
View File

@ -108,7 +108,7 @@ void pre_bootstrap(int argc, char *argv[]) {
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-v") == 0) { if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-v") == 0) {
// Print // Print
printf("Reborn v%s\n", MCPI_VERSION); printf("Reborn Legacy v%s\n", MCPI_VERSION);
fflush(stdout); fflush(stdout);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
@ -407,7 +407,7 @@ void bootstrap(int argc, char *argv[]) {
{ {
// Get Mods Folder // Get Mods Folder
char *mods_folder = NULL; char *mods_folder = NULL;
safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/mods/", getenv("HOME")); safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/legacy-mods/", getenv("HOME"));
// Load Mods From ./mods // Load Mods From ./mods
load(&preload, mods_folder); load(&preload, mods_folder);
// Free Mods Folder // Free Mods Folder

4
scripts/package.sh
View File

@ -3,8 +3,8 @@
set -e set -e
# Prepare # Prepare
NAME='minecraft-pi-reborn' NAME='minecraft-pi-reborn-legacy'
BRANCH='master' BRANCH='legacy'
# Build # Build
./scripts/setup.sh "$1" "$2" -DMCPI_IS_APPIMAGE_BUILD=ON ./scripts/setup.sh "$1" "$2" -DMCPI_IS_APPIMAGE_BUILD=ON

8
scripts/test.sh
View File

@ -7,7 +7,7 @@ ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
./scripts/setup.sh server "${ARCH}" ./scripts/setup.sh server "${ARCH}"
./scripts/build.sh server "${ARCH}" ./scripts/build.sh server "${ARCH}"
# Add minecraft-pi-reborn-server To PATH # Add minecraft-pi-reborn-legacy-server To PATH
export PATH="$(pwd)/out/server-$(dpkg-architecture -qDEB_BUILD_ARCH)/usr/bin:${PATH}" export PATH="$(pwd)/out/server-$(dpkg-architecture -qDEB_BUILD_ARCH)/usr/bin:${PATH}"
# Create Test Directory # Create Test Directory
@ -16,14 +16,14 @@ 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
cd ../../ cd ../../
# Build Benchmark # Build Benchmark
./scripts/setup.sh client "${ARCH}" -DMCPI_HEADLESS_MODE=ON ./scripts/setup.sh client "${ARCH}" -DMCPI_HEADLESS_MODE=ON
./scripts/build.sh client "${ARCH}" ./scripts/build.sh client "${ARCH}"
# Add minecraft-pi-reborn-client To PATH # Add minecraft-pi-reborn-legacy-client To PATH
export PATH="$(pwd)/out/client-$(dpkg-architecture -qDEB_BUILD_ARCH)/usr/bin:${PATH}" export PATH="$(pwd)/out/client-$(dpkg-architecture -qDEB_BUILD_ARCH)/usr/bin:${PATH}"
# Skip Root Check # Skip Root Check
@ -31,4 +31,4 @@ export _MCPI_SKIP_ROOT_CHECK=1
# Run Benchmark # Run Benchmark
export HOME="$(pwd)/build/test" export HOME="$(pwd)/build/test"
minecraft-pi-reborn-client --default --no-cache --benchmark minecraft-pi-reborn-legacy-client --default --no-cache --benchmark