Translated using Weblate (German)

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

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 6c8ca8699f63d3bf69c2c77b5f7aa07f9a3e9e28..6a35c034e9268036cc23633f26d4b63ae715afd4 100644 (file)
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -10,6 +10,7 @@ function core.register_chatcommand(cmd, def)
        def.params = def.params or ""
        def.description = def.description or ""
        def.privs = def.privs or {}
+       def.mod_origin = core.get_current_modname() or "??"
        core.chatcommands[cmd] = def
 end
 
@@ -37,6 +38,7 @@ core.register_on_chat_message(function(name, message)
        end
        local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs)
        if has_privs then
+               core.set_last_run_mod(cmd_def.mod_origin)
                local success, message = cmd_def.func(name, param)
                if message then
                        core.chat_send_player(name, message)
@@ -49,6 +51,27 @@ core.register_on_chat_message(function(name, message)
        return true  -- Handled chat message
 end)
 
+-- Parses a "range" string in the format of "here (number)" or
+-- "(x1, y1, z1) (x2, y2, z2)", returning two position vectors
+local function parse_range_str(player_name, str)
+       local p1, p2
+       local args = str:split(" ")
+
+       if args[1] == "here" then
+               p1, p2 = core.get_player_radius_area(player_name, tonumber(args[2]))
+               if p1 == nil then
+                       return false, "Unable to get player " .. player_name .. " position"
+               end
+       else
+               p1, p2 = core.string_to_area(str)
+               if p1 == nil then
+                       return false, "Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)"
+               end
+       end
+
+       return p1, p2
+end
+
 --
 -- Chat commands
 --
@@ -413,40 +436,65 @@ core.register_chatcommand("set", {
        end,
 })
 
-core.register_chatcommand("deleteblocks", {
+local function emergeblocks_callback(pos, action, num_calls_remaining, ctx)
+       if ctx.total_blocks == 0 then
+               ctx.total_blocks   = num_calls_remaining + 1
+               ctx.current_blocks = 0
+       end
+       ctx.current_blocks = ctx.current_blocks + 1
+
+       if ctx.current_blocks == ctx.total_blocks then
+               core.chat_send_player(ctx.requestor_name,
+                       string.format("Finished emerging %d blocks in %.2fms.",
+                       ctx.total_blocks, (os.clock() - ctx.start_time) * 1000))
+       end
+end
+
+local function emergeblocks_progress_update(ctx)
+       if ctx.current_blocks ~= ctx.total_blocks then
+               core.chat_send_player(ctx.requestor_name,
+                       string.format("emergeblocks update: %d/%d blocks emerged (%.1f%%)",
+                       ctx.current_blocks, ctx.total_blocks,
+                       (ctx.current_blocks / ctx.total_blocks) * 100))
+
+               core.after(2, emergeblocks_progress_update, ctx)
+       end
+end
+
+core.register_chatcommand("emergeblocks", {
        params = "(here [radius]) | (<pos1> <pos2>)",
-       description = "delete map blocks contained in area pos1 to pos2",
+       description = "starts loading (or generating, if inexistent) map blocks "
+               .. "contained in area pos1 to pos2",
        privs = {server=true},
        func = function(name, param)
-               local p1 = {}
-               local p2 = {}
-               local args = param:split(" ")
-               if args[1] == "here" then
-                       local player = core.get_player_by_name(name)
-                       if player == nil then
-                               core.log("error", "player is nil")
-                               return false, "Unable to get current position; player is nil"
-                       end
-                       p1 = player:getpos()
-                       p2 = p1
+               local p1, p2 = parse_range_str(name, param)
+               if p1 == false then
+                       return false, p2
+               end
 
-                       if #args >= 2 then
-                               local radius = tonumber(args[2]) or 0
-                               p1 = vector.add(p1, radius)
-                               p2 = vector.subtract(p2, radius)
-                       end
-               else
-                       local pos1, pos2 = unpack(param:split(") ("))
-                       if pos1 == nil or pos2 == nil then
-                               return false, "Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)"
-                       end
+               local context = {
+                       current_blocks = 0,
+                       total_blocks   = 0,
+                       start_time     = os.clock(),
+                       requestor_name = name
+               }
 
-                       p1 = core.string_to_pos(pos1 .. ")")
-                       p2 = core.string_to_pos("(" .. pos2)
+               core.emerge_area(p1, p2, emergeblocks_callback, context)
+               core.after(2, emergeblocks_progress_update, context)
 
-                       if p1 == nil or p2 == nil then
-                               return false, "Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)"
-                       end
+               return true, "Started emerge of area ranging from " ..
+                       core.pos_to_string(p1, 1) .. " to " .. core.pos_to_string(p2, 1)
+       end,
+})
+
+core.register_chatcommand("deleteblocks", {
+       params = "(here [radius]) | (<pos1> <pos2>)",
+       description = "delete map blocks contained in area pos1 to pos2",
+       privs = {server=true},
+       func = function(name, param)
+               local p1, p2 = parse_range_str(name, param)
+               if p1 == false then
+                       return false, p2
                end
 
                if core.delete_area(p1, p2) then
@@ -696,7 +744,7 @@ core.register_chatcommand("time", {
                        local hour = (current_time - minutes) / 60
                        return true, ("Current time is %d:%02d"):format(hour, minutes)
                end
-               local player_privs = minetest.get_player_privs(name)
+               local player_privs = core.get_player_privs(name)
                if not player_privs.settime then
                        return false, "You don't have permission to run this command " ..
                                "(missing privilege: settime)."