Rewrite command registration

worldedit_commands/cuboid.lua

@@ -1,28 +1,22 @@
-minetest.register_chatcommand("/outset", {
+worldedit.register_command("outset", {
 	params = "[h|v] <amount>",
-	description = "outset the selection",
+	description = "Outset the selected region.",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
-		
 		if find == nil then
-			return false, "invalid usage: " .. param
-		end
-		
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
-		
-		if pos1 == nil or pos2 == nil then
-			return false, 
-				"Undefined region. Region must be defined beforehand."
+			return false
 		end
 
 		local hv_test = dir:find("[^hv]+")
-		
 		if hv_test ~= nil then
 			return false, "Invalid direction."
 		end
 
+		return true, dir, tonumber(amount)
+	end,
+	func = function(name, dir, amount)
 		if dir == "" or dir == "hv" or dir == "vh" then
 			assert(worldedit.cuboid_volumetric_expand(name, amount))
 		elseif dir == "h" then
@@ -40,35 +34,28 @@ minetest.register_chatcommand("/outset", {
 		worldedit.marker_update(name)
 		return true, "Region outset by " .. amount .. " blocks"
       end,
-  }
-)
+})
 
 
-minetest.register_chatcommand("/inset", {
+worldedit.register_command("inset", {
 	params = "[h|v] <amount>",
-	description = "inset the selection",
+	description = "Inset the selected region.",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
-		
 		if find == nil then
-			return false, "invalid usage: " .. param
-		end
-		
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
-		
-		if pos1 == nil or pos2 == nil then
-			return false, 
-				"Undefined region. Region must be defined beforehand."
+			return false
 		end
 
 		local hv_test = dir:find("[^hv]+")
-		
 		if hv_test ~= nil then
 			return false, "Invalid direction."
 		end
 
+		return true, dir, tonumber(amount)
+	end,
+	func = function(name, dir, amount)
 		if dir == "" or dir == "vh" or dir == "hv" then
 			assert(worldedit.cuboid_volumetric_expand(name, -amount))
 		elseif dir == "h" then
@@ -86,30 +73,23 @@ minetest.register_chatcommand("/inset", {
 		worldedit.marker_update(name)
 		return true, "Region inset by " .. amount .. " blocks"
       end,
-  }
-)
+})
 
 
-minetest.register_chatcommand("/shift", {
+worldedit.register_command("shift", {
 	params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
 	description = "Moves the selection region. Does not move contents.",
 	privs = {worldedit=true},
-	func = function(name, param)
-		local pos1 = worldedit.pos1[name]
-		local pos2 = worldedit.pos2[name]
+	require_pos = 2,
+	parse = function(param)
 		local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")
-		
 		if find == nil then
-			worldedit.player_notify(name, "invalid usage: " .. param)
-			return
-		end
-		
-		if pos1 == nil or pos2 == nil then
-			worldedit.player_notify(name, 
-				"Undefined region. Region must be defined beforehand.")
-			return
+			return false
 		end
 
+		return true, direction, tonumber(amount)
+	end,
+	func = function(name, direction, amount)
 		local axis, dir
 		if direction == "x" or direction == "y" or direction == "z" then
 			axis, dir = direction, 1
@@ -128,36 +108,31 @@ minetest.register_chatcommand("/shift", {
 
 		return true, "Region shifted by " .. amount .. " nodes"
       end,
-  }
-)
+})
 
 
-minetest.register_chatcommand("/expand", {
+worldedit.register_command("expand", {
 	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
 	description = "expand the selection in one or two directions at once",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, sign, direction, amount,
 				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
-	
 		if find == nil then
-		worldedit.player_notify(name, "invalid use: " .. param)
-		return
+			return false
 		end
 
-	if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
-		worldedit.player_notify(name, 
-		"Undefined region. Region must be defined beforehand.")
-		return
-	end
-	
-	local absolute = direction:find("[xyz?]")
-	local dir, axis
-	
 		if rev_amount == "" then
-		rev_amount = 0
+			rev_amount = "0"
 		end
 
+		return true, sign, direction, tonumber(amount), tonumber(rev_amount)
+	end,
+	func = function(name, sign, direction, amount, rev_amount)
+		local absolute = direction:find("[xyz?]")
+		local dir, axis
+
 		if absolute == nil then
 			axis, dir = worldedit.translate_direction(name, direction)
 
@@ -182,36 +157,31 @@ minetest.register_chatcommand("/expand", {
 		worldedit.marker_update(name)
 		return true, "Region expanded by " .. (amount + rev_amount) .. " nodes"
 	end,
-  }
-)
+})
 
 
-minetest.register_chatcommand("/contract", {
+worldedit.register_command("contract", {
 	params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
 	description = "contract the selection in one or two directions at once",
 	privs = {worldedit=true},
-	func = function(name, param)
+	require_pos = 2,
+	parse = function(param)
 		local find, _, sign, direction, amount,
 				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
-	
 		if find == nil then
-		worldedit.player_notify(name, "invalid use: " .. param)
-		return
+			return false
 		end
 
-	if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
-		worldedit.player_notify(name, 
-		"Undefined region. Region must be defined beforehand.")
-		return
-	end
-	
-	local absolute = direction:find("[xyz?]")
-	local dir, axis
-	
 		if rev_amount == "" then
-		rev_amount = 0
+			rev_amount = "0"
 		end
 
+		return true, sign, direction, tonumber(amount), tonumber(rev_amount)
+	end,
+	func = function(name, sign, direction, amount, rev_amount)
+		local absolute = direction:find("[xyz?]")
+		local dir, axis
+
 		if absolute == nil then
 			axis, dir = worldedit.translate_direction(name, direction)
 
@@ -236,5 +206,4 @@ minetest.register_chatcommand("/contract", {
 		worldedit.marker_update(name)
 		return true, "Region contracted by " .. (amount + rev_amount) .. " nodes"
 	end,
-  }
-)
+})

worldedit_commands/safe.lua

@@ -1,53 +1,35 @@
 local safe_region_callback = {}
-local safe_region_param = {}
 
 worldedit._override_safe_regions = false -- internal use ONLY!
 
-local function check_region(name, param)
-	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] --obtain positions
-	if pos1 == nil or pos2 == nil then
-		worldedit.player_notify(name, "no region selected")
-		return nil
-	end
-	return worldedit.volume(pos1, pos2)
-end
-
+--`count` is the number of nodes that would possibly be modified
 --`callback` is a callback to run when the user confirms
---`nodes_needed` is a function accepting `param`, `pos1`, and `pos2` to calculate the number of nodes needed
-local function safe_region(callback, nodes_needed)
-	--default node volume calculation
-	nodes_needed = nodes_needed or check_region
-
-	return function(name, param)
-		--check if the operation applies to a safe number of nodes
-		local count = nodes_needed(name, param)
-		if count == nil then return end --invalid command
+local function safe_region(name, count, callback)
 	if worldedit._override_safe_regions or count < 10000 then
-			return callback(name, param)
+		return callback()
 	end
 
 	--save callback to call later
-		safe_region_callback[name], safe_region_param[name] = callback, param
+	safe_region_callback[name] = callback
 	worldedit.player_notify(name, "WARNING: this operation could affect up to " .. count .. " nodes; type //y to continue or //n to cancel")
 end
-end
 
 local function reset_pending(name)
-	safe_region_callback[name], safe_region_param[name] = nil, nil
+	safe_region_callback[name] = nil
 end
 
 minetest.register_chatcommand("/y", {
 	params = "",
 	description = "Confirm a pending operation",
 	func = function(name)
-		local callback, param = safe_region_callback[name], safe_region_param[name]
+		local callback = safe_region_callback[name]
 		if not callback then
 			worldedit.player_notify(name, "no operation pending")
 			return
 		end
 
 		reset_pending(name)
-		callback(name, param)
+		callback(name)
 	end,
 })
 
@@ -65,4 +47,4 @@ minetest.register_chatcommand("/n", {
 })
 
 
-return safe_region, check_region, reset_pending
+return safe_region, reset_pending

worldedit_commands/wand.lua

@@ -25,7 +25,7 @@ minetest.register_tool(":worldedit:wand", {
 			local now = minetest.get_us_time()
 			if now - (punched_air_time[name] or 0) < 1000 * 1000 then
 				-- reset markers
-				minetest.registered_chatcommands["/reset"].func(name, "")
+				worldedit.registered_commands["reset"].func(name)
 			end
 			punched_air_time[name] = now
 		elseif pointed_thing.type == "object" then