From b3b935dd1d68fb8f142101b30a2f4fa714286b00 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Fri, 8 Jul 2022 22:40:56 -0400 Subject: [PATCH] Logging Changes --- launcher/src/bootstrap.c | 4 ++-- media-layer/core/src/screenshot.c | 2 +- mods/src/game-mode/game-mode.c | 2 +- mods/src/options/options.c | 12 ++---------- mods/src/server/server.cpp | 1 + 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c index ff28d12..cbdff05 100644 --- a/launcher/src/bootstrap.c +++ b/launcher/src/bootstrap.c @@ -78,14 +78,14 @@ static void load(char **ld_preload, char *folder) { // Add Terminator name[total_length] = '\0'; - // Check If File Is Executable + // Check If File Is Accessible int result = access(name, R_OK); if (result == 0) { // Add To LD_PRELOAD string_append(ld_preload, "%s%s", *ld_preload == NULL ? "" : ":", name); } else if (result == -1 && errno != 0) { // Fail - INFO("Unable To Acesss: %s: %s", name, strerror(errno)); + WARN("Unable To Acesss: %s: %s", name, strerror(errno)); errno = 0; } } diff --git a/media-layer/core/src/screenshot.c b/media-layer/core/src/screenshot.c index 87cdc69..0750218 100644 --- a/media-layer/core/src/screenshot.c +++ b/media-layer/core/src/screenshot.c @@ -154,7 +154,7 @@ void media_take_screenshot(char *home) { // Save Image if (save_png(file, pixels, line_size, width, height)) { - INFO("Screenshot Failed: %s", file); + WARN("Screenshot Failed: %s", file); } else { INFO("Screenshot Saved: %s", file); } diff --git a/mods/src/game-mode/game-mode.c b/mods/src/game-mode/game-mode.c index 2cf2332..8123e33 100644 --- a/mods/src/game-mode/game-mode.c +++ b/mods/src/game-mode/game-mode.c @@ -10,7 +10,7 @@ static int is_survival = -1; // Patch Game Mode static void set_is_survival(int new_is_survival) { if (is_survival != new_is_survival) { - INFO("Setting Game Mode: %s", new_is_survival ? "Survival" : "Creative"); + DEBUG("Setting Game Mode: %s", new_is_survival ? "Survival" : "Creative"); // Correct Inventpry UI unsigned char inventory_patch[4] = {new_is_survival ? 0x00 : 0x01, 0x30, 0xa0, 0xe3}; // "mov r3, #0x0" or "mov r3, #0x1" diff --git a/mods/src/options/options.c b/mods/src/options/options.c index fe46024..c70342a 100644 --- a/mods/src/options/options.c +++ b/mods/src/options/options.c @@ -12,7 +12,6 @@ static bool LevelData_getSpawnMobs_injection(__attribute__((unused)) unsigned ch return 1; } -#ifndef MCPI_SERVER_MODE // Get Custom Render Distance static int get_render_distance() { char *distance_str = getenv("MCPI_RENDER_DISTANCE"); @@ -31,7 +30,6 @@ static int get_render_distance() { ERR("Invalid Render Distance: %s", distance_str); } } -#endif // Get Custom Username static char *get_username() { @@ -91,12 +89,8 @@ void init_options() { // 3D Anaglyph anaglyph = feature_has("3D Anaglyph", server_disabled); // Render Distance -#ifndef MCPI_SERVER_MODE render_distance = get_render_distance(); - INFO("Setting Render Distance: %i", render_distance); -#else - render_distance = 3; -#endif + DEBUG("Setting Render Distance: %i", render_distance); // Set Options overwrite_calls((void *) Options_initDefaultValue, (void *) Options_initDefaultValue_injection); @@ -104,9 +98,7 @@ void init_options() { // Change Username const char *username = get_username(); -#ifndef MCPI_SERVER_MODE - INFO("Setting Username: %s", username); -#endif + DEBUG("Setting Username: %s", username); if (strcmp(*default_username, "StevePi") != 0) { ERR("Default Username Is Invalid"); } diff --git a/mods/src/server/server.cpp b/mods/src/server/server.cpp index 10c2085..9a9225e 100644 --- a/mods/src/server/server.cpp +++ b/mods/src/server/server.cpp @@ -585,5 +585,6 @@ static void server_init() { void init_server() { server_init(); setenv("MCPI_FEATURE_FLAGS", get_features(), 1); + setenv("MCPI_RENDER_DISTANCE", "Tiny", 1); setenv("MCPI_USERNAME", get_motd().c_str(), 1); }