seaniedan/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues 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 176b04bf8c
commit ad94343132
20 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -30,7 +30,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()

2
Dockerfile
View File

@ -9,7 +9,7 @@ RUN \
# Copy AppImage # Copy AppImage
RUN mkdir /app RUN mkdir /app
ADD ./out/minecraft-pi-reborn-server-*-amd64.AppImage /app ADD ./out/minecraft-pi-reborn-legacy-server-*-amd64.AppImage /app
# Extract AppImage # Extract AppImage
WORKDIR /app WORKDIR /app

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

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,11 +1,11 @@
# 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/)
## Picking A Package ## Picking A Package
### 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.

6
launcher/CMakeLists.txt
View File

@ -12,21 +12,21 @@ if(BUILD_NATIVE_COMPONENTS)
# Install # Install
install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}") install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}") install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
set(ICON_PATH "data/com.thebrokenrail.MCPIReborn.png") set(ICON_PATH "data/com.thebrokenrail.MCPIRebornLegacy.png")
set(ICON_TARGET_PATH "share/icons/hicolor/scalable/apps") set(ICON_TARGET_PATH "share/icons/hicolor/scalable/apps")
if(NOT MCPI_SERVER_MODE) if(NOT MCPI_SERVER_MODE)
install(DIRECTORY "data/client/" DESTINATION ".") install(DIRECTORY "data/client/" DESTINATION ".")
install( install(
FILES "${ICON_PATH}" FILES "${ICON_PATH}"
DESTINATION "${ICON_TARGET_PATH}" DESTINATION "${ICON_TARGET_PATH}"
RENAME "com.thebrokenrail.MCPIRebornClient.png" RENAME "com.thebrokenrail.MCPIRebornLegacyClient.png"
) )
else() else()
install(DIRECTORY "data/server/" DESTINATION ".") install(DIRECTORY "data/server/" DESTINATION ".")
install( install(
FILES "${ICON_PATH}" FILES "${ICON_PATH}"
DESTINATION "${ICON_TARGET_PATH}" DESTINATION "${ICON_TARGET_PATH}"
RENAME "com.thebrokenrail.MCPIRebornServer.png" RENAME "com.thebrokenrail.MCPIRebornLegacyServer.png"
) )
endif() endif()
endif() endif()

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

10
launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
View File

@ -1,10 +0,0 @@
[Desktop Entry]
Name=Minecraft: Pi Edition: Reborn (Client)
Comment=Fun with Blocks
Icon=com.thebrokenrail.MCPIRebornClient
StartupNotify=false
StartupWMClass=Minecraft: Pi Edition: Reborn
Exec=minecraft-pi-reborn-client
Terminal=false
Type=Application
Categories=Game;

10
launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornLegacyClient.desktop Executable file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=Minecraft: Pi Edition: Reborn Legacy (Client)
Comment=Fun with Blocks
Icon=com.thebrokenrail.MCPIRebornLegacyClient
StartupNotify=false
StartupWMClass=Minecraft: Pi Edition: Reborn Legacy
Exec=minecraft-pi-reborn-legacy-client
Terminal=false
Type=Application
Categories=Game;

12
launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml → launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornLegacyClient.appdata.xml
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop"> <component type="desktop">
<id>com.thebrokenrail.MCPIRebornClient</id> <id>com.thebrokenrail.MCPIRebornLegacyClient</id>
<name>Minecraft: Pi Edition: Reborn (Client)</name> <name>Minecraft: Pi Edition: Reborn Legacy (Client)</name>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<summary>Fun with Blocks</summary> <summary>Fun with Blocks</summary>
<description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description> <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
<url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url> <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/src/branch/legacy</url>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png</image> <image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/legacy/images/start.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<launchable type="desktop-id">com.thebrokenrail.MCPIRebornClient.desktop</launchable> <launchable type="desktop-id">com.thebrokenrail.MCPIRebornLegacyClient.desktop</launchable>
<provides> <provides>
<id>com.thebrokenrail.MCPIRebornClient.desktop</id> <id>com.thebrokenrail.MCPIRebornLegacyClient.desktop</id>
</provides> </provides>
<project_license>LicenseRef-proprietary</project_license> <project_license>LicenseRef-proprietary</project_license>
<developer_name>TheBrokenRail &amp; Mojang AB</developer_name> <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>

