world generation, ores, ingots and more!

mods/worldedit/worldedit_commands/.gitignore

@@ -0,0 +1 @@
+*~

mods/worldedit/worldedit_commands/cuboid.lua

@@ -0,0 +1,266 @@
+worldedit.register_command("outset", {
+	params = "[h/v] <amount>",
+	description = "Outset the selected region.",
+	privs = {worldedit=true},
+	require_pos = 2,
+	parse = function(param)
+		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
+		if find == nil then
+			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
+			assert(worldedit.cuboid_linear_expand(name, 'x', 1, amount))
+			assert(worldedit.cuboid_linear_expand(name, 'x', -1, amount))
+			assert(worldedit.cuboid_linear_expand(name, 'z', 1, amount))
+			assert(worldedit.cuboid_linear_expand(name, 'z', -1, amount))
+		elseif dir == "v" then
+			assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
+			assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
+		else
+			return false, "Invalid number of arguments"
+		end
+
+		worldedit.marker_update(name)
+		return true, "Region outset by " .. amount .. " blocks"
+      end,
+})
+
+
+worldedit.register_command("inset", {
+	params = "[h/v] <amount>",
+	description = "Inset the selected region.",
+	privs = {worldedit=true},
+	require_pos = 2,
+	parse = function(param)
+		local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
+		if find == nil then
+			return false
+		end
+		if dir:find("[^hv]") ~= 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
+			assert(worldedit.cuboid_linear_expand(name, 'x', 1, -amount))
+			assert(worldedit.cuboid_linear_expand(name, 'x', -1, -amount))
+			assert(worldedit.cuboid_linear_expand(name, 'z', 1, -amount))
+			assert(worldedit.cuboid_linear_expand(name, 'z', -1, -amount))
+		elseif dir == "v" then
+			assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
+			assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
+		else
+			return false, "Invalid number of arguments"
+		end
+
+		worldedit.marker_update(name)
+		return true, "Region inset by " .. amount .. " blocks"
+      end,
+})
+
+
+worldedit.register_command("shift", {
+	params = "x/y/z/?/up/down/left/right/front/back [+/-]<amount>",
+	description = "Shifts the selection area without moving its contents",
+	privs = {worldedit=true},
+	require_pos = 2,
+	parse = function(param)
+		local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")
+		if find == nil then
+			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
+		elseif direction == "?" then
+			axis, dir = worldedit.player_axis(name)
+		else
+			axis, dir = worldedit.translate_direction(name, direction)
+		end
+
+		if axis == nil or dir == nil then
+			return false, "Invalid if looking straight up or down"
+		end
+
+		assert(worldedit.cuboid_shift(name, axis, amount * dir))
+		worldedit.marker_update(name)
+
+		return true, "Region shifted by " .. amount .. " nodes"
+      end,
+})
+
+
+worldedit.register_command("expand", {
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
+	description = "Expands the selection in the selected absolute or relative axis",
+	privs = {worldedit=true},
+	require_pos = 2,
+	parse = function(param)
+		local find, _, sign, direction, amount,
+				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
+		if find == nil then
+			return false
+		end
+
+		if rev_amount == "" then
+			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)
+
+			if axis == nil or dir == nil then
+				return false, "Invalid if looking straight up or down"
+			end
+		else
+			if direction == "?" then
+				axis, dir = worldedit.player_axis(name)
+			else
+				axis = direction
+				dir = 1
+			end
+		end
+
+		if sign == "-" then
+			dir = -dir
+		end
+
+		worldedit.cuboid_linear_expand(name, axis, dir, amount)
+		worldedit.cuboid_linear_expand(name, axis, -dir, rev_amount)
+		worldedit.marker_update(name)
+		return true, "Region expanded by " .. (amount + rev_amount) .. " nodes"
+	end,
+})
+
+
+worldedit.register_command("contract", {
+	params = "[+/-]x/y/z/?/up/down/left/right/front/back <amount> [reverse amount]",
+	description = "Contracts the selection in the selected absolute or relative axis",
+	privs = {worldedit=true},
+	require_pos = 2,
+	parse = function(param)
+		local find, _, sign, direction, amount,
+				rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")
+		if find == nil then
+			return false
+		end
+
+		if rev_amount == "" then
+			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)
+
+			if axis == nil or dir == nil then
+				return false, "Invalid if looking straight up or down"
+			end
+		else
+			if direction == "?" then
+				axis, dir = worldedit.player_axis(name)
+			else
+				axis = direction
+				dir = 1
+			end
+		end
+
+		if sign == "-" then
+			dir = -dir
+		end
+
+		worldedit.cuboid_linear_expand(name, axis, dir, -amount)
+		worldedit.cuboid_linear_expand(name, axis, -dir, -rev_amount)
+		worldedit.marker_update(name)
+		return true, "Region contracted by " .. (amount + rev_amount) .. " nodes"
+	end,
+})
+
+worldedit.register_command("cubeapply", {
+	params = "<size>/(<sizex> <sizey> <sizez>) <command> [parameters]",
+	description = "Select a cube with side length <size> around position 1 and run <command> on region",
+	privs = {worldedit=true},
+	require_pos = 1,
+	parse = function(param)
+		local found, _, sidex, sidey, sidez, cmd, args =
+			param:find("^(%d+)%s+(%d+)%s+(%d+)%s+([^%s]+)%s*(.*)$")
+		if found == nil then
+			found, _, sidex, cmd, args = param:find("^(%d+)%s+([^%s]+)%s*(.*)$")
+			if found == nil then
+				return false
+			end
+			sidey = sidex
+			sidez = sidex
+		end
+		sidex = tonumber(sidex)
+		sidey = tonumber(sidey)
+		sidez = tonumber(sidez)
+		if sidex < 1 or sidey < 1 or sidez < 1 then
+			return false
+		end
+		local cmddef = worldedit.registered_commands[cmd]
+		if cmddef == nil or cmddef.require_pos ~= 2 then
+			return false, "invalid usage: //" .. cmd .. " cannot be used with cubeapply"
+		end
+		-- run parsing of target command
+		local parsed = {cmddef.parse(args)}
+		if not table.remove(parsed, 1) then
+			return false, parsed[1]
+		end
+		return true, sidex, sidey, sidez, cmd, parsed
+	end,
+	nodes_needed = function(name, sidex, sidey, sidez, cmd, parsed)
+		-- its not possible to defer to the target command at this point
+		return sidex * sidey * sidez
+	end,
+	func = function(name, sidex, sidey, sidez, cmd, parsed)
+		local cmddef = assert(worldedit.registered_commands[cmd])
+		local success, missing_privs = minetest.check_player_privs(name, cmddef.privs)
+		if not success then
+			worldedit.player_notify(name, "Missing privileges: " ..
+				table.concat(missing_privs, ", "))
+			return
+		end
+
+		-- update region to be the cuboid the user wanted
+		local half = vector.divide(vector.new(sidex, sidey, sidez), 2)
+		local sizea, sizeb = vector.apply(half, math.floor), vector.apply(half, math.ceil)
+		local center = worldedit.pos1[name]
+		worldedit.pos1[name] = vector.subtract(center, sizea)
+		worldedit.pos2[name] = vector.add(center, vector.subtract(sizeb, 1))
+		worldedit.marker_update(name)
+
+		-- actually run target command
+		return cmddef.func(name, unpack(parsed))
+	end,
+})

