diff --git a/launcher/src/client/available-feature-flags b/launcher/src/client/available-feature-flags index 282336fe..4d5efe42 100644 --- a/launcher/src/client/available-feature-flags +++ b/launcher/src/client/available-feature-flags @@ -6,7 +6,7 @@ TRUE Disable Autojump By Default TRUE Display Nametags By Default TRUE Fix Sign Placement TRUE Show Block Outlines -FALSE Expand Creative Inventory +FALSE Expand Creative Mode Inventory FALSE Remove Creative Mode Restrictions TRUE Animated Water TRUE Remove Invalid Item Background @@ -16,7 +16,7 @@ TRUE Implement Chat FALSE Hide Chat Messages TRUE Implement Death Messages TRUE Implement Game-Mode Switching -TRUE Allow Joining Survival Servers +TRUE Allow Joining Survival Mode Servers TRUE Miscellaneous Input Fixes TRUE Bind "Q" Key To Item Dropping TRUE Bind Common Toggleable Options To Function Keys @@ -43,3 +43,4 @@ TRUE Translucent Toolbar FALSE Force EGL TRUE Improved Classic Title Screen FALSE Disable Speed Bridging +FALSE Disable Creative Mode Mining Delay diff --git a/mods/src/creative/creative.cpp b/mods/src/creative/creative.cpp index 135ed54d..8940d7bd 100644 --- a/mods/src/creative/creative.cpp +++ b/mods/src/creative/creative.cpp @@ -104,7 +104,7 @@ int creative_is_restricted() { // Init void init_creative() { // Add Extra Items To Creative Inventory (Only Replace Specific Function Call) - if (feature_has("Expand Creative Inventory", server_enabled)) { + if (feature_has("Expand Creative Mode Inventory", server_enabled)) { #ifndef MCPI_SERVER_MODE misc_run_on_creative_inventory_setup(Inventory_setupDefault_FillingContainer_addItem_call_injection); #endif @@ -120,7 +120,7 @@ void init_creative() { } } - // Remove Creative Restrictions (Opening Chests, Crafting, Etc) + // Remove Creative Mode Restrictions (Opening Chests, Crafting, Etc) if (feature_has("Remove Creative Mode Restrictions", server_enabled)) { unsigned char nop_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop" // Remove Restrictions diff --git a/mods/src/game-mode/game-mode.c b/mods/src/game-mode/game-mode.c index 8123e339..66ca18bf 100644 --- a/mods/src/game-mode/game-mode.c +++ b/mods/src/game-mode/game-mode.c @@ -70,8 +70,8 @@ void init_game_mode() { _init_game_mode_ui(); } - // Allow Joining Survival Servers - if (feature_has("Allow Joining Survival Servers", server_enabled)) { + // Allow Joining Survival Mode Servers + if (feature_has("Allow Joining Survival Mode Servers", server_enabled)) { unsigned char server_patch[4] = {0x0f, 0x00, 0x00, 0xea}; // "b 0x6dcb4" patch((void *) 0x6dc70, server_patch); } diff --git a/mods/src/misc/misc.c b/mods/src/misc/misc.c index 171abd47..7f0e0c2c 100644 --- a/mods/src/misc/misc.c +++ b/mods/src/misc/misc.c @@ -424,6 +424,12 @@ void init_misc() { patch((void *) 0x494b4, disable_speed_bridging_patch); } + // Disable Creative Mode Mining Delay + if (feature_has("Disable Creative Mode Mining Delay", server_disabled)) { + unsigned char nop_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop" + patch((void *) 0x19fa0, nop_patch); + } + // Init C++ And Logging _init_misc_cpp(); _init_misc_logging();