"explode" all modpacks into their individual components

(you can't have a modpack buried inside a modpack)

7 files changed, 0 insertions, 1391 deletions

diff --git a/worldedit/worldedit_commands/depends.txt b/worldedit/worldedit_commands/depends.txt
deleted file mode 100644
index df8caff..0000000
--- a/worldedit/worldedit_commands/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-worldedit
\ No newline at end of file
diff --git a/worldedit/worldedit_commands/init.lua b/worldedit/worldedit_commands/init.lua
deleted file mode 100644
index 83a127e..0000000
--- a/worldedit/worldedit_commands/init.lua
+++ /dev/null
@@ -1,1160 +0,0 @@
-minetest.register_privilege("worldedit", "Can use WorldEdit commands")

-

-worldedit.set_pos = {}

-worldedit.inspect = {}

-

-worldedit.pos1 = {}

-worldedit.pos2 = {}

-if minetest.place_schematic then

-	worldedit.prob_pos = {}

-	worldedit.prob_list = {}

-end

-

-dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")

-local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")

-

-local function get_position(name) --position 1 retrieval function for when not using `safe_region`

-	local pos1 = worldedit.pos1[name]

-	if pos1 == nil then

-		worldedit.player_notify(name, "no position 1 selected")

-	end

-	return pos1

-end

-

-local function get_node(name, nodename)

-	local node = worldedit.normalize_nodename(nodename)

-	if not node then

-		worldedit.player_notify(name, "invalid node name: " .. nodename)

-		return nil

-	end

-	return node

-end

-

-function worldedit.player_notify(name, message)

-	minetest.chat_send_player(name, "WorldEdit -!- " .. message, false)

-end

-

---determines whether `nodename` is a valid node name, returning a boolean

-worldedit.normalize_nodename = function(nodename)

-	nodename = nodename:gsub("^%s*(.-)%s*$", "%1")

-	if nodename == "" then return nil end

-	local fullname = ItemStack({name=nodename}):get_name() --resolve aliases of node names to full names

-	if minetest.registered_nodes[fullname] or fullname == "air" then --directly found node name or alias of nodename

-		return fullname

-	end

-	for key, value in pairs(minetest.registered_nodes) do

-		if key:find(":" .. nodename, 1, true) then --found in mod

-			return key

-		end

-	end

-	nodename = nodename:lower() --lowercase both for case insensitive comparison

-	for key, value in pairs(minetest.registered_nodes) do

-		if value.description:lower() == nodename then --found in description

-			return key

-		end

-	end

-	return nil

-end

-

--- Determines the axis in which a player is facing, returning an axis ("x", "y", or "z") and the sign (1 or -1)

-function worldedit.player_axis(name)

-	local dir = minetest.get_player_by_name(name):get_look_dir()

-	local x, y, z = math.abs(dir.x), math.abs(dir.y), math.abs(dir.z)

-	if x > y then

-		if x > z then

-			return "x", dir.x > 0 and 1 or -1

-		end

-	elseif y > z then

-		return "y", dir.y > 0 and 1 or -1

-	end

-	return "z", dir.z > 0 and 1 or -1

-end

-

-local function mkdir(path)

-	if minetest.mkdir then

-		minetest.mkdir(path)

-	else

-		os.execute('mkdir "' .. path .. '"')

-	end

-end

-

-local function check_filename(name)

-	return name:find("^[%w%s%^&'@{}%[%],%$=!%-#%(%)%%%.%+~_]+$") ~= nil

-end

-

-

-minetest.register_chatcommand("/about", {

-	params = "",

-	description = "Get information about the mod",

-	func = function(name, param)

-		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/")

-	end,

-})

-

-minetest.register_chatcommand("/inspect", {

-	params = "on/off/1/0/true/false/yes/no/enable/disable/<blank>",

-	description = "Enable or disable node inspection",

-	privs = {worldedit=true},

-	func = function(name, param)

-		if param == "on" or param == "1" or param == "true" or param == "yes" or param == "enable" or param == "" then

-			worldedit.inspect[name] = true

-			local axis, sign = worldedit.player_axis(name)

-			worldedit.player_notify(name, string.format("inspector: inspection enabled for %s, currently facing the %s axis",

-				name, axis .. (sign > 0 and "+" or "-")))

-		elseif param == "off" or param == "0" or param == "false" or param == "no" or param == "disable" then

-			worldedit.inspect[name] = nil

-			worldedit.player_notify(name, "inspector: inspection disabled")

-		else

-			worldedit.player_notify(name, "invalid usage: " .. param)

-		end

-	end,

-})

-

-minetest.register_on_punchnode(function(pos, node, puncher)

-	local name = puncher:get_player_name()

-	if worldedit.inspect[name] then

-		if minetest.check_player_privs(name, {worldedit=true}) then

-			local axis, sign = worldedit.player_axis(name)

-			message = string.format("inspector: %s at %s (param1=%d, param2=%d) punched by %s facing the %s axis",

-				node.name, minetest.pos_to_string(pos), node.param1, node.param2, name, axis .. (sign > 0 and "+" or "-"))

-		else

-			message = "inspector: worldedit privileges required"

-		end

-		worldedit.player_notify(name, message)

-	end

-end)

-

-minetest.register_chatcommand("/reset", {

-	params = "",

-	description = "Reset the region so that it is empty",

-	privs = {worldedit=true},

-	func = function(name, param)

-		worldedit.pos1[name] = nil

-		worldedit.pos2[name] = nil

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-		worldedit.set_pos[name] = nil

-		worldedit.player_notify(name, "region reset")

-	end,

-})

-

-minetest.register_chatcommand("/mark", {

-	params = "",

-	description = "Show markers at the region positions",

-	privs = {worldedit=true},

-	func = function(name, param)

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-		worldedit.player_notify(name, "region marked")

-	end,

-})

-

-minetest.register_chatcommand("/unmark", {

-	params = "",

-	description = "Hide markers if currently shown",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		worldedit.pos1[name] = nil

-		worldedit.pos2[name] = nil

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-		worldedit.pos1[name] = pos1

-		worldedit.pos2[name] = pos2

-		worldedit.player_notify(name, "region unmarked")

-	end,

-})

-

-minetest.register_chatcommand("/pos1", {

-	params = "",

-	description = "Set WorldEdit region position 1 to the player's location",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos = minetest.get_player_by_name(name):getpos()

-		pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)

-		worldedit.pos1[name] = pos

-		worldedit.mark_pos1(name)

-		worldedit.player_notify(name, "position 1 set to " .. minetest.pos_to_string(pos))

-	end,

-})

