From 6be534d4b78ac1348a117d61977a01ac6965b3ef Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Sun, 10 May 2020 22:01:31 +0100
Subject: [PATCH] Migrate //ellipsoid and it's sibling to
 worldedit.register_command

---
 .../commands/ellipsoid.lua                    | 84 ++++++++-----------
 1 file changed, 34 insertions(+), 50 deletions(-)

diff --git a/worldeditadditions_commands/commands/ellipsoid.lua b/worldeditadditions_commands/commands/ellipsoid.lua
index a090b25..7d64b83 100644
--- a/worldeditadditions_commands/commands/ellipsoid.lua
+++ b/worldeditadditions_commands/commands/ellipsoid.lua
@@ -1,5 +1,3 @@
-local we_c = worldeditadditions_commands
-
 -- ███████ ██      ██      ██ ██████  ███████  ██████  ██ ██████
 -- ██      ██      ██      ██ ██   ██ ██      ██    ██ ██ ██   ██
 -- █████   ██      ██      ██ ██████  ███████ ██    ██ ██ ██   ██
@@ -10,7 +8,7 @@ local function parse_params_ellipsoid(params_text)
 	local found, _, radius_x, radius_y, radius_z, replace_node = params_text:find("([0-9]+)%s+([0-9]+)%s+([0-9]+)%s+([a-z:_\\-]+)")
 	
 	if found == nil then
-		return nil, nil
+		return false, "Invalid syntax"
 	end
 	
 	local radius = {
@@ -20,73 +18,59 @@ local function parse_params_ellipsoid(params_text)
 	}
 	
 	replace_node = worldedit.normalize_nodename(replace_node)
+	if not replace_node then
+		worldedit.player_notify(name, "Error: Invalid node name.")
+		return false
+	end
+	if not radius.x or not radius.y or not radius.z then
+		worldedit.player_notify(name, "Error: Invalid radius(es).")
+		return false
+	end
 	
-	return replace_node, radius
+	return true, replace_node, radius
 end
 
-minetest.register_chatcommand("/ellipsoid", {
+worldedit.register_command("ellipsoid", {
 	params = "<rx> <ry> <rz> <replace_node>",
 	description = "Creates a 3D ellipsoid with a radius of (rx, ry, rz) at pos1, filled with <replace_node>.",
 	privs = { worldedit = true },
-	func = we_c.safe_region(function(name, params_text)
-		local target_node, radius = parse_params_ellipsoid(params_text)
-		
-		if not target_node then
-			worldedit.player_notify(name, "Error: Invalid node name.")
-			return false
-		end
-		if not radius then
-			worldedit.player_notify(name, "Error: Invalid radius(es).")
-			return false
-		end
-		
+	require_pos = 1,
+	parse = function(params_text)
+		local values = {parse_params_ellipsoid(params_text)}
+		return unpack(values)
+	end,
+	nodes_needed = function(name, target_node, radius)
+		return math.ceil(4/3 * math.pi * radius.x * radius.y * radius.z)
+	end,
+	func = function(name, target_node, radius)
 		local start_time = os.clock()
 		local replaced = worldedit.ellipsoid(worldedit.pos1[name], radius, target_node, false)
 		local time_taken = os.clock() - start_time
 		
-		worldedit.player_notify(name, replaced .. " nodes replaced in " .. time_taken .. "s")
 		minetest.log("action", name .. " used //ellipsoid at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s")
-	end, function(name, params_text)
-		local target_node, radius = parse_params_ellipsoid(params_text)
-		if not target_node or not radius then
-			worldedit.player_notify(name, "Error: Invalid input '" .. params_text .. "'. Try '/help /ellipsoid' to learn how to use this command.")
-			return 0
-		end
-		
-		return math.ceil(4/3 * math.pi * radius.x * radius.y * radius.z)
-	end)
+		return true, replaced .. " nodes replaced in " .. time_taken .. "s"
+	end
 })
 
 -- TODO: This duplicates a lot of code. Perhaps we can trim it down a bit?
-minetest.register_chatcommand("/hollowellipsoid", {
+worldedit.register_command("hollowellipsoid", {
 	params = "<rx> <ry> <rz> <replace_node>",
 	description = "Creates a 3D hollow ellipsoid with a radius of (rx, ry, rz) at pos1, made out of <replace_node>.",
 	privs = { worldedit = true },
-	func = we_c.safe_region(function(name, params_text)
-		local target_node, radius = parse_params_ellipsoid(params_text)
-		
-		if not target_node then
-			worldedit.player_notify(name, "Error: Invalid node name.")
-			return false
-		end
-		if not radius then
-			worldedit.player_notify(name, "Error: Invalid radius(es).")
-			return false
-		end
-		
+	require_pos = 1,
+	parse = function(params_text)
+		local values = {parse_params_ellipsoid(params_text)}
+		return unpack(values)
+	end,
+	nodes_needed = function(name, target_node, radius)
+		return math.ceil(4/3 * math.pi * radius.x * radius.y * radius.z)
+	end,
+	func = function(name, target_node, radius)
 		local start_time = os.clock()
 		local replaced = worldedit.ellipsoid(worldedit.pos1[name], radius, target_node, true)
 		local time_taken = os.clock() - start_time
 		
-		worldedit.player_notify(name, replaced .. " nodes replaced in " .. time_taken .. "s")
 		minetest.log("action", name .. " used //hollowellipsoid at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s")
-	end, function(name, params_text)
-		local target_node, radius = parse_params_ellipsoid(params_text)
-		if not target_node or not radius then
-			worldedit.player_notify(name, "Error: Invalid input '" .. params_text .. "'. Try '/help /hollowellipsoid' to learn how to use this command.")
-			return 0
-		end
-		
-		return math.ceil(4/3 * math.pi * radius.x * radius.y * radius.z)
-	end)
+		return true, replaced .. " nodes replaced in " .. time_taken .. "s"
+	end
 })