Liquids: Flow into and destroy 'floodable' nodes

[oweals/minetest.git] / builtin / game / register.lua

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index d0e04bfc37e1a80c172a923424530f5b09f18c7c..ba5f69d67defaab0f7ad940002e3d99255267b77 100644 (file)
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -51,20 +51,24 @@ local forbidden_item_names = {
 
 local function check_modname_prefix(name)
        if name:sub(1,1) == ":" then
-               -- Escape the modname prefix enforcement mechanism
+               -- If the name starts with a colon, we can skip the modname prefix
+               -- mechanism.
                return name:sub(2)
        else
-               -- Modname prefix enforcement
+               -- Enforce that the name starts with the correct mod name.
                local expected_prefix = core.get_current_modname() .. ":"
                if name:sub(1, #expected_prefix) ~= expected_prefix then
                        error("Name " .. name .. " does not follow naming conventions: " ..
-                               "\"modname:\" or \":\" prefix required")
+                               "\"" .. expected_prefix .. "\" or \":\" prefix required")
                end
+               
+               -- Enforce that the name only contains letters, numbers and underscores.
                local subname = name:sub(#expected_prefix+1)
-               if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
+               if subname:find("[^%w_]") then
                        error("Name " .. name .. " does not follow naming conventions: " ..
                                "contains unallowed characters")
                end
+               
                return name
        end
 end
@@ -221,7 +225,7 @@ function core.register_alias(name, convert_to)
                error("Unable to register alias: Name is forbidden: " .. name)
        end
        if core.registered_items[name] ~= nil then
-               core.log("WARNING: Not registering alias, item with same name" ..
+               core.log("warning", "Not registering alias, item with same name" ..
                        " is already defined: " .. name .. " -> " .. convert_to)
        else
                --core.log("Registering alias: " .. name .. " -> " .. convert_to)
@@ -268,6 +272,7 @@ core.register_item(":unknown", {
        description = "Unknown Item",
        inventory_image = "unknown_item.png",
        on_place = core.item_place,
+       on_secondary_use = core.item_secondary_use,
        on_drop = core.item_drop,
        groups = {not_in_creative_inventory=1},
        diggable = true,
@@ -284,6 +289,7 @@ core.register_node(":air", {
        pointable = false,
        diggable = false,
        buildable_to = true,
+       floodable = true,
        air_equivalent = true,
        drop = "",
        groups = {not_in_creative_inventory=1},