Red-exe-Engineer/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Rename GUI Flags To UI

Browse Source
This commit is contained in:
TheBrokenRail 2024-11-22 03:35:26 -05:00
parent ef3292c5e0
commit 2eb6a1c5be
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/CHANGELOG.md
View File

@ -88,6 +88,11 @@
* `Disable Buggy Held Item Caching` To `Fix Held Item Caching` * `Disable Buggy Held Item Caching` To `Fix Held Item Caching`
* `Disable 'gui_blocks' Atlas` To `Regenerate "gui_blocks" Atlas` * `Disable 'gui_blocks' Atlas` To `Regenerate "gui_blocks" Atlas`
* `Fix Sign Placement` To `Enable Sign Screen` * `Fix Sign Placement` To `Enable Sign Screen`
* `Force Touch GUI Inventory` To `Force Touch UI Inventory`
* `Full Touch GUI` To `Full Touch UI`
* `Force Touch GUI Button Behavior` To `Force Touch UI Button Behavior`
* `Remove Forced GUI Lag (Can Break Joining Servers)` To `Remove Forced UI Lag (Can Break Joining Servers)`
* `Hide Block Outline When GUI Is Hidden` To `Hide Block Outline When UI Is Hidden`
* Add Milk Buckets * Add Milk Buckets
* Included In The `Add Buckets` Feature Flag * Included In The `Add Buckets` Feature Flag
* Removed `Property Scale Animated Textures` Feature Flag * Removed `Property Scale Animated Textures` Feature Flag

10
libreborn/src/util/flags/available-feature-flags
View File

@ -20,7 +20,7 @@ CATEGORY User Interface
CATEGORY Options CATEGORY Options
TRUE Fix Options Screen TRUE Fix Options Screen
TRUE Add Reborn Info To Options TRUE Add Reborn Info To Options
TRUE Force Touch GUI Inventory TRUE Force Touch UI Inventory
TRUE Fix Pause Menu TRUE Fix Pause Menu
TRUE Close Current Screen On Death TRUE Close Current Screen On Death
TRUE Implement Create World Dialog TRUE Implement Create World Dialog
@ -37,10 +37,10 @@ CATEGORY User Interface
CATEGORY Text CATEGORY Text
TRUE Load Language Files TRUE Load Language Files
TRUE Add Missing Language Strings TRUE Add Missing Language Strings
FALSE Full Touch GUI FALSE Full Touch UI
TRUE Force Touch GUI Button Behavior TRUE Force Touch UI Button Behavior
TRUE Improved Cursor Rendering TRUE Improved Cursor Rendering
FALSE Remove Forced GUI Lag (Can Break Joining Servers) FALSE Remove Forced UI Lag (Can Break Joining Servers)
TRUE Improved Button Hover Behavior TRUE Improved Button Hover Behavior
TRUE Classic Item Count UI TRUE Classic Item Count UI
TRUE Click Buttons On Mouse Down TRUE Click Buttons On Mouse Down
@ -55,7 +55,7 @@ CATEGORY Rendering
CATEGORY Block Outline CATEGORY Block Outline
TRUE Show Block Outlines TRUE Show Block Outlines
TRUE Replace Block Highlight With Outline TRUE Replace Block Highlight With Outline
TRUE Hide Block Outline When GUI Is Hidden TRUE Hide Block Outline When UI Is Hidden
CATEGORY Block Tinting CATEGORY Block Tinting
FALSE Add Biome Colors To Grass FALSE Add Biome Colors To Grass
FALSE Disable Block Tinting FALSE Disable Block Tinting

2
mods/src/misc/graphics.cpp
View File