mods/worldedit/worldedit_commands/mark.lua

@@ -0,0 +1,206 @@
+worldedit.marker1 = {}
+worldedit.marker2 = {}
+worldedit.marker_region = {}
+
+local init_sentinel = "new" .. tostring(math.random(99999))
+
+--marks worldedit region position 1
+worldedit.mark_pos1 = function(name, region_too)
+	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
+
+	if worldedit.marker1[name] ~= nil then --marker already exists
+		worldedit.marker1[name]:remove() --remove marker
+		worldedit.marker1[name] = nil
+	end
+	if pos1 ~= nil then
+		--make area stay loaded
+		local manip = minetest.get_voxel_manip()
+		manip:read_from_map(pos1, pos1)
+
+		--add marker
+		worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1", init_sentinel)
+		if worldedit.marker1[name] ~= nil then
+			worldedit.marker1[name]:get_luaentity().player_name = name
+		end
+	end
+	if region_too == nil or region_too then
+		worldedit.mark_region(name)
+	end
+end
+
+--marks worldedit region position 2
+worldedit.mark_pos2 = function(name, region_too)
+	local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
+
+	if worldedit.marker2[name] ~= nil then --marker already exists
+		worldedit.marker2[name]:remove() --remove marker
+		worldedit.marker2[name] = nil
+	end
+	if pos2 ~= nil then
+		--make area stay loaded
+		local manip = minetest.get_voxel_manip()
+		manip:read_from_map(pos2, pos2)
+
+		--add marker
+		worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2", init_sentinel)
+		if worldedit.marker2[name] ~= nil then
+			worldedit.marker2[name]:get_luaentity().player_name = name
+		end
+	end
+	if region_too == nil or region_too then
+		worldedit.mark_region(name)
+	end
+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
+		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 vec = vector.subtract(pos2, pos1)
+		local maxside = math.max(vec.x, math.max(vec.y, vec.z))
+		local limit = tonumber(minetest.settings:get("active_object_send_range_blocks")) * 16
+		if maxside > limit * 1.5 then
+			-- The client likely won't be able to see the plane markers as intended anyway,
+			-- thus don't place them and also don't load the area into memory
+			return
+		end
+
+		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 entpos = {x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}
+			local marker = minetest.add_entity(entpos, "worldedit:region_cube", init_sentinel)
+			if marker ~= nil then
+				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
+		end
+
+		--YZ plane markers
+		for _, x in ipairs({pos1.x - 0.5, pos2.x + 0.5}) do
+			local entpos = {x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}
+			local marker = minetest.add_entity(entpos, "worldedit:region_cube", init_sentinel)
+			if marker ~= nil then
+				marker:set_properties({
+					visual_size={x=sizez * 2, y=sizey * 2},
+					collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},
+				})
+				marker:set_yaw(math.pi / 2)
+				marker:get_luaentity().player_name = name
+				table.insert(markers, marker)
+			end
+		end
+
+		worldedit.marker_region[name] = markers
+	end
+end
+
+--convenience function that calls everything
+worldedit.marker_update = function(name)
+	worldedit.mark_pos1(name, false)
+	worldedit.mark_pos2(name, false)
+	worldedit.mark_region(name)
+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,
+		static_save = false,
+	},
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
+			self.object:remove()
+		end
+	end,
+	on_punch = function(self, hitter)
+		self.object:remove()
+		worldedit.marker1[self.player_name] = nil
+	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	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,
+		static_save = false,
+	},
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
+			self.object:remove()
+		end
+	end,
+	on_punch = function(self, hitter)
+		self.object:remove()
+		worldedit.marker2[self.player_name] = nil
+	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	end,
+})
+
+minetest.register_entity(":worldedit:region_cube", {
+	initial_properties = {
+		visual = "upright_sprite",
+		textures = {"worldedit_cube.png"},
+		visual_size = {x=10, y=10},
+		physical = false,
+		static_save = false,
+	},
+	on_activate = function(self, staticdata, dtime_s)
+		if staticdata ~= init_sentinel then
+			-- we were loaded from before static_save = false was added
+			self.object:remove()
+		end
+	end,
+	on_punch = function(self, hitter)
+		local markers = worldedit.marker_region[self.player_name]
+		if not markers then
+			return
+		end
+		for _, entity in ipairs(markers) do
+			entity:remove()
+		end
+		worldedit.marker_region[self.player_name] = nil
+	end,
+	on_blast = function(self, damage)
+		return false, false, {} -- don't damage or knockback
+	end,
+})
+

