From b29d6bc196b3a6bafa1b200e8944cf277b0bc9c1 Mon Sep 17 00:00:00 2001 From: realOneplustwo Date: Wed, 21 Oct 2020 17:49:17 -0700 Subject: Make cheat menu color and font configurable via settings --- src/defaultsettings.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 2899f2509..525f94678 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -63,6 +63,13 @@ void set_default_settings(Settings *settings) settings->setDefault("max_out_chat_queue_size", "20"); settings->setDefault("pause_on_lost_focus", "false"); settings->setDefault("enable_register_confirmation", "true"); + + // Cheat Menu + settings->setDefault("cheat_menu_font", "FM_Mono"); + settings->setDefault("m_bg_color_alpha", "173"); + settings->setDefault("m_active_bg_color_alpha", "210"); + settings->setDefault("m_font_color_alpha", "195"); + settings->setDefault("m_selected_font_color_alpha", "235"); // Cheats settings->setDefault("xray", "false"); -- cgit v1.2.3 From 6652d7ac2a463581aa53c1599b7b93762422ff0f Mon Sep 17 00:00:00 2001 From: realOneplustwo Date: Thu, 22 Oct 2020 17:36:31 -0700 Subject: Add Block Formspec Hack --- builtin/client/cheats/init.lua | 1 + builtin/settingtypes.txt | 2 ++ src/defaultsettings.cpp | 1 + src/gui/cheatMenu.h | 2 +- src/network/clientpackethandler.cpp | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/builtin/client/cheats/init.lua b/builtin/client/cheats/init.lua index a7be83cee..5e94ed86c 100644 --- a/builtin/client/cheats/init.lua +++ b/builtin/client/cheats/init.lua @@ -51,6 +51,7 @@ core.cheats = { ["PointLiquids"] = "point_liquids", ["PrivBypass"] = "priv_bypass", ["AutoRespawn"] = "autorespawn", + ["BlockFormspec"] = "block_formspec" }, ["Chat"] = { ["IgnoreStatus"] = "ignore_status_messages", diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index ebd0ad621..f13492146 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2299,6 +2299,8 @@ replace (Replace) bool false crystal_pvp (CrystalPvP) bool false +block_formspec (BlockFormSpec) bool false + [Cheat Menu] # Font to use for cheat menu diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 525f94678..6a37ebab9 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -118,6 +118,7 @@ void set_default_settings(Settings *settings) settings->setDefault("crystal_pvp", "false"); settings->setDefault("autototem", "false"); settings->setDefault("dont_point_nodes", "false"); + settings->setDefault("block_formspec", "false"); // Keymap settings->setDefault("remote_port", "30000"); diff --git a/src/gui/cheatMenu.h b/src/gui/cheatMenu.h index c25af5ed2..513d217b6 100644 --- a/src/gui/cheatMenu.h +++ b/src/gui/cheatMenu.h @@ -72,7 +72,7 @@ private: video::SColor m_font_color = video::SColor(195, 255, 255, 255); video::SColor m_selected_font_color = video::SColor(235, 255, 255, 255); - FontMode fontStringToEnum(std::string str); + FontMode fontStringToEnum(std::string str) Client *m_client; diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index f0fb09fad..f3c2bc134 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -957,6 +957,10 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt) void Client::handleCommand_ShowFormSpec(NetworkPacket* pkt) { + if (g_settings->getBool("block_formspec")) { + return; + } + std::string formspec = pkt->readLongString(); std::string formname; -- cgit v1.2.3 From 8e9e76a5076db0042773c6b925698f018a208b29 Mon Sep 17 00:00:00 2001 From: realOneplustwo Date: Fri, 23 Oct 2020 08:34:58 -0700 Subject: Revert "Add Block Formspec Hack" This reverts commit 6652d7ac2a463581aa53c1599b7b93762422ff0f. --- builtin/client/cheats/init.lua | 1 - builtin/settingtypes.txt | 2 -- src/defaultsettings.cpp | 1 - src/gui/cheatMenu.h | 2 +- src/network/clientpackethandler.cpp | 4 ---- 5 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/defaultsettings.cpp') diff --git a/builtin/client/cheats/init.lua b/builtin/client/cheats/init.lua index 5e94ed86c..a7be83cee 100644 --- a/builtin/client/cheats/init.lua +++ b/builtin/client/cheats/init.lua @@ -51,7 +51,6 @@ core.cheats = { ["PointLiquids"] = "point_liquids", ["PrivBypass"] = "priv_bypass", ["AutoRespawn"] = "autorespawn", - ["BlockFormspec"] = "block_formspec" }, ["Chat"] = { ["IgnoreStatus"] = "ignore_status_messages", diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index f13492146..ebd0ad621 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2299,8 +2299,6 @@ replace (Replace) bool false crystal_pvp (CrystalPvP) bool false -block_formspec (BlockFormSpec) bool false - [Cheat Menu] # Font to use for cheat menu diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6a37ebab9..525f94678 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -118,7 +118,6 @@ void set_default_settings(Settings *settings) settings->setDefault("crystal_pvp", "false"); settings->setDefault("autototem", "false"); settings->setDefault("dont_point_nodes", "false"); - settings->setDefault("block_formspec", "false"); // Keymap settings->setDefault("remote_port", "30000"); diff --git a/src/gui/cheatMenu.h b/src/gui/cheatMenu.h index 513d217b6..c25af5ed2 100644 --- a/src/gui/cheatMenu.h +++ b/src/gui/cheatMenu.h @@ -72,7 +72,7 @@ private: video::SColor m_font_color = video::SColor(195, 255, 255, 255); video::SColor m_selected_font_color = video::SColor(235, 255, 255, 255); - FontMode fontStringToEnum(std::string str) + FontMode fontStringToEnum(std::string str); Client *m_client; diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index f3c2bc134..f0fb09fad 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -957,10 +957,6 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt) void Client::handleCommand_ShowFormSpec(NetworkPacket* pkt) { - if (g_settings->getBool("block_formspec")) { - return; - } - std::string formspec = pkt->readLongString(); std::string formname; -- cgit v1.2.3