@ -527,7 +527,7 @@ void _init_misc_graphics() {
} }
// Properly Hide Block Outline // Properly Hide Block Outline
if (feature_has("Hide Block Outline When GUI Is Hidden", server_disabled)) { if (feature_has("Hide Block Outline When UI Is Hidden", server_disabled)) {
overwrite_calls(LevelRenderer_renderHitSelect, [](LevelRenderer_renderHitSelect_t original, LevelRenderer *self, Player *player, const HitResult &hit_result, const int i, void *vp, const float f) { overwrite_calls(LevelRenderer_renderHitSelect, [](LevelRenderer_renderHitSelect_t original, LevelRenderer *self, Player *player, const HitResult &hit_result, const int i, void *vp, const float f) {
if (!self->minecraft->options.hide_gui) { if (!self->minecraft->options.hide_gui) {
original(self, player, hit_result, i, vp, f); original(self, player, hit_result, i, vp, f);

2
mods/src/misc/ui.cpp
View File

@ -299,7 +299,7 @@ void _init_misc_ui() {
} }
// Remove Forced GUI Lag // Remove Forced GUI Lag
if (feature_has("Remove Forced GUI Lag (Can Break Joining Servers)", server_enabled)) { if (feature_has("Remove Forced UI Lag (Can Break Joining Servers)", server_enabled)) {
overwrite_calls(Common_sleepMs, nop<Common_sleepMs_t, int>); overwrite_calls(Common_sleepMs, nop<Common_sleepMs_t, int>);
} }

10
mods/src/touch/touch.cpp
View File

@ -61,8 +61,8 @@ Button *touch_create_button(const int id, const std::string &text) {
// Init // Init
void init_touch() { void init_touch() {
touch_gui = feature_has("Full Touch GUI", server_disabled); touch_gui = feature_has("Full Touch UI", server_disabled);
int touch_buttons = touch_gui; bool touch_buttons = touch_gui;
if (touch_gui) { if (touch_gui) {
// Main UI // Main UI
overwrite_calls(Minecraft_isTouchscreen, Minecraft_isTouchscreen_injection); overwrite_calls(Minecraft_isTouchscreen, Minecraft_isTouchscreen_injection);
@ -72,7 +72,7 @@ void init_touch() {
patch((void *) 0x257b0, toolbar_patch); patch((void *) 0x257b0, toolbar_patch);
} else { } else {
// Force Touch Inventory // Force Touch Inventory
if (feature_has("Force Touch GUI Inventory", server_disabled)) { if (feature_has("Force Touch UI Inventory", server_disabled)) {
overwrite_call((void *) 0x2943c, (void *) operator_new_IngameBlockSelectionScreen_injection); overwrite_call((void *) 0x2943c, (void *) operator_new_IngameBlockSelectionScreen_injection);
overwrite_call((void *) 0x29444, (void *) Touch_IngameBlockSelectionScreen_constructor->get(true)); overwrite_call((void *) 0x29444, (void *) Touch_IngameBlockSelectionScreen_constructor->get(true));
// Make "Craft" And "Armor" Buttons Use Classic GUI Style (Button And TButton Have The Same Size) // Make "Craft" And "Armor" Buttons Use Classic GUI Style (Button And TButton Have The Same Size)
@ -81,8 +81,8 @@ void init_touch() {
} }
// Force Touch Button Behavior // Force Touch Button Behavior
if (feature_has("Force Touch GUI Button Behavior", server_disabled)) { if (feature_has("Force Touch UI Button Behavior", server_disabled)) {
touch_buttons = 1; touch_buttons = true;
overwrite_call((void *) 0x1baf4, (void *) Minecraft_isTouchscreen_injection); overwrite_call((void *) 0x1baf4, (void *) Minecraft_isTouchscreen_injection);
overwrite_call((void *) 0x1be40, (void *) Minecraft_isTouchscreen_injection); overwrite_call((void *) 0x1be40, (void *) Minecraft_isTouchscreen_injection);
overwrite_call((void *) 0x1c470, (void *) Minecraft_isTouchscreen_injection); overwrite_call((void *) 0x1c470, (void *) Minecraft_isTouchscreen_injection);