aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/game.cpp46
-rw-r--r--src/client/game.h4
-rw-r--r--src/client/inputhandler.cpp4
-rw-r--r--src/client/keys.h4
-rw-r--r--src/client/render/core.cpp2
-rw-r--r--src/defaultsettings.cpp19
-rw-r--r--src/gui/guiKeyChangeMenu.cpp12
-rw-r--r--src/script/cpp_api/s_client.cpp4
-rw-r--r--src/script/cpp_api/s_client.h2
9 files changed, 77 insertions, 20 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp
index d983e2bb8..663fbd672 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1071,8 +1071,8 @@ void Game::processKeyInput()
toggleAutoforward();
} else if (wasKeyDown(KeyType::INVENTORY)) {
openInventory();
- } else if (wasKeyDown(KeyType::SPECIAL_INVENTORY)) {
- openSpecialInventory();
+ } else if (wasKeyDown(KeyType::ENDERCHEST)) {
+ openEnderchest();
} else if (input->cancelPressed()) {
#ifdef __ANDROID__
m_android_chat_open = false;
@@ -1105,6 +1105,10 @@ void Game::processKeyInput()
toggleKillaura();
} else if (wasKeyDown(KeyType::FREECAM)) {
toggleFreecam();
+ } else if (wasKeyDown(KeyType::SCAFFOLD)) {
+ toggleScaffold();
+ } else if (wasKeyDown(KeyType::NEXT_ITEM)) {
+ toggleNextItem();
} else if (wasKeyDown(KeyType::SELECT_UP)) {
m_cheat_menu->selectUp();
} else if (wasKeyDown(KeyType::SELECT_DOWN)) {
@@ -1285,7 +1289,7 @@ void Game::openInventory()
}
}
-void Game::openSpecialInventory()
+void Game::openEnderchest()
{
LocalPlayer *player = client->getEnv().getLocalPlayer();
if (!player || !player->getCAO())
@@ -1294,7 +1298,7 @@ void Game::openSpecialInventory()
infostream << "Game: Launching special inventory" << std::endl;
if (client->modsLoaded())
- client->getScript()->open_special_inventory();
+ client->getScript()->open_enderchest();
}
@@ -1428,6 +1432,30 @@ void Game::toggleFreecam()
}
}
+void Game::toggleScaffold()
+{
+ bool scaffold = ! g_settings->getBool("scaffold");
+ g_settings->set("scaffold", bool_to_cstr(scaffold));
+
+ if (scaffold) {
+ m_game_ui->showTranslatedStatusText("Scaffold enabled");
+ } else {
+ m_game_ui->showTranslatedStatusText("Scaffold disabled");
+ }
+}
+
+void Game::toggleNextItem()
+{
+ bool next_item = ! g_settings->getBool("next_item");
+ g_settings->set("next_item", bool_to_cstr(next_item));
+
+ if (next_item) {
+ m_game_ui->showTranslatedStatusText("NextItem enabled");
+ } else {
+ m_game_ui->showTranslatedStatusText("NextItem disabled");
+ }
+}
+
void Game::toggleCinematic()
{
bool cinematic = !g_settings->getBool("cinematic");
@@ -3432,7 +3460,7 @@ void Game::showPauseMenu()
"- %s: sneak/go down\n"
"- %s: drop item\n"
"- %s: inventory\n"
- "- %s: special inventory\n"
+ "- %s: enderchest\n"
"- Mouse: turn/look\n"
"- Mouse left: dig/punch\n"
"- Mouse right: place/use\n"
@@ -3440,6 +3468,8 @@ void Game::showPauseMenu()
"- %s: chat\n"
"- %s: Killaura\n"
"- %s: Freecam\n"
+ "- %s: Scaffold\n"
+ "- %s: NextItem\n"
);
char control_text_buf[600];
@@ -3453,10 +3483,12 @@ void Game::showPauseMenu()
GET_KEY_NAME(keymap_sneak),
GET_KEY_NAME(keymap_drop),
GET_KEY_NAME(keymap_inventory),
- GET_KEY_NAME(keymap_special_inventory),
+ GET_KEY_NAME(keymap_enderchest),
GET_KEY_NAME(keymap_chat),
GET_KEY_NAME(keymap_toggle_killaura),
- GET_KEY_NAME(keymap_toggle_freecam)
+ GET_KEY_NAME(keymap_toggle_freecam),
+ GET_KEY_NAME(keymap_toggle_scaffold),
+ GET_KEY_NAME(keymap_toggle_next_item)
);
std::string control_text = std::string(control_text_buf);
diff --git a/src/client/game.h b/src/client/game.h
index a2a1e7c2d..b8efa3a73 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -724,7 +724,7 @@ public:
void dropSelectedItem(bool single_item = false);
void openInventory();
- void openSpecialInventory();
+ void openEnderchest();
void openConsole(float scale, const wchar_t *line=NULL);
void toggleFreeMove();
void toggleFreeMoveAlt();
@@ -733,6 +733,8 @@ public:
void toggleNoClip();
void toggleKillaura();
void toggleFreecam();
+ void toggleScaffold();
+ void toggleNextItem();
void toggleCinematic();
void toggleAutoforward();
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index edf2056d0..418e41931 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -42,7 +42,7 @@ void KeyCache::populate()
key[KeyType::DROP] = getKeySetting("keymap_drop");
key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
- key[KeyType::SPECIAL_INVENTORY] = getKeySetting("keymap_special_inventory");
+ key[KeyType::ENDERCHEST] = getKeySetting("keymap_enderchest");
key[KeyType::CHAT] = getKeySetting("keymap_chat");
key[KeyType::CMD] = getKeySetting("keymap_cmd");
key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
@@ -75,6 +75,8 @@ void KeyCache::populate()
key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
key[KeyType::KILLAURA] = getKeySetting("keymap_toggle_killaura");
key[KeyType::FREECAM] = getKeySetting("keymap_toggle_freecam");
+ key[KeyType::SCAFFOLD] = getKeySetting("keymap_toggle_scaffold");
+ key[KeyType::NEXT_ITEM] = getKeySetting("keymap_toggle_next_item");
key[KeyType::SELECT_UP] = getKeySetting("keymap_select_up");
key[KeyType::SELECT_DOWN] = getKeySetting("keymap_select_down");
key[KeyType::SELECT_LEFT] = getKeySetting("keymap_select_left");
diff --git a/src/client/keys.h b/src/client/keys.h
index b29e232fd..43a032a7b 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -41,7 +41,7 @@ public:
// Other
DROP,
INVENTORY,
- SPECIAL_INVENTORY,
+ ENDERCHEST,
CHAT,
CMD,
CMD_LOCAL,
@@ -72,6 +72,8 @@ public:
ZOOM,
KILLAURA,
FREECAM,
+ SCAFFOLD,
+ NEXT_ITEM,
SELECT_UP,
SELECT_DOWN,
SELECT_LEFT,
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 45fc0d8ec..223af5142 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -69,7 +69,7 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
draw_crosshair = _draw_crosshair;
draw_tracers = _draw_tracers;
draw_esp = _draw_esp;
-
+
beforeDraw();
drawAll();
}
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5e23ffc39..96c4e0688 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -95,7 +95,20 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_esp", "false");
settings->setDefault("no_slow", "false");
settings->setDefault("float_above_parent", "false");
-
+ settings->setDefault("ignore_status_messages", "true");
+ settings->setDefault("mark_deathmessages", "true");
+ settings->setDefault("autosneak", "false");
+ settings->setDefault("autoeject", "false");
+ settings->setDefault("eject_items", "");
+ settings->setDefault("autotool", "false");
+ settings->setDefault("autorespawn", "false");
+ settings->setDefault("next_item", "false");
+ settings->setDefault("scaffold", "false");
+ settings->setDefault("scaffold_plus", "false");
+ settings->setDefault("block_water", "false");
+ settings->setDefault("autotnt", "false");
+ settings->setDefault("replace", "false");
+
// Keymap
settings->setDefault("remote_port", "30000");
settings->setDefault("keymap_forward", "KEY_KEY_W");
@@ -108,7 +121,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("keymap_drop", "KEY_KEY_Q");
settings->setDefault("keymap_zoom", "KEY_KEY_Z");
settings->setDefault("keymap_inventory", "KEY_KEY_I");
- settings->setDefault("keymap_special_inventory", "KEY_KEY_O");
+ settings->setDefault("keymap_enderchest", "KEY_KEY_O");
settings->setDefault("keymap_special1", "KEY_KEY_E");
settings->setDefault("keymap_chat", "KEY_KEY_T");
settings->setDefault("keymap_cmd", "/");
@@ -143,6 +156,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("keymap_decrease_viewing_range_min", "-");
settings->setDefault("keymap_toggle_killaura", "KEY_KEY_X");
settings->setDefault("keymap_toggle_freecam", "KEY_KEY_G");
+ settings->setDefault("keymap_toggle_scaffold", "KEY_KEY_Y");
+ settings->setDefault("keymap_toggle_next_item", "KEY_KEY_U");
settings->setDefault("keymap_select_up", "KEY_UP");
settings->setDefault("keymap_select_down", "KEY_DOWN");
settings->setDefault("keymap_select_left", "KEY_LEFT");
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index 1ad09389e..94fe0074a 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -59,7 +59,7 @@ enum
GUI_ID_KEY_SNEAK_BUTTON,
GUI_ID_KEY_DROP_BUTTON,
GUI_ID_KEY_INVENTORY_BUTTON,
- GUI_ID_KEY_SPECIAL_INVENTORY_BUTTON,
+ GUI_ID_KEY_ENDERCHEST_BUTTON,
GUI_ID_KEY_HOTBAR_PREV_BUTTON,
GUI_ID_KEY_HOTBAR_NEXT_BUTTON,
GUI_ID_KEY_MUTE_BUTTON,
@@ -79,6 +79,8 @@ enum
GUI_ID_KEY_AUTOFWD_BUTTON,
GUI_ID_KEY_KILLAURA_BUTTON,
GUI_ID_KEY_FREECAM_BUTTON,
+ GUI_ID_KEY_SCAFFOLD_BUTTON,
+ GUI_ID_KEY_NEXT_ITEM_BUTTON,
GUI_ID_KEY_SELECT_UP_BUTTON,
GUI_ID_KEY_SELECT_DOWN_BUTTON,
GUI_ID_KEY_SELECT_LEFT_BUTTON,
@@ -430,7 +432,7 @@ void GUIKeyChangeMenu::init_keys()
this->add_key(GUI_ID_KEY_SNEAK_BUTTON, wgettext("Sneak"), "keymap_sneak");
this->add_key(GUI_ID_KEY_DROP_BUTTON, wgettext("Drop"), "keymap_drop");
this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"), "keymap_inventory");
- this->add_key(GUI_ID_KEY_SPECIAL_INVENTORY_BUTTON,wgettext("Special Inv."),"keymap_special_inventory");
+ this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON,wgettext("Enderchest"), "keymap_enderchest");
this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,wgettext("Prev. item"), "keymap_hotbar_previous");
this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"), "keymap_hotbar_next");
this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom");
@@ -456,8 +458,10 @@ void GUIKeyChangeMenu::init_keys()
this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"), "keymap_toggle_chat");
this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog");
this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON,wgettext("Toggle C. Menu"),"keymap_toggle_cheat_menu");
- this->add_key(GUI_ID_KEY_KILLAURA_BUTTON, wgettext("Toggle Killaura"), "keymap_toggle_killaura");
- this->add_key(GUI_ID_KEY_FREECAM_BUTTON, wgettext("Toggle Freec."), "keymap_toggle_freecam");
+ this->add_key(GUI_ID_KEY_KILLAURA_BUTTON, wgettext("Killaura"), "keymap_toggle_killaura");
+ this->add_key(GUI_ID_KEY_FREECAM_BUTTON, wgettext("Freecam"), "keymap_toggle_freecam");
+ this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON, wgettext("Scaffold"), "keymap_toggle_scaffold");
+ this->add_key(GUI_ID_KEY_NEXT_ITEM_BUTTON, wgettext("NextItem"), "keymap_toggle_next_item");
this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON, wgettext("C. Menu Up"), "keymap_select_up");
this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON,wgettext("C. Menu Down"), "keymap_select_down");
this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON,wgettext("C. Menu Left"), "keymap_select_left");
diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp
index 0d4e21876..dd9019d4d 100644
--- a/src/script/cpp_api/s_client.cpp
+++ b/src/script/cpp_api/s_client.cpp
@@ -234,7 +234,7 @@ bool ScriptApiClient::on_inventory_open(Inventory *inventory)
return readParam<bool>(L, -1);
}
-void ScriptApiClient::open_special_inventory()
+void ScriptApiClient::open_enderchest()
{
SCRIPTAPI_PRECHECKHEADER
@@ -243,7 +243,7 @@ void ScriptApiClient::open_special_inventory()
lua_insert(L, error_handler);
lua_getglobal(L, "core");
- lua_getfield(L, -1, "open_special_inventory");
+ lua_getfield(L, -1, "open_enderchest");
if (lua_isfunction(L, -1))
lua_pcall(L, 0, 0, error_handler);
}
diff --git a/src/script/cpp_api/s_client.h b/src/script/cpp_api/s_client.h
index 4cdcb42eb..177dce3ea 100644
--- a/src/script/cpp_api/s_client.h
+++ b/src/script/cpp_api/s_client.h
@@ -59,7 +59,7 @@ public:
bool on_item_use(const ItemStack &item, const PointedThing &pointed);
bool on_inventory_open(Inventory *inventory);
- void open_special_inventory();
+ void open_enderchest();
void setEnv(ClientEnvironment *env);
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-01 22:12:12 +0000