minetest.register_privilege("worldedit", "Can use WorldEdit commands")\r
\r
+worldedit.pos1 = {}\r
+worldedit.pos2 = {}\r
+\r
worldedit.set_pos = {}\r
worldedit.inspect = {}\r
+worldedit.prob_pos = {}\r
+worldedit.prob_list = {}\r
\r
-worldedit.pos1 = {}\r
-worldedit.pos2 = {}\r
-if minetest.place_schematic then\r
- worldedit.prob_pos = {}\r
- worldedit.prob_list = {}\r
+\r
+\r
+local safe_region, reset_pending = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")\r
+\r
+function worldedit.player_notify(name, message)\r
+ minetest.chat_send_player(name, "WorldEdit -!- " .. message, false)\r
end\r
\r
-dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")\r
-dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")\r
-dofile(minetest.get_modpath("worldedit_commands") .. "/wand.lua")\r
-local safe_region, check_region, reset_pending = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")\r
+worldedit.registered_commands = {}\r
+\r
+local function chatcommand_handler(cmd_name, name, param)\r
+ local def = assert(worldedit.registered_commands[cmd_name])\r
\r
-local function get_position(name) --position 1 retrieval function for when not using `safe_region`\r
- local pos1 = worldedit.pos1[name]\r
- if pos1 == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
+ if def.require_pos == 2 then\r
+ local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
+ if pos1 == nil or pos2 == nil then\r
+ worldedit.player_notify(name, "no region selected")\r
+ return\r
+ end\r
+ elseif def.require_pos == 1 then\r
+ local pos1 = worldedit.pos1[name]\r
+ if pos1 == nil then\r
+ worldedit.player_notify(name, "no position 1 selected")\r
+ return\r
+ end\r
+ end\r
+\r
+ local parsed = {def.parse(param)}\r
+ local success = table.remove(parsed, 1)\r
+ if not success then\r
+ worldedit.player_notify(name, parsed[1] or "invalid usage")\r
+ return\r
+ end\r
+\r
+ if def.nodes_needed then\r
+ local count = def.nodes_needed(name, unpack(parsed))\r
+ safe_region(name, count, function()\r
+ local success, msg = def.func(name, unpack(parsed))\r
+ if msg then\r
+ minetest.chat_send_player(name, msg)\r
+ end\r
+ end)\r
+ else\r
+ -- no "safe region" check\r
+ local success, msg = def.func(name, unpack(parsed))\r
+ if msg then\r
+ minetest.chat_send_player(name, msg)\r
+ end\r
end\r
- return pos1\r
end\r
\r
--- normalize_nodename wrapper for convenience purposes\r
-local function get_node(name, nodename)\r
- local node = worldedit.normalize_nodename(nodename)\r
- if not node then\r
- worldedit.player_notify(name, "invalid node name: " .. nodename)\r
- return nil\r
+-- Registers a chatcommand for WorldEdit\r
+-- name = "about" -- Name of the chat command (without any /)\r
+-- def = {\r
+-- privs = {}, -- Privileges needed\r
+-- params = "", -- Human readable parameter list (optional)\r
+-- -- setting params = "" will automatically provide a parse() if not given \r
+-- description = "", -- Description\r
+-- require_pos = 0, -- Number of positions required to be set (optional)\r
+-- parse = function(param)\r
+-- return true, foo, bar, ...\r
+-- -- or\r
+-- return false\r
+-- -- or\r
+-- return false, "error message"\r
+-- end,\r
+-- nodes_needed = function(name, foo, bar, ...), -- (optional)\r
+-- return n\r
+-- end,\r
+-- func = function(name, foo, bar, ...)\r
+-- return success, "message"\r
+-- end,\r
+-- }\r
+function worldedit.register_command(name, def)\r
+ local def = table.copy(def)\r
+ assert(name and #name > 0)\r
+ assert(def.privs)\r
+ def.require_pos = def.require_pos or 0\r
+ assert(def.require_pos >= 0 and def.require_pos < 3)\r
+ if def.params == "" and not def.parse then\r
+ def.parse = function(param) return true end\r
+ else\r
+ assert(def.parse)\r
end\r
- return node\r
+ assert(def.nodes_needed == nil or type(def.nodes_needed) == "function")\r
+ assert(def.func)\r
+\r
+ -- for development\r
+ --[[if def.require_pos == 2 and not def.nodes_needed then\r
+ minetest.log("warning", "//" .. name .. " might be missing nodes_needed")\r
+ end--]]\r
+\r
+ minetest.register_chatcommand("/" .. name, {\r
+ privs = def.privs,\r
+ params = def.params,\r
+ description = def.description,\r
+ func = function(player_name, param)\r
+ return chatcommand_handler(name, player_name, param)\r
+ end,\r
+ })\r
+ worldedit.registered_commands[name] = def\r
end\r
\r
-function worldedit.player_notify(name, message)\r
- minetest.chat_send_player(name, "WorldEdit -!- " .. message, false)\r
+\r
+\r
+dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")\r
+dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")\r
+dofile(minetest.get_modpath("worldedit_commands") .. "/wand.lua")\r
+\r
+\r
+local function check_region(name)\r
+ return worldedit.volume(worldedit.pos1[name], worldedit.pos2[name])\r
end\r
\r
-- https://github.com/minetest/minetest/blob/53dd7819277c53954d1298dfffa5287c306db8d0/src/util/string.cpp#L777\r
end\r
\r
\r
-minetest.register_chatcommand("/about", {\r
+worldedit.register_command("about", {\r
+ privs = {},\r
params = "",\r
description = "Get information about the WorldEdit mod",\r
- func = function(name, param)\r
- worldedit.player_notify(name, "WorldEdit " .. worldedit.version_string .. " is available on this server. Type /help to get a list of commands, or get more information at https://github.com/Uberi/Minetest-WorldEdit/")\r
+ func = function(name)\r
+ worldedit.player_notify(name, "WorldEdit " .. worldedit.version_string .. " is available on this server. Type //help to get a list of commands, or get more information at https://github.com/Uberi/Minetest-WorldEdit")\r
end,\r
})\r
\r
-- mostly copied from builtin/chatcommands.lua with minor modifications\r
-minetest.register_chatcommand("/help", {\r
+worldedit.register_command("help", {\r
privs = {},\r
params = "[all/<cmd>]",\r
description = "Get help for WorldEdit commands",\r
+ parse = function(param)\r
+ return true, param\r
+ end,\r
func = function(name, param)\r
- local function is_we_command(cmd)\r
- return cmd:sub(0, 1) == "/"\r
- end\r
local function format_help_line(cmd, def)\r
- local msg = minetest.colorize("#00ffff", "/"..cmd)\r
+ local msg = minetest.colorize("#00ffff", "//"..cmd)\r
if def.params and def.params ~= "" then\r
msg = msg .. " " .. def.params\r
end\r
if param == "" then\r
local msg = ""\r
local cmds = {}\r
- for cmd, def in pairs(minetest.chatcommands) do\r
- if is_we_command(cmd) and minetest.check_player_privs(name, def.privs) then\r
- cmds[#cmds + 1] = cmd:sub(2) -- strip the /\r
+ for cmd, def in pairs(worldedit.registered_commands) do\r
+ if minetest.check_player_privs(name, def.privs) then\r
+ cmds[#cmds + 1] = cmd\r
end\r
end\r
table.sort(cmds)\r
.. " or '//help all' to list everything."\r
elseif param == "all" then\r
local cmds = {}\r
- for cmd, def in pairs(minetest.chatcommands) do\r
- if is_we_command(cmd) and minetest.check_player_privs(name, def.privs) then\r
+ for cmd, def in pairs(worldedit.registered_commands) do\r
+ if minetest.check_player_privs(name, def.privs) then\r
cmds[#cmds + 1] = format_help_line(cmd, def)\r
end\r
end\r
table.sort(cmds)\r
return true, "Available commands:\n"..table.concat(cmds, "\n")\r
else\r
- return minetest.chatcommands["help"].func(name, "/" .. param)\r
+ local def = worldedit.registered_commands[param]\r
+ if not def then\r
+ return false, "Command not available: " .. param\r
+ else\r
+ return true, format_help_line(param, def)\r
+ end\r
end\r
end,\r
})\r
\r
-minetest.register_chatcommand("/inspect", {\r
- params = "on/off/1/0/true/false/yes/no/enable/disable/<blank>",\r
+worldedit.register_command("inspect", {\r
+ params = "[on/off/1/0/true/false/yes/no/enable/disable]",\r
description = "Enable or disable node inspection",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ parse = function(param)\r
if param == "on" or param == "1" or param == "true" or param == "yes" or param == "enable" or param == "" then\r
+ return true, true\r
+ elseif param == "off" or param == "0" or param == "false" or param == "no" or param == "disable" then\r
+ return true, false\r
+ end\r
+ return false\r
+ end,\r
+ func = function(name, enable)\r
+ if enable then\r
worldedit.inspect[name] = true\r
local axis, sign = worldedit.player_axis(name)\r
worldedit.player_notify(name, string.format("inspector: inspection enabled for %s, currently facing the %s axis",\r
name, axis .. (sign > 0 and "+" or "-")))\r
- elseif param == "off" or param == "0" or param == "false" or param == "no" or param == "disable" then\r
+ else\r
worldedit.inspect[name] = nil\r
worldedit.player_notify(name, "inspector: inspection disabled")\r
- else\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
end\r
end,\r
})\r
end\r
end)\r
\r
-minetest.register_chatcommand("/reset", {\r
+worldedit.register_command("reset", {\r
params = "",\r
description = "Reset the region so that it is empty",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ func = function(name)\r
worldedit.pos1[name] = nil\r
worldedit.pos2[name] = nil\r
worldedit.mark_pos1(name)\r
end,\r
})\r
\r
-minetest.register_chatcommand("/mark", {\r
+worldedit.register_command("mark", {\r
params = "",\r
description = "Show markers at the region positions",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ func = function(name)\r
worldedit.mark_pos1(name)\r
worldedit.mark_pos2(name)\r
worldedit.player_notify(name, "region marked")\r
end,\r
})\r
\r
-minetest.register_chatcommand("/unmark", {\r
+worldedit.register_command("unmark", {\r
params = "",\r
description = "Hide markers if currently shown",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ func = function(name)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
worldedit.pos1[name] = nil\r
worldedit.pos2[name] = nil\r
end,\r
})\r
\r
-minetest.register_chatcommand("/pos1", {\r
+worldedit.register_command("pos1", {\r
params = "",\r
description = "Set WorldEdit region position 1 to the player's location",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ func = function(name)\r
local pos = minetest.get_player_by_name(name):get_pos()\r
pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)\r
worldedit.pos1[name] = pos\r
end,\r
})\r
\r
-minetest.register_chatcommand("/pos2", {\r
+worldedit.register_command("pos2", {\r
params = "",\r
description = "Set WorldEdit region position 2 to the player's location",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ func = function(name)\r
local pos = minetest.get_player_by_name(name):get_pos()\r
pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)\r
worldedit.pos2[name] = pos\r
end,\r
})\r
\r
-minetest.register_chatcommand("/p", {\r
+worldedit.register_command("p", {\r
params = "set/set1/set2/get",\r
description = "Set WorldEdit region, WorldEdit position 1, or WorldEdit position 2 by punching nodes, or display the current WorldEdit region",\r
privs = {worldedit=true},\r
+ parse = function(param)\r
+ if param == "set" or param == "set1" or param == "set2" or param == "get" then\r
+ return true, param\r
+ end\r
+ return false, "unknown subcommand: " .. param\r
+ end,\r
func = function(name, param)\r
if param == "set" then --set both WorldEdit positions\r
worldedit.set_pos[name] = "pos1"\r
else\r
worldedit.player_notify(name, "position 2 not set")\r
end\r
- else\r
- worldedit.player_notify(name, "unknown subcommand: " .. param)\r
end\r
end,\r
})\r
\r
-minetest.register_chatcommand("/fixedpos", {\r
+worldedit.register_command("fixedpos", {\r
params = "set1/set2 x y z",\r
description = "Set a WorldEdit region position to the position at (<x>, <y>, <z>)",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ parse = function(param)\r
local found, _, flag, x, y, z = param:find("^(set[12])%s+([+-]?%d+)%s+([+-]?%d+)%s+([+-]?%d+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
+ return false\r
end\r
- local pos = {x=tonumber(x), y=tonumber(y), z=tonumber(z)}\r
+ return true, flag, {x=tonumber(x), y=tonumber(y), z=tonumber(z)}\r
+ end,\r
+ func = function(name, flag, pos)\r
if flag == "set1" then\r
worldedit.pos1[name] = pos\r
worldedit.mark_pos1(name)\r
end\r
end)\r
\r
-minetest.register_chatcommand("/volume", {\r
+worldedit.register_command("volume", {\r
params = "",\r
description = "Display the volume of the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ require_pos = 2,\r
+ func = function(name)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
- if pos1 == nil or pos2 == nil then\r
- worldedit.player_notify(name, "no region selected")\r
- return nil\r
- end\r
\r
local volume = worldedit.volume(pos1, pos2)\r
local abs = math.abs\r
end,\r
})\r
\r
-minetest.register_chatcommand("/deleteblocks", {\r
+worldedit.register_command("deleteblocks", {\r
params = "",\r
description = "remove all MapBlocks (16x16x16) containing the selected area from the map",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
local success = minetest.delete_area(pos1, pos2)\r
if success then\r
else\r
worldedit.player_notify(name, "There was an error during deletion of the area.")\r
end\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/set", {\r
+worldedit.register_command("set", {\r
params = "<node>",\r
description = "Set the current WorldEdit region to <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local node = get_node(name, param)\r
- if not node then return end\r
-\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, node\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, node)\r
local count = worldedit.set(worldedit.pos1[name], worldedit.pos2[name], node)\r
worldedit.player_notify(name, count .. " nodes set")\r
- end, check_region),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/param2", {\r
+worldedit.register_command("param2", {\r
params = "<param2>",\r
description = "Set param2 of all nodes in the current WorldEdit region to <param2>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local param2 = tonumber(param)\r
if not param2 then\r
- worldedit.player_notify(name, "Invalid or missing param2 argument")\r
- return\r
+ return false, "Invalid or missing param2 argument"\r
elseif param2 < 0 or param2 > 255 then\r
- worldedit.player_notify(name, "Param2 is out of range (must be between 0 and 255 inclusive)!")\r
- return\r
+ return false, "Param2 is out of range (must be between 0 and 255 inclusive!)"\r
end\r
-\r
+ return true, param2\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, param2)\r
local count = worldedit.set_param2(worldedit.pos1[name], worldedit.pos2[name], param2)\r
worldedit.player_notify(name, count .. " nodes altered")\r
- end, check_region),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/mix", {\r
+worldedit.register_command("mix", {\r
params = "<node1> [<weighting1>] [<node2> [<weighting2>]] ...",\r
description = "Fill the current WorldEdit region with a random mix of <node1>, ...",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local nodes = {}\r
for nodename in param:gmatch("[^%s]+") do\r
if tonumber(nodename) ~= nil and #nodes > 0 then\r
nodes[#nodes + 1] = last_node\r
end\r
else\r
- local node = get_node(name, nodename)\r
- if not node then return end\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
nodes[#nodes + 1] = node\r
end\r
end\r
-\r
+ return true, nodes\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, nodes)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
local count = worldedit.set(pos1, pos2, nodes)\r
worldedit.player_notify(name, count .. " nodes set")\r
- end, check_region),\r
+ end,\r
})\r
\r
-local check_replace = function(name, param)\r
+local check_replace = function(param)\r
local found, _, searchnode, replacenode = param:find("^([^%s]+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
local newsearchnode = worldedit.normalize_nodename(searchnode)\r
if not newsearchnode then\r
- worldedit.player_notify(name, "invalid search node name: " .. searchnode)\r
- return nil\r
+ return false, "invalid search node name: " .. searchnode\r
end\r
local newreplacenode = worldedit.normalize_nodename(replacenode)\r
if not newreplacenode then\r
- worldedit.player_notify(name, "invalid replace node name: " .. replacenode)\r
- return nil\r
+ return false, "invalid replace node name: " .. replacenode\r
end\r
- return check_region(name, param)\r
+ return true, newsearchnode, newreplacenode\r
end\r
\r
-minetest.register_chatcommand("/replace", {\r
+worldedit.register_command("replace", {\r
params = "<search node> <replace node>",\r
description = "Replace all instances of <search node> with <replace node> in the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, search_node, replace_node = param:find("^([^%s]+)%s+(.+)$")\r
- local norm_search_node = worldedit.normalize_nodename(search_node)\r
- local norm_replace_node = worldedit.normalize_nodename(replace_node)\r
+ require_pos = 2,\r
+ parse = check_replace,\r
+ nodes_needed = check_region,\r
+ func = function(name, search_node, replace_node)\r
local count = worldedit.replace(worldedit.pos1[name], worldedit.pos2[name],\r
- norm_search_node, norm_replace_node)\r
+ search_node, replace_node)\r
worldedit.player_notify(name, count .. " nodes replaced")\r
- end, check_replace),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/replaceinverse", {\r
+worldedit.register_command("replaceinverse", {\r
params = "<search node> <replace node>",\r
description = "Replace all nodes other than <search node> with <replace node> in the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, search_node, replace_node = param:find("^([^%s]+)%s+(.+)$")\r
- local norm_search_node = worldedit.normalize_nodename(search_node)\r
- local norm_replace_node = worldedit.normalize_nodename(replace_node)\r
+ require_pos = 2,\r
+ parse = check_replace,\r
+ nodes_needed = check_region,\r
+ func = function(name, search_node, replace_node)\r
local count = worldedit.replace(worldedit.pos1[name], worldedit.pos2[name],\r
- norm_search_node, norm_replace_node, true)\r
+ search_node, replace_node, true)\r
worldedit.player_notify(name, count .. " nodes replaced")\r
- end, check_replace),\r
+ end,\r
})\r
\r
-local check_cube = function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+local check_cube = function(param)\r
local found, _, w, h, l, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- return tonumber(w) * tonumber(h) * tonumber(l)\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, w, h, l, node\r
end\r
\r
-minetest.register_chatcommand("/hollowcube", {\r
+worldedit.register_command("hollowcube", {\r
params = "<width> <height> <length> <node>",\r
description = "Add a hollow cube with its ground level centered at WorldEdit position 1 with dimensions <width> x <height> x <length>, composed of <node>.",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, w, h, l, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.cube(worldedit.pos1[name], tonumber(w), tonumber(h), tonumber(l), node, true)\r
+ require_pos = 1,\r
+ parse = check_cube,\r
+ nodes_needed = function(name, w, h, l, node)\r
+ return w * h * l\r
+ end,\r
+ func = function(name, w, h, l, node)\r
+ local count = worldedit.cube(worldedit.pos1[name], w, h, l, node, true)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_cube),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/cube", {\r
+worldedit.register_command("cube", {\r
params = "<width> <height> <length> <node>",\r
description = "Add a cube with its ground level centered at WorldEdit position 1 with dimensions <width> x <height> x <length>, composed of <node>.",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, w, h, l, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.cube(worldedit.pos1[name], tonumber(w), tonumber(h), tonumber(l), node)\r
+ require_pos = 1,\r
+ parse = check_cube,\r
+ nodes_needed = function(name, w, h, l, node)\r
+ return w * h * l\r
+ end,\r
+ func = function(name, w, h, l, node)\r
+ local count = worldedit.cube(worldedit.pos1[name], w, h, l, node)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_cube),\r
+ end,\r
})\r
\r
-local check_sphere = function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+local check_sphere = function(param)\r
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- return math.ceil((4 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of sphere\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, radius, node\r
end\r
\r
-minetest.register_chatcommand("/hollowsphere", {\r
+worldedit.register_command("hollowsphere", {\r
params = "<radius> <node>",\r
description = "Add hollow sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.sphere(worldedit.pos1[name], tonumber(radius), node, true)\r
+ require_pos = 1,\r
+ parse = check_sphere,\r
+ nodes_needed = function(name, radius, node)\r
+ return math.ceil((4 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of sphere\r
+ end,\r
+ func = function(name, radius, node)\r
+ local count = worldedit.sphere(worldedit.pos1[name], radius, node, true)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_sphere),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/sphere", {\r
+worldedit.register_command("sphere", {\r
params = "<radius> <node>",\r
description = "Add sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.sphere(worldedit.pos1[name], tonumber(radius), node)\r
+ require_pos = 1,\r
+ parse = check_sphere,\r
+ nodes_needed = function(name, radius, node)\r
+ return math.ceil((4 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of sphere\r
+ end,\r
+ func = function(name, radius, node)\r
+ local count = worldedit.sphere(worldedit.pos1[name], radius, node)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_sphere),\r
+ end,\r
})\r
\r
-local check_dome = function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+local check_dome = function(param)\r
local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- return math.ceil((2 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of dome\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, radius, node\r
end\r
\r
-minetest.register_chatcommand("/hollowdome", {\r
+worldedit.register_command("hollowdome", {\r
params = "<radius> <node>",\r
description = "Add hollow dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.dome(worldedit.pos1[name], tonumber(radius), node, true)\r
+ require_pos = 1,\r
+ parse = check_dome,\r
+ nodes_needed = function(name, radius, node)\r
+ return math.ceil((2 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of dome\r
+ end,\r
+ func = function(name, radius, node)\r
+ local count = worldedit.dome(worldedit.pos1[name], radius, node, true)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_dome),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/dome", {\r
+worldedit.register_command("dome", {\r
params = "<radius> <node>",\r
description = "Add dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.dome(worldedit.pos1[name], tonumber(radius), node)\r
+ require_pos = 1,\r
+ parse = check_dome,\r
+ nodes_needed = function(name, radius, node)\r
+ return math.ceil((2 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of dome\r
+ end,\r
+ func = function(name, radius, node)\r
+ local count = worldedit.dome(worldedit.pos1[name], radius, node)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_dome),\r
+ end,\r
})\r
\r
-local check_cylinder = function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+local check_cylinder = function(param)\r
-- two radii\r
local found, _, axis, length, radius1, radius2, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
if found == nil then\r
radius2 = radius1\r
end\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- local radius = math.max(tonumber(radius1), tonumber(radius2))\r
- return math.ceil(math.pi * (radius ^ 2) * tonumber(length))\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, axis, tonumber(length), tonumber(radius1), tonumber(radius2), node\r
end\r
\r
-minetest.register_chatcommand("/hollowcylinder", {\r
+worldedit.register_command("hollowcylinder", {\r
params = "x/y/z/? <length> <radius1> [radius2] <node>",\r
description = "Add hollow cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length>, base radius <radius1> (and top radius [radius2]), composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- -- two radii\r
- local found, _, axis, length, radius1, radius2, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
- if found == nil then\r
- -- single radius\r
- found, _, axis, length, radius1, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")\r
- radius2 = radius1\r
- end\r
- length = tonumber(length)\r
+ require_pos = 1,\r
+ parse = check_cylinder,\r
+ nodes_needed = function(name, axis, length, radius1, radius2, node)\r
+ local radius = math.max(radius1, radius2)\r
+ return math.ceil(math.pi * (radius ^ 2) * length)\r
+ end,\r
+ func = function(name, axis, length, radius1, radius2, node)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
length = length * sign\r
end\r
- local node = get_node(name, nodename)\r
- local count = worldedit.cylinder(worldedit.pos1[name], axis, length, tonumber(radius1), tonumber(radius2), node, true)\r
+ local count = worldedit.cylinder(worldedit.pos1[name], axis, length, radius1, radius2, node, true)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_cylinder),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/cylinder", {\r
+worldedit.register_command("cylinder", {\r
params = "x/y/z/? <length> <radius1> [radius2] <node>",\r
description = "Add cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length>, base radius <radius1> (and top radius [radius2]), composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- -- two radii\r
- local found, _, axis, length, radius1, radius2, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
- if found == nil then\r
- -- single radius\r
- found, _, axis, length, radius1, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")\r
- radius2 = radius1\r
- end\r
- length = tonumber(length)\r
+ require_pos = 1,\r
+ parse = check_cylinder,\r
+ nodes_needed = function(name, axis, length, radius1, radius2, node)\r
+ local radius = math.max(radius1, radius2)\r
+ return math.ceil(math.pi * (radius ^ 2) * length)\r
+ end,\r
+ func = function(name, axis, length, radius1, radius2, node)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
length = length * sign\r
end\r
- local node = get_node(name, nodename)\r
- local count = worldedit.cylinder(worldedit.pos1[name], axis, length, tonumber(radius1), tonumber(radius2), node)\r
+ local count = worldedit.cylinder(worldedit.pos1[name], axis, length, radius1, radius2, node)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_cylinder),\r
+ end,\r
})\r
\r
-local check_pyramid = function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+local check_pyramid = function(param)\r
local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
+ end\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- height = tonumber(height)\r
- return math.ceil(((height * 2 + 1) ^ 2) * height / 3)\r
+ return true, axis, tonumber(height), node\r
end\r
\r
-minetest.register_chatcommand("/hollowpyramid", {\r
+worldedit.register_command("hollowpyramid", {\r
params = "x/y/z/? <height> <node>",\r
description = "Add hollow pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")\r
- height = tonumber(height)\r
+ require_pos = 1,\r
+ parse = check_pyramid,\r
+ nodes_needed = function(name, axis, height, node)\r
+ return math.ceil(((height * 2 + 1) ^ 2) * height / 3)\r
+ end,\r
+ func = function(name, axis, height, node)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
height = height * sign\r
end\r
- local node = get_node(name, nodename)\r
local count = worldedit.pyramid(worldedit.pos1[name], axis, height, node, true)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_pyramid),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/pyramid", {\r
+worldedit.register_command("pyramid", {\r
params = "x/y/z/? <height> <node>",\r
description = "Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")\r
- height = tonumber(height)\r
+ require_pos = 1,\r
+ parse = check_pyramid,\r
+ nodes_needed = function(name, axis, height, node)\r
+ return math.ceil(((height * 2 + 1) ^ 2) * height / 3)\r
+ end,\r
+ func = function(name, axis, height, node)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
height = height * sign\r
end\r
- local node = get_node(name, nodename)\r
local count = worldedit.pyramid(worldedit.pos1[name], axis, height, node)\r
worldedit.player_notify(name, count .. " nodes added")\r
- end, check_pyramid),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/spiral", {\r
+worldedit.register_command("spiral", {\r
params = "<length> <height> <space> <node>",\r
description = "Add spiral centered at WorldEdit position 1 with side length <length>, height <height>, space between walls <space>, composed of <node>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, length, height, space, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
- local node = get_node(name, nodename)\r
- local count = worldedit.spiral(worldedit.pos1[name], tonumber(length), tonumber(height), tonumber(space), node)\r
- worldedit.player_notify(name, count .. " nodes added")\r
- end,\r
- function(name, param)\r
- if worldedit.pos1[name] == nil then\r
- worldedit.player_notify(name, "no position 1 selected")\r
- return nil\r
- end\r
+ require_pos = 1,\r
+ parse = function(param)\r
local found, _, length, height, space, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
- local node = get_node(name, nodename)\r
- if not node then return nil end\r
- return 1 -- TODO: return an useful value\r
- end),\r
+ local node = worldedit.normalize_nodename(nodename)\r
+ if not node then\r
+ return false, "invalid node name: " .. nodename\r
+ end\r
+ return true, tonumber(length), tonumber(height), tonumber(space), node\r
+ end,\r
+ nodes_needed = function(name, length, height, space, node)\r
+ return (length + space) * height -- TODO: this is not the upper bound\r
+ end,\r
+ func = function(name, length, height, space, node)\r
+ local count = worldedit.spiral(worldedit.pos1[name], length, height, space, node)\r
+ worldedit.player_notify(name, count .. " nodes added")\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/copy", {\r
+worldedit.register_command("copy", {\r
params = "x/y/z/? <amount>",\r
description = "Copy the current WorldEdit region along the x/y/z/? axis by <amount> nodes",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, axis, amount = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
+ return false\r
end\r
- amount = tonumber(amount)\r
+ return true, axis, tonumber(amount)\r
+ end,\r
+ nodes_needed = function(name, axis, amount)\r
+ return check_region(name) * 2\r
+ end,\r
+ func = function(name, axis, amount)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
local count = worldedit.copy(worldedit.pos1[name], worldedit.pos2[name], axis, amount)\r
worldedit.player_notify(name, count .. " nodes copied")\r
end,\r
- function(name, param)\r
- local volume = check_region(name, param)\r
- return volume and volume * 2 or volume\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/move", {\r
+worldedit.register_command("move", {\r
params = "x/y/z/? <amount>",\r
description = "Move the current WorldEdit region along the x/y/z/? axis by <amount> nodes",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, axis, amount = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
+ return false\r
end\r
- amount = tonumber(amount)\r
+ return true, axis, tonumber(amount)\r
+ end,\r
+ nodes_needed = function(name, axis, amount)\r
+ return check_region(name) * 2\r
+ end,\r
+ func = function(name, axis, amount)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
worldedit.mark_pos1(name)\r
worldedit.mark_pos2(name)\r
worldedit.player_notify(name, count .. " nodes moved")\r
- end, check_region),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/stack", {\r
+worldedit.register_command("stack", {\r
params = "x/y/z/? <count>",\r
description = "Stack the current WorldEdit region along the x/y/z/? axis <count> times",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, axis, repetitions = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
- repetitions = tonumber(repetitions)\r
+ if found == nil then\r
+ return false\r
+ end\r
+ return true, axis, tonumber(repetitions)\r
+ end,\r
+ nodes_needed = function(name, axis, repetitions)\r
+ return check_region(name) * math.abs(repetitions)\r
+ end,\r
+ func = function(name, axis, repetitions)\r
if axis == "?" then\r
local sign\r
axis, sign = worldedit.player_axis(name)\r
worldedit.player_notify(name, count .. " nodes stacked")\r
end)\r
end,\r
- function(name, param)\r
- local found, _, axis, repetitions = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
- if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
- end\r
-\r
- local count = check_region(name, param)\r
- if count then return tonumber(repetitions) * count end\r
- return nil\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/stack2", {\r
+worldedit.register_command("stack2", {\r
params = "<count> <x> <y> <z>",\r
description = "Stack the current WorldEdit region <count> times by offset <x>, <y>, <z>",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local repetitions, incs = param:match("(%d+)%s*(.+)")\r
if repetitions == nil then\r
- return\r
+ return false, "invalid count: " .. param\r
end\r
- repetitions = tonumber(repetitions)\r
-\r
local x, y, z = incs:match("([+-]?%d+) ([+-]?%d+) ([+-]?%d+)")\r
if x == nil then\r
- worldedit.player_notify(name, "invalid increments: " .. param)\r
- return\r
+ return false, "invalid increments: " .. param\r
end\r
- x, y, z = tonumber(x), tonumber(y), tonumber(z)\r
\r
+ return true, tonumber(repetitions), {x=tonumber(x), y=tonumber(y), z=tonumber(z)}\r
+ end,\r
+ nodes_needed = function(name, repetitions, offset)\r
+ return check_region(name) * repetitions\r
+ end,\r
+ func = function(name, repetitions, offset)\r
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
local count = worldedit.volume(pos1, pos2) * repetitions\r
- worldedit.stack2(pos1, pos2, {x=x, y=y, z=z}, repetitions, function()\r
+ worldedit.stack2(pos1, pos2, offset, repetitions, function()\r
worldedit.player_notify(name, count .. " nodes stacked")\r
end)\r
end,\r
- function(name, param)\r
- local repetitions, incs = param:match("(%d+)%s*(.+)")\r
- if repetitions == nil then\r
- worldedit.player_notify(name, "invalid count: " .. param)\r
- return\r
- end\r
- repetitions = tonumber(repetitions)\r
-\r
- local count = check_region(name, param)\r
- if count then return repetitions * count end\r
- return nil\r
- end),\r
})\r
\r
\r
-minetest.register_chatcommand("/stretch", {\r
+worldedit.register_command("stretch", {\r
params = "<stretchx> <stretchy> <stretchz>",\r
description = "Scale the current WorldEdit positions and region by a factor of <stretchx>, <stretchy>, <stretchz> along the X, Y, and Z axes, repectively, with position 1 as the origin",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, stretchx, stretchy, stretchz = param:find("^(%d+)%s+(%d+)%s+(%d+)$")\r
+ if found == nil then\r
+ return false\r
+ end\r
stretchx, stretchy, stretchz = tonumber(stretchx), tonumber(stretchy), tonumber(stretchz)\r
+ if stretchx == 0 or stretchy == 0 or stretchz == 0 then\r
+ return false, "invalid scaling factors: " .. param\r
+ end\r
+ return true, stretchx, stretchy, stretchz\r
+ end,\r
+ nodes_needed = function(name, stretchx, stretchy, stretchz)\r
+ return check_region(name) * stretchx * stretchy * stretchz\r
+ end,\r
+ func = function(name, stretchx, stretchy, stretchz)\r
+ local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
local count, pos1, pos2 = worldedit.stretch(pos1, pos2, stretchx, stretchy, stretchz)\r
\r
--reset markers to scaled positions\r
\r
worldedit.player_notify(name, count .. " nodes stretched")\r
end,\r
- function(name, param)\r
- local found, _, stretchx, stretchy, stretchz = param:find("^(%d+)%s+(%d+)%s+(%d+)$")\r
- if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
- end\r
- stretchx, stretchy, stretchz = tonumber(stretchx), tonumber(stretchy), tonumber(stretchz)\r
- if stretchx == 0 or stretchy == 0 or stretchz == 0 then\r
- worldedit.player_notify(name, "invalid scaling factors: " .. param)\r
- return nil\r
- end\r
- local count = check_region(name, param)\r
- if count then\r
- return stretchx * stretchy * stretchz * count\r
- end\r
- return nil\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/transpose", {\r
+worldedit.register_command("transpose", {\r
params = "x/y/z/? x/y/z/?",\r
description = "Transpose the current WorldEdit region along the x/y/z/? and x/y/z/? axes",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, axis1, axis2 = param:find("^([xyz%?])%s+([xyz%?])$")\r
+ if found == nil then\r
+ return false\r
+ elseif axis1 == axis2 then\r
+ return false, "invalid usage: axes must be different"\r
+ end\r
+ return true, axis1, axis2\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, axis1, axis2)\r
+ local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
if axis1 == "?" then axis1 = worldedit.player_axis(name) end\r
if axis2 == "?" then axis2 = worldedit.player_axis(name) end\r
local count, pos1, pos2 = worldedit.transpose(pos1, pos2, axis1, axis2)\r
\r
worldedit.player_notify(name, count .. " nodes transposed")\r
end,\r
- function(name, param)\r
- local found, _, axis1, axis2 = param:find("^([xyz%?])%s+([xyz%?])$")\r
- if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
- end\r
- if axis1 == axis2 then\r
- worldedit.player_notify(name, "invalid usage: axes must be different")\r
- return nil\r
- end\r
- return check_region(name, param)\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/flip", {\r
+worldedit.register_command("flip", {\r
params = "x/y/z/?",\r
description = "Flip the current WorldEdit region along the x/y/z/? axis",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ if param ~= "x" and param ~= "y" and param ~= "z" and param ~= "?" then\r
+ return false\r
+ end\r
+ return true, param\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, param)\r
if param == "?" then param = worldedit.player_axis(name) end\r
local count = worldedit.flip(worldedit.pos1[name], worldedit.pos2[name], param)\r
worldedit.player_notify(name, count .. " nodes flipped")\r
end,\r
- function(name, param)\r
- if param ~= "x" and param ~= "y" and param ~= "z" and param ~= "?" then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
- end\r
- return check_region(name, param)\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/rotate", {\r
+worldedit.register_command("rotate", {\r
params = "<axis> <angle>",\r
description = "Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment)",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, axis, angle = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
+ if found == nil then\r
+ return false\r
+ end\r
+ angle = tonumber(angle)\r
+ if angle % 90 ~= 0 or angle % 360 == 0 then\r
+ return false, "invalid usage: angle must be multiple of 90"\r
+ end\r
+ return true, axis, angle\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, axis, angle)\r
+ local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
if axis == "?" then axis = worldedit.player_axis(name) end\r
local count, pos1, pos2 = worldedit.rotate(pos1, pos2, axis, angle)\r
\r
\r
worldedit.player_notify(name, count .. " nodes rotated")\r
end,\r
- function(name, param)\r
- local found, _, axis, angle = param:find("^([xyz%?])%s+([+-]?%d+)$")\r
- if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
- end\r
- if angle % 90 ~= 0 or angle % 360 == 0 then\r
- worldedit.player_notify(name, "invalid usage: angle must be multiple of 90")\r
- return nil\r
- end\r
- return check_region(name, param)\r
- end),\r
})\r
\r
-minetest.register_chatcommand("/orient", {\r
+worldedit.register_command("orient", {\r
params = "<angle>",\r
description = "Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local found, _, angle = param:find("^([+-]?%d+)$")\r
- local count = worldedit.orient(worldedit.pos1[name], worldedit.pos2[name], angle)\r
- worldedit.player_notify(name, count .. " nodes oriented")\r
- end,\r
- function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
local found, _, angle = param:find("^([+-]?%d+)$")\r
if found == nil then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return nil\r
+ return false\r
end\r
+ angle = tonumber(angle)\r
if angle % 90 ~= 0 then\r
- worldedit.player_notify(name, "invalid usage: angle must be multiple of 90")\r
- return nil\r
+ return false, "invalid usage: angle must be multiple of 90"\r
end\r
- return check_region(name, param)\r
- end),\r
+ return true, angle\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, angle)\r
+ local count = worldedit.orient(worldedit.pos1[name], worldedit.pos2[name], angle)\r
+ worldedit.player_notify(name, count .. " nodes oriented")\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/fixlight", {\r
+worldedit.register_command("fixlight", {\r
params = "",\r
description = "Fix the lighting in the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
local count = worldedit.fixlight(worldedit.pos1[name], worldedit.pos2[name])\r
worldedit.player_notify(name, count .. " nodes updated")\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/drain", {\r
+worldedit.register_command("drain", {\r
params = "",\r
description = "Remove any fluid node within the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
-- TODO: make an API function for this\r
local count = 0\r
local pos1, pos2 = worldedit.sort_pos(worldedit.pos1[name], worldedit.pos2[name])\r
end\r
end\r
worldedit.player_notify(name, count .. " nodes updated")\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/hide", {\r
+worldedit.register_command("hide", {\r
params = "",\r
description = "Hide all nodes in the current WorldEdit region non-destructively",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
local count = worldedit.hide(worldedit.pos1[name], worldedit.pos2[name])\r
worldedit.player_notify(name, count .. " nodes hidden")\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/suppress", {\r
+worldedit.register_command("suppress", {\r
params = "<node>",\r
description = "Suppress all <node> in the current WorldEdit region non-destructively",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local node = get_node(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ local node = worldedit.normalize_nodename(param)\r
+ if not node then\r
+ return false, "invalid node name: " .. param\r
+ end\r
+ return true, node\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, node)\r
local count = worldedit.suppress(worldedit.pos1[name], worldedit.pos2[name], node)\r
worldedit.player_notify(name, count .. " nodes suppressed")\r
- end, check_region),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/highlight", {\r
+worldedit.register_command("highlight", {\r
params = "<node>",\r
description = "Highlight <node> in the current WorldEdit region by hiding everything else non-destructively",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- local node = get_node(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ local node = worldedit.normalize_nodename(param)\r
+ if not node then\r
+ return false, "invalid node name: " .. param\r
+ end\r
+ return true, node\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, node)\r
local count = worldedit.highlight(worldedit.pos1[name], worldedit.pos2[name], node)\r
worldedit.player_notify(name, count .. " nodes highlighted")\r
- end, check_region),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/restore", {\r
+worldedit.register_command("restore", {\r
params = "",\r
description = "Restores nodes hidden with WorldEdit in the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
local count = worldedit.restore(worldedit.pos1[name], worldedit.pos2[name])\r
worldedit.player_notify(name, count .. " nodes restored")\r
- end),\r
+ end,\r
})\r
\r
local function detect_misaligned_schematic(name, pos1, pos2)\r
end\r
end\r
\r
-minetest.register_chatcommand("/save", {\r
+worldedit.register_command("save", {\r
params = "<file>",\r
description = "Save the current WorldEdit region to \"(world folder)/schems/<file>.we\"",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
if param == "" then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
+ return false\r
end\r
if not check_filename(param) then\r
- worldedit.player_notify(name, "Disallowed file name: " .. param)\r
- return\r
+ return false, "Disallowed file name: " .. param\r
end\r
+ return true, param\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, param)\r
local result, count = worldedit.serialize(worldedit.pos1[name],\r
worldedit.pos2[name])\r
detect_misaligned_schematic(name, worldedit.pos1[name], worldedit.pos2[name])\r
file:close()\r
\r
worldedit.player_notify(name, count .. " nodes saved")\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/allocate", {\r
+worldedit.register_command("allocate", {\r
params = "<file>",\r
description = "Set the region defined by nodes from \"(world folder)/schems/<file>.we\" as the current WorldEdit region",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
- local pos = get_position(name)\r
- if pos == nil then return end\r
-\r
+ require_pos = 1,\r
+ parse = function(param)\r
if param == "" then\r
- worldedit.player_notify(name, "invalid usage: " .. param)\r
- return\r
+ return false\r
end\r
if not check_filename(param) then\r
- worldedit.player_notify(name, "Disallowed file name: " .. param)\r
- return\r
+ return false, "Disallowed file name: " .. param\r
end\r
+ return true, param\r
+ end,\r
+ func = function(name, param)\r
+ local pos = worldedit.pos1[name]\r
\r
local filename = minetest.get_worldpath() .. "/schems/" .. param .. ".we"\r
local file, err = io.open(filename, "rb")\r
end,\r
})\r
\r
-minetest.register_chatcommand("/load", {\r
+worldedit.register_command("load", {\r
params = "<file>",\r
description = "Load nodes from \"(world folder)/schems/<file>[.we[m]]\" with position 1 of the current WorldEdit region as the origin",\r
privs = {worldedit=true},\r
+ require_pos = 1,\r
+ parse = function(param)\r
+ if param == "" then\r
+ return false\r
+ end\r
+ if not check_filename(param) then\r
+ return false, "Disallowed file name: " .. param\r
+ end\r
+ return true, param\r
+ end,\r
func = function(name, param)\r
- local pos = get_position(name)\r
- if pos == nil then return end\r
+ local pos = worldedit.pos1[name]\r
\r
if param == "" then\r
worldedit.player_notify(name, "invalid usage: " .. param)\r
end,\r
})\r
\r
-minetest.register_chatcommand("/lua", {\r
+worldedit.register_command("lua", {\r
params = "<code>",\r
description = "Executes <code> as a Lua chunk in the global namespace",\r
privs = {worldedit=true, server=true},\r
+ parse = function(param)\r
+ return true, param\r
+ end,\r
func = function(name, param)\r
local err = worldedit.lua(param)\r
if err then\r
end,\r
})\r
\r
-minetest.register_chatcommand("/luatransform", {\r
+worldedit.register_command("luatransform", {\r
params = "<code>",\r
description = "Executes <code> as a Lua chunk in the global namespace with the variable pos available, for each node in the current WorldEdit region",\r
privs = {worldedit=true, server=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ return true, param\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, param)\r
local err = worldedit.luatransform(worldedit.pos1[name], worldedit.pos2[name], param)\r
if err then\r
worldedit.player_notify(name, "code error: " .. err, false)\r
worldedit.player_notify(name, "code successfully executed", false)\r
minetest.log("action", name.." executed luatransform "..param)\r
end\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/mtschemcreate", {\r
+worldedit.register_command("mtschemcreate", {\r
params = "<file>",\r
description = "Save the current WorldEdit region using the Minetest "..\r
"Schematic format to \"(world folder)/schems/<filename>.mts\"",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
- if param == nil then\r
- worldedit.player_notify(name, "No filename specified")\r
- return\r
+ require_pos = 2,\r
+ parse = function(param)\r
+ if param == "" then\r
+ return false\r
end\r
if not check_filename(param) then\r
- worldedit.player_notify(name, "Disallowed file name: " .. param)\r
- return\r
+ return false, "Disallowed file name: " .. param\r
end\r
-\r
+ return true, param\r
+ end,\r
+ nodes_needed = check_region,\r
+ func = function(name, param)\r
local path = minetest.get_worldpath() .. "/schems"\r
-- Create directory if it does not already exist\r
minetest.mkdir(path)\r
worldedit.pos2[name], worldedit.prob_list[name],\r
filename)\r
if ret == nil then\r
- worldedit.player_notify(name, "Failed to create Minetest schematic", false)\r
+ worldedit.player_notify(name, "Failed to create Minetest schematic")\r
else\r
- worldedit.player_notify(name, "Saved Minetest schematic to " .. param, false)\r
+ worldedit.player_notify(name, "Saved Minetest schematic to " .. param)\r
end\r
worldedit.prob_list[name] = {}\r
- end),\r
+ end,\r
})\r
\r
-minetest.register_chatcommand("/mtschemplace", {\r
+worldedit.register_command("mtschemplace", {\r
params = "<file>",\r
description = "Load nodes from \"(world folder)/schems/<file>.mts\" with position 1 of the current WorldEdit region as the origin",\r
privs = {worldedit=true},\r
- func = function(name, param)\r
+ require_pos = 1,\r
+ parse = function(param)\r
if param == "" then\r
- worldedit.player_notify(name, "no filename specified")\r
- return\r
+ return false\r
end\r
if not check_filename(param) then\r
- worldedit.player_notify(name, "Disallowed file name: " .. param)\r
- return\r
+ return false, "Disallowed file name: " .. param\r
end\r
-\r
- local pos = get_position(name)\r
- if pos == nil then return end\r
+ return true, param\r
+ end,\r
+ func = function(name, param)\r
+ local pos = worldedit.pos1[name]\r
\r
local path = minetest.get_worldpath() .. "/schems/" .. param .. ".mts"\r
if minetest.place_schematic(pos, path) == nil then\r
- worldedit.player_notify(name, "failed to place Minetest schematic", false)\r
+ worldedit.player_notify(name, "failed to place Minetest schematic")\r
else\r
worldedit.player_notify(name, "placed Minetest schematic " .. param ..\r
- " at " .. minetest.pos_to_string(pos), false)\r
+ " at " .. minetest.pos_to_string(pos))\r
end\r
end,\r
})\r
\r
-minetest.register_chatcommand("/mtschemprob", {\r
+worldedit.register_command("mtschemprob", {\r
params = "start/finish/get",\r
description = "Begins node probability entry for Minetest schematics, gets the nodes that have probabilities set, or ends node probability entry",\r
privs = {worldedit=true},\r
+ parse = function(param)\r
+ if param ~= "start" and param ~= "finish" and param ~= "get" then\r
+ return false, "unknown subcommand: " .. param\r
+ end\r
+ return true, param\r
+ end,\r
func = function(name, param)\r
if param == "start" then --start probability setting\r
worldedit.set_pos[name] = "prob"\r
end\r
worldedit.player_notify(name, "currently set node probabilities:")\r
worldedit.player_notify(name, text)\r
- else\r
- worldedit.player_notify(name, "unknown subcommand: " .. param)\r
end\r
end,\r
})\r
end\r
end)\r
\r
-minetest.register_chatcommand("/clearobjects", {\r
+worldedit.register_command("clearobjects", {\r
params = "",\r
description = "Clears all objects within the WorldEdit region",\r
privs = {worldedit=true},\r
- func = safe_region(function(name, param)\r
+ require_pos = 2,\r
+ nodes_needed = check_region,\r
+ func = function(name)\r
local count = worldedit.clear_objects(worldedit.pos1[name], worldedit.pos2[name])\r
worldedit.player_notify(name, count .. " objects cleared")\r
- end),\r
+ end,\r
})\r
projects / worldedit.git / commitdiff