aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--builtin/client/cheats/init.lua1
-rw-r--r--builtin/client/cheats/inventory.lua17
-rw-r--r--builtin/settingtypes.txt2
-rw-r--r--src/client/game.cpp18
-rw-r--r--src/client/inputhandler.cpp1
-rw-r--r--src/client/keys.h1
-rw-r--r--src/defaultsettings.cpp2
-rw-r--r--src/gui/guiKeyChangeMenu.cpp2
8 files changed, 4 insertions, 40 deletions
diff --git a/builtin/client/cheats/init.lua b/builtin/client/cheats/init.lua
index f1cfedfef..31657e9ed 100644
--- a/builtin/client/cheats/init.lua
+++ b/builtin/client/cheats/init.lua
@@ -77,7 +77,6 @@ core.cheats = {
["AutoTool"] = "autotool",
["Enderchest"] = function() core.open_enderchest() end,
["HandSlot"] = function() core.open_handslot() end,
- ["NextItem"] = "next_item",
["Strip"] = "strip",
["AutoRefill"] = "autorefill",
}
diff --git a/builtin/client/cheats/inventory.lua b/builtin/client/cheats/inventory.lua
index 85dce3be5..bb32d7d8b 100644
--- a/builtin/client/cheats/inventory.lua
+++ b/builtin/client/cheats/inventory.lua
@@ -1,5 +1,3 @@
-local elapsed_time = 0
-local tick_time = 0.05
local drop_action = InventoryAction("drop")
local strip_move_act = InventoryAction("move")
@@ -48,15 +46,6 @@ core.register_globalstep(function(dtime)
end
end
end
- -- NextItem
- if core.settings:get_bool("next_item") then
- elapsed_time = elapsed_time + dtime
- if elapsed_time < tick_time then return end
- if item:get_count() == 0 then
- player:set_wield_index(wieldindex + 1)
- end
- elapsed_time = 0
- end
end)
core.register_list_command("eject", "Configure AutoEject", "eject_items")
@@ -103,7 +92,7 @@ end
local new_index, old_index, pointed_pos
core.register_on_punchnode(function(pos, node)
- if minetest.settings:get_bool("autotool") then
+ if core.settings:get_bool("autotool") then
pointed_pos = pos
old_index = old_index or core.localplayer:get_wield_index()
new_index = find_best_tool(node.name)
@@ -113,7 +102,7 @@ end)
core.register_globalstep(function()
local player = core.localplayer
if not new_index then return end
- if minetest.settings:get_bool("autotool") then
+ if core.settings:get_bool("autotool") then
local pt = core.get_pointed_thing()
if pt and pt.type == "node" and vector.equals(core.get_pointed_thing_position(pt), pointed_pos) and player:get_control().dig then
player:set_wield_index(new_index)
@@ -167,7 +156,7 @@ local hand_formspec = "size[9,8.75]"..
"listring[current_player;main]"
function core.open_handslot()
- minetest.show_formspec("__builtin__:hand", hand_formspec)
+ core.show_formspec("__builtin__:hand", hand_formspec)
end
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 9c5e859b8..b66ac3538 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2295,8 +2295,6 @@ autotool (AutoTool) bool false
autorespawn (AutoRespawn) bool false
-next_item (NextItem) bool false
-
scaffold (Scaffold) bool false
scaffold_plus (ScaffoldPlus) bool false
diff --git a/src/client/game.cpp b/src/client/game.cpp
index f79fdba8c..69feeef97 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1125,8 +1125,6 @@ void Game::processKeyInput()
toggleFreecam();
} else if (wasKeyDown(KeyType::SCAFFOLD)) {
toggleScaffold();
- } else if (wasKeyDown(KeyType::NEXT_ITEM)) {
- toggleNextItem();
#if USE_SOUND
} else if (wasKeyDown(KeyType::MUTE)) {
if (g_settings->getBool("enable_sound")) {
@@ -1448,18 +1446,6 @@ void Game::toggleScaffold()
}
}
-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");
@@ -3472,7 +3458,6 @@ void Game::showPauseMenu()
"- %s: Killaura\n"
"- %s: Freecam\n"
"- %s: Scaffold\n"
- "- %s: NextItem\n"
);
char control_text_buf[600];
@@ -3492,8 +3477,7 @@ void Game::showPauseMenu()
GET_KEY_NAME(keymap_chat),
GET_KEY_NAME(keymap_toggle_killaura),
GET_KEY_NAME(keymap_toggle_freecam),
- GET_KEY_NAME(keymap_toggle_scaffold),
- GET_KEY_NAME(keymap_toggle_next_item)
+ GET_KEY_NAME(keymap_toggle_scaffold)
);
std::string control_text = std::string(control_text_buf);
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 37ab838c0..544c0e344 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -78,7 +78,6 @@ void KeyCache::populate()
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 828ea3ec4..d4f3dd4c1 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -75,7 +75,6 @@ public:
KILLAURA,
FREECAM,
SCAFFOLD,
- NEXT_ITEM,
SELECT_UP,
SELECT_DOWN,
SELECT_LEFT,
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7c53cacc8..141070003 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -110,7 +110,6 @@ void set_default_settings(Settings *settings)
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");
@@ -198,7 +197,6 @@ void set_default_settings(Settings *settings)
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 94fe0074a..a7270da06 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -80,7 +80,6 @@ enum
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,
@@ -461,7 +460,6 @@ void GUIKeyChangeMenu::init_keys()
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");
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-01 23:29:17 +0000