Sort commands and privs alphabetically in '/help'.
[oweals/minetest.git] / builtin / game / chatcommands.lua
index f8df83d8e2a8bef9fba33d79517d16ead48a1843..fb08d2a6b15636164a1f76016b7dd387a81b09fe 100644 (file)
@@ -4,27 +4,27 @@
 -- Chat command handler
 --
 
-minetest.chatcommands = {}
-function minetest.register_chatcommand(cmd, def)
+core.chatcommands = {}
+function core.register_chatcommand(cmd, def)
        def = def or {}
        def.params = def.params or ""
        def.description = def.description or ""
        def.privs = def.privs or {}
-       minetest.chatcommands[cmd] = def
+       core.chatcommands[cmd] = def
 end
 
-minetest.register_on_chat_message(function(name, message)
+core.register_on_chat_message(function(name, message)
        local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
        if not param then
                param = ""
        end
-       local cmd_def = minetest.chatcommands[cmd]
+       local cmd_def = core.chatcommands[cmd]
        if cmd_def then
-               local has_privs, missing_privs = minetest.check_player_privs(name, cmd_def.privs)
+               local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs)
                if has_privs then
                        cmd_def.func(name, param)
                else
-                       minetest.chat_send_player(name, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
+                       core.chat_send_player(name, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
                end
                return true -- handled chat message
        end
@@ -34,16 +34,16 @@ end)
 --
 -- Chat commands
 --
-minetest.register_chatcommand("me", {
+core.register_chatcommand("me", {
        params = "<action>",
        description = "chat action (eg. /me orders a pizza)",
        privs = {shout=true},
        func = function(name, param)
-               minetest.chat_send_all("* " .. name .. " " .. param)
+               core.chat_send_all("* " .. name .. " " .. param)
        end,
 })
 
-minetest.register_chatcommand("help", {
+core.register_chatcommand("help", {
        privs = {},
        params = "(nothing)/all/privs/<cmd>",
        description = "Get help for commands or list privileges",
@@ -56,83 +56,96 @@ minetest.register_chatcommand("help", {
                end
                if param == "" then
                        local msg = ""
-                       cmds = {}
-                       for cmd, def in pairs(minetest.chatcommands) do
-                               if minetest.check_player_privs(name, def.privs) then
+                       local cmds = {}
+                       for cmd, def in pairs(core.chatcommands) do
+                               if core.check_player_privs(name, def.privs) then
                                        table.insert(cmds, cmd)
                                end
                        end
-                       minetest.chat_send_player(name, "Available commands: "..table.concat(cmds, " "))
-                       minetest.chat_send_player(name, "Use '/help <cmd>' to get more information, or '/help all' to list everything.")
+                       table.sort(cmds)
+                       core.chat_send_player(name, "Available commands: "..table.concat(cmds, " "))
+                       core.chat_send_player(name, "Use '/help <cmd>' to get more information, or '/help all' to list everything.")
                elseif param == "all" then
-                       minetest.chat_send_player(name, "Available commands:")
-                       for cmd, def in pairs(minetest.chatcommands) do
-                               if minetest.check_player_privs(name, def.privs) then
-                                       minetest.chat_send_player(name, format_help_line(cmd, def))
+                       local cmds = {}
+                       for cmd, def in pairs(core.chatcommands) do
+                               if core.check_player_privs(name, def.privs) then
+                                       table.insert(cmds, cmd)
                                end
                        end
+                       table.sort(cmds)
+                       core.chat_send_player(name, "Available commands:")
+                       for _, cmd in ipairs(cmds) do
+                               local def = core.chatcommands[cmd]
+                               core.chat_send_player(name, format_help_line(cmd, def))
+                       end
                elseif param == "privs" then
-                       minetest.chat_send_player(name, "Available privileges:")
-                       for priv, def in pairs(minetest.registered_privileges) do
-                               minetest.chat_send_player(name, priv..": "..def.description)
+                       local privs = {}
+                       for priv, def in pairs(core.registered_privileges) do
+                               table.insert(privs, priv)
+                       end
+                       table.sort(privs)
+                       core.chat_send_player(name, "Available privileges:")
+                       for _, priv in ipairs(privs) do
+                               local def = core.registered_privileges[priv]
+                               core.chat_send_player(name, priv..": "..def.description)
                        end
                else
                        local cmd = param
-                       def = minetest.chatcommands[cmd]
+                       def = core.chatcommands[cmd]
                        if not def then
-                               minetest.chat_send_player(name, "Command not available: "..cmd)
+                               core.chat_send_player(name, "Command not available: "..cmd)
                        else
-                               minetest.chat_send_player(name, format_help_line(cmd, def))
+                               core.chat_send_player(name, format_help_line(cmd, def))
                        end
                end
        end,
 })
-minetest.register_chatcommand("privs", {
+core.register_chatcommand("privs", {
        params = "<name>",
        description = "print out privileges of player",
        func = function(name, param)
                if param == "" then
                        param = name
                else
-                       --[[if not minetest.check_player_privs(name, {privs=true}) then
-                               minetest.chat_send_player(name, "Privileges of "..param.." are hidden from you.")
+                       --[[if not core.check_player_privs(name, {privs=true}) then
+                               core.chat_send_player(name, "Privileges of "..param.." are hidden from you.")
                                return
                        end]]
                end
-               minetest.chat_send_player(name, "Privileges of "..param..": "..minetest.privs_to_string(minetest.get_player_privs(param), ' '))
+               core.chat_send_player(name, "Privileges of "..param..": "..core.privs_to_string(core.get_player_privs(param), ' '))
        end,
 })
-minetest.register_chatcommand("grant", {
+core.register_chatcommand("grant", {
        params = "<name> <privilege>|all",
        description = "Give privilege to player",
        privs = {},
        func = function(name, param)
-               if not minetest.check_player_privs(name, {privs=true}) and
-                               not minetest.check_player_privs(name, {basic_privs=true}) then
-                       minetest.chat_send_player(name, "Your privileges are insufficient.")
+               if not core.check_player_privs(name, {privs=true}) and
+                               not core.check_player_privs(name, {basic_privs=true}) then
+                       core.chat_send_player(name, "Your privileges are insufficient.")
                        return
                end
                local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
                if not grantname or not grantprivstr then
-                       minetest.chat_send_player(name, "Invalid parameters (see /help grant)")
+                       core.chat_send_player(name, "Invalid parameters (see /help grant)")
                        return
-               elseif not minetest.auth_table[grantname] then
-                       minetest.chat_send_player(name, "Player "..grantname.." does not exist.")
+               elseif not core.auth_table[grantname] then
+                       core.chat_send_player(name, "Player "..grantname.." does not exist.")
                        return
                end
-               local grantprivs = minetest.string_to_privs(grantprivstr)
+               local grantprivs = core.string_to_privs(grantprivstr)
                if grantprivstr == "all" then
-                       grantprivs = minetest.registered_privileges
+                       grantprivs = core.registered_privileges
                end
-               local privs = minetest.get_player_privs(grantname)
+               local privs = core.get_player_privs(grantname)
                local privs_known = true
                for priv, _ in pairs(grantprivs) do
-                       if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not minetest.check_player_privs(name, {privs=true}) then
-                               minetest.chat_send_player(name, "Your privileges are insufficient.")
+                       if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not core.check_player_privs(name, {privs=true}) then
+                               core.chat_send_player(name, "Your privileges are insufficient.")
                                return
                        end
-                       if not minetest.registered_privileges[priv] then
-                               minetest.chat_send_player(name, "Unknown privilege: "..priv)
+                       if not core.registered_privileges[priv] then
+                               core.chat_send_player(name, "Unknown privilege: "..priv)
                                privs_known = false
                        end
                        privs[priv] = true
@@ -140,37 +153,37 @@ minetest.register_chatcommand("grant", {
                if not privs_known then
                        return
                end
-               minetest.set_player_privs(grantname, privs)
-               minetest.log(name..' granted ('..minetest.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
-               minetest.chat_send_player(name, "Privileges of "..grantname..": "..minetest.privs_to_string(minetest.get_player_privs(grantname), ' '))
+               core.set_player_privs(grantname, privs)
+               core.log(name..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
+               core.chat_send_player(name, "Privileges of "..grantname..": "..core.privs_to_string(core.get_player_privs(grantname), ' '))
                if grantname ~= name then
-                       minetest.chat_send_player(grantname, name.." granted you privileges: "..minetest.privs_to_string(grantprivs, ' '))
+                       core.chat_send_player(grantname, name.." granted you privileges: "..core.privs_to_string(grantprivs, ' '))
                end
        end,
 })
-minetest.register_chatcommand("revoke", {
+core.register_chatcommand("revoke", {
        params = "<name> <privilege>|all",
        description = "Remove privilege from player",
        privs = {},
        func = function(name, param)
-               if not minetest.check_player_privs(name, {privs=true}) and
-                               not minetest.check_player_privs(name, {basic_privs=true}) then
-                       minetest.chat_send_player(name, "Your privileges are insufficient.")
+               if not core.check_player_privs(name, {privs=true}) and
+                               not core.check_player_privs(name, {basic_privs=true}) then
+                       core.chat_send_player(name, "Your privileges are insufficient.")
                        return
                end
                local revokename, revokeprivstr = string.match(param, "([^ ]+) (.+)")
                if not revokename or not revokeprivstr then
-                       minetest.chat_send_player(name, "Invalid parameters (see /help revoke)")
+                       core.chat_send_player(name, "Invalid parameters (see /help revoke)")
                        return
-               elseif not minetest.auth_table[revokename] then
-                       minetest.chat_send_player(name, "Player "..revokename.." does not exist.")
+               elseif not core.auth_table[revokename] then
+                       core.chat_send_player(name, "Player "..revokename.." does not exist.")
                        return
                end
-               local revokeprivs = minetest.string_to_privs(revokeprivstr)
-               local privs = minetest.get_player_privs(revokename)
+               local revokeprivs = core.string_to_privs(revokeprivstr)
+               local privs = core.get_player_privs(revokename)
                for priv, _ in pairs(revokeprivs) do
-                       if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not minetest.check_player_privs(name, {privs=true}) then
-                               minetest.chat_send_player(name, "Your privileges are insufficient.")
+                       if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not core.check_player_privs(name, {privs=true}) then
+                               core.chat_send_player(name, "Your privileges are insufficient.")
                                return
                        end
                end
@@ -181,15 +194,15 @@ minetest.register_chatcommand("revoke", {
                                privs[priv] = nil
                        end
                end
-               minetest.set_player_privs(revokename, privs)
-               minetest.log(name..' revoked ('..minetest.privs_to_string(revokeprivs, ', ')..') privileges from '..revokename)
-               minetest.chat_send_player(name, "Privileges of "..revokename..": "..minetest.privs_to_string(minetest.get_player_privs(revokename), ' '))
+               core.set_player_privs(revokename, privs)
+               core.log(name..' revoked ('..core.privs_to_string(revokeprivs, ', ')..') privileges from '..revokename)
+               core.chat_send_player(name, "Privileges of "..revokename..": "..core.privs_to_string(core.get_player_privs(revokename), ' '))
                if revokename ~= name then
-                       minetest.chat_send_player(revokename, name.." revoked privileges from you: "..minetest.privs_to_string(revokeprivs, ' '))
+                       core.chat_send_player(revokename, name.." revoked privileges from you: "..core.privs_to_string(revokeprivs, ' '))
                end
        end,
 })
-minetest.register_chatcommand("setpassword", {
+core.register_chatcommand("setpassword", {
        params = "<name> <password>",
        description = "set given password",
        privs = {password=true},
@@ -200,53 +213,53 @@ minetest.register_chatcommand("setpassword", {
                        raw_password = nil
                end
                if not toname then
-                       minetest.chat_send_player(name, "Name field required")
+                       core.chat_send_player(name, "Name field required")
                        return
                end
                local actstr = "?"
                if not raw_password then
-                       minetest.set_player_password(toname, "")
+                       core.set_player_password(toname, "")
                        actstr = "cleared"
                else
-                       minetest.set_player_password(toname, minetest.get_password_hash(toname, raw_password))
+                       core.set_player_password(toname, core.get_password_hash(toname, raw_password))
                        actstr = "set"
                end
-               minetest.chat_send_player(name, "Password of player \""..toname.."\" "..actstr)
+               core.chat_send_player(name, "Password of player \""..toname.."\" "..actstr)
                if toname ~= name then
-                       minetest.chat_send_player(toname, "Your password was "..actstr.." by "..name)
+                       core.chat_send_player(toname, "Your password was "..actstr.." by "..name)
                end
        end,
 })
-minetest.register_chatcommand("clearpassword", {
+core.register_chatcommand("clearpassword", {
        params = "<name>",
        description = "set empty password",
        privs = {password=true},
        func = function(name, param)
                toname = param
                if toname == "" then
-                       minetest.chat_send_player(name, "Name field required")
+                       core.chat_send_player(name, "Name field required")
                        return
                end
-               minetest.set_player_password(toname, '')
-               minetest.chat_send_player(name, "Password of player \""..toname.."\" cleared")
+               core.set_player_password(toname, '')
+               core.chat_send_player(name, "Password of player \""..toname.."\" cleared")
        end,
 })
 
-minetest.register_chatcommand("auth_reload", {
+core.register_chatcommand("auth_reload", {
        params = "",
        description = "reload authentication data",
        privs = {server=true},
        func = function(name, param)
-               local done = minetest.auth_reload()
+               local done = core.auth_reload()
                if done then
-                       minetest.chat_send_player(name, "Done.")
+                       core.chat_send_player(name, "Done.")
                else
-                       minetest.chat_send_player(name, "Failed.")
+                       core.chat_send_player(name, "Failed.")
                end
        end,
 })
 
-minetest.register_chatcommand("teleport", {
+core.register_chatcommand("teleport", {
        params = "<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>",
        description = "teleport to given position",
        privs = {teleport=true},
@@ -261,9 +274,9 @@ minetest.register_chatcommand("teleport", {
                        }
                        for _, d in ipairs(tries) do
                                local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
-                               local n = minetest.get_node_or_nil(p)
+                               local n = core.get_node_or_nil(p)
                                if n and n.name then
-                                       local def = minetest.registered_nodes[n.name]
+                                       local def = core.registered_nodes[n.name]
                                        if def and not def.walkable then
                                                return p, true
                                        end
@@ -278,9 +291,9 @@ minetest.register_chatcommand("teleport", {
                p.x = tonumber(p.x)
                p.y = tonumber(p.y)
                p.z = tonumber(p.z)
-               teleportee = minetest.get_player_by_name(name)
+               teleportee = core.get_player_by_name(name)
                if teleportee and p.x and p.y and p.z then
-                       minetest.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
+                       core.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
                        teleportee:setpos(p)
                        return
                end
@@ -289,21 +302,21 @@ minetest.register_chatcommand("teleport", {
                local p = nil
                local target_name = nil
                target_name = string.match(param, "^([^ ]+)$")
-               teleportee = minetest.get_player_by_name(name)
+               teleportee = core.get_player_by_name(name)
                if target_name then
-                       local target = minetest.get_player_by_name(target_name)
+                       local target = core.get_player_by_name(target_name)
                        if target then
                                p = target:getpos()
                        end
                end
                if teleportee and p then
                        p = find_free_position_near(p)
-                       minetest.chat_send_player(name, "Teleporting to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
+                       core.chat_send_player(name, "Teleporting to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
                        teleportee:setpos(p)
                        return
                end
                
-               if minetest.check_player_privs(name, {bring=true}) then
+               if core.check_player_privs(name, {bring=true}) then
                        local teleportee = nil
                        local p = {}
                        local teleportee_name = nil
@@ -312,10 +325,10 @@ minetest.register_chatcommand("teleport", {
                        p.y = tonumber(p.y)
                        p.z = tonumber(p.z)
                        if teleportee_name then
-                               teleportee = minetest.get_player_by_name(teleportee_name)
+                               teleportee = core.get_player_by_name(teleportee_name)
                        end
                        if teleportee and p.x and p.y and p.z then
-                               minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
+                               core.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
                                teleportee:setpos(p)
                                return
                        end
@@ -326,68 +339,68 @@ minetest.register_chatcommand("teleport", {
                        local target_name = nil
                        teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
                        if teleportee_name then
-                               teleportee = minetest.get_player_by_name(teleportee_name)
+                               teleportee = core.get_player_by_name(teleportee_name)
                        end
                        if target_name then
-                               local target = minetest.get_player_by_name(target_name)
+                               local target = core.get_player_by_name(target_name)
                                if target then
                                        p = target:getpos()
                                end
                        end
                        if teleportee and p then
                                p = find_free_position_near(p)
-                               minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
+                               core.chat_send_player(name, "Teleporting "..teleportee_name.." to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
                                teleportee:setpos(p)
                                return
                        end
                end
 
-               minetest.chat_send_player(name, "Invalid parameters (\""..param.."\") or player not found (see /help teleport)")
+               core.chat_send_player(name, "Invalid parameters (\""..param.."\") or player not found (see /help teleport)")
                return
        end,
 })
 
-minetest.register_chatcommand("set", {
+core.register_chatcommand("set", {
        params = "[-n] <name> <value> | <name>",
        description = "set or read server configuration setting",
        privs = {server=true},
        func = function(name, param)
                local arg, setname, setvalue = string.match(param, "(-[n]) ([^ ]+) (.+)")
                if arg and arg == "-n" and setname and setvalue then
-                       minetest.setting_set(setname, setvalue)
-                       minetest.chat_send_player(name, setname.." = "..setvalue)
+                       core.setting_set(setname, setvalue)
+                       core.chat_send_player(name, setname.." = "..setvalue)
                        return
                end
                local setname, setvalue = string.match(param, "([^ ]+) (.+)")
                if setname and setvalue then
-                       if not minetest.setting_get(setname) then
-                               minetest.chat_send_player(name, "Failed. Use '/set -n <name> <value>' to create a new setting.")
+                       if not core.setting_get(setname) then
+                               core.chat_send_player(name, "Failed. Use '/set -n <name> <value>' to create a new setting.")
                                return
                        end
-                       minetest.setting_set(setname, setvalue)
-                       minetest.chat_send_player(name, setname.." = "..setvalue)
+                       core.setting_set(setname, setvalue)
+                       core.chat_send_player(name, setname.." = "..setvalue)
                        return
                end
                local setname = string.match(param, "([^ ]+)")
                if setname then
-                       local setvalue = minetest.setting_get(setname)
+                       local setvalue = core.setting_get(setname)
                        if not setvalue then
                                setvalue = "<not set>"
                        end
-                       minetest.chat_send_player(name, setname.." = "..setvalue)
+                       core.chat_send_player(name, setname.." = "..setvalue)
                        return
                end
-               minetest.chat_send_player(name, "Invalid parameters (see /help set)")
+               core.chat_send_player(name, "Invalid parameters (see /help set)")
        end,
 })
 
-minetest.register_chatcommand("mods", {
+core.register_chatcommand("mods", {
        params = "",
        description = "lists mods installed on the server",
        privs = {},
        func = function(name, param)
                local response = ""
-               local modnames = minetest.get_modnames()
+               local modnames = core.get_modnames()
                for i, mod in ipairs(modnames) do
                        response = response .. mod
                        -- Add space if not at the end
@@ -395,25 +408,25 @@ minetest.register_chatcommand("mods", {
                                response = response .. " "
                        end
                end
-               minetest.chat_send_player(name, response)
+               core.chat_send_player(name, response)
        end,
 })
 
 local function handle_give_command(cmd, giver, receiver, stackstring)
-       minetest.log("action", giver.." invoked "..cmd..', stackstring="'
+       core.log("action", giver.." invoked "..cmd..', stackstring="'
                        ..stackstring..'"')
-       minetest.log(cmd..' invoked, stackstring="'..stackstring..'"')
+       core.log(cmd..' invoked, stackstring="'..stackstring..'"')
        local itemstack = ItemStack(stackstring)
        if itemstack:is_empty() then
-               minetest.chat_send_player(giver, 'error: cannot give an empty item')
+               core.chat_send_player(giver, 'error: cannot give an empty item')
                return
        elseif not itemstack:is_known() then
-               minetest.chat_send_player(giver, 'error: cannot give an unknown item')
+               core.chat_send_player(giver, 'error: cannot give an unknown item')
                return
        end
-       local receiverref = minetest.get_player_by_name(receiver)
+       local receiverref = core.get_player_by_name(receiver)
        if receiverref == nil then
-               minetest.chat_send_player(giver, receiver..' is not a known player')
+               core.chat_send_player(giver, receiver..' is not a known player')
                return
        end
        local leftover = receiverref:get_inventory():add_item("main", itemstack)
@@ -428,96 +441,96 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
        -- entered (e.g. big numbers are always interpreted as 2^16-1).
        stackstring = itemstack:to_string()
        if giver == receiver then
-               minetest.chat_send_player(giver, '"'..stackstring
+               core.chat_send_player(giver, '"'..stackstring
                        ..'" '..partiality..'added to inventory.');
        else
-               minetest.chat_send_player(giver, '"'..stackstring
+               core.chat_send_player(giver, '"'..stackstring
                        ..'" '..partiality..'added to '..receiver..'\'s inventory.');
-               minetest.chat_send_player(receiver, '"'..stackstring
+               core.chat_send_player(receiver, '"'..stackstring
                        ..'" '..partiality..'added to inventory.');
        end
 end
 
-minetest.register_chatcommand("give", {
+core.register_chatcommand("give", {
        params = "<name> <itemstring>",
        description = "give item to player",
        privs = {give=true},
        func = function(name, param)
                local toname, itemstring = string.match(param, "^([^ ]+) +(.+)$")
                if not toname or not itemstring then
-                       minetest.chat_send_player(name, "name and itemstring required")
+                       core.chat_send_player(name, "name and itemstring required")
                        return
                end
                handle_give_command("/give", name, toname, itemstring)
        end,
 })
-minetest.register_chatcommand("giveme", {
+core.register_chatcommand("giveme", {
        params = "<itemstring>",
        description = "give item to yourself",
        privs = {give=true},
        func = function(name, param)
                local itemstring = string.match(param, "(.+)$")
                if not itemstring then
-                       minetest.chat_send_player(name, "itemstring required")
+                       core.chat_send_player(name, "itemstring required")
                        return
                end
                handle_give_command("/giveme", name, name, itemstring)
        end,
 })
-minetest.register_chatcommand("spawnentity", {
+core.register_chatcommand("spawnentity", {
        params = "<entityname>",
        description = "spawn entity at your position",
        privs = {give=true, interact=true},
        func = function(name, param)
                local entityname = string.match(param, "(.+)$")
                if not entityname then
-                       minetest.chat_send_player(name, "entityname required")
+                       core.chat_send_player(name, "entityname required")
                        return
                end
-               minetest.log("action", '/spawnentity invoked, entityname="'..entityname..'"')
-               local player = minetest.get_player_by_name(name)
+               core.log("action", '/spawnentity invoked, entityname="'..entityname..'"')
+               local player = core.get_player_by_name(name)
                if player == nil then
-                       minetest.log("error", "Unable to spawn entity, player is nil")
+                       core.log("error", "Unable to spawn entity, player is nil")
                        return true -- Handled chat message
                end
                local p = player:getpos()
                p.y = p.y + 1
-               minetest.add_entity(p, entityname)
-               minetest.chat_send_player(name, '"'..entityname
+               core.add_entity(p, entityname)
+               core.chat_send_player(name, '"'..entityname
                                ..'" spawned.');
        end,
 })
-minetest.register_chatcommand("pulverize", {
+core.register_chatcommand("pulverize", {
        params = "",
        description = "delete item in hand",
        privs = {},
        func = function(name, param)
-               local player = minetest.get_player_by_name(name)
+               local player = core.get_player_by_name(name)
                if player == nil then
-                       minetest.log("error", "Unable to pulverize, player is nil")
+                       core.log("error", "Unable to pulverize, player is nil")
                        return true -- Handled chat message
                end
                if player:get_wielded_item():is_empty() then
-                       minetest.chat_send_player(name, 'Unable to pulverize, no item in hand.')
+                       core.chat_send_player(name, 'Unable to pulverize, no item in hand.')
                else
                        player:set_wielded_item(nil)
-                       minetest.chat_send_player(name, 'An item was pulverized.')
+                       core.chat_send_player(name, 'An item was pulverized.')
                end
        end,
 })
 
 -- Key = player name
-minetest.rollback_punch_callbacks = {}
+core.rollback_punch_callbacks = {}
 
-minetest.register_on_punchnode(function(pos, node, puncher)
+core.register_on_punchnode(function(pos, node, puncher)
        local name = puncher:get_player_name()
-       if minetest.rollback_punch_callbacks[name] then
-               minetest.rollback_punch_callbacks[name](pos, node, puncher)
-               minetest.rollback_punch_callbacks[name] = nil
+       if core.rollback_punch_callbacks[name] then
+               core.rollback_punch_callbacks[name](pos, node, puncher)
+               core.rollback_punch_callbacks[name] = nil
        end
 end)
 
-minetest.register_chatcommand("rollback_check", {
+core.register_chatcommand("rollback_check", {
        params = "[<range>] [<seconds>] [limit]",
        description = "check who has last touched a node or near it, "..
                        "max. <seconds> ago (default range=0, seconds=86400=24h, limit=5)",
@@ -529,29 +542,29 @@ minetest.register_chatcommand("rollback_check", {
                seconds = tonumber(seconds) or 86400
                limit = tonumber(limit) or 5
                if limit > 100 then
-                       minetest.chat_send_player(name, "That limit is too high!")
+                       core.chat_send_player(name, "That limit is too high!")
                        return
                end
-               minetest.chat_send_player(name, "Punch a node (range="..
+               core.chat_send_player(name, "Punch a node (range="..
                                range..", seconds="..seconds.."s, limit="..limit..")")
 
-               minetest.rollback_punch_callbacks[name] = function(pos, node, puncher)
+               core.rollback_punch_callbacks[name] = function(pos, node, puncher)
                        local name = puncher:get_player_name()
-                       minetest.chat_send_player(name, "Checking "..minetest.pos_to_string(pos).."...")
-                       local actions = minetest.rollback_get_node_actions(pos, range, seconds, limit)
+                       core.chat_send_player(name, "Checking "..core.pos_to_string(pos).."...")
+                       local actions = core.rollback_get_node_actions(pos, range, seconds, limit)
                        local num_actions = #actions
                        if num_actions == 0 then
-                               minetest.chat_send_player(name, "Nobody has touched the "..
+                               core.chat_send_player(name, "Nobody has touched the "..
                                                "specified location in "..seconds.." seconds")
                                return
                        end
                        local time = os.time()
                        for i = num_actions, 1, -1 do
                                local action = actions[i]
-                               minetest.chat_send_player(name,
+                               core.chat_send_player(name,
                                        ("%s %s %s -> %s %d seconds ago.")
                                                :format(
-                                                       minetest.pos_to_string(action.pos),
+                                                       core.pos_to_string(action.pos),
                                                        action.actor,
                                                        action.oldnode.name,
                                                        action.newnode.name,
@@ -561,7 +574,7 @@ minetest.register_chatcommand("rollback_check", {
        end,
 })
 
-minetest.register_chatcommand("rollback", {
+core.register_chatcommand("rollback", {
        params = "<player name> [<seconds>] | :<actor> [<seconds>]",
        description = "revert actions of a player; default for <seconds> is 60",
        privs = {rollback=true},
@@ -571,109 +584,109 @@ minetest.register_chatcommand("rollback", {
                        local player_name = nil
                        player_name, seconds = string.match(param, "([^ ]+) *(%d*)")
                        if not player_name then
-                               minetest.chat_send_player(name, "Invalid parameters. See /help rollback and /help rollback_check")
+                               core.chat_send_player(name, "Invalid parameters. See /help rollback and /help rollback_check")
                                return
                        end
                        target_name = "player:"..player_name
                end
                seconds = tonumber(seconds) or 60
-               minetest.chat_send_player(name, "Reverting actions of "..
+               core.chat_send_player(name, "Reverting actions of "..
                                target_name.." since "..seconds.." seconds.")
-               local success, log = minetest.rollback_revert_actions_by(
+               local success, log = core.rollback_revert_actions_by(
                                target_name, seconds)
                if #log > 100 then
-                       minetest.chat_send_player(name, "(log is too long to show)")
+                       core.chat_send_player(name, "(log is too long to show)")
                else
                        for _, line in pairs(log) do
-                               minetest.chat_send_player(name, line)
+                               core.chat_send_player(name, line)
                        end
                end
                if success then
-                       minetest.chat_send_player(name, "Reverting actions succeeded.")
+                       core.chat_send_player(name, "Reverting actions succeeded.")
                else
-                       minetest.chat_send_player(name, "Reverting actions FAILED.")
+                       core.chat_send_player(name, "Reverting actions FAILED.")
                end
        end,
 })
 
-minetest.register_chatcommand("status", {
+core.register_chatcommand("status", {
        params = "",
        description = "print server status line",
        privs = {},
        func = function(name, param)
-               minetest.chat_send_player(name, minetest.get_server_status())
+               core.chat_send_player(name, core.get_server_status())
        end,
 })
 
-minetest.register_chatcommand("time", {
+core.register_chatcommand("time", {
        params = "<0...24000>",
        description = "set time of day",
        privs = {settime=true},
        func = function(name, param)
                if param == "" then
-                       minetest.chat_send_player(name, "Missing parameter")
+                       core.chat_send_player(name, "Missing parameter")
                        return
                end
                local newtime = tonumber(param)
                if newtime == nil then
-                       minetest.chat_send_player(name, "Invalid time")
+                       core.chat_send_player(name, "Invalid time")
                else
-                       minetest.set_timeofday((newtime % 24000) / 24000)
-                       minetest.chat_send_player(name, "Time of day changed.")
-                       minetest.log("action", name .. " sets time " .. newtime)
+                       core.set_timeofday((newtime % 24000) / 24000)
+                       core.chat_send_player(name, "Time of day changed.")
+                       core.log("action", name .. " sets time " .. newtime)
                end
        end,
 })
 
-minetest.register_chatcommand("shutdown", {
+core.register_chatcommand("shutdown", {
        params = "",
        description = "shutdown server",
        privs = {server=true},
        func = function(name, param)
-               minetest.log("action", name .. " shuts down server")
-               minetest.request_shutdown()
-               minetest.chat_send_all("*** Server shutting down (operator request).")
+               core.log("action", name .. " shuts down server")
+               core.request_shutdown()
+               core.chat_send_all("*** Server shutting down (operator request).")
        end,
 })
 
-minetest.register_chatcommand("ban", {
+core.register_chatcommand("ban", {
        params = "<name>",
        description = "ban IP of player",
        privs = {ban=true},
        func = function(name, param)
                if param == "" then
-                       minetest.chat_send_player(name, "Ban list: " .. minetest.get_ban_list())
+                       core.chat_send_player(name, "Ban list: " .. core.get_ban_list())
                        return
                end
-               if not minetest.get_player_by_name(param) then
-                       minetest.chat_send_player(name, "No such player")
+               if not core.get_player_by_name(param) then
+                       core.chat_send_player(name, "No such player")
                        return
                end
-               if not minetest.ban_player(param) then
-                       minetest.chat_send_player(name, "Failed to ban player")
+               if not core.ban_player(param) then
+                       core.chat_send_player(name, "Failed to ban player")
                else
-                       local desc = minetest.get_ban_description(param)
-                       minetest.chat_send_player(name, "Banned " .. desc .. ".")
-                       minetest.log("action", name .. " bans " .. desc .. ".")
+                       local desc = core.get_ban_description(param)
+                       core.chat_send_player(name, "Banned " .. desc .. ".")
+                       core.log("action", name .. " bans " .. desc .. ".")
                end
        end,
 })
 
-minetest.register_chatcommand("unban", {
+core.register_chatcommand("unban", {
        params = "<name/ip>",
        description = "remove IP ban",
        privs = {ban=true},
        func = function(name, param)
-               if not minetest.unban_player_or_ip(param) then
-                       minetest.chat_send_player(name, "Failed to unban player/IP")
+               if not core.unban_player_or_ip(param) then
+                       core.chat_send_player(name, "Failed to unban player/IP")
                else
-                       minetest.chat_send_player(name, "Unbanned " .. param)
-                       minetest.log("action", name .. " unbans " .. param)
+                       core.chat_send_player(name, "Unbanned " .. param)
+                       core.log("action", name .. " unbans " .. param)
                end
        end,
 })
 
-minetest.register_chatcommand("kick", {
+core.register_chatcommand("kick", {
        params = "<name> [reason]",
        description = "kick a player",
        privs = {kick=true},
@@ -682,44 +695,44 @@ minetest.register_chatcommand("kick", {
                if not tokick then
                        tokick = param
                end
-               if not minetest.kick_player(tokick, reason) then
-                       minetest.chat_send_player(name, "Failed to kick player " .. tokick)
+               if not core.kick_player(tokick, reason) then
+                       core.chat_send_player(name, "Failed to kick player " .. tokick)
                else
-                       minetest.chat_send_player(name, "kicked " .. tokick)
-                       minetest.log("action", name .. " kicked " .. tokick)
+                       core.chat_send_player(name, "kicked " .. tokick)
+                       core.log("action", name .. " kicked " .. tokick)
                end
        end,
 })
 
-minetest.register_chatcommand("clearobjects", {
+core.register_chatcommand("clearobjects", {
        params = "",
        description = "clear all objects in world",
        privs = {server=true},
        func = function(name, param)
-               minetest.log("action", name .. " clears all objects")
-               minetest.chat_send_all("Clearing all objects.  This may take long.  You may experience a timeout.  (by " .. name .. ")")
-               minetest.clear_objects()
-               minetest.log("action", "object clearing done")
-               minetest.chat_send_all("*** Cleared all objects.")
+               core.log("action", name .. " clears all objects")
+               core.chat_send_all("Clearing all objects.  This may take long.  You may experience a timeout.  (by " .. name .. ")")
+               core.clear_objects()
+               core.log("action", "object clearing done")
+               core.chat_send_all("*** Cleared all objects.")
        end,
 })
 
-minetest.register_chatcommand("msg", {
+core.register_chatcommand("msg", {
        params = "<name> <message>",
        description = "Send a private message",
        privs = {shout=true},
        func = function(name, param)
                local found, _, sendto, message = param:find("^([^%s]+)%s(.+)$")
                if found then
-                       if minetest.get_player_by_name(sendto) then
-                               minetest.log("action", "PM from "..name.." to "..sendto..": "..message)
-                               minetest.chat_send_player(sendto, "PM from "..name..": "..message)
-                               minetest.chat_send_player(name, "Message sent")
+                       if core.get_player_by_name(sendto) then
+                               core.log("action", "PM from "..name.." to "..sendto..": "..message)
+                               core.chat_send_player(sendto, "PM from "..name..": "..message)
+                               core.chat_send_player(name, "Message sent")
                        else
-                               minetest.chat_send_player(name, "The player "..sendto.." is not online")
+                               core.chat_send_player(name, "The player "..sendto.." is not online")
                        end
                else
-                       minetest.chat_send_player(name, "Invalid usage, see /help msg")
+                       core.chat_send_player(name, "Invalid usage, see /help msg")
                end
        end,
 })