9 files changed, 372 insertions, 0 deletions
diff --git a/games/devtest/mods/experimental/commands.lua b/games/devtest/mods/experimental/commands.lua
new file mode 100644
index 000000000..96f8cbe39
--- /dev/null
+++ b/games/devtest/mods/experimental/commands.lua
@@ -0,0 +1,215 @@
+minetest.register_chatcommand("test_inv", {
+	params = "",
+	description = "Test: Modify player's inventory formspec",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+		player:set_inventory_formspec(
+			"size[13,7.5]"..
+			"image[6,0.6;1,2;player.png]"..
+			"list[current_player;main;5,3.5;8,4;]"..
+			"list[current_player;craft;8,0;3,3;]"..
+			"list[current_player;craftpreview;12,1;1,1;]"..
+			"list[detached:test_inventory;main;0,0;4,6;0]"..
+			"button[0.5,7;2,1;button1;Button 1]"..
+			"button_exit[2.5,7;2,1;button2;Exit Button]")
+		return true, "Done."
+	end,
+})
+
+minetest.register_chatcommand("test_bulk_set_node", {
+	params = "",
+	description = "Test: Bulk-set 9×9×9 stone nodes",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+		local pos_list = {}
+		local ppos = player:get_pos()
+		local i = 1
+		for x=2,10 do
+			for y=2,10 do
+				for z=2,10 do
+					pos_list[i] = {x=ppos.x + x,y = ppos.y + y,z = ppos.z + z}
+					i = i + 1
+				end
+			end
+		end
+		minetest.bulk_set_node(pos_list, {name = "mapgen_stone"})
+		return true, "Done."
+	end,
+})
+
+minetest.register_chatcommand("bench_bulk_set_node", {
+	params = "",
+	description = "Benchmark: Bulk-set 99×99×99 stone nodes",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+		local pos_list = {}
+		local ppos = player:get_pos()
+		local i = 1
+		for x=2,100 do
+			for y=2,100 do
+				for z=2,100 do
+					pos_list[i] = {x=ppos.x + x,y = ppos.y + y,z = ppos.z + z}
+					i = i + 1
+				end
+			end
+		end
+
+		minetest.chat_send_player(name, "Benchmarking minetest.bulk_set_node. Warming up ...");
+
+		-- warm up with stone to prevent having different callbacks
+		-- due to different node topology
+		minetest.bulk_set_node(pos_list, {name = "mapgen_stone"})
+
+		minetest.chat_send_player(name, "Warming up finished, now benchmarking ...");
+
+		local start_time = minetest.get_us_time()
+		for i=1,#pos_list do
+			minetest.set_node(pos_list[i], {name = "mapgen_stone"})
+		end
+		local middle_time = minetest.get_us_time()
+		minetest.bulk_set_node(pos_list, {name = "mapgen_stone"})
+		local end_time = minetest.get_us_time()
+		local msg = string.format("Benchmark results: minetest.set_node loop: %.2f ms; minetest.bulk_set_node: %.2f ms",
+			((middle_time - start_time)) / 1000,
+			((end_time - middle_time)) / 1000
+		)
+		return true, msg
+	end,
+})
+
+local function advance_pos(pos, start_pos, advance_z)
+	if advance_z then
+		pos.z = pos.z + 2
+		pos.x = start_pos.x
+	else
+		pos.x = pos.x + 2
+	end
+	if pos.x > 30900 or pos.x - start_pos.x > 46 then
+		pos.x = start_pos.x
+		pos.z = pos.z + 2
+	end
+	if pos.z > 30900 then
+		-- We ran out of space! Aborting
+		aborted = true
+		return false
+	end
+	return pos
+end
+
+local function place_nodes(param)
+	local nodes = param.nodes
+	local name = param.name
+	local pos = param.pos
+	local start_pos = param.start_pos
+	table.sort(nodes)
+	minetest.chat_send_player(name, "Placing nodes …")
+	local nodes_placed = 0
+	for n=1, #nodes do
+		local itemstring = nodes[n]
+		local def = minetest.registered_nodes[itemstring]
+		local p2_max = 0
+		if param.param ~= "no_param2" then
+			-- Also test the param2 values of the nodes
+			-- ... but we only use permissible param2 values
+			if def.paramtype2 == "wallmounted" then
+				p2_max = 5
+			elseif def.paramtype2 == "facedir" then
+				p2_max = 23
+			elseif def.paramtype2 == "glasslikeliquidlevel" then
+				p2_max = 63
+			elseif def.paramtype2 == "meshoptions" and def.drawtype == "plantlike" then
+				p2_max = 63
+			elseif def.paramtype2 == "leveled" then
+				p2_max = 127
+			elseif def.paramtype2 == "degrotate" and def.drawtype == "plantlike" then
+				p2_max = 179
+			elseif def.paramtype2 == "colorfacedir" or
+				def.paramtype2 == "colorwallmounted" or
+				def.paramtype2 == "color" then
+				p2_max = 255
+			end
+		end
+		for p2 = 0, p2_max do
+			-- Skip undefined param2 values
+			if not ((def.paramtype2 == "meshoptions" and p2 % 8 > 4) or
+					(def.paramtype2 == "colorwallmounted" and p2 % 8 > 5) or
+					(def.paramtype2 == "colorfacedir" and p2 % 32 > 23)) then
+
+				minetest.set_node(pos, { name = itemstring, param2 = p2 })
+				nodes_placed = nodes_placed + 1
+				pos = advance_pos(pos, start_pos)
+				if not pos then
+					aborted = true
+					break
+				end
+			end
+		end
+		if aborted then
+			break
+		end
+	end
+	if aborted then
+		minetest.chat_send_player(name, "Not all nodes could be placed, please move further away from the world boundary. Nodes placed: "..nodes_placed)
+	end
+	minetest.chat_send_player(name, "Nodes placed: "..nodes_placed..".")
+end
+
+local function after_emerge(blockpos, action, calls_remaining, param)
+	if calls_remaining == 0 then
+		place_nodes(param)
+	end
+end
+
+minetest.register_chatcommand("test_place_nodes", {
+	params = "[ no_param2 ]",
+	description = "Test: Place all non-experimental nodes and optionally their permissible param2 variants",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+		local pos = vector.floor(player:get_pos())
+		pos.x = math.ceil(pos.x + 3)
+		pos.z = math.ceil(pos.z + 3)
+		pos.y = math.ceil(pos.y + 1)
+		local start_pos = table.copy(pos)
+		if pos.x > 30800 then
+			return false, "Too close to world boundary (+X). Please move to X < 30800."
+		end
+		if pos.z > 30800 then
+			return false, "Too close to world boundary (+Z). Please move to Z < 30800."
+		end
+
+		local aborted = false
+		local nodes = {}
+		local emerge_estimate = 0
+		for itemstring, def in pairs(minetest.registered_nodes) do
+			if itemstring ~= "ignore" and string.sub(itemstring, 1, 13) ~= "experimental:" then
+				table.insert(nodes, itemstring)
+				if def.paramtype2 == 0 then
+					emerge_estimate = emerge_estimate + 1
+				else
+					emerge_estimate = emerge_estimate + 255
+				end
+			end
+		end
+		-- Emerge area to make sure that all nodes are being placed.
+		-- Note we will emerge much more than we need to (overestimation),
+		-- the estimation code could be improved performance-wise …
+		local length = 16 + math.ceil(emerge_estimate / 24) * 2
+		minetest.emerge_area(start_pos,
+			{ x = start_pos.x + 46, y = start_pos.y, z = start_pos.z + length },
+			after_emerge, { nodes = nodes, name = name, pos = pos, start_pos = start_pos, param = param })
+		return true, "Emerging area …"
+	end,
+})
+
diff --git a/games/devtest/mods/experimental/detached.lua b/games/devtest/mods/experimental/detached.lua
new file mode 100644
index 000000000..673adfdd4
--- /dev/null
+++ b/games/devtest/mods/experimental/detached.lua
@@ -0,0 +1,29 @@
+-- Create a detached inventory
+local inv = minetest.create_detached_inventory("test_inventory", {
+	allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+		experimental.print_to_everything("allow move asked")
+		return count -- Allow all
+	end,
+	allow_put = function(inv, listname, index, stack, player)
+		experimental.print_to_everything("allow put asked")
+		return 1 -- Allow only 1
+	end,
+	allow_take = function(inv, listname, index, stack, player)
+		experimental.print_to_everything("allow take asked")
+		return 4 -- Allow 4 at max
+	end,
+	on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+		experimental.print_to_everything(player:get_player_name().." moved items")
+	end,
+	on_put = function(inv, listname, index, stack, player)
+		experimental.print_to_everything(player:get_player_name().." put items")
+	end,
+	on_take = function(inv, listname, index, stack, player)
+		experimental.print_to_everything(player:get_player_name().." took items")
+	end,
+})
+inv:set_size("main", 4*6)
+inv:add_item("main", "experimental:callback_node")
+inv:add_item("main", "experimental:particle_spawner")
+
+
diff --git a/games/devtest/mods/experimental/init.lua b/games/devtest/mods/experimental/init.lua
new file mode 100644
index 000000000..b292f792e
--- /dev/null
+++ b/games/devtest/mods/experimental/init.lua
@@ -0,0 +1,23 @@
+--
+-- Experimental things
+--
+
+experimental = {}
+
+dofile(minetest.get_modpath("experimental").."/detached.lua")
+dofile(minetest.get_modpath("experimental").."/items.lua")
+dofile(minetest.get_modpath("experimental").."/commands.lua")
+
+function experimental.print_to_everything(msg)
+	minetest.log("action", msg)
+	minetest.chat_send_all(msg)
+end
+
+minetest.log("info", "[experimental] modname="..dump(minetest.get_current_modname()))
+minetest.log("info", "[experimental] modpath="..dump(minetest.get_modpath("experimental")))
+minetest.log("info", "[experimental] worldpath="..dump(minetest.get_worldpath()))
+
+
+minetest.register_on_mods_loaded(function()
+	minetest.log("action", "[experimental] on_mods_loaded()")
+end)
diff --git a/games/devtest/mods/experimental/items.lua b/games/devtest/mods/experimental/items.lua
new file mode 100644
index 000000000..51b063ba2
--- /dev/null
+++ b/games/devtest/mods/experimental/items.lua
@@ -0,0 +1,103 @@
+minetest.register_node("experimental:callback_node", {
+	description = "Callback Test Node (construct/destruct/timer)",
+	tiles = {"experimental_callback_node.png"},
+	groups = {dig_immediate=3},
+	-- This was known to cause a bug in minetest.item_place_node() when used
+	-- via minetest.place_node(), causing a placer with no position
+	paramtype2 = "facedir",
+	drop = "",
+
+	on_construct = function(pos)
+		experimental.print_to_everything("experimental:callback_node:on_construct("..minetest.pos_to_string(pos)..")")
+		local meta = minetest.get_meta(pos)
+		meta:set_string("mine", "test")
+		local timer = minetest.get_node_timer(pos)
+		timer:start(4, 3)
+	end,
+
+	after_place_node = function(pos, placer)
+		experimental.print_to_everything("experimental:callback_node:after_place_node("..minetest.pos_to_string(pos)..")")
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("mine") == "test" then
+			experimental.print_to_everything("correct metadata found")
+		else
+			experimental.print_to_everything("incorrect metadata found")
+		end
+	end,
+
+	on_destruct = function(pos)
+		experimental.print_to_everything("experimental:callback_node:on_destruct("..minetest.pos_to_string(pos)..")")
+	end,
+
+	after_destruct = function(pos)
+		experimental.print_to_everything("experimental:callback_node:after_destruct("..minetest.pos_to_string(pos)..")")
+	end,
+
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		experimental.print_to_everything("experimental:callback_node:after_dig_node("..minetest.pos_to_string(pos)..")")
+	end,
+
+	on_timer = function(pos, elapsed)
+		experimental.print_to_everything("on_timer(): elapsed="..dump(elapsed))
+		return true
+	end,
+})
+
+minetest.register_tool("experimental:privatizer", {
+	description = "Node Meta Privatizer",
+	inventory_image = "experimental_tester_tool_1.png",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_use = function(itemstack, user, pointed_thing)
+		if pointed_thing.type == "node" then
+			local node = minetest.get_node(pointed_thing.under)
+			if node.name == "chest:chest" then
+				local p = pointed_thing.under
+				minetest.log("action", "Privatizer used at "..minetest.pos_to_string(p))
+				minetest.get_meta(p):mark_as_private({"infotext", "formspec"})
+				if user and user:is_player() then
+					minetest.chat_send_player(user:get_player_name(), "Chest metadata (infotext, formspec) set private!")
+				end
+				return
+			end
+		end
+		if user and user:is_player() then
+			minetest.chat_send_player(user:get_player_name(), "Privatizer can only be used on chest!")
+		end
+	end,
+})
+
+minetest.register_tool("experimental:particle_spawner", {
+	description = "Particle Spawner",
+	inventory_image = "experimental_tester_tool_1.png^[invert:g",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_use = function(itemstack, user, pointed_thing)
+		local pos = minetest.get_pointed_thing_position(pointed_thing, true)
+		if pos == nil then
+			if user then
+				pos = user:get_pos()
+			end
+		end
+		pos = vector.add(pos, {x=0, y=0.5, z=0})
+		local tex, anim
+		if math.random(0, 1) == 0 then
+			tex = "experimental_particle_sheet.png"
+			anim = {type="sheet_2d", frames_w=3, frames_h=2, frame_length=0.5}
+		else
+			tex = "experimental_particle_vertical.png"
+			anim = {type="vertical_frames", aspect_w=16, aspect_h=16, length=3.3}
+		end
+
+		minetest.add_particle({
+			pos = pos,
+			velocity = {x=0, y=0, z=0},
+			acceleration = {x=0, y=0.04, z=0},
+			expirationtime = 6,
+			collisiondetection = true,
+			texture = tex,
+			animation = anim,
+			size = 4,
+			glow = math.random(0, 5),
+		})
+	end,
+})
+
diff --git a/games/devtest/mods/experimental/mod.conf b/games/devtest/mods/experimental/mod.conf
new file mode 100644
index 000000000..cf0f9cb42
--- /dev/null
+++ b/games/devtest/mods/experimental/mod.conf
@@ -0,0 +1,2 @@
+name = experimental
+description = Chaotic mod containing unstructured tests for testing out engine features. The features in this mod should be moved to other mods.
diff --git a/games/devtest/mods/experimental/textures/experimental_callback_node.png b/games/devtest/mods/experimental/textures/experimental_callback_node.png
new file mode 100644
index 000000000..e9d87434c
--- /dev/null
+++ b/games/devtest/mods/experimental/textures/experimental_callback_node.png
diff --git a/games/devtest/mods/experimental/textures/experimental_particle_sheet.png b/games/devtest/mods/experimental/textures/experimental_particle_sheet.png
new file mode 100644
index 000000000..6d70394e4
--- /dev/null
+++ b/games/devtest/mods/experimental/textures/experimental_particle_sheet.png
diff --git a/games/devtest/mods/experimental/textures/experimental_particle_vertical.png b/games/devtest/mods/experimental/textures/experimental_particle_vertical.png
new file mode 100644
index 000000000..0320b7545
--- /dev/null
+++ b/games/devtest/mods/experimental/textures/experimental_particle_vertical.png
diff --git a/games/devtest/mods/experimental/textures/experimental_tester_tool_1.png b/games/devtest/mods/experimental/textures/experimental_tester_tool_1.png
new file mode 100644
index 000000000..5df416a58
--- /dev/null
+++ b/games/devtest/mods/experimental/textures/experimental_tester_tool_1.png