-

-minetest.register_chatcommand("/pos2", {

-	params = "",

-	description = "Set WorldEdit region position 2 to the player's location",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos = minetest.get_player_by_name(name):getpos()

-		pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)

-		worldedit.pos2[name] = pos

-		worldedit.mark_pos2(name)

-		worldedit.player_notify(name, "position 2 set to " .. minetest.pos_to_string(pos))

-	end,

-})

-

-minetest.register_chatcommand("/p", {

-	params = "set/set1/set2/get",

-	description = "Set WorldEdit region, WorldEdit position 1, or WorldEdit position 2 by punching nodes, or display the current WorldEdit region",

-	privs = {worldedit=true},

-	func = function(name, param)

-		if param == "set" then --set both WorldEdit positions

-			worldedit.set_pos[name] = "pos1"

-			worldedit.player_notify(name, "select positions by punching two nodes")

-		elseif param == "set1" then --set WorldEdit position 1

-			worldedit.set_pos[name] = "pos1only"

-			worldedit.player_notify(name, "select position 1 by punching a node")

-		elseif param == "set2" then --set WorldEdit position 2

-			worldedit.set_pos[name] = "pos2"

-			worldedit.player_notify(name, "select position 2 by punching a node")

-		elseif param == "get" then --display current WorldEdit positions

-			if worldedit.pos1[name] ~= nil then

-				worldedit.player_notify(name, "position 1: " .. minetest.pos_to_string(worldedit.pos1[name]))

-			else

-				worldedit.player_notify(name, "position 1 not set")

-			end

-			if worldedit.pos2[name] ~= nil then

-				worldedit.player_notify(name, "position 2: " .. minetest.pos_to_string(worldedit.pos2[name]))

-			else

-				worldedit.player_notify(name, "position 2 not set")

-			end

-		else

-			worldedit.player_notify(name, "unknown subcommand: " .. param)

-		end

-	end,

-})

-

-minetest.register_chatcommand("/fixedpos", {

-	params = "set1/set2 x y z",

-	description = "Set a WorldEdit region position to the position at (<x>, <y>, <z>)",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local found, _, flag, x, y, z = param:find("^(set[12])%s+([+-]?%d+)%s+([+-]?%d+)%s+([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		local pos = {x=tonumber(x), y=tonumber(y), z=tonumber(z)}

-		if flag == "set1" then

-			worldedit.pos1[name] = pos

-			worldedit.mark_pos1(name)

-			worldedit.player_notify(name, "position 1 set to " .. minetest.pos_to_string(pos))

-		else --flag == "set2"

-			worldedit.pos2[name] = pos

-			worldedit.mark_pos2(name)

-			worldedit.player_notify(name, "position 2 set to " .. minetest.pos_to_string(pos))

-		end

-	end,

-})

-

-minetest.register_on_punchnode(function(pos, node, puncher)

-	local name = puncher:get_player_name()

-	if name ~= "" and worldedit.set_pos[name] ~= nil then --currently setting position

-		if worldedit.set_pos[name] == "pos1" then --setting position 1

-			worldedit.pos1[name] = pos

-			worldedit.mark_pos1(name)

-			worldedit.set_pos[name] = "pos2" --set position 2 on the next invocation

-			worldedit.player_notify(name, "position 1 set to " .. minetest.pos_to_string(pos))

-		elseif worldedit.set_pos[name] == "pos1only" then --setting position 1 only

-			worldedit.pos1[name] = pos

-			worldedit.mark_pos1(name)

-			worldedit.set_pos[name] = nil --finished setting positions

-			worldedit.player_notify(name, "position 1 set to " .. minetest.pos_to_string(pos))

-		elseif worldedit.set_pos[name] == "pos2" then --setting position 2

-			worldedit.pos2[name] = pos

-			worldedit.mark_pos2(name)

-			worldedit.set_pos[name] = nil --finished setting positions

-			worldedit.player_notify(name, "position 2 set to " .. minetest.pos_to_string(pos))

-		elseif worldedit.set_pos[name] == "prob" then --setting Minetest schematic node probabilities

-			worldedit.prob_pos[name] = pos

-			minetest.show_formspec(puncher:get_player_name(), "prob_val_enter", "field[text;;]")

-		end

-	end

-end)

-

-minetest.register_chatcommand("/volume", {

-	params = "",

-	description = "Display the volume of the current WorldEdit region",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		if pos1 == nil or pos2 == nil then

-			worldedit.player_notify(name, "no region selected")

-			return nil

-		end

-

-		local volume = worldedit.volume(pos1, pos2)

-		local abs = math.abs

-		worldedit.player_notify(name, "current region has a volume of " .. volume .. " nodes ("

-			.. abs(pos2.x - pos1.x) + 1 .. "*"

-			.. abs(pos2.y - pos1.y) + 1 .. "*"

-			.. abs(pos2.z - pos1.z) + 1 .. ")")

-	end,

-})

-

-minetest.register_chatcommand("/deleteblocks", {

-	params = "",

-	description = "remove all MapBlocks (16x16x16) containing the selected area from the map",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local success = minetest.delete_area(pos1, pos2)

-		if success then

-			worldedit.player_notify(name, "Area deleted.")

-		else

-			worldedit.player_notify(name, "There was an error during deletion of the area.")

-		end

-	end),

-})

-

