From cd397331770f1904b83484b3f429e23ecceaa6d4 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 9 May 2024 02:06:24 -0400 Subject: [PATCH] Update Changelog & Fix Flatpak Detection In Info Screen --- docs/CHANGELOG.md | 2 ++ launcher/src/client/available-feature-flags | 2 +- libreborn/include/libreborn/config.h.in | 1 + mods/src/options/ui.cpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 17fd1d33a..854e4a835 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,7 @@ **3.0.0** * Modding API Revamped * `*(unsigned char **)` Is Dead! + * Now C++ Only * Add Peaceful Mode To Options Screen * Proper Create New World Screen * Proper Chat Screen @@ -14,6 +15,7 @@ * Add `Display Date In Select World Screen` Feature Flag (Enabled By Default) * Add `Optimized Chunk Sorting` Feature Flag (Enabled By Default) * Add `Add Cake` Feature Flag (Enabled By Default) +* Add `Add Reborn Info To Options` Feature Flag (Enabled By Default) * Add Milk Buckets * Implement Crafting Remainders * Improve Death Messages diff --git a/launcher/src/client/available-feature-flags b/launcher/src/client/available-feature-flags index 3a12eff7d..c1a758d8c 100644 --- a/launcher/src/client/available-feature-flags +++ b/launcher/src/client/available-feature-flags @@ -61,4 +61,4 @@ TRUE Add Splashes TRUE Display Date In Select World Screen TRUE Optimized Chunk Sorting TRUE Disable Buggy Held Item Caching -TRUE Add Info Button To Options \ No newline at end of file +TRUE Add Reborn Info To Options \ No newline at end of file diff --git a/libreborn/include/libreborn/config.h.in b/libreborn/include/libreborn/config.h.in index 3d0c5bc4b..8b1652569 100644 --- a/libreborn/include/libreborn/config.h.in +++ b/libreborn/include/libreborn/config.h.in @@ -3,6 +3,7 @@ #cmakedefine MCPI_SERVER_MODE #cmakedefine MCPI_HEADLESS_MODE #cmakedefine MCPI_IS_APPIMAGE_BUILD +#cmakedefine MCPI_IS_FLATPAK_BUILD #cmakedefine MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN #cmakedefine MCPI_USE_GLES1_COMPATIBILITY_LAYER #cmakedefine MCPI_APP_BASE_TITLE "@MCPI_APP_BASE_TITLE@" diff --git a/mods/src/options/ui.cpp b/mods/src/options/ui.cpp index e8918771c..a8c5cdbef 100644 --- a/mods/src/options/ui.cpp +++ b/mods/src/options/ui.cpp @@ -184,7 +184,7 @@ void _init_options_ui() { } // Info Button - if (feature_has("Add Info Button To Options", server_disabled)) { + if (feature_has("Add Reborn Info To Options", server_disabled)) { // Add Button overwrite_virtual_calls(OptionsScreen_init, OptionsScreen_init_injection); // Position Button