mods/worldedit/worldedit_commands/mod.conf

@@ -0,0 +1,3 @@
+name = worldedit_commands
+description = WorldEdit chat commands
+depends = worldedit

mods/worldedit/worldedit_commands/safe.lua

@@ -0,0 +1,48 @@
+local safe_region_callback = {}
+
+--`count` is the number of nodes that would possibly be modified
+--`callback` is a callback to run when the user confirms
+local function safe_region(name, count, callback)
+	if count < 20000 then
+		return callback()
+	end
+
+	--save callback to call later
+	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
+
+local function reset_pending(name)
+	safe_region_callback[name] = nil
+end
+
+minetest.register_chatcommand("/y", {
+	params = "",
+	description = "Confirm a pending operation",
+	func = function(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)
+	end,
+})
+
+minetest.register_chatcommand("/n", {
+	params = "",
+	description = "Abort a pending operation",
+	func = function(name)
+		if not safe_region_callback[name] then
+			worldedit.player_notify(name, "no operation pending")
+			return
+		end
+
+		reset_pending(name)
+	end,
+})
+
+
+return safe_region, reset_pending

mods/worldedit/worldedit_commands/wand.lua

@@ -0,0 +1,65 @@
+local function above_or_under(placer, pointed_thing)
+	if placer:get_player_control().sneak then
+		return pointed_thing.above
+	else
+		return pointed_thing.under
+	end
+end
+
+local punched_air_time = {}
+
+minetest.register_tool(":worldedit:wand", {
+	description = "WorldEdit Wand tool\nLeft-click to set 1st position, right-click to set 2nd",
+	inventory_image = "worldedit_wand.png",
+	stack_max = 1, -- there is no need to have more than one
+	liquids_pointable = true, -- ground with only water on can be selected as well
+
+	on_use = function(itemstack, placer, pointed_thing)
+		if placer == nil or pointed_thing == nil then return end
+		local name = placer:get_player_name()
+		if pointed_thing.type == "node" then
+			-- set and mark pos1
+			worldedit.pos1[name] = above_or_under(placer, pointed_thing)
+			worldedit.mark_pos1(name)
+		elseif pointed_thing.type == "nothing" then
+			local now = minetest.get_us_time()
+			if now - (punched_air_time[name] or 0) < 1000 * 1000 then
+				-- reset markers
+				worldedit.registered_commands["reset"].func(name)
+			end
+			punched_air_time[name] = now
+		elseif pointed_thing.type == "object" then
+			local entity = pointed_thing.ref:get_luaentity()
+			if entity and entity.name == "worldedit:pos2" then
+				-- set pos1 = pos2
+				worldedit.pos1[name] = worldedit.pos2[name]
+				worldedit.mark_pos1(name)
+			end
+		end
+	end,
+
+	on_place = function(itemstack, placer, pointed_thing)
+		if placer == nil or (pointed_thing or {}).type ~= "node" then
+			return itemstack
+		end
+		local name = placer:get_player_name()
+		-- set and mark pos2
+		worldedit.pos2[name] = above_or_under(placer, pointed_thing)
+		worldedit.mark_pos2(name)
+		return itemstack -- nothing consumed, nothing changed
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		if user == nil or (pointed_thing or {}).type ~= "object" then
+			return itemstack
+		end
+		local name = user:get_player_name()
+		local entity = pointed_thing.ref:get_luaentity()
+		if entity and entity.name == "worldedit:pos1" then
+			-- set pos2 = pos1
+			worldedit.pos2[name] = worldedit.pos1[name]
+			worldedit.mark_pos2(name)
+		end
+		return itemstack -- nothing consumed, nothing changed
+	end,
+})