-minetest.register_chatcommand("/set", {

-	params = "<node>",

-	description = "Set the current WorldEdit region to <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local node = get_node(name, param)

-		if not node then

-			worldedit.player_notify(name, "Could not identify node \"" .. param .. "\"")

-			return

-		end

-

-		local count = worldedit.set(worldedit.pos1[name], worldedit.pos2[name], node)

-		worldedit.player_notify(name, count .. " nodes set")

-	end, check_region),

-})

-

-minetest.register_chatcommand("/mix", {

-	params = "<node1> ...",

-	description = "Fill the current WorldEdit region with a random mix of <node1>, ...",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local nodes = {}

-		for nodename in param:gmatch("[^%s]+") do

-			local node = get_node(name, nodename)

-			if not node then

-				worldedit.player_notify(name, "Could not identify node \"" .. name .. "\"")

-				return

-			end

-			nodes[#nodes + 1] = node

-		end

-

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local count = worldedit.set(pos1, pos2, nodes)

-		worldedit.player_notify(name, count .. " nodes set")

-	end, check_region),

-})

-

-local check_replace = function(name, param)

-	local found, _, searchnode, replacenode = param:find("^([^%s]+)%s+(.+)$")

-	if found == nil then

-		worldedit.player_notify(name, "invalid usage: " .. param)

-		return nil

-	end

-	local newsearchnode = worldedit.normalize_nodename(searchnode)

-	if not newsearchnode then

-		worldedit.player_notify(name, "invalid search node name: " .. searchnode)

-		return nil

-	end

-	local newreplacenode = worldedit.normalize_nodename(replacenode)

-	if not newreplacenode then

-		worldedit.player_notify(name, "invalid replace node name: " .. replacenode)

-		return nil

-	end

-	return check_region(name, param)

-end

-

-minetest.register_chatcommand("/replace", {

-	params = "<search node> <replace node>",

-	description = "Replace all instances of <search node> with <replace node> in the current WorldEdit region",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, search_node, replace_node = param:find("^([^%s]+)%s+(.+)$")

-		local norm_search_node = worldedit.normalize_nodename(search_node)

-		local norm_replace_node = worldedit.normalize_nodename(replace_node)

-		local count = worldedit.replace(worldedit.pos1[name], worldedit.pos2[name],

-				norm_search_node, norm_replace_node)

-		worldedit.player_notify(name, count .. " nodes replaced")

-	end, check_replace),

-})

-

-minetest.register_chatcommand("/replaceinverse", {

-	params = "<search node> <replace node>",

-	description = "Replace all nodes other than <search node> with <replace node> in the current WorldEdit region",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, search_node, replace_node = param:find("^([^%s]+)%s+(.+)$")

-		local norm_search_node = worldedit.normalize_nodename(search_node)

-		local norm_replace_node = worldedit.normalize_nodename(replace_node)

-		local count = worldedit.replace(worldedit.pos1[name], worldedit.pos2[name],

-				norm_search_node, norm_replace_node, true)

-		worldedit.player_notify(name, count .. " nodes replaced")

-	end, check_replace),

-})

-

-local check_sphere = function(name, param)

-	if worldedit.pos1[name] == nil then

-		worldedit.player_notify(name, "no position 1 selected")

-		return nil

-	end

-	local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-	if found == nil then

-		worldedit.player_notify(name, "invalid usage: " .. param)

-		return nil

-	end

-	local node = get_node(name, nodename)

-	if not node then return nil end

-	return math.ceil((4 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of sphere

-end

-

-minetest.register_chatcommand("/hollowsphere", {

-	params = "<radius> <node>",

-	description = "Add hollow sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-		local node = get_node(name, nodename)

-		local count = worldedit.sphere(worldedit.pos1[name], tonumber(radius), node, true)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_sphere),

-})

-

-minetest.register_chatcommand("/sphere", {

-	params = "<radius> <node>",

-	description = "Add sphere centered at WorldEdit position 1 with radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-		local node = get_node(name, nodename)

-		local count = worldedit.sphere(worldedit.pos1[name], tonumber(radius), node)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_sphere),

-})

-

-local check_dome = function(name, param)

-	if worldedit.pos1[name] == nil then

-		worldedit.player_notify(name, "no position 1 selected")

-		return nil

-	end

-	local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-	if found == nil then

-		worldedit.player_notify(name, "invalid usage: " .. param)

-		return nil

-	end

-	local node = get_node(name, nodename)

-	if not node then return nil end

-	return math.ceil((2 * math.pi * (tonumber(radius) ^ 3)) / 3) --volume of dome

-end

-

-minetest.register_chatcommand("/hollowdome", {

-	params = "<radius> <node>",

-	description = "Add hollow dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-		local node = get_node(name, nodename)

-		local count = worldedit.dome(worldedit.pos1[name], tonumber(radius), node, true)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_dome),

-})

-

-minetest.register_chatcommand("/dome", {

-	params = "<radius> <node>",

-	description = "Add dome centered at WorldEdit position 1 with radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, radius, nodename = param:find("^(%d+)%s+(.+)$")

-		local node = get_node(name, nodename)

-		local count = worldedit.dome(worldedit.pos1[name], tonumber(radius), node)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_dome),

-})

-

-local check_cylinder = function(name, param)

-	if worldedit.pos1[name] == nil then

-		worldedit.player_notify(name, "no position 1 selected")

-		return nil

-	end

-	local found, _, axis, length, radius, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")

-	if found == nil then

-		worldedit.player_notify(name, "invalid usage: " .. param)

-		return nil

-	end

-	local node = get_node(name, nodename)

-	if not node then return nil end

-	return math.ceil(math.pi * (tonumber(radius) ^ 2) * tonumber(length))

-end

-

-minetest.register_chatcommand("/hollowcylinder", {

-	params = "x/y/z/? <length> <radius> <node>",

-	description = "Add hollow cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length> and radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, axis, length, radius, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")

-		length = tonumber(length)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			length = length * sign

-		end

-		local node = get_node(name, nodename)

-		local count = worldedit.cylinder(worldedit.pos1[name], axis, length, tonumber(radius), node, true)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_cylinder),

