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

Use stderr

Browse Source
This commit is contained in:
TheBrokenRail 2020-10-10 19:39:29 -04:00
parent f588300da2
commit b607356c86
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/client/usr/bin/minecraft-pi vendored
View File

@ -28,7 +28,7 @@ xhost local:root
# Launch Minecraft # Launch Minecraft
DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/client/docker-compose.yml" DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/client/docker-compose.yml"
(${DOCKER_COMPOSE} pull || :) | zenity --class 'Minecraft - Pi edition' --progress --pulsate --no-cancel --auto-close --text 'Updating Minecraft...' (${DOCKER_COMPOSE} pull || :) | zenity --class 'Minecraft - Pi edition' --progress --pulsate --no-cancel --auto-close --text 'Updating Minecraft...'
${DOCKER_COMPOSE} run --rm minecraft-pi || : ${DOCKER_COMPOSE} run --rm -T minecraft-pi || :
# Kill VirGL # Kill VirGL
kill "${VIRGL_PID}" kill "${VIRGL_PID}"

2
debian/server/usr/bin/minecraft-pi-server vendored
View File

@ -7,4 +7,4 @@ export MCPI_ROOT="${PWD}"
# Launch Minecraft # Launch Minecraft
DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/server/docker-compose.yml" DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/server/docker-compose.yml"
${DOCKER_COMPOSE} pull || : ${DOCKER_COMPOSE} pull || :
${DOCKER_COMPOSE} run --rm minecraft-pi ${DOCKER_COMPOSE} run --rm -T minecraft-pi

6
mods/src/server/server.cpp
View File

@ -35,7 +35,7 @@ static ProgressScreen_t ProgressScreen = (ProgressScreen_t) 0x37044;
typedef void (*Minecraft_setScreen_t)(unsigned char *minecraft, unsigned char *screen); typedef void (*Minecraft_setScreen_t)(unsigned char *minecraft, unsigned char *screen);
static Minecraft_setScreen_t Minecraft_setScreen = (Minecraft_setScreen_t) 0x15d6c; static Minecraft_setScreen_t Minecraft_setScreen = (Minecraft_setScreen_t) 0x15d6c;
#define INFO(msg, ...) printf("[INFO]: " msg "\n", __VA_ARGS__); #define INFO(msg, ...) fprintf(stderr, "[INFO]: " msg "\n", __VA_ARGS__);
// Store Minecraft For Exit // Store Minecraft For Exit
static unsigned char *stored_minecraft = NULL; static unsigned char *stored_minecraft = NULL;
@ -159,7 +159,7 @@ static void *Gui_addMessage_original = NULL;
static void Gui_addMessage_injection(unsigned char *gui, std::string const& text) { static void Gui_addMessage_injection(unsigned char *gui, std::string const& text) {
// Print Log Message // Print Log Message
printf("[CHAT]: %s\n", text.c_str()); fprintf(stderr, "[CHAT]: %s\n", text.c_str());
// Call Original Method // Call Original Method
revert_overwrite((void *) Gui_addMessage, Gui_addMessage_original); revert_overwrite((void *) Gui_addMessage, Gui_addMessage_original);
@ -214,7 +214,7 @@ void server_init() {
} }
if (!properties_file.is_open()) { if (!properties_file.is_open()) {
printf("[ERR]: Unable To Open server.properties\n"); fprintf(stderr, "[ERR]: Unable To Open server.properties\n");
exit(1); exit(1);
} }