Replacement for Minimal Development Test (PR) (#9450)

12 files changed, 357 insertions, 826 deletions

diff --git a/games/minimal/mods/experimental/commands.lua b/games/minimal/mods/experimental/commands.lua
new file mode 100644
index 000000000..96f8cbe39
--- /dev/null
+++ b/games/minimal/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/minimal/mods/experimental/detached.lua b/games/minimal/mods/experimental/detached.lua
new file mode 100644
index 000000000..673adfdd4
--- /dev/null
+++ b/games/minimal/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/minimal/mods/experimental/init.lua b/games/minimal/mods/experimental/init.lua
index e8aeff2b3..b292f792e 100644
--- a/games/minimal/mods/experimental/init.lua
+++ b/games/minimal/mods/experimental/init.lua
@@ -2,821 +2,22 @@
 -- Experimental things
 --
 
-dofile(minetest.get_modpath("experimental").."/modchannels.lua")
-
--- For testing random stuff
-
 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
 
---[[
-experimental.player_visual_index = 0
-function switch_player_visual()
-	for _, obj in pairs(minetest.get_connected_players()) do
-		if experimental.player_visual_index == 0 then
-			obj:set_properties({visual="upright_sprite"})
-		else
-			obj:set_properties({visual="cube"})
-		end
-	end
-	experimental.player_visual_index = (experimental.player_visual_index + 1) % 2
-	minetest.after(1.0, switch_player_visual)
-end
-minetest.after(1.0, switch_player_visual)
-]]
-
-minetest.register_node("experimental:soundblock", {
-	tiles = {"unknown_node.png", "default_tnt_bottom.png",
-			"default_tnt_side.png", "default_tnt_side.png",
-			"default_tnt_side.png", "default_tnt_side.png"},
-	inventory_image = minetest.inventorycube("unknown_node.png",
-			"default_tnt_side.png", "default_tnt_side.png"),
-	groups = {dig_immediate=3},
-})
-
-minetest.register_alias("sb", "experimental:soundblock")
-
-minetest.register_abm({
-	nodenames = {"experimental:soundblock"},
-	interval = 1,
-	chance = 1,
-	action = function(p0, node, _, _)
-		minetest.sound_play("default_grass_footstep", {pos=p0, gain=0.5})
-	end,
-})
-
---[[
-stepsound = -1
-function test_sound()
-	print("test_sound")
-	stepsound = minetest.sound_play("default_grass_footstep", {gain=1.0})
-	minetest.after(2.0, test_sound)
-	--minetest.after(0.1, test_sound_stop)
-end
-function test_sound_stop()
-	print("test_sound_stop")
-	minetest.sound_stop(stepsound)
-	minetest.after(2.0, test_sound)
-end
-test_sound()
---]]
-
-function on_step(dtime)
-	-- print("experimental on_step")
-	--[[
-	objs = minetest.get_objects_inside_radius({x=0,y=0,z=0}, 10)
-	for k, obj in pairs(objs) do
-		name = obj:get_player_name()
-		if name then
-			print(name.." at "..dump(obj:getpos()))
-			print(name.." dir: "..dump(obj:get_look_dir()))
-			print(name.." pitch: "..dump(obj:get_look_pitch()))
-			print(name.." yaw: "..dump(obj:get_look_yaw()))
-		else
-			print("Some object at "..dump(obj:getpos()))
-		end
-	end
-	--]]
-	--[[
-	if experimental.t1 == nil then
-		experimental.t1 = 0
-	end
-	experimental.t1 = experimental.t1 + dtime
-	if experimental.t1 >= 2 then
-		experimental.t1 = experimental.t1 - 2
-		minetest.log("verbose", "time of day is "..minetest.get_timeofday())
-		if experimental.day then
-			minetest.log("verbose", "forcing day->night")
-			experimental.day = false
-			minetest.set_timeofday(0.0)
-		else
-			minetest.log("verbose", "forcing night->day")
-			experimental.day = true
-			minetest.set_timeofday(0.5)
-		end
-		minetest.log("verbose", "time of day is "..minetest.get_timeofday())
-	end
-	--]]
-end
-minetest.register_globalstep(on_step)
-
---
--- Random stuff
---
-
---
--- TNT (not functional)
---
-
-minetest.register_craft({
-	output = 'experimental:tnt',
-	recipe = {
-		{'default:wood'},
-		{'default:coal_lump'},
-		{'default:wood'}
-	}
-})
-
-minetest.register_node("experimental:tnt", {
-	tiles = {"default_tnt_top.png", "default_tnt_bottom.png",
-			"default_tnt_side.png", "default_tnt_side.png",
-			"default_tnt_side.png", "default_tnt_side.png"},
-	inventory_image = minetest.inventorycube("default_tnt_top.png",
-			"default_tnt_side.png", "default_tnt_side.png"),
-	drop = '', -- Get nothing
-	material = {
-		diggability = "not",
-	},
-})
-
-minetest.register_on_punchnode(function(p, node)
-	if node.name == "experimental:tnt" then
-		minetest.remove_node(p)
-		minetest.add_entity(p, "experimental:tnt")
-		minetest.check_for_falling(p)
-	end
-end)
-
-local TNT = {
-	-- Static definition
-	physical = true, -- Collides with things
-	-- weight = 5,
-	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-	visual = "cube",
-	textures = {"default_tnt_top.png", "default_tnt_bottom.png",
-			"default_tnt_side.png", "default_tnt_side.png",
-			"default_tnt_side.png", "default_tnt_side.png"},
-	-- Initial value for our timer
-	timer = 0,
-	-- Number of punches required to defuse
-	health = 1,
-	blinktimer = 0,
-	blinkstatus = true,
-}
-
--- Called when a TNT object is created
-function TNT:on_activate(staticdata)
-	print("TNT:on_activate()")
-	self.object:setvelocity({x=0, y=4, z=0})
-	self.object:setacceleration({x=0, y=-10, z=0})
-	self.object:settexturemod("^[brighten")
-	self.object:set_armor_groups({immortal=1})
-end
-
--- Called periodically
-function TNT:on_step(dtime)
-	--print("TNT:on_step()")
-	self.timer = self.timer + dtime
-	self.blinktimer = self.blinktimer + dtime
-	if self.blinktimer > 0.5 then
-		self.blinktimer = self.blinktimer - 0.5
-		if self.blinkstatus then
-			self.object:settexturemod("")
-		else
-			self.object:settexturemod("^[brighten")
-		end
-		self.blinkstatus = not self.blinkstatus
-	end
-end
-
--- Called when object is punched
-function TNT:on_punch(hitter)
-	print("TNT:on_punch()")
-	self.health = self.health - 1
-	if self.health <= 0 then
-		self.object:remove()
-		hitter:get_inventory():add_item("main", "experimental:tnt")
-		--hitter:set_hp(hitter:get_hp() - 1)
-	end
-end
-
--- Called when object is right-clicked
-function TNT:on_rightclick(clicker)
-	--pos = self.object:getpos()
-	--pos = {x=pos.x, y=pos.y+0.1, z=pos.z}
-	--self.object:moveto(pos, false)
-end
-
---print("TNT dump: "..dump(TNT))
---print("Registering TNT");
-minetest.register_entity("experimental:tnt", TNT)
-
--- Add TNT's old name also
-minetest.register_alias("TNT", "experimental:tnt")
-
---
--- The dummyball!
---
-
-minetest.register_entity("experimental:dummyball", {
-	initial_properties = {
-		hp_max = 20,
-		physical = false,
-		collisionbox = {-0.4,-0.4,-0.4, 0.4,0.4,0.4},
-		visual = "sprite",
-		visual_size = {x=1, y=1},
-		textures = {"experimental_dummyball.png"},
-		spritediv = {x=1, y=3},
-		initial_sprite_basepos = {x=0, y=0},
-	},
-
-	phase = 0,
-	phasetimer = 0,
-
-	on_activate = function(self, staticdata)
-		minetest.log("action", "Dummyball activated!")
-	end,
-
-	on_step = function(self, dtime)
-		self.phasetimer = self.phasetimer + dtime
-		if self.phasetimer > 2.0 then
-			self.phasetimer = self.phasetimer - 2.0
-			self.phase = self.phase + 1
-			if self.phase >= 3 then
-				self.phase = 0
-			end
-			self.object:setsprite({x=0, y=self.phase})
-			phasearmor = {
-				[0]={cracky=3},
-				[1]={crumbly=3},
-				[2]={fleshy=3}
-			}
-			self.object:set_armor_groups(phasearmor[self.phase])
-		end
-	end,
-
-	on_punch = function(self, hitter)
-	end,
-})
-
-minetest.register_on_chat_message(function(name, message)
-	local cmd = "/dummyball"
-	if message:sub(0, #cmd) == cmd then
-		count = tonumber(message:sub(#cmd+1)) or 1
-		if not minetest.get_player_privs(name)["give"] then
-			minetest.chat_send_player(name, "you don't have permission to spawn (give)")
-			return true -- Handled chat message
-		end
-		if not minetest.get_player_privs(name)["interact"] then
-			minetest.chat_send_player(name, "you don't have permission to interact")
-			return true -- Handled chat message
-		end
-		if count >= 2 and not minetest.get_player_privs(name)["server"] then
-			minetest.chat_send_player(name, "you don't have " ..
-					"permission to spawn multiple " ..
-					"dummyballs (server)")
-			return true -- Handled chat message
-		end
-		local player = minetest.get_player_by_name(name)
-		if player == nil then
-			print("Unable to spawn entity, player is nil")
-			return true -- Handled chat message
-		end
-		local entityname = "experimental:dummyball"
-		local p = player:getpos()
-		p.y = p.y + 1
-		for i = 1,count do
-			minetest.add_entity(p, entityname)
-		end
-		minetest.chat_send_player(name, '"'..entityname
-				..'" spawned '..tostring(count)..' time(s).');
-		return true -- Handled chat message
-	end
-end)
-
---
--- A test entity for testing animated and yaw-modulated sprites
---
-
-minetest.register_entity("experimental:testentity", {
-	-- Static definition
-	physical = true, -- Collides with things
-	-- weight = 5,
-	collisionbox = {-0.7,-1.35,-0.7, 0.7,1.0,0.7},
-	--collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-	visual = "sprite",
-	visual_size = {x=2, y=3},
-	textures = {"dungeon_master.png^[makealpha:128,0,0^[makealpha:128,128,0"},
-	spritediv = {x=6, y=5},
-	initial_sprite_basepos = {x=0, y=0},
-
-	on_activate = function(self, staticdata)
-		print("testentity.on_activate")
-		self.object:setsprite({x=0,y=0}, 1, 0, true)
-		--self.object:setsprite({x=0,y=0}, 4, 0.3, true)
-
-		-- Set gravity
-		self.object:setacceleration({x=0, y=-10, z=0})
-		-- Jump a bit upwards
-		self.object:setvelocity({x=0, y=10, z=0})
-	end,
-
-	on_punch = function(self, hitter)
-		self.object:remove()
-		hitter:add_to_inventory('craft testobject1 1')
-	end,
-	on_death = function(self, killer)
-		print("testentity.on_death")
-	end
-})
-
---
--- More random stuff
---
-
-minetest.register_on_respawnplayer(function(player)
-	print("on_respawnplayer")
-	-- player:setpos({x=0, y=30, z=0})
-	-- return true
-end)
-
-minetest.register_on_generated(function(minp, maxp)
-	--print("on_generated: minp="..dump(minp).." maxp="..dump(maxp))
-	--cp = {x=(minp.x+maxp.x)/2, y=(minp.y+maxp.y)/2, z=(minp.z+maxp.z)/2}
-	--minetest.add_node(cp, {name="sand"})
-end)
-
--- Example setting get
---print("setting max_users = " .. dump(minetest.setting_get("max_users")))
---print("setting asdf = " .. dump(minetest.setting_get("asdf")))
-
-minetest.register_on_chat_message(function(name, message)
-	--[[print("on_chat_message: name="..dump(name).." message="..dump(message))
-	local cmd = "/testcommand"
-	if message:sub(0, #cmd) == cmd then
-		print(cmd.." invoked")
-		return true
-	end
-	local cmd = "/help"
-	if message:sub(0, #cmd) == cmd then
-		print("script-overridden help command")
-		minetest.chat_send_all("script-overridden help command")
-		return true
-	end]]
-end)
-
--- Grow papyrus on TNT every 10 seconds
---[[minetest.register_abm({
-	nodenames = {"TNT"},
-	interval = 10.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		print("TNT ABM action")
-		pos.y = pos.y + 1
-		minetest.add_node(pos, {name="papyrus"})
-	end,
-})]]
-
--- Replace texts of alls signs with "foo" every 10 seconds
---[[minetest.register_abm({
-	nodenames = {"sign_wall"},
-	interval = 10.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		print("ABM: Sign text changed")
-		local meta = minetest.get_meta(pos)
-		meta:set_text("foo")
-	end,
-})]]
-
---[[local ncpos = nil
-local ncq = 1
-local ncstuff = {
-    {2, 1, 0, 3}, {3, 0, 1, 2}, {4, -1, 0, 1}, {5, -1, 0, 1}, {6, 0, -1, 0},
-    {7, 0, -1, 0}, {8, 1, 0, 3}, {9, 1, 0, 3}, {10, 1, 0, 3}, {11, 0, 1, 2},
-    {12, 0, 1, 2}, {13, 0, 1, 2}, {14, -1, 0, 1}, {15, -1, 0, 1}, {16, -1, 0, 1},
-    {17, -1, 0, 1}, {18, 0, -1, 0}, {19, 0, -1, 0}, {20, 0, -1, 0}, {21, 0, -1, 0},
-    {22, 1, 0, 3}, {23, 1, 0, 3}, {24, 1, 0, 3}, {25, 1, 0, 3}, {10, 0, 1, 2}
-}
-local ncold = {}
-local nctime = nil
-
-minetest.register_abm({
-    nodenames = {"dirt_with_grass"},
-    interval = 100000.0,
-    chance = 1,
-    action = function(pos, node, active_object_count, active_object_count_wider)
-        if ncpos ~= nil then
-            return
-        end
-
-        if pos.x % 16 ~= 8 or pos.z % 16 ~= 8 then
-            return
-        end
-
-        pos.y = pos.y + 1
-        n = minetest.get_node(pos)
-        print(dump(n))
-        if n.name ~= "air" then
-            return
-        end
-
-        pos.y = pos.y + 2
-        ncpos = pos
-        nctime = os.clock()
-        minetest.add_node(ncpos, {name="nyancat"})
-    end
-})
-
-minetest.register_abm({
-    nodenames = {"nyancat"},
-    interval = 1.0,
-    chance = 1,
-    action = function(pos, node, active_object_count, active_object_count_wider)
-        if ncpos == nil then
-            return
-        end
-        if pos.x == ncpos.x and pos.y == ncpos.y and pos.z == ncpos.z then
-            clock = os.clock()
-            if clock - nctime < 0.1 then
-                return
-            end
-            nctime = clock
-
-            s0 = ncstuff[ncq]
-            ncq = s0[1]
-            s1 = ncstuff[ncq]
-            p0 = pos
-            p1 = {x = p0.x + s0[2], y = p0.y, z = p0.z + s0[3]}
-            p2 = {x = p1.x + s1[2], y = p1.y, z = p1.z + s1[3]}
-            table.insert(ncold, 1, p0)
-            while #ncold >= 10 do
-                minetest.add_node(ncold[#ncold], {name="air"})
-                table.remove(ncold, #ncold)
-            end
-            minetest.add_node(p0, {name="nyancat_rainbow"})
-            minetest.add_node(p1, {name="nyancat", param1=s0[4]})
-            minetest.add_node(p2, {name="air"})
-            ncpos = p1
-        end
-    end,
-})--]]
-
-minetest.register_node("experimental:tester_node_1", {
-	description = "Tester Node 1 (construct/destruct/timer)",
-	tiles = {"wieldhand.png"},
-	groups = {oddly_breakable_by_hand=2},
-	sounds = default.node_sound_wood_defaults(),
-	-- 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",
-
-	on_construct = function(pos)
-		experimental.print_to_everything("experimental:tester_node_1: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:tester_node_1: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:tester_node_1:on_destruct("..minetest.pos_to_string(pos)..")")
-	end,
-
-	after_destruct = function(pos)
-		experimental.print_to_everything("experimental:tester_node_1:after_destruct("..minetest.pos_to_string(pos)..")")
-	end,
-
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		experimental.print_to_everything("experimental:tester_node_1: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_node("experimental:tiled", {
-        description = "Tiled stone",
-        tiles = {{
-                name = "experimental_tiled.png",
-                align_style = "world",
-                scale = 8,
-        }},
-        groups = {cracky=2},
-})
-
-stairs.register_stair_and_slab("tiled_n", "experimental:tiled",
-		{cracky=2},
-		{{name="experimental_tiled.png", align_style="node", scale=8}},
-		"Tiled stair (node-aligned)",
-		"Tiled slab (node-aligned)")
-
-stairs.register_stair_and_slab("tiled", "experimantal:tiled",
-		{cracky=2},
-		{{name="experimental_tiled.png", align_style="world", scale=8}},
-		"Tiled stair",
-		"Tiled slab")
-
-minetest.register_craft({
-	output = 'experimental:tiled 4',
-	recipe = {
-		{'default:cobble', '', 'default:cobble'},
-		{'', '', ''},
-		{'default:cobble', '', 'default:cobble'},
-	}
-})
-
-minetest.register_craft({
-	output = 'stairs:stair_tiled',
-	recipe = {{'stairs:stair_tiled_n'}}
-})
+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_craft({
-	output = 'stairs:stair_tiled_n',
-	recipe = {{'stairs:stair_tiled'}}
-})
 
-minetest.register_craft({
-	output = 'stairs:slab_tiled',
-	recipe = {{'stairs:slab_tiled_n'}}
-})
-
-minetest.register_craft({
-	output = 'stairs:slab_tiled_n',
-	recipe = {{'stairs:slab_tiled'}}
-})
-
-minetest.register_craftitem("experimental:tester_tool_1", {
-	description = "Tester Tool 1",
-	inventory_image = "experimental_tester_tool_1.png",
-    on_use = function(itemstack, user, pointed_thing)
-		--print(dump(pointed_thing))
-		if pointed_thing.type == "node" then
-			local node = minetest.get_node(pointed_thing.under)
-			if node.name == "experimental:tester_node_1" or node.name == "default:chest" then
-				local p = pointed_thing.under
-				minetest.log("action", "Tester tool used at "..minetest.pos_to_string(p))
-				if node.name == "experimental:tester_node_1" then
-					minetest.dig_node(p)
-				else
-					minetest.get_meta(p):mark_as_private({"infotext", "formspec"})
-					minetest.chat_send_player(user:get_player_name(), "Verify that chest is unusable now.")
-				end
-			else
-				local p = pointed_thing.above
-				minetest.log("action", "Tester tool used at "..minetest.pos_to_string(p))
-				minetest.place_node(p, {name="experimental:tester_node_1"})
-			end
-		end
-	end,
-})
-
-minetest.register_craft({
-	output = 'experimental:tester_tool_1',
-	recipe = {
-		{'group:crumbly'},
-		{'group:crumbly'},
-	}
-})
-
-minetest.register_craftitem("experimental:tester_tool_2", {
-	description = "Tester Tool 2",
-	inventory_image = "experimental_tester_tool_1.png^[invert:g",
-	on_use = function(itemstack, user, pointed_thing)
-		local pos = minetest.get_pointed_thing_position(pointed_thing, true)
-		if pos == nil then return end
-		pos = vector.add(pos, {x=0, y=0.5, z=0})
-		local tex, anim
-		if math.random(0, 1) == 0 then
-			tex = "default_lava_source_animated.png"
-			anim = {type="sheet_2d", frames_w=3, frames_h=2, frame_length=0.5}
-		else
-			tex = "default_lava_flowing_animated.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,
-})
-
--- Test the disable_repair=1 group
-minetest.register_tool("experimental:unrepairable_tool", {
-	description = "Unrepairable Tool",
-	wield_image = "default_stone.png",
-	inventory_image = "default_stone.png",
-	tool_capabilities = {
-		groupcaps = {
-			cracky = {
-				times = {3, 2, 1},
-			}
-		}
-	},
-	groups = { disable_repair = 1 }
-})
-
-minetest.register_tool("experimental:repairable_tool", {
-	description = "Repairable Tool",
-	wield_image = "default_dirt.png",
-	inventory_image = "default_dirt.png",
-	tool_capabilities = {
-		groupcaps = {
-			cracky = {
-				times = {3, 2, 1},
-			}
-		}
-	},
-})
-
-minetest.register_craft({
-	output = 'experimental:tester_tool_2',
-	recipe = {
-		{'group:crumbly','group:crumbly'},
-	}
-})
-
---[[minetest.register_on_joinplayer(function(player)
-	minetest.after(3, function()
-		player:set_inventory_formspec("size[8,7.5]"..
-			"image[1,0.6;1,2;player.png]"..
-			"list[current_player;main;0,3.5;8,4;]"..
-			"list[current_player;craft;3,0;3,3;]"..
-			"list[current_player;craftpreview;7,1;1,1;]")
-	end)
-end)]]
-
--- 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:tester_tool_1")
-inv:add_item("main", "experimental:tnt 5")
-
-minetest.register_chatcommand("test1", {
-	params = "",
-	description = "Test 1: Modify player's inventory view",
-	func = function(name, param)
-		local player = minetest.get_player_by_name(name)
-		if not player then
-			return
-		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]"
-		)
-		minetest.chat_send_player(name, "Done.");
-	end,
-})
-
-minetest.register_chatcommand("test_bulk_set_node", {
-	params = "",
-	description = "Test 2: bulk set a node",
-	func = function(name, param)
-		local player = minetest.get_player_by_name(name)
-		if not player then
-			return
-		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 = "default:stone"})
-		minetest.chat_send_player(name, "Done.");
-	end,
-})
-
-minetest.register_chatcommand("bench_bulk_set_node", {
-	params = "",
-	description = "Test 3: bulk set a node (bench)",
-	func = function(name, param)
-		local player = minetest.get_player_by_name(name)
-		if not player then
-			return
-		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, "Benching bulk set node. Warming up...");
-
-		-- warm up with default:stone to prevent having different callbacks
-		-- due to different node topology
-		minetest.bulk_set_node(pos_list, {name = "default:stone"})
-
-		minetest.chat_send_player(name, "Warming up finished, now benching...");
-
-		local start_time = os.clock()
-		for i=1,#pos_list do
-			minetest.set_node(pos_list[i], {name = "default:stone"})
-		end
-		local middle_time = os.clock()
-		minetest.bulk_set_node(pos_list, {name = "default:stone"})
-		local end_time = os.clock()
-		minetest.chat_send_player(name,
-			string.format("Bench results: set_node loop[%.2fms], bulk_set_node[%.2fms]",
-				(middle_time - start_time) * 1000,
-				(end_time - middle_time) * 1000
-			)
-		);
-	end,
-})
-
-local formspec_test_active = false
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if formspec_test_active then
-		experimental.print_to_everything("Inventory fields 1: player="..player:get_player_name()..", fields="..dump(fields))
-	end
-end)
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if formspec_test_active then
-		experimental.print_to_everything("Inventory fields 2: player="..player:get_player_name()..", fields="..dump(fields))
-		return true -- Disable the first callback
-	end
-end)
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if formspec_test_active then
-		experimental.print_to_everything("Inventory fields 3: player="..player:get_player_name()..", fields="..dump(fields))
-	end
+minetest.register_on_mods_loaded(function()
+	minetest.log("action", "[experimental] on_mods_loaded()")
 end)
-
-minetest.register_chatcommand("test_formspec", {
-	param = "",
-	description = "Test 4: Toggle formspec test",
-	func = function(name, param)
-		formspec_test_active = not formspec_test_active
-		if formspec_test_active then
-			minetest.chat_send_player(name, "Formspec test enabled!")
-		else
-			minetest.chat_send_player(name, "Formspec test disabled!")
-		end
-	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()))
-
-
-core.register_on_mods_loaded(function()
-	core.log("action", "Yeah experimental loaded mods.")
-end)
-
--- END
diff --git a/games/minimal/mods/experimental/items.lua b/games/minimal/mods/experimental/items.lua
new file mode 100644
index 000000000..51b063ba2
--- /dev/null
+++ b/games/minimal/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/minimal/mods/experimental/mod.conf b/games/minimal/mods/experimental/mod.conf
index 018e761b3..cf0f9cb42 100644
--- a/games/minimal/mods/experimental/mod.conf
+++ b/games/minimal/mods/experimental/mod.conf
@@ -1,3 +1,2 @@
 name = experimental
-description = Minimal mod to test features
-depends = default, stairs
+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/minimal/mods/experimental/modchannels.lua b/games/minimal/mods/experimental/modchannels.lua
deleted file mode 100644
index 8fce6cfc4..000000000
--- a/games/minimal/mods/experimental/modchannels.lua
+++ /dev/null
@@ -1,16 +0,0 @@
---
--- Mod channels experimental handlers
---
-local mod_channel = core.mod_channel_join("experimental_preview")
-
-core.register_on_modchannel_message(function(channel, sender, message)
-	print("[minimal][modchannels] Server received message `" .. message
-			.. "` on channel `" .. channel .. "` from sender `" .. sender .. "`")
-
-	if mod_channel:is_writeable() then
-		mod_channel:send_all("experimental answers to preview")
-		mod_channel:leave()
-	end
-end)
-
-print("[minimal][modchannels] Code loaded!")
diff --git a/games/minimal/mods/experimental/textures/experimental_callback_node.png b/games/minimal/mods/experimental/textures/experimental_callback_node.png
new file mode 100644
index 000000000..e9d87434c
--- /dev/null
+++ b/games/minimal/mods/experimental/textures/experimental_callback_node.png
diff --git a/games/minimal/mods/experimental/textures/experimental_dummyball.png b/games/minimal/mods/experimental/textures/experimental_dummyball.png
deleted file mode 100644
index 256414f46..000000000
--- a/games/minimal/mods/experimental/textures/experimental_dummyball.png
+++ /dev/null
diff --git a/games/minimal/mods/experimental/textures/experimental_particle_sheet.png b/games/minimal/mods/experimental/textures/experimental_particle_sheet.png
new file mode 100644
index 000000000..6d70394e4
--- /dev/null
+++ b/games/minimal/mods/experimental/textures/experimental_particle_sheet.png
diff --git a/games/minimal/mods/experimental/textures/experimental_particle_vertical.png b/games/minimal/mods/experimental/textures/experimental_particle_vertical.png
new file mode 100644
index 000000000..0320b7545
--- /dev/null
+++ b/games/minimal/mods/experimental/textures/experimental_particle_vertical.png
diff --git a/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png b/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png
index 587923c86..5df416a58 100644
--- a/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png
+++ b/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png
diff --git a/games/minimal/mods/experimental/textures/experimental_tiled.png b/games/minimal/mods/experimental/textures/experimental_tiled.png
deleted file mode 100644
index 67397b902..000000000
--- a/games/minimal/mods/experimental/textures/experimental_tiled.png
+++ /dev/null