From ccac208ee344161d15c5c3c5bbc005765b1a193e Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 12 Jan 2017 22:14:32 +0100 Subject: [PATCH] Remove infotexts --- mods/3d_armor/3d_armor_stand/init.lua | 1 - mods/default/nodes.lua | 40 ++++---------------- mods/redstone/mesecons_commandblock/init.lua | 3 -- mods/signs/init.lua | 2 - 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/mods/3d_armor/3d_armor_stand/init.lua b/mods/3d_armor/3d_armor_stand/init.lua index 964f4e7937..f78fdb2870 100644 --- a/mods/3d_armor/3d_armor_stand/init.lua +++ b/mods/3d_armor/3d_armor_stand/init.lua @@ -98,7 +98,6 @@ minetest.register_node("3d_armor_stand:armor_stand", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", armor_stand_formspec) - meta:set_string("infotext", "Armor Stand") local inv = meta:get_inventory() for _, element in pairs(elements) do inv:set_size("armor_"..element, 1) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 776dbaff2c..0a9f4b3aaf 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1359,7 +1359,6 @@ minetest.register_node("default:chest", { "listring[nodemeta:"..p.x..","..p.y..","..p.z..";main]".. "listring[current_player;main]".. "listring[current_name;main]") - meta:set_string("infotext", "Large Chest") hacky_swap_node(p, "default:chest_left", param2) local m = minetest.get_meta(p) m:set_string("formspec", @@ -1372,7 +1371,6 @@ minetest.register_node("default:chest", { "listring[current_name;main]".. "listring[current_player;main]".. "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]") - m:set_string("infotext", "Large Chest") elseif minetest.get_node(get_chest_neighborpos(pos, param2, "left")).name == "default:chest" then minetest.set_node(pos, {name="default:chest_left",param2=param2}) local p = get_chest_neighborpos(pos, param2, "left") @@ -1386,7 +1384,6 @@ minetest.register_node("default:chest", { "listring[current_name;main]".. "listring[current_player;main]".. "listring[nodemeta:"..p.x..","..p.y..","..p.z..";main]") - meta:set_string("infotext", "Large Chest") hacky_swap_node(p, "default:chest_right", param2) local m = minetest.get_meta(p) m:set_string("formspec", @@ -1399,7 +1396,6 @@ minetest.register_node("default:chest", { "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]".. "listring[current_player;main]".. "listring[current_name;main]") - m:set_string("infotext", "Large Chest") else meta:set_string("formspec", "size[9,8.75]".. @@ -1410,7 +1406,6 @@ minetest.register_node("default:chest", { "list[current_player;main;0,7.74;9,1;]".. "listring[current_name;main]".. "listring[current_player;main]") - meta:set_string("infotext", "Chest") end local inv = meta:get_inventory() inv:set_size("main", 9*3) @@ -1452,13 +1447,13 @@ minetest.register_node("default:chest_left", { is_ground_content = false, sounds = default.node_sound_wood_defaults(), on_destruct = function(pos) - local m = minetest.get_meta(pos) - if m:get_string("infotext") == "Chest" then + local n = minetest.get_node(pos) + if n.name == "deault:chest" then return end - local param2 = minetest.get_node(pos).param2 + local param2 = n.param2 local p = get_chest_neighborpos(pos, param2, "left") - if not p or minetest.get_node(p).name ~= "default:chest_right" then + if not p or n.name ~= "default:chest_right" then return end local meta = minetest.get_meta(p) @@ -1471,7 +1466,6 @@ minetest.register_node("default:chest_left", { "list[current_player;main;0,7.74;9,1;]".. "listring[current_name;main]".. "listring[current_player;main]") - meta:set_string("infotext", "Chest") hacky_swap_node(p, "default:chest") end, after_dig_node = function(pos, oldnode, oldmetadata, digger) @@ -1511,13 +1505,13 @@ minetest.register_node("default:chest_right", { is_ground_content = false, sounds = default.node_sound_wood_defaults(), on_destruct = function(pos) - local m = minetest.get_meta(pos) - if m:get_string("infotext") == "Chest" then + local n = minetest.get_node(pos) + if n.name == "default:chest" then return end - local param2 = minetest.get_node(pos).param2 + local param2 = n.param2 local p = get_chest_neighborpos(pos, param2, "right") - if not p or minetest.get_node(p).name ~= "default:chest_left" then + if not p or n.name ~= "default:chest_left" then return end local meta = minetest.get_meta(p) @@ -1530,7 +1524,6 @@ minetest.register_node("default:chest_right", { "list[current_player;main;0,7.74;9,1;]".. "listring[current_name;main]".. "listring[current_player;main]") - meta:set_string("infotext", "Chest") hacky_swap_node(p, "default:chest") end, after_dig_node = function(pos, oldnode, oldmetadata, digger) @@ -1590,7 +1583,6 @@ minetest.register_node("default:furnace", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", default.furnace_inactive_formspec) - meta:set_string("infotext", "Furnace") local inv = meta:get_inventory() inv:set_size("fuel", 1) inv:set_size("src", 1) @@ -1613,9 +1605,6 @@ minetest.register_node("default:furnace", { local inv = meta:get_inventory() if listname == "fuel" then if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then - if inv:is_empty("src") then - meta:set_string("infotext","Furnace is empty") - end return stack:get_count() else return 0 @@ -1632,9 +1621,6 @@ minetest.register_node("default:furnace", { local stack = inv:get_stack(from_list, from_index) if to_list == "fuel" then if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then - if inv:is_empty("src") then - meta:set_string("infotext","Furnace is empty") - end return count else return 0 @@ -1660,7 +1646,6 @@ minetest.register_node("default:furnace_active", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", default.furnace_inactive_formspec) - meta:set_string("infotext", "Furnace"); local inv = meta:get_inventory() inv:set_size("fuel", 1) inv:set_size("src", 1) @@ -1683,9 +1668,6 @@ minetest.register_node("default:furnace_active", { local inv = meta:get_inventory() if listname == "fuel" then if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then - if inv:is_empty("src") then - meta:set_string("infotext","Furnace is empty") - end return stack:get_count() else return 0 @@ -1702,9 +1684,6 @@ minetest.register_node("default:furnace_active", { local stack = inv:get_stack(from_list, from_index) if to_list == "fuel" then if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then - if inv:is_empty("src") then - meta:set_string("infotext","Furnace is empty") - end return count else return 0 @@ -1781,7 +1760,6 @@ minetest.register_abm({ if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then local percent = math.floor(meta:get_float("fuel_time") / meta:get_float("fuel_totaltime") * 100) - meta:set_string("infotext","Furnace active: "..percent.."%") hacky_swap_node(pos,"default:furnace_active") meta:set_string("formspec", "size[9,8.75]".. @@ -1817,7 +1795,6 @@ minetest.register_abm({ end if fuel.time <= 0 then - meta:set_string("infotext","Furnace out of fuel") hacky_swap_node(pos,"default:furnace") meta:set_string("formspec", default.furnace_inactive_formspec) return @@ -1825,7 +1802,6 @@ minetest.register_abm({ if cooked.item:is_empty() then if was_active then - meta:set_string("infotext","Furnace is empty") hacky_swap_node(pos,"default:furnace") meta:set_string("formspec", default.furnace_inactive_formspec) end diff --git a/mods/redstone/mesecons_commandblock/init.lua b/mods/redstone/mesecons_commandblock/init.lua index 7d4dc1cd0f..ea625aae89 100644 --- a/mods/redstone/mesecons_commandblock/init.lua +++ b/mods/redstone/mesecons_commandblock/init.lua @@ -55,9 +55,6 @@ local function initialize_data(meta) else owner = "owned by " .. owner end - meta:set_string("infotext", "Command Block\n" .. - "(" .. owner .. ")\n" .. - "Commands: "..commands) end local function construct(pos) diff --git a/mods/signs/init.lua b/mods/signs/init.lua index d7a3e52b77..70e75502c2 100644 --- a/mods/signs/init.lua +++ b/mods/signs/init.lua @@ -37,7 +37,6 @@ local sign_groups = {choppy=2, dig_immediate=2} local construct_sign = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", "field[text;;${text}]") - meta:set_string("infotext", "") end local destruct_sign = function(pos) @@ -52,7 +51,6 @@ end local update_sign = function(pos, fields, sender) local meta = minetest.get_meta(pos) local owner = meta:get_string("owner") - meta:set_string("infotext", "") local text = meta:get_string("text") if fields and sender:get_player_name() == owner or text == "" and fields then meta:set_string("text", fields.text)