0
launcher/data/com.thebrokenrail.MCPIReborn.png → launcher/data/com.thebrokenrail.MCPIRebornLegacy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

9
launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornLegacyServer.desktop Executable file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Name=Minecraft: Pi Edition: Reborn Legacy (Server)
Comment=Fun with Blocks
Icon=com.thebrokenrail.MCPIRebornLegacyServer
Exec=minecraft-pi-reborn-legacy-server
Terminal=true
Type=Application
Categories=Game;
NoDisplay=true

9
launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Minecraft: Pi Edition: Reborn (Server)
Comment=Fun with Blocks
Icon=com.thebrokenrail.MCPIRebornServer
Exec=minecraft-pi-reborn-server
Terminal=true
Type=Application
Categories=Game;
NoDisplay=true

10
launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml → launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornLegacyServer.appdata.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop"> <component type="desktop">
<id>com.thebrokenrail.MCPIRebornServer</id> <id>com.thebrokenrail.MCPIRebornLegacyServer</id>
<name>Minecraft: Pi Edition: Reborn (Server)</name> <name>Minecraft: Pi Edition: Reborn Legacy (Server)</name>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<summary>Fun with Blocks</summary> <summary>Fun with Blocks</summary>
<description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description> <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
<url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url> <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/src/branch/legacy</url>
<launchable type="desktop-id">com.thebrokenrail.MCPIRebornServer.desktop</launchable> <launchable type="desktop-id">com.thebrokenrail.MCPIRebornLegacyServer.desktop</launchable>
<provides> <provides>
<id>com.thebrokenrail.MCPIRebornServer.desktop</id> <id>com.thebrokenrail.MCPIRebornLegacyServer.desktop</id>
</provides> </provides>
<project_license>LicenseRef-proprietary</project_license> <project_license>LicenseRef-proprietary</project_license>
<developer_name>TheBrokenRail &amp; Mojang AB</developer_name> <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>

2
libreborn/include/libreborn/config.h
View File

@ -1,3 +1,3 @@
#pragma once #pragma once
#define GUI_TITLE "Minecraft: Pi Edition: Reborn" #define GUI_TITLE "Minecraft: Pi Edition: Reborn Legacy"

6
scripts/generate-appimage-builder-yaml.js
View File

@ -8,9 +8,9 @@ const mode = process.argv[2];
const arch = process.argv[3]; const arch = process.argv[3];
// Data // Data
const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : 'Client'}`; const id = `com.thebrokenrail.MCPIRebornLegacy${mode === 'server' ? 'Server' : 'Client'}`;
const name = `minecraft-pi-reborn-${mode}`; const name = `minecraft-pi-reborn-legacy-${mode}`;
const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`; const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`;
// APT Data // APT Data
const apt_distribution = 'bullseye'; const apt_distribution = 'bullseye';

2
scripts/package.sh
View File

@ -9,4 +9,4 @@ set -e
appimage-builder --recipe AppImageBuilder.yml appimage-builder --recipe AppImageBuilder.yml
# Move ZSync # Move ZSync
mv "./minecraft-pi-reborn-$1-$(cat VERSION)-$2.AppImage.zsync" "./out/minecraft-pi-reborn-$1-latest-$2.AppImage.zsync" mv "./minecraft-pi-reborn-legacy-$1-$(cat VERSION)-$2.AppImage.zsync" "./out/minecraft-pi-reborn-legacy-$1-latest-$2.AppImage.zsync"

2
scripts/test.sh
View File

@ -15,4 +15,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