-})

-

-minetest.register_chatcommand("/cylinder", {

-	params = "x/y/z/? <length> <radius> <node>",

-	description = "Add cylinder at WorldEdit position 1 along the x/y/z/? axis with length <length> and radius <radius>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, axis, length, radius, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(%d+)%s+(.+)$")

-		length = tonumber(length)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			length = length * sign

-		end

-		local node = get_node(name, nodename)

-		local count = worldedit.cylinder(worldedit.pos1[name], axis, length, tonumber(radius), node)

-		worldedit.player_notify(name, count .. " nodes added")

-	end, check_cylinder),

-})

-

-minetest.register_chatcommand("/pyramid", {

-	params = "x/y/z/? <height> <node>",

-	description = "Add pyramid centered at WorldEdit position 1 along the x/y/z/? axis with height <height>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")

-		height = tonumber(height)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			height = height * sign

-		end

-		local node = get_node(name, nodename)

-		local count = worldedit.pyramid(worldedit.pos1[name], axis, height, node)

-		worldedit.player_notify(name, count .. " nodes added")

-	end,

-	function(name, param)

-		if worldedit.pos1[name] == nil then

-			worldedit.player_notify(name, "no position 1 selected")

-			return nil

-		end

-		local found, _, axis, height, nodename = param:find("^([xyz%?])%s+([+-]?%d+)%s+(.+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		local node = get_node(name, nodename)

-		if not node then return nil end

-		height = tonumber(height)

-		return math.ceil(((height * 2 + 1) ^ 2) * height / 3)

-	end),

-})

-

-minetest.register_chatcommand("/spiral", {

-	params = "<length> <height> <space> <node>",

-	description = "Add spiral centered at WorldEdit position 1 with side length <length>, height <height>, space between walls <space>, composed of <node>",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, length, height, space, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")

-		local node = get_node(name, nodename)

-		local count = worldedit.spiral(worldedit.pos1[name], tonumber(length), tonumber(height), tonumber(space), node)

-		worldedit.player_notify(name, count .. " nodes added")

-	end,

-	function(name, param)

-		if worldedit.pos1[name] == nil then

-			worldedit.player_notify(name, "no position 1 selected")

-			return nil

-		end

-		local found, _, length, height, space, nodename = param:find("^(%d+)%s+(%d+)%s+(%d+)%s+(.+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		local node = get_node(name, nodename)

-		if not node then return nil end

-		return check_region(name, param)

-	end),

-})

-

-minetest.register_chatcommand("/copy", {

-	params = "x/y/z/? <amount>",

-	description = "Copy the current WorldEdit region along the x/y/z/? axis by <amount> nodes",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, axis, amount = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		amount = tonumber(amount)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			amount = amount * sign

-		end

-

-		local count = worldedit.copy(worldedit.pos1[name], worldedit.pos2[name], axis, amount)

-		worldedit.player_notify(name, count .. " nodes copied")

-	end,

-	function(name, param)

-		local volume = check_region(name, param)

-		return volume and volume * 2 or volume

-	end),

-})

-

-minetest.register_chatcommand("/move", {

-	params = "x/y/z/? <amount>",

-	description = "Move the current WorldEdit region along the x/y/z/? axis by <amount> nodes",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local found, _, axis, amount = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		amount = tonumber(amount)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			amount = amount * sign

-		end

-

-		local count = worldedit.move(pos1, pos2, axis, amount)

-

-		pos1[axis] = pos1[axis] + amount

-		pos2[axis] = pos2[axis] + amount

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-		worldedit.player_notify(name, count .. " nodes moved")

-	end, check_region),

-})

-

-minetest.register_chatcommand("/stack", {

-	params = "x/y/z/? <count>",

-	description = "Stack the current WorldEdit region along the x/y/z/? axis <count> times",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, axis, repetitions = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		repetitions = tonumber(repetitions)

-		if axis == "?" then

-			axis, sign = worldedit.player_axis(name)

-			repetitions = repetitions * sign

-		end

-		local count = worldedit.stack(worldedit.pos1[name], worldedit.pos2[name], axis, repetitions)

-		worldedit.player_notify(name, count .. " nodes stacked")

-	end,

-	function(name, param)

-		local found, _, axis, repetitions = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		local count = check_region(name, param)

-		if count then return (tonumber(repetitions) + 1) * count end

-		return nil

-	end),

-})

-

-minetest.register_chatcommand("/stack2", {

-	params = "<count> <x> <y> <z>",

-	description = "Stack the current WorldEdit region <count> times by offset <x>, <y>, <z>",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		if pos1 == nil or pos2 == nil then

-			worldedit.player_notify(name, "Select a position first!")

-			return

-		end

-		local repetitions, incs = param:match("(%d+)%s*(.+)")

-		if repetitions == nil then

-			worldedit.player_notify(name, "invalid count: " .. param)

-			return

-		end

-		repetitions = tonumber(repetitions)

-

-		local x, y, z = incs:match("([+-]?%d+) ([+-]?%d+) ([+-]?%d+)")

-		if x == nil then

-			worldedit.player_notify(name, "invalid increments: " .. param)

-			return

-		end

-		x, y, z = tonumber(x), tonumber(y), tonumber(z)

-

-		local count = worldedit.volume(pos1, pos2) * repetitions

-

-		return safe_region(function()

-			worldedit.stack2(pos1, pos2, {x=x, y=y, z=z}, repetitions,

-				function() worldedit.player_notify(name, count .. " nodes stacked") end)

-		end, function()

-			return count

-		end)(name,param) -- more hax --wip: clean this up a little bit

-	end

-})

-

-

-minetest.register_chatcommand("/stretch", {

-	params = "<stretchx> <stretchy> <stretchz>",

-	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",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local found, _, stretchx, stretchy, stretchz = param:find("^(%d+)%s+(%d+)%s+(%d+)$")

-		stretchx, stretchy, stretchz = tonumber(stretchx), tonumber(stretchy), tonumber(stretchz)

-		local count, pos1, pos2 = worldedit.stretch(pos1, pos2, stretchx, stretchy, stretchz)

-

-		--reset markers to scaled positions

-		worldedit.pos1[name] = pos1

-		worldedit.pos2[name] = pos2

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-

-		worldedit.player_notify(name, count .. " nodes stretched")

-	end,

-	function(name, param)

-		local found, _, stretchx, stretchy, stretchz = param:find("^(%d+)%s+(%d+)%s+(%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		stretchx, stretchy, stretchz = tonumber(stretchx), tonumber(stretchy), tonumber(stretchz)

-		if stretchx == 0 or stretchy == 0 or stretchz == 0 then

-			worldedit.player_notify(name, "invalid scaling factors: " .. param)

-		end

-		local count = check_region(name, param)

-		if count then return tonumber(stretchx) * tonumber(stretchy) * tonumber(stretchz) * count end

-		return nil

-	end),

-})

-

-minetest.register_chatcommand("/transpose", {

-	params = "x/y/z/? x/y/z/?",

-	description = "Transpose the current WorldEdit region along the x/y/z/? and x/y/z/? axes",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local found, _, axis1, axis2 = param:find("^([xyz%?])%s+([xyz%?])$")

-		if axis1 == "?" then axis1 = worldedit.player_axis(name) end

-		if axis2 == "?" then axis2 = worldedit.player_axis(name) end

-		local count, pos1, pos2 = worldedit.transpose(pos1, pos2, axis1, axis2)

-

-		--reset markers to transposed positions

-		worldedit.pos1[name] = pos1

-		worldedit.pos2[name] = pos2

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-

-		worldedit.player_notify(name, count .. " nodes transposed")

-	end,

-	function(name, param)

-		local found, _, axis1, axis2 = param:find("^([xyz%?])%s+([xyz%?])$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		if axis1 == axis2 then

-			worldedit.player_notify(name, "invalid usage: axes must be different")

-			return nil

-		end

-		return check_region(name, param)

-	end),

-})

-

-minetest.register_chatcommand("/flip", {

-	params = "x/y/z/?",

-	description = "Flip the current WorldEdit region along the x/y/z/? axis",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		if param == "?" then param = worldedit.player_axis(name) end

-		local count = worldedit.flip(worldedit.pos1[name], worldedit.pos2[name], param)

-		worldedit.player_notify(name, count .. " nodes flipped")

-	end,

-	function(name, param)

-		if param ~= "x" and param ~= "y" and param ~= "z" and param ~= "?" then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		return check_region(name, param)

-	end),

-})

-

-minetest.register_chatcommand("/rotate", {

-	params = "<axis> <angle>",

-	description = "Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment)",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		local found, _, axis, angle = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		if axis == "?" then axis = worldedit.player_axis(name) end

-		local count, pos1, pos2 = worldedit.rotate(pos1, pos2, axis, angle)

-

-		--reset markers to rotated positions

-		worldedit.pos1[name] = pos1

-		worldedit.pos2[name] = pos2

-		worldedit.mark_pos1(name)

-		worldedit.mark_pos2(name)

-

-		worldedit.player_notify(name, count .. " nodes rotated")

-	end,

-	function(name, param)

-		local found, _, axis, angle = param:find("^([xyz%?])%s+([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		if angle % 90 ~= 0 then

-			worldedit.player_notify(name, "invalid usage: angle must be multiple of 90")

-			return nil

-		end

-		return check_region(name, param)

-	end),

-})

-

-minetest.register_chatcommand("/orient", {

-	params = "<angle>",

-	description = "Rotate oriented nodes in the current WorldEdit region around the Y axis by angle <angle> (90 degree increment)",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local found, _, angle = param:find("^([+-]?%d+)$")

-		local count = worldedit.orient(worldedit.pos1[name], worldedit.pos2[name], angle)

-		worldedit.player_notify(name, count .. " nodes oriented")

-	end,

-	function(name, param)

-		local found, _, angle = param:find("^([+-]?%d+)$")

-		if found == nil then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return nil

-		end

-		if angle % 90 ~= 0 then

-			worldedit.player_notify(name, "invalid usage: angle must be multiple of 90")

-			return nil

-		end

-		return check_region(name, param)

-	end),

-})

-

-minetest.register_chatcommand("/fixlight", {

-	params = "",

-	description = "Fix the lighting in the current WorldEdit region",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local count = worldedit.fixlight(worldedit.pos1[name], worldedit.pos2[name])

-		worldedit.player_notify(name, count .. " nodes updated")

-	end),

-})

-

-minetest.register_chatcommand("/hide", {

-	params = "",

-	description = "Hide all nodes in the current WorldEdit region non-destructively",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local count = worldedit.hide(worldedit.pos1[name], worldedit.pos2[name])

-		worldedit.player_notify(name, count .. " nodes hidden")

-	end),

-})

-

-minetest.register_chatcommand("/suppress", {

-	params = "<node>",

-	description = "Suppress all <node> in the current WorldEdit region non-destructively",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local node = get_node(name, param)

-		local count = worldedit.suppress(worldedit.pos1[name], worldedit.pos2[name], node)

-		worldedit.player_notify(name, count .. " nodes suppressed")

-	end, check_region),

-})

-

-minetest.register_chatcommand("/highlight", {

-	params = "<node>",

-	description = "Highlight <node> in the current WorldEdit region by hiding everything else non-destructively",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local node = get_node(name, param)

-		local count = worldedit.highlight(worldedit.pos1[name], worldedit.pos2[name], node)

-		worldedit.player_notify(name, count .. " nodes highlighted")

-	end, check_region),

-})

-

-minetest.register_chatcommand("/restore", {

-	params = "",

-	description = "Restores nodes hidden with WorldEdit in the current WorldEdit region",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local count = worldedit.restore(worldedit.pos1[name], worldedit.pos2[name])

-		worldedit.player_notify(name, count .. " nodes restored")

-	end),

-})

-

-minetest.register_chatcommand("/save", {

-	params = "<file>",

-	description = "Save the current WorldEdit region to \"(world folder)/schems/<file>.we\"",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		if param == "" then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		if not check_filename(param) then

-			worldedit.player_notify(name, "Disallowed file name: " .. param)

-			return

-		end

-		local result, count = worldedit.serialize(worldedit.pos1[name],

-				worldedit.pos2[name])

-

-		local path = minetest.get_worldpath() .. "/schems"

-		-- Create directory if it does not already exist

-		mkdir(path)

-

-		local filename = path .. "/" .. param .. ".we"

-		local file, err = io.open(filename, "wb")

-		if err ~= nil then

-			worldedit.player_notify(name, "Could not save file to \"" .. filename .. "\"")

-			return

-		end

-		file:write(result)

-		file:flush()

-		file:close()

-

-		worldedit.player_notify(name, count .. " nodes saved")

-	end),

-})

-

-minetest.register_chatcommand("/allocate", {

-	params = "<file>",

-	description = "Set the region defined by nodes from \"(world folder)/schems/<file>.we\" as the current WorldEdit region",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos = get_position(name)

-		if pos == nil then return end

-

-		if param == "" then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		if not check_filename(param) then

-			worldedit.player_notify(name, "Disallowed file name: " .. param)

-			return

-		end

-

-		local filename = minetest.get_worldpath() .. "/schems/" .. param .. ".we"

-		local file, err = io.open(filename, "rb")

-		if err ~= nil then

-			worldedit.player_notify(name, "could not open file \"" .. filename .. "\"")

-			return

-		end

-		local value = file:read("*a")

-		file:close()

-

-		local version = worldedit.read_header(value)

-		if version == 0 then

-			worldedit.player_notify(name, "File is invalid!")

-			return

-		elseif version > worldedit.LATEST_SERIALIZATION_VERSION then

-			worldedit.player_notify(name, "File was created with newer version of WorldEdit!")

-		end

-		local nodepos1, nodepos2, count = worldedit.allocate(pos, value)

-

-		worldedit.pos1[name] = nodepos1

-		worldedit.mark_pos1(name)

-		worldedit.pos2[name] = nodepos2

-		worldedit.mark_pos2(name)

-

-		worldedit.player_notify(name, count .. " nodes allocated")

-	end,

-})

-

-minetest.register_chatcommand("/load", {

-	params = "<file>",

-	description = "Load nodes from \"(world folder)/schems/<file>[.we[m]]\" with position 1 of the current WorldEdit region as the origin",

-	privs = {worldedit=true},

-	func = function(name, param)

-		local pos = get_position(name)

-		if pos == nil then return end

-

-		if param == "" then

-			worldedit.player_notify(name, "invalid usage: " .. param)

-			return

-		end

-		if not string.find(param, "^[%w \t.,+-_=!@#$%%^&*()%[%]{};'\"]+$") then

-			worldedit.player_notify(name, "invalid file name: " .. param)

-			return

-		end

-

-		--find the file in the world path

-		local testpaths = {

-			minetest.get_worldpath() .. "/schems/" .. param,

-			minetest.get_worldpath() .. "/schems/" .. param .. ".we",

-			minetest.get_worldpath() .. "/schems/" .. param .. ".wem",

-		}

-		local file, err

-		for index, path in ipairs(testpaths) do

-			file, err = io.open(path, "rb")

-			if not err then

-				break

-			end

-		end

-		if err then

-			worldedit.player_notify(name, "could not open file \"" .. param .. "\"")

-			return

-		end

-		local value = file:read("*a")

-		file:close()

-

-		local version = worldedit.read_header(value)

-		if version == 0 then

-			worldedit.player_notify(name, "File is invalid!")

-			return

-		elseif version > worldedit.LATEST_SERIALIZATION_VERSION then

-			worldedit.player_notify(name, "File was created with newer version of WorldEdit!")

-			return

-		end

-

-		local count = worldedit.deserialize(pos, value)

-

-		worldedit.player_notify(name, count .. " nodes loaded")

-	end,

-})

-

-minetest.register_chatcommand("/lua", {

-	params = "<code>",

-	description = "Executes <code> as a Lua chunk in the global namespace",

-	privs = {worldedit=true, server=true},

-	func = function(name, param)

-		local admin = minetest.setting_get("name")

-		if not admin or not name == admin then

-			worldedit.player_notify(name, "this command can only be run by the server administrator")

-			return

-		end

-		local err = worldedit.lua(param)

-		if err then

-			worldedit.player_notify(name, "code error: " .. err)

-		else

-			worldedit.player_notify(name, "code successfully executed", false)

-		end

-	end,

-})

-

-minetest.register_chatcommand("/luatransform", {

-	params = "<code>",

-	description = "Executes <code> as a Lua chunk in the global namespace with the variable pos available, for each node in the current WorldEdit region",

-	privs = {worldedit=true, server=true},

-	func = safe_region(function(name, param)

-		local admin = minetest.setting_get("name")

-		if not admin or not name == admin then

-			worldedit.player_notify(name, "this command can only be run by the server administrator")

-			return

-		end

-

-		local err = worldedit.luatransform(worldedit.pos1[name], worldedit.pos2[name], param)

-		if err then

-			worldedit.player_notify(name, "code error: " .. err, false)

-		else

-			worldedit.player_notify(name, "code successfully executed", false)

-		end

-	end),

-})

-

-minetest.register_chatcommand("/mtschemcreate", {

-	params = "<file>",

-	description = "Save the current WorldEdit region using the Minetest "..

-		"Schematic format to \"(world folder)/schems/<filename>.mts\"",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		if param == nil then

-			worldedit.player_notify(name, "No filename specified")

-			return

-		end

-		if not check_filename(param) then

-			worldedit.player_notify(name, "Disallowed file name: " .. param)

-			return

-		end

-

-		local path = minetest.get_worldpath() .. "/schems"

-		-- Create directory if it does not already exist

-		mkdir(path)

-

-		local filename = path .. "/" .. param .. ".mts"

-		local ret = minetest.create_schematic(worldedit.pos1[name],

-				worldedit.pos2[name], worldedit.prob_list[name],

-				filename)

-		if ret == nil then

-			worldedit.player_notify(name, "Failed to create Minetest schematic", false)

-		else

-			worldedit.player_notify(name, "Saved Minetest schematic to " .. param, false)

-		end

-		worldedit.prob_list[name] = {}

-	end),

-})

-

-minetest.register_chatcommand("/mtschemplace", {

-	params = "<file>",

-	description = "Load nodes from \"(world folder)/schems/<file>.mts\" with position 1 of the current WorldEdit region as the origin",

-	privs = {worldedit=true},

-	func = function(name, param)

-		if param == "" then

-			worldedit.player_notify(name, "no filename specified")

-			return

-		end

-		if not check_filename(param) then

-			worldedit.player_notify(name, "Disallowed file name: " .. param)

-			return

-		end

-

-		local pos = get_position(name)

-		if pos == nil then return end

-

-		local path = minetest.get_worldpath() .. "/schems/" .. param .. ".mts"

-		if minetest.place_schematic(pos, path) == nil then

-			worldedit.player_notify(name, "failed to place Minetest schematic", false)

-		else

-			worldedit.player_notify(name, "placed Minetest schematic " .. param ..

-				" at " .. minetest.pos_to_string(pos), false)

-		end

-	end,

-})

-

-minetest.register_chatcommand("/mtschemprob", {

-	params = "start/finish/get",

-	description = "Begins node probability entry for Minetest schematics, gets the nodes that have probabilities set, or ends node probability entry",

-	privs = {worldedit=true},

-	func = function(name, param)

-		if param == "start" then --start probability setting

-			worldedit.set_pos[name] = "prob"

-			worldedit.prob_list[name] = {}

-			worldedit.player_notify(name, "select Minetest schematic probability values by punching nodes")

-		elseif param == "finish" then --finish probability setting

-			worldedit.set_pos[name] = nil

-			worldedit.player_notify(name, "finished Minetest schematic probability selection")

-		elseif param == "get" then --get all nodes that had probabilities set on them

-			local text = ""

-			local problist = worldedit.prob_list[name]

-			if problist == nil then

-				return

-			end

-			for k,v in pairs(problist) do

-				local prob = math.floor(((v["prob"] / 256) * 100) * 100 + 0.5) / 100

-				text = text .. minetest.pos_to_string(v["pos"]) .. ": " .. prob .. "% | "

-			end

-			worldedit.player_notify(name, "currently set node probabilities:")

-			worldedit.player_notify(name, text)

-		else

-			worldedit.player_notify(name, "unknown subcommand: " .. param)

-		end

-	end,

-})

-

-minetest.register_on_player_receive_fields(

-	function(player, formname, fields)

-		if (formname == "prob_val_enter") and (fields.text ~= "") then

-			local name = player:get_player_name()

-			local prob_entry = {pos=worldedit.prob_pos[name], prob=tonumber(fields.text)}

-			local index = table.getn(worldedit.prob_list[name]) + 1

-			worldedit.prob_list[name][index] = prob_entry

-		end

-	end

-)

-

-minetest.register_chatcommand("/clearobjects", {

-	params = "",

-	description = "Clears all objects within the WorldEdit region",

-	privs = {worldedit=true},

-	func = safe_region(function(name, param)

-		local count = worldedit.clear_objects(worldedit.pos1[name], worldedit.pos2[name])

-		worldedit.player_notify(name, count .. " objects cleared")

-	end),

-})

diff --git a/worldedit/worldedit_commands/mark.lua b/worldedit/worldedit_commands/mark.lua
deleted file mode 100644
index 4062cae..0000000
--- a/worldedit/worldedit_commands/mark.lua
+++ /dev/null
@@ -1,162 +0,0 @@
-worldedit.marker1 = {}

-worldedit.marker2 = {}

-worldedit.marker_region = {}

-

---marks worldedit region position 1

-worldedit.mark_pos1 = function(name)

-	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-

-	if pos1 ~= nil then

-		--make area stay loaded

-		local manip = minetest.get_voxel_manip()

-		manip:read_from_map(pos1, pos1)

-	end

-	if worldedit.marker1[name] ~= nil then --marker already exists

-		worldedit.marker1[name]:remove() --remove marker

-		worldedit.marker1[name] = nil

-	end

-	if pos1 ~= nil then

-		--add marker

-		worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1")

-		if worldedit.marker1[name] ~= nil then

-			worldedit.marker1[name]:get_luaentity().player_name = name

-		end

-	end

-	worldedit.mark_region(name)

-end

-

---marks worldedit region position 2

-worldedit.mark_pos2 = function(name)

-	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-

-	if pos2 ~= nil then

-		--make area stay loaded

-		local manip = minetest.get_voxel_manip()

-		manip:read_from_map(pos2, pos2)

-	end

-	if worldedit.marker2[name] ~= nil then --marker already exists

-		worldedit.marker2[name]:remove() --remove marker

-		worldedit.marker2[name] = nil

-	end

-	if pos2 ~= nil then

-		--add marker

-		worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2")

-		if worldedit.marker2[name] ~= nil then

-			worldedit.marker2[name]:get_luaentity().player_name = name

-		end

-	end

-	worldedit.mark_region(name)

-end

-

-worldedit.mark_region = function(name)

-	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-

-	if worldedit.marker_region[name] ~= nil then --marker already exists

-		--wip: make the area stay loaded somehow

-		for _, entity in ipairs(worldedit.marker_region[name]) do

-			entity:remove()

-		end

-		worldedit.marker_region[name] = nil

-	end

-	if pos1 ~= nil and pos2 ~= nil then

-		local pos1, pos2 = worldedit.sort_pos(pos1, pos2)

-		local thickness = 0.2

-		local sizex, sizey, sizez = (1 + pos2.x - pos1.x) / 2, (1 + pos2.y - pos1.y) / 2, (1 + pos2.z - pos1.z) / 2

-

-		--make area stay loaded

-		local manip = minetest.get_voxel_manip()

-		manip:read_from_map(pos1, pos2)

-

-		local markers = {}

-

-		--XY plane markers

-		for _, z in ipairs({pos1.z - 0.5, pos2.z + 0.5}) do

-			local marker = minetest.add_entity({x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}, "worldedit:region_cube")

-			marker:set_properties({

-				visual_size={x=sizex * 2, y=sizey * 2},

-				collisionbox = {-sizex, -sizey, -thickness, sizex, sizey, thickness},

-			})

-			marker:get_luaentity().player_name = name

-			table.insert(markers, marker)

-		end

-

-		--YZ plane markers

-		for _, x in ipairs({pos1.x - 0.5, pos2.x + 0.5}) do

-			local marker = minetest.add_entity({x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}, "worldedit:region_cube")

-			marker:set_properties({

-				visual_size={x=sizez * 2, y=sizey * 2},

-				collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},

-			})

-			marker:setyaw(math.pi / 2)

-			marker:get_luaentity().player_name = name

-			table.insert(markers, marker)

-		end

-

-		worldedit.marker_region[name] = markers

-	end

-end

-

-minetest.register_entity(":worldedit:pos1", {

-	initial_properties = {

-		visual = "cube",

-		visual_size = {x=1.1, y=1.1},

-		textures = {"worldedit_pos1.png", "worldedit_pos1.png",

-			"worldedit_pos1.png", "worldedit_pos1.png",

-			"worldedit_pos1.png", "worldedit_pos1.png"},

-		collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},

-		physical = false,

-	},

-	on_step = function(self, dtime)

-		if worldedit.marker1[self.player_name] == nil then

-			self.object:remove()

-		end

-	end,

-	on_punch = function(self, hitter)

-		self.object:remove()

-		worldedit.marker1[self.player_name] = nil

-	end,

-})

-

-minetest.register_entity(":worldedit:pos2", {

-	initial_properties = {

-		visual = "cube",

-		visual_size = {x=1.1, y=1.1},

-		textures = {"worldedit_pos2.png", "worldedit_pos2.png",

-			"worldedit_pos2.png", "worldedit_pos2.png",

-			"worldedit_pos2.png", "worldedit_pos2.png"},

-		collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},

-		physical = false,

-	},

-	on_step = function(self, dtime)

-		if worldedit.marker2[self.player_name] == nil then

-			self.object:remove()

-		end

-	end,

-	on_punch = function(self, hitter)

-		self.object:remove()

-		worldedit.marker2[self.player_name] = nil

-	end,

-})

-

-minetest.register_entity(":worldedit:region_cube", {

-	initial_properties = {

-		visual = "upright_sprite",

-		visual_size = {x=1.1, y=1.1},

-		textures = {"worldedit_cube.png"},

-		visual_size = {x=10, y=10},

-		physical = false,

-	},

-	on_step = function(self, dtime)

-		if worldedit.marker_region[self.player_name] == nil then

-			self.object:remove()

-			return

-		end

-	end,

-	on_punch = function(self, hitter)

-		for _, entity in ipairs(worldedit.marker_region[self.player_name]) do

-			entity:remove()

-		end

-		worldedit.marker_region[self.player_name] = nil

-	end,

-})

-

diff --git a/worldedit/worldedit_commands/safe.lua b/worldedit/worldedit_commands/safe.lua
deleted file mode 100644
index e640853..0000000
--- a/worldedit/worldedit_commands/safe.lua
+++ /dev/null
@@ -1,68 +0,0 @@
-local safe_region_callback = {}

-local safe_region_param = {}

-

-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

-

---`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

-		if count < 10000 then

-			return callback(name, param)

-		end

-

-		--save callback to call later

-		safe_region_callback[name], safe_region_param[name] = callback, param

-		worldedit.player_notify(name, "WARNING: this operation could affect up to " .. count .. " nodes; type //y to continue or //n to cancel")

-	end

-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]

-		if not callback then

-			worldedit.player_notify(name, "no operation pending")

-			return

-		end

-

-		--obtain positions

-		local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]

-		if pos1 == nil or pos2 == nil then

-			worldedit.player_notify(name, "no region selected")

-			return

-		end

-

-		safe_region_callback[name], safe_region_param[name] = nil, nil --reset pending operation

-		callback(name, param, pos1, pos2)

-	end,

-})

-

-minetest.register_chatcommand("/n", {

-	params = "",

-	description = "Confirm a pending operation",

-	func = function(name)

-		if not safe_region_callback[name] then

-			worldedit.player_notify(name, "no operation pending")

-			return

-		end

-		safe_region_callback[name], safe_region_param[name] = nil, nil

-	end,

-})

-

-return safe_region, check_region

-

diff --git a/worldedit/worldedit_commands/textures/worldedit_cube.png b/worldedit/worldedit_commands/textures/worldedit_cube.png
deleted file mode 100644
index fde36a8..0000000
--- a/worldedit/worldedit_commands/textures/worldedit_cube.png
+++ /dev/null
diff --git a/worldedit/worldedit_commands/textures/worldedit_pos1.png b/worldedit/worldedit_commands/textures/worldedit_pos1.png
deleted file mode 100644
index 4c304aa..0000000
--- a/worldedit/worldedit_commands/textures/worldedit_pos1.png
+++ /dev/null
diff --git a/worldedit/worldedit_commands/textures/worldedit_pos2.png b/worldedit/worldedit_commands/textures/worldedit_pos2.png
deleted file mode 100644
index 1502f16..0000000
--- a/worldedit/worldedit_commands/textures/worldedit_pos2.png
+++ /dev/null