Add formspec escaping to subgame list in create world dialog (#5808)

[dragonfireclient.git] / builtin / game / register.lua

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index ba5f69d67defaab0f7ad940002e3d99255267b77..ec6f28097c8543698e8d9bceb20def960c1f0ea2 100644 (file)
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -7,14 +7,18 @@
 local register_item_raw = core.register_item_raw
 core.register_item_raw = nil
 
+local unregister_item_raw = core.unregister_item_raw
+core.unregister_item_raw = nil
+
 local register_alias_raw = core.register_alias_raw
 core.register_alias_raw = nil
 
 --
--- Item / entity / ABM registration functions
+-- Item / entity / ABM / LBM registration functions
 --
 
 core.registered_abms = {}
+core.registered_lbms = {}
 core.registered_entities = {}
 core.registered_items = {}
 core.registered_nodes = {}
@@ -75,7 +79,14 @@ end
 
 function core.register_abm(spec)
        -- Add to core.registered_abms
-       core.registered_abms[#core.registered_abms+1] = spec
+       core.registered_abms[#core.registered_abms + 1] = spec
+       spec.mod_origin = core.get_current_modname() or "??"
+end
+
+function core.register_lbm(spec)
+       -- Add to core.registered_lbms
+       check_modname_prefix(spec.name)
+       core.registered_lbms[#core.registered_lbms + 1] = spec
        spec.mod_origin = core.get_current_modname() or "??"
 end
 
@@ -116,6 +127,11 @@ function core.register_item(name, itemdef)
                                fixed = {-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
                        }
                end
+               if itemdef.light_source and itemdef.light_source > core.LIGHT_MAX then
+                       itemdef.light_source = core.LIGHT_MAX
+                       core.log("warning", "Node 'light_source' value exceeds maximum," ..
+                               " limiting to maximum: " ..name)
+               end
                setmetatable(itemdef, {__index = core.nodedef_default})
                core.registered_nodes[itemdef.name] = itemdef
        elseif itemdef.type == "craft" then
@@ -164,6 +180,27 @@ function core.register_item(name, itemdef)
        register_item_raw(itemdef)
 end
 
+function core.unregister_item(name)
+       if not core.registered_items[name] then
+               core.log("warning", "Not unregistering item " ..name..
+                       " because it doesn't exist.")
+               return
+       end
+       -- Erase from registered_* table
+       local type = core.registered_items[name].type
+       if type == "node" then
+               core.registered_nodes[name] = nil
+       elseif type == "craft" then
+               core.registered_craftitems[name] = nil
+       elseif type == "tool" then
+               core.registered_tools[name] = nil
+       end
+       core.registered_items[name] = nil
+
+
+       unregister_item_raw(name)
+end
+
 function core.register_node(name, nodedef)
        nodedef.type = "node"
        core.register_item(name, nodedef)
@@ -234,6 +271,20 @@ function core.register_alias(name, convert_to)
        end
 end
 
+function core.register_alias_force(name, convert_to)
+       if forbidden_item_names[name] then
+               error("Unable to register alias: Name is forbidden: " .. name)
+       end
+       if core.registered_items[name] ~= nil then
+               core.unregister_item(name)
+               core.log("info", "Removed item " ..name..
+                       " while attempting to force add an alias")
+       end
+       --core.log("Registering alias: " .. name .. " -> " .. convert_to)
+       core.registered_aliases[name] = convert_to
+       register_alias_raw(name, convert_to)
+end
+
 function core.on_craft(itemstack, player, old_craft_list, craft_inv)
        for _, func in ipairs(core.registered_on_crafts) do
                itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
@@ -280,8 +331,8 @@ core.register_item(":unknown", {
 
 core.register_node(":air", {
        description = "Air (you hacker you!)",
-       inventory_image = "unknown_node.png",
-       wield_image = "unknown_node.png",
+       inventory_image = "air.png",
+       wield_image = "air.png",
        drawtype = "airlike",
        paramtype = "light",
        sunlight_propagates = true,
@@ -297,8 +348,8 @@ core.register_node(":air", {
 
 core.register_node(":ignore", {
        description = "Ignore (you hacker you!)",
-       inventory_image = "unknown_node.png",
-       wield_image = "unknown_node.png",
+       inventory_image = "ignore.png",
+       wield_image = "ignore.png",
        drawtype = "airlike",
        paramtype = "none",
        sunlight_propagates = false,
@@ -391,7 +442,7 @@ end
 local function make_registration()
        local t = {}
        local registerfunc = function(func)
-               table.insert(t, func)
+               t[#t + 1] = func
                core.callback_origins[func] = {
                        mod = core.get_current_modname() or "??",
                        name = debug.getinfo(1, "n").name or "??"
@@ -467,9 +518,9 @@ end
 
 function core.register_on_player_hpchange(func, modifier)
        if modifier then
-               table.insert(core.registered_on_player_hpchanges.modifiers, func)
+               core.registered_on_player_hpchanges.modifiers[#core.registered_on_player_hpchanges.modifiers + 1] = func
        else
-               table.insert(core.registered_on_player_hpchanges.loggers, func)
+               core.registered_on_player_hpchanges.loggers[#core.registered_on_player_hpchanges.loggers + 1] = func
        end
        core.callback_origins[func] = {
                mod = core.get_current_modname() or "??",