Call this 0.4.dev-20120408

Pro-tip: You can open a world in minetest by opening the world.mt file using minetest.

.gitignore

@@ -6,16 +6,18 @@ tags
 *.vim
 
 ## Non-static Minetest directories
-bin/
-games/
-!games/mesetint
-cache/
-textures/
-sounds/
-mods/
-!mods/mesetint/mods_here.txt
-worlds/
-world/
+/bin/
+/games/*
+!/games/minimal/
+/cache/
+/textures/
+/sounds/
+/mods/*
+!/mods/minetest/
+/mods/minetest/*
+!/mods/minetest/mods_here.txt
+/worlds/
+/world/
 
 ## Configuration/log files
 minetest.conf

CMakeLists.txt

@@ -7,10 +7,15 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)
 
+set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
+
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20120320)
+set(VERSION_PATCH dev-20120408)
+if(VERSION_EXTRA)
+	set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
+endif()
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -85,16 +90,25 @@ elseif(UNIX) # Linux, BSD etc
 endif()
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
+set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
+if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
+	install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")
+	install(FILES ${MINETEST_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/minetest_game/")
+	install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game")
+endif()
 if(BUILD_CLIENT)
 	#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base")
 	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
 endif()
 if(RUN_IN_PLACE)
-	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mesetint/mods_here.txt" DESTINATION "${SHAREDIR}/mods/mesetint")
+	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/minetest/mods_here.txt" DESTINATION "${SHAREDIR}/mods/minetest")
+	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/all/textures_here.txt" DESTINATION "${SHAREDIR}/textures/all")
 endif()
 
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX)

README.txt

@@ -1,50 +1,75 @@
 Minetest-c55
----------------
-An InfiniMiner/Minecraft inspired game.
-Copyright (c) 2010-2012 Perttu Ahola <celeron55@gmail.com>
-(see source files for other contributors)
+============
 
-Further documentation:
+An InfiniMiner/Minecraft inspired game.
+
+Copyright (c) 2010-2012 Perttu Ahola <celeron55@gmail.com>
+and ther contributors (see source file comments and the version control log)
+
+In case you downloaded the source code:
+---------------------------------------
+If you downloaded the Minetest Engine source code in which this file is
+contained, you probably want to download the minetest_game project too:
+  https://github.com/celeron55/minetest_game/
+See the README.txt in it.
+
+Further documentation
 ----------------------
-- Website: http://celeron.55.lt/~celeron55/minetest/
-- Wiki: http://celeron.55.lt/~celeron55/minetest/wiki/
-- Forum: http://celeron.55.lt/~celeron55/minetest/forum/
+- Website: http://c55.me/minetest/
+- Wiki: http://c55.me/minetest/wiki/
+- Forum: http://c55.me/minetest/forum/
+- Github: https://github.com/celeron55/minetest/
 - doc/ directory of source distribution
 
-This game is not finished:
+This game is not finished
 --------------------------
 - Don't expect it to work as well as a finished game will.
-- Please report any bugs to me. debug.txt is useful.
+- Please report any bugs. When doing that, debug.txt is useful.
 
-Controls:
----------
-- See the in-game pause menu
+Default Controls
+-----------------
+- WASD: Move
+- Space: Jump
+- E: Go down
+- Shift: Sneak
+- Q: Drop item
+- I: Open inventory
+- Mouse: Turn/look
 - Settable in the configuration file, see the section below.
 
-Map directory:
---------------
-- Map is stored in a directory, which can be removed to generate a new map.
-- There is a command-line option for it: --map-dir
-- For a RUN_IN_PLACE build, it is located in:
-		../world
-- Otherwise something like this:
-	Windows: C:\Documents and Settings\user\Application Data\minetest\world
-	Linux: ~/.minetest/world
-	OS X: ~/Library/Application Support/minetest/world
+Paths
+------
+$bin   - Compiled binaries
+$share - Cistributed read-only data
+$user  - User-created modifiable data
+
+Windows .zip / RUN_IN_PLACE source:
+$bin   = bin
+$share = .
+$user  = .
+
+Linux installed:
+$bin   = /usr/bin
+$share = /usr/share/minetest
+$user  = ~/.minetest
+
+OS X:
+$bin   = ?
+$share = ?
+$user  = ~/Library/Application Support/minetest
+
+World directory
+----------------
+- Worlds can be found as separate folders in:
+    $user/worlds/
 
 Configuration file:
 -------------------
-- An optional configuration file can be used. See minetest.conf.example.
-- Path to file can be passed as a parameter to the executable:
+- Default location:
+    $user/minetest.conf
+- It is created by Minetest when it is ran the first time.
+- A specific file can be specified on the command line:
 	--config <path-to-file>
-- Defaults:
-	- If built with -DRUN_IN_PLACE=1:
-		../minetest.conf
-		../../minetest.conf
-	- Otherwise something like this:
-		Windows: C:\Documents and Settings\user\Application Data\minetest\minetest.conf
-		Linux: ~/.minetest/minetest.conf
-		OS X: ~/Library/Application Support/minetest.conf
 
 Command-line options:
 ---------------------
@@ -54,13 +79,20 @@ Compiling on GNU/Linux:
 -----------------------
 
 Install dependencies. Here's an example for Debian/Ubuntu:
-$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev
+$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev
 
 Download source, extract (this is the URL to the latest of source repository, which might not work at all times):
 $ wget https://github.com/celeron55/minetest/tarball/master -O master.tar.gz
 $ tar xf master.tar.gz
 $ cd celeron55-minetest-286edd4 (or similar)
 
+Download minetest_game (otherwise only the "Minimal development test" game is available)
+$ cd games/
+$ wget https://github.com/celeron55/minetest_game/tarball/master -O master.tar.gz
+$ tar xf master.tar.gz
+$ mv celeron55-minetest_game-* minetest_game
+$ cd ..
+
 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=1
 $ make -j2
@@ -77,6 +109,9 @@ $ ./minetest
 
 Compiling on Windows:
 ---------------------
+- This section is outdated. In addition to what is described here:
+  - In addition to minetest, you need to download minetest_game.
+  - If you wish to have sound support, you need libogg, libvorbis and libopenal
 
 - You need:
 	* CMake:
@@ -94,7 +129,7 @@ Compiling on Windows:
 		http://gnuwin32.sourceforge.net/downlinks/gettext.php
 		- This is used for other UI languages. Feel free to leave it out.
 	* And, of course, Minetest-c55:
-		http://celeron.55.lt/~celeron55/minetest/download
+		http://c55.me/minetest/download
 - Steps:
 	- Select a directory called DIR hereafter in which you will operate.
 	- Make sure you have CMake and a compiler installed.
@@ -290,6 +325,34 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
+Lua
+---------------
+
+Lua is licensed under the terms of the MIT license reproduced below.
+This means that Lua is free software and can be used for both academic
+and commercial purposes at absolutely no cost.
+
+For details and rationale, see http://www.lua.org/license.html .
+
+Copyright (C) 1994-2008 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 Fonts
 ---------------

builtin/auth.lua

@@ -0,0 +1,191 @@
+-- Minetest: builtin/auth.lua
+
+--
+-- Authentication handler
+--
+
+function minetest.string_to_privs(str, delim)
+	assert(type(str) == "string")
+	delim = delim or ','
+	privs = {}
+	for _, priv in pairs(string.split(str, delim)) do
+		privs[priv:trim()] = true
+	end
+	return privs
+end
+
+function minetest.privs_to_string(privs, delim)
+	assert(type(privs) == "table")
+	delim = delim or ','
+	list = {}
+	for priv, bool in pairs(privs) do
+		if bool then
+			table.insert(list, priv)
+		end
+	end
+	return table.concat(list, delim)
+end
+
+assert(minetest.string_to_privs("a,b").b == true)
+assert(minetest.privs_to_string({a=true,b=true}) == "a,b")
+
+minetest.auth_file_path = minetest.get_worldpath().."/auth.txt"
+minetest.auth_table = {}
+
+local function read_auth_file()
+	local newtable = {}
+	local file, errmsg = io.open(minetest.auth_file_path, 'rb')
+	if not file then
+		minetest.log("info", minetest.auth_file_path.." could not be opened for reading ("..errmsg.."); assuming new world")
+		return
+	end
+	for line in file:lines() do
+		if line ~= "" then
+			local name, password, privilegestring = string.match(line, "([^:]*):([^:]*):([^:]*)")
+			if not name or not password or not privilegestring then
+				error("Invalid line in auth.txt: "..dump(line))
+			end
+			local privileges = minetest.string_to_privs(privilegestring)
+			newtable[name] = {password=password, privileges=privileges}
+		end
+	end
+	io.close(file)
+	minetest.auth_table = newtable
+	minetest.notify_authentication_modified()
+end
+
+local function save_auth_file()
+	local newtable = {}
+	-- Check table for validness before attempting to save
+	for name, stuff in pairs(minetest.auth_table) do
+		assert(type(name) == "string")
+		assert(name ~= "")
+		assert(type(stuff) == "table")
+		assert(type(stuff.password) == "string")
+		assert(type(stuff.privileges) == "table")
+	end
+	local file, errmsg = io.open(minetest.auth_file_path, 'w+b')
+	if not file then
+		error(minetest.auth_file_path.." could not be opened for writing: "..errmsg)
+	end
+	for name, stuff in pairs(minetest.auth_table) do
+		local privstring = minetest.privs_to_string(stuff.privileges)
+		file:write(name..":"..stuff.password..":"..privstring..'\n')
+	end
+	io.close(file)
+end
+
+read_auth_file()
+
+minetest.builtin_auth_handler = {
+	get_auth = function(name)
+		assert(type(name) == "string")
+		-- Figure out what password to use for a new player (singleplayer
+		-- always has an empty password, otherwise use default, which is
+		-- usually empty too)
+		local new_password_hash = ""
+		if not minetest.is_singleplayer() then
+			new_password_hash = minetest.get_password_hash(name, minetest.setting_get("default_password"))
+		end
+		-- Add player to authentication table if not there already
+		if not minetest.auth_table[name] then
+			minetest.builtin_auth_handler.create_auth(name, minetest.get_password_hash(name, minetest.setting_get("default_password")))
+		end
+		-- Figure out what privileges the player should have.
+		-- Take a copy of the privilege table
+		local privileges = {}
+		for priv, _ in pairs(minetest.auth_table[name].privileges) do
+			privileges[priv] = true
+		end
+		-- If singleplayer, give all privileges except those marked as give_to_singleplayer = false
+		if minetest.is_singleplayer() then
+			for priv, def in pairs(minetest.registered_privileges) do
+				if def.give_to_singleplayer then
+					privileges[priv] = true
+				end
+			end
+		-- For the admin, give everything
+		elseif name == minetest.setting_get("name") then
+			for priv, def in pairs(minetest.registered_privileges) do
+				privileges[priv] = true
+			end
+		end
+		-- All done
+		return {
+			password = minetest.auth_table[name].password,
+			privileges = privileges,
+		}
+	end,
+	create_auth = function(name, password)
+		assert(type(name) == "string")
+		assert(type(password) == "string")
+		minetest.log('info', "Built-in authentication handler adding player '"..name.."'")
+		minetest.auth_table[name] = {
+			password = password,
+			privileges = minetest.string_to_privs(minetest.setting_get("default_privs")),
+		}
+		save_auth_file()
+	end,
+	set_password = function(name, password)
+		assert(type(name) == "string")
+		assert(type(password) == "string")
+		if not minetest.auth_table[name] then
+			minetest.builtin_auth_handler.create_auth(name, password)
+		else
+			minetest.log('info', "Built-in authentication handler setting password of player '"..name.."'")
+			minetest.auth_table[name].password = password
+			save_auth_file()
+		end
+		return true
+	end,
+	set_privileges = function(name, privileges)
+		assert(type(name) == "string")
+		assert(type(privileges) == "table")
+		if not minetest.auth_table[name] then
+			minetest.builtin_auth_handler.create_auth(name, minetest.get_password_hash(name, minetest.setting_get("default_password")))
+		end
+		minetest.auth_table[name].privileges = privileges
+		minetest.notify_authentication_modified(name)
+		save_auth_file()
+	end,
+	reload = function()
+		read_auth_file()
+		return true
+	end,
+}
+
+function minetest.register_authentication_handler(handler)
+	if minetest.registered_auth_handler then
+		error("Add-on authentication handler already registered by "..minetest.registered_auth_handler_modname)
+	end
+	minetest.registered_auth_handler = handler
+	minetest.registered_auth_handler_modname = minetest.get_current_modname()
+end
+
+function minetest.get_auth_handler()
+	if minetest.registered_auth_handler then
+		return minetest.registered_auth_handler
+	end
+	return minetest.builtin_auth_handler
+end
+
+function minetest.set_player_password(name, password)
+	if minetest.get_auth_handler().set_password then
+		minetest.get_auth_handler().set_password(name, password)
+	end
+end
+
+function minetest.set_player_privs(name, privs)
+	if minetest.get_auth_handler().set_privileges then
+		minetest.get_auth_handler().set_privileges(name, privs)
+	end
+end
+
+function minetest.auth_reload()
+	if minetest.get_auth_handler().reload then
+		return minetest.get_auth_handler().reload()
+	end
+	return false
+end
+
+

builtin/builtin.lua

@@ -5,800 +5,18 @@
 -- before loading and running any mods.
 --
 
---
--- Override some Lua library functions
---
-
+-- Initialize some very basic things
 print = minetest.debug
-
---
---
---
-
-function basic_dump2(o)
-	if type(o) == "number" then
-		return tostring(o)
-	elseif type(o) == "string" then
-		return string.format("%q", o)
-	elseif type(o) == "boolean" then
-		return tostring(o)
-	elseif type(o) == "function" then
-		return "<function>"
-	elseif type(o) == "userdata" then
-		return "<userdata>"
-	elseif type(o) == "nil" then
-		return "nil"
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
-function dump2(o, name, dumped)
-	name = name or "_"
-	dumped = dumped or {}
-	io.write(name, " = ")
-	if type(o) == "number" or type(o) == "string" or type(o) == "boolean"
-			or type(o) == "function" or type(o) == "nil"
-			or type(o) == "userdata" then
-		io.write(basic_dump2(o), "\n")
-	elseif type(o) == "table" then
-		if dumped[o] then
-			io.write(dumped[o], "\n")
-		else
-			dumped[o] = name
-			io.write("{}\n") -- new table
-			for k,v in pairs(o) do
-				local fieldname = string.format("%s[%s]", name, basic_dump2(k))
-				dump2(v, fieldname, dumped)
-			end
-		end
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
-function dump(o, dumped)
-	dumped = dumped or {}
-	if type(o) == "number" then
-		return tostring(o)
-	elseif type(o) == "string" then
-		return string.format("%q", o)
-	elseif type(o) == "table" then
-		if dumped[o] then
-			return "<circular reference>"
-		end
-		dumped[o] = true
-		local t = {}
-		for k,v in pairs(o) do
-			t[#t+1] = "" .. k .. " = " .. dump(v, dumped)
-		end
-		return "{" .. table.concat(t, ", ") .. "}"
-	elseif type(o) == "boolean" then
-		return tostring(o)
-	elseif type(o) == "function" then
-		return "<function>"
-	elseif type(o) == "userdata" then
-		return "<userdata>"
-	elseif type(o) == "nil" then
-		return "nil"
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
---
--- Item definition helpers
---
-
-function minetest.inventorycube(img1, img2, img3)
-	img2 = img2 or img1
-	img3 = img3 or img1
-	return "[inventorycube"
-			.. "{" .. img1:gsub("%^", "&")
-			.. "{" .. img2:gsub("%^", "&")
-			.. "{" .. img3:gsub("%^", "&")
-end
-
-function minetest.pos_to_string(pos)
-	return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
-end
-
-function minetest.get_pointed_thing_position(pointed_thing, above)
-	if pointed_thing.type == "node" then
-		if above then
-			-- The position where a node would be placed
-			return pointed_thing.above
-		else
-			-- The position where a node would be dug
-			return pointed_thing.under
-		end
-	elseif pointed_thing.type == "object" then
-		obj = pointed_thing.ref
-		if obj ~= nil then
-			return obj:getpos()
-		else
-			return nil
-		end
-	else
-		return nil
-	end
-end
-
-function minetest.dir_to_facedir(dir)
-	if math.abs(dir.x) > math.abs(dir.z) then
-		if dir.x < 0 then
-			return 3
-		else
-			return 1
-		end
-	else
-		if dir.z < 0 then
-			return 2
-		else
-			return 0
-		end
-	end
-end
-
-function minetest.dir_to_wallmounted(dir)
-	if math.abs(dir.y) > math.max(math.abs(dir.x), math.abs(dir.z)) then
-		if dir.y < 0 then
-			return 1
-		else
-			return 0
-		end
-	elseif math.abs(dir.x) > math.abs(dir.z) then
-		if dir.x < 0 then
-			return 3
-		else
-			return 2
-		end
-	else
-		if dir.z < 0 then
-			return 5
-		else
-			return 4
-		end
-	end
-end
-
-function minetest.get_node_drops(nodename, toolname)
-	local drop = ItemStack({name=nodename}):get_definition().drop
-	if drop == nil then
-		-- default drop
-		return {ItemStack({name=nodename})}
-	elseif type(drop) == "string" then
-		-- itemstring drop
-		return {ItemStack(drop)}
-	elseif drop.items == nil then
-		-- drop = {} to disable default drop
-		return {}
-	end
-
-	-- Extended drop table
-	local got_items = {}
-	local got_count = 0
-	local _, item, tool
-	for _, item in ipairs(drop.items) do
-		local good_rarity = true
-		local good_tool = true
-		if item.rarity ~= nil then
-			good_rarity = item.rarity < 1 or math.random(item.rarity) == 1
-		end
-		if item.tools ~= nil then
-			good_tool = false
-			for _, tool in ipairs(item.tools) do
-				if tool:sub(1, 1) == '~' then
-					good_tool = toolname:find(tool:sub(2)) ~= nil
-				else
-					good_tool = toolname == tool
-				end
-				if good_tool then
-					break
-				end
-			end
-        	end
-		if good_rarity and good_tool then
-			got_count = got_count + 1
-			for _, add_item in ipairs(item.items) do
-				got_items[#got_items+1] = add_item
-			end
-			if drop.max_items ~= nil and got_count == drop.max_items then
-				break
-			end
-		end
-	end
-	return got_items
-end
-
-function minetest.item_place_node(itemstack, placer, pointed_thing)
-	local item = itemstack:peek_item()
-	local def = itemstack:get_definition()
-	if def.type == "node" and pointed_thing.type == "node" then
-		local pos = pointed_thing.above
-		local oldnode = minetest.env:get_node(pos)
-		local olddef = ItemStack({name=oldnode.name}):get_definition()
-
-		if not olddef.buildable_to then
-			minetest.log("info", placer:get_player_name() .. " tried to place"
-				.. " node in invalid position " .. minetest.pos_to_string(pos)
-				.. ", replacing " .. oldnode.name)
-			return
-		end
-
-		minetest.log("action", placer:get_player_name() .. " places node "
-			.. def.name .. " at " .. minetest.pos_to_string(pos))
-
-		local newnode = {name = def.name, param1 = 0, param2 = 0}
-
-		-- Calculate direction for wall mounted stuff like torches and signs
-		if def.paramtype2 == 'wallmounted' then
-			local under = pointed_thing.under
-			local above = pointed_thing.above
-			local dir = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
-			newnode.param2 = minetest.dir_to_wallmounted(dir)
-		-- Calculate the direction for furnaces and chests and stuff
-		elseif def.paramtype2 == 'facedir' then
-			local playerpos = placer:getpos()
-			local dir = {x = pos.x - playerpos.x, y = pos.y - playerpos.y, z = pos.z - playerpos.z}
-			newnode.param2 = minetest.dir_to_facedir(dir)
-			minetest.log("action", "facedir: " .. newnode.param2)
-		end
-
-		-- Add node and update
-		minetest.env:add_node(pos, newnode)
-
-		-- Set metadata owner
-		if def.metadata_name ~= "" then
-			minetest.env:get_meta(pos):set_owner(placer:get_player_name())
-		end
-
-		-- Run script hook
-		local _, callback
-		for _, callback in ipairs(minetest.registered_on_placenodes) do
-			callback(pos, newnode, placer)
-		end
-
-		itemstack:take_item()
-	end
-	return itemstack
-end
-
-function minetest.item_place_object(itemstack, placer, pointed_thing)
-	local pos = minetest.get_pointed_thing_position(pointed_thing, true)
-	if pos ~= nil then
-		local item = itemstack:take_item()
-		minetest.env:add_item(pos, item)
-	end
-	return itemstack
-end
-
-function minetest.item_place(itemstack, placer, pointed_thing)
-	if itemstack:get_definition().type == "node" then
-		return minetest.item_place_node(itemstack, placer, pointed_thing)
-	else
-		return minetest.item_place_object(itemstack, placer, pointed_thing)
-	end
-end
-
-function minetest.item_drop(itemstack, dropper, pos)
-	minetest.env:add_item(pos, itemstack)
-	return ""
-end
-
-function minetest.item_eat(hp_change, replace_with_item)
-	return function(itemstack, user, pointed_thing)  -- closure
-		if itemstack:take_item() ~= nil then
-			user:set_hp(user:get_hp() + hp_change)
-			itemstack:add_item(replace_with_item) -- note: replace_with_item is optional
-		end
-		return itemstack
-	end
-end
-
-function minetest.node_punch(pos, node, puncher)
-	-- Run script hook
-	local _, callback
-	for _, callback in ipairs(minetest.registered_on_punchnodes) do
-		callback(pos, node, puncher)
-	end
-
-end
-
-function minetest.node_dig(pos, node, digger)
-	minetest.debug("node_dig")
-
-	local def = ItemStack({name=node.name}):get_definition()
-	if not def.diggable then
-		minetest.debug("not diggable")
-		minetest.log("info", digger:get_player_name() .. " tried to dig "
-			.. node.name .. " which is not diggable "
-			.. minetest.pos_to_string(pos))
-		return
-	end
-
-	local meta = minetest.env:get_meta(pos)
-	if meta ~= nil and not meta:get_allow_removal() then
-		minetest.debug("dig prevented by metadata")
-		minetest.log("info", digger:get_player_name() .. " tried to dig "
-			.. node.name .. ", but removal is disabled by metadata "
-			.. minetest.pos_to_string(pos))
-		return
-	end
-
-	minetest.log('action', digger:get_player_name() .. " digs "
-		.. node.name .. " at " .. minetest.pos_to_string(pos))
-
-	if not minetest.setting_getbool("creative_mode") then
-		local wielded = digger:get_wielded_item()
-		local drops = minetest.get_node_drops(node.name, wielded:get_name())
-
-		-- Wear out tool
-		tp = wielded:get_tool_capabilities()
-		dp = minetest.get_dig_params(def.groups, tp)
-		wielded:add_wear(dp.wear)
-		digger:set_wielded_item(wielded)
-
-		-- Add dropped items
-		local _, dropped_item
-		for _, dropped_item in ipairs(drops) do
-			digger:get_inventory():add_item("main", dropped_item)
-		end
-	end
-
-	-- Remove node and update
-	minetest.env:remove_node(pos)
-
-	-- Run script hook
-	local _, callback
-	for _, callback in ipairs(minetest.registered_on_dignodes) do
-		callback(pos, node, digger)
-	end
-end
-
---
--- Item definition defaults
---
-
-minetest.nodedef_default = {
-	-- Item properties
-	type="node",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	usable = false,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = minetest.item_place,
-	on_drop = minetest.item_drop,
-	on_use = nil,
-
-	on_punch = minetest.node_punch,
-	on_dig = minetest.node_dig,
-
-	-- Node properties
-	drawtype = "normal",
-	visual_scale = 1.0,
-	tile_images = {""},
-	special_materials = {
-		{image="", backface_culling=true},
-		{image="", backface_culling=true},
-	},
-	alpha = 255,
-	post_effect_color = {a=0, r=0, g=0, b=0},
-	paramtype = "none",
-	paramtype2 = "none",
-	is_ground_content = false,
-	sunlight_propagates = false,
-	walkable = true,
-	pointable = true,
-	diggable = true,
-	climbable = false,
-	buildable_to = false,
-	metadata_name = "",
-	liquidtype = "none",
-	liquid_alternative_flowing = "",
-	liquid_alternative_source = "",
-	liquid_viscosity = 0,
-	light_source = 0,
-	damage_per_second = 0,
-	selection_box = {type="regular"},
-	legacy_facedir_simple = false,
-	legacy_wallmounted = false,
-}
-
-minetest.craftitemdef_default = {
-	type="craft",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = minetest.item_place,
-	on_drop = minetest.item_drop,
-	on_use = nil,
-}
-
-minetest.tooldef_default = {
-	type="tool",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 1,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = minetest.item_place,
-	on_drop = minetest.item_drop,
-	on_use = nil,
-}
-
-minetest.noneitemdef_default = {  -- This is used for the hand and unknown items
-	type="none",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = nil,
-	on_drop = nil,
-	on_use = nil,
-}
-
---
--- Make raw registration functions inaccessible to anyone except builtin.lua
---
-
-local register_item_raw = minetest.register_item_raw
-minetest.register_item_raw = nil
-
-local register_alias_raw = minetest.register_alias_raw
-minetest.register_item_raw = nil
-
---
--- Item / entity / ABM registration functions
---
-
-minetest.registered_abms = {}
-minetest.registered_entities = {}
-minetest.registered_items = {}
-minetest.registered_nodes = {}
-minetest.registered_craftitems = {}
-minetest.registered_tools = {}
-minetest.registered_aliases = {}
-
--- For tables that are indexed by item name:
--- If table[X] does not exist, default to table[minetest.registered_aliases[X]]
-local function set_alias_metatable(table)
-	setmetatable(table, {
-		__index = function(name)
-			return rawget(table, minetest.registered_aliases[name])
-		end
-	})
-end
-set_alias_metatable(minetest.registered_items)
-set_alias_metatable(minetest.registered_nodes)
-set_alias_metatable(minetest.registered_craftitems)
-set_alias_metatable(minetest.registered_tools)
-
--- These item names may not be used because they would interfere
--- with legacy itemstrings
-local forbidden_item_names = {
-	MaterialItem = true,
-	MaterialItem2 = true,
-	MaterialItem3 = true,
-	NodeItem = true,
-	node = true,
-	CraftItem = true,
-	craft = true,
-	MBOItem = true,
-	ToolItem = true,
-	tool = true,
-}
-
-local function check_modname_prefix(name)
-	if name:sub(1,1) == ":" then
-		-- Escape the modname prefix enforcement mechanism
-		return name:sub(2)
-	else
-		-- Modname prefix enforcement
-		local expected_prefix = minetest.get_current_modname() .. ":"
-		if name:sub(1, #expected_prefix) ~= expected_prefix then
-			error("Name " .. name .. " does not follow naming conventions: " ..
-				"\"modname:\" or \":\" prefix required")
-		end
-		local subname = name:sub(#expected_prefix+1)
-		if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
-			error("Name " .. name .. " does not follow naming conventions: " ..
-				"contains unallowed characters")
-		end
-		return name
-	end
-end
-
-function minetest.register_abm(spec)
-	-- Add to minetest.registered_abms
-	minetest.registered_abms[#minetest.registered_abms+1] = spec
-end
-
-function minetest.register_entity(name, prototype)
-	-- Check name
-	if name == nil then
-		error("Unable to register entity: Name is nil")
-	end
-	name = check_modname_prefix(tostring(name))
-
-	prototype.name = name
-	prototype.__index = prototype  -- so that it can be used as a metatable
-
-	-- Add to minetest.registered_entities
-	minetest.registered_entities[name] = prototype
-end
-
-function minetest.register_item(name, itemdef)
-	-- Check name
-	if name == nil then
-		error("Unable to register item: Name is nil")
-	end
-	name = check_modname_prefix(tostring(name))
-	if forbidden_item_names[name] then
-		error("Unable to register item: Name is forbidden: " .. name)
-	end
-	itemdef.name = name
-
-	-- Apply defaults and add to registered_* table
-	if itemdef.type == "node" then
-		setmetatable(itemdef, {__index = minetest.nodedef_default})
-		minetest.registered_nodes[itemdef.name] = itemdef
-	elseif itemdef.type == "craft" then
-		setmetatable(itemdef, {__index = minetest.craftitemdef_default})
-		minetest.registered_craftitems[itemdef.name] = itemdef
-	elseif itemdef.type == "tool" then
-		setmetatable(itemdef, {__index = minetest.tooldef_default})
-		minetest.registered_tools[itemdef.name] = itemdef
-	elseif itemdef.type == "none" then
-		setmetatable(itemdef, {__index = minetest.noneitemdef_default})
-	else
-		error("Unable to register item: Type is invalid: " .. dump(itemdef))
-	end
-
-	-- Flowing liquid uses param2
-	if itemdef.type == "node" and itemdef.liquidtype == "flowing" then
-		itemdef.paramtype2 = "flowingliquid"
-	end
-
-	-- BEGIN Legacy stuff
-	if itemdef.cookresult_itemstring ~= nil and itemdef.cookresult_itemstring ~= "" then
-		minetest.register_craft({
-			type="cooking",
-			output=itemdef.cookresult_itemstring,
-			recipe=itemdef.name,
-			cooktime=itemdef.furnace_cooktime
-		})
-	end
-	if itemdef.furnace_burntime ~= nil and itemdef.furnace_burntime >= 0 then
-		minetest.register_craft({
-			type="fuel",
-			recipe=itemdef.name,
-			burntime=itemdef.furnace_burntime
-		})
-	end
-	-- END Legacy stuff
-
-	-- Disable all further modifications
-	getmetatable(itemdef).__newindex = {}
-
-	--minetest.log("Registering item: " .. itemdef.name)
-	minetest.registered_items[itemdef.name] = itemdef
-	minetest.registered_aliases[itemdef.name] = nil
-	register_item_raw(itemdef)
-end
-
-function minetest.register_node(name, nodedef)
-	nodedef.type = "node"
-	minetest.register_item(name, nodedef)
-end
-
-function minetest.register_craftitem(name, craftitemdef)
-	craftitemdef.type = "craft"
-
-	-- BEGIN Legacy stuff
-	if craftitemdef.inventory_image == nil and craftitemdef.image ~= nil then
-		craftitemdef.inventory_image = craftitemdef.image
-	end
-	-- END Legacy stuff
-
-	minetest.register_item(name, craftitemdef)
-end
-
-function minetest.register_tool(name, tooldef)
-	tooldef.type = "tool"
-	tooldef.stack_max = 1
-
-	-- BEGIN Legacy stuff
-	if tooldef.inventory_image == nil and tooldef.image ~= nil then
-		tooldef.inventory_image = tooldef.image
-	end
-	if tooldef.tool_capabilities == nil and
-	   (tooldef.full_punch_interval ~= nil or
-	    tooldef.basetime ~= nil or
-	    tooldef.dt_weight ~= nil or
-	    tooldef.dt_crackiness ~= nil or
-	    tooldef.dt_crumbliness ~= nil or
-	    tooldef.dt_cuttability ~= nil or
-	    tooldef.basedurability ~= nil or
-	    tooldef.dd_weight ~= nil or
-	    tooldef.dd_crackiness ~= nil or
-	    tooldef.dd_crumbliness ~= nil or
-	    tooldef.dd_cuttability ~= nil) then
-		tooldef.tool_capabilities = {
-			full_punch_interval = tooldef.full_punch_interval,
-			basetime = tooldef.basetime,
-			dt_weight = tooldef.dt_weight,
-			dt_crackiness = tooldef.dt_crackiness,
-			dt_crumbliness = tooldef.dt_crumbliness,
-			dt_cuttability = tooldef.dt_cuttability,
-			basedurability = tooldef.basedurability,
-			dd_weight = tooldef.dd_weight,
-			dd_crackiness = tooldef.dd_crackiness,
-			dd_crumbliness = tooldef.dd_crumbliness,
-			dd_cuttability = tooldef.dd_cuttability,
-		}
-	end
-	-- END Legacy stuff
-
-	minetest.register_item(name, tooldef)
-end
-
-function minetest.register_alias(name, convert_to)
-	if forbidden_item_names[name] then
-		error("Unable to register alias: Name is forbidden: " .. name)
-	end
-	if minetest.registered_items[name] ~= nil then
-		minetest.log("WARNING: Not registering alias, item with same name" ..
-			" is already defined: " .. name .. " -> " .. convert_to)
-	else
-		--minetest.log("Registering alias: " .. name .. " -> " .. convert_to)
-		minetest.registered_aliases[name] = convert_to
-		register_alias_raw(name, convert_to)
-	end
-end
-
--- Alias the forbidden item names to "" so they can't be
--- created via itemstrings (e.g. /give)
-local name
-for name in pairs(forbidden_item_names) do
-	minetest.registered_aliases[name] = ""
-	register_alias_raw(name, "")
-end
-
-
--- Deprecated:
--- Aliases for minetest.register_alias (how ironic...)
---minetest.alias_node = minetest.register_alias
---minetest.alias_tool = minetest.register_alias
---minetest.alias_craftitem = minetest.register_alias
-
---
--- Built-in node definitions. Also defined in C.
---
-
-minetest.register_item(":unknown", {
-	type = "none",
-	description = "Unknown Item",
-	inventory_image = "unknown_item.png",
-	on_place = minetest.item_place,
-	on_drop = minetest.item_drop,
-})
-
-minetest.register_node(":air", {
-	description = "Air (you hacker you!)",
-	inventory_image = "unknown_block.png",
-	wield_image = "unknown_block.png",
-	drawtype = "airlike",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	air_equivalent = true,
-})
-
-minetest.register_node(":ignore", {
-	description = "Ignore (you hacker you!)",
-	inventory_image = "unknown_block.png",
-	wield_image = "unknown_block.png",
-	drawtype = "airlike",
-	paramtype = "none",
-	sunlight_propagates = false,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true, -- A way to remove accidentally placed ignores
-	air_equivalent = true,
-})
-
--- The hand (bare definition)
-minetest.register_item(":", {
-	type = "none",
-})
-
---
--- Default material types
---
-function digprop_err()
-	minetest.log("info", debug.traceback())
-	minetest.log("info", "WARNING: The minetest.digprop_* functions are obsolete and need to be replaced by item groups.")
-end
-
-minetest.digprop_constanttime = digprop_err
-minetest.digprop_stonelike = digprop_err
-minetest.digprop_dirtlike = digprop_err
-minetest.digprop_gravellike = digprop_err
-minetest.digprop_woodlike = digprop_err
-minetest.digprop_leaveslike = digprop_err
-minetest.digprop_glasslike = digprop_err
-
---
--- Creative inventory
---
-
-minetest.creative_inventory = {}
-
-minetest.add_to_creative_inventory = function(itemstring)
-	table.insert(minetest.creative_inventory, itemstring)
-end
-
---
--- Callback registration
---
-
-local function make_registration()
-	local t = {}
-	local registerfunc = function(func) table.insert(t, func) end
-	return t, registerfunc
-end
-
-minetest.registered_on_chat_messages, minetest.register_on_chat_message = make_registration()
-minetest.registered_globalsteps, minetest.register_globalstep = make_registration()
-minetest.registered_on_placenodes, minetest.register_on_placenode = make_registration()
-minetest.registered_on_dignodes, minetest.register_on_dignode = make_registration()
-minetest.registered_on_punchnodes, minetest.register_on_punchnode = make_registration()
-minetest.registered_on_generateds, minetest.register_on_generated = make_registration()
-minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
-minetest.registered_on_dieplayers, minetest.register_on_dieplayer = make_registration()
-minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make_registration()
-
---
--- Set random seed
---
-
 math.randomseed(os.time())
 
--- END
+-- Load other files
+dofile(minetest.get_modpath("__builtin").."/misc_helpers.lua")
+dofile(minetest.get_modpath("__builtin").."/item.lua")
+dofile(minetest.get_modpath("__builtin").."/misc_register.lua")
+dofile(minetest.get_modpath("__builtin").."/item_entity.lua")
+dofile(minetest.get_modpath("__builtin").."/deprecated.lua")
+dofile(minetest.get_modpath("__builtin").."/misc.lua")
+dofile(minetest.get_modpath("__builtin").."/privileges.lua")
+dofile(minetest.get_modpath("__builtin").."/auth.lua")
+dofile(minetest.get_modpath("__builtin").."/chatcommands.lua")
+

builtin/chatcommands.lua

@@ -0,0 +1,332 @@
+-- Minetest: builtin/chatcommands.lua
+
+--
+-- Chat command handler
+--
+
+minetest.chatcommands = {}
+function minetest.register_chatcommand(cmd, def)
+	def = def or {}
+	def.params = def.params or ""
+	def.description = def.description or ""
+	def.privs = def.privs or {}
+	minetest.chatcommands[cmd] = def
+end
+
+minetest.register_on_chat_message(function(name, message)
+	local cmd, param = string.match(message, "/([^ ]+) *(.*)")
+	if not param then
+		param = ""
+	end
+	local cmd_def = minetest.chatcommands[cmd]
+	if cmd_def then
+		if not cmd_def.func then
+			-- This is a C++ command
+			return false
+		else
+			local has_privs, missing_privs = minetest.check_player_privs(name, cmd_def.privs)
+			if has_privs then
+				cmd_def.func(name, param)
+			else
+				minetest.chat_send_player(name, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
+			end
+			return true -- handled chat message
+		end
+	end
+	return false
+end)
+
+--
+-- Chat commands
+--
+
+-- Register C++ commands without functions
+minetest.register_chatcommand("me", {params = nil, description = "chat action (eg. /me orders a pizza)"})
+minetest.register_chatcommand("status", {description = "print server status line"})
+minetest.register_chatcommand("shutdown", {params = "", description = "shutdown server", privs = {server=true}})
+minetest.register_chatcommand("clearobjects", {params = "", description = "clear all objects in world", privs = {server=true}})
+minetest.register_chatcommand("time", {params = "<0...24000>", description = "set time of day", privs = {settime=true}})
+minetest.register_chatcommand("ban", {params = "<name>", description = "ban IP of player", privs = {ban=true}})
+minetest.register_chatcommand("unban", {params = "<name/ip>", description = "remove IP ban", privs = {ban=true}})
+
+-- Register other commands
+minetest.register_chatcommand("help", {
+	privs = {},
+	params = "(nothing)/all/privs/<cmd>",
+	description = "Get help for commands or list privileges",
+	func = function(name, param)
+		local format_help_line = function(cmd, def)
+			local msg = "/"..cmd
+			if def.params and def.params ~= "" then msg = msg .. " " .. def.params end
+			if def.description and def.description ~= "" then msg = msg .. ": " .. def.description end
+			return msg
+		end
+		if param == "" then
+			local msg = ""
+			cmds = {}
+			for cmd, def in pairs(minetest.chatcommands) do
+				if minetest.check_player_privs(name, def.privs) then
+					table.insert(cmds, cmd)
+				end
+			end
+			minetest.chat_send_player(name, "Available commands: "..table.concat(cmds, " "))
+			minetest.chat_send_player(name, "Use '/help <cmd>' to get more information, or '/help all' to list everything.")
+		elseif param == "all" then
+			minetest.chat_send_player(name, "Available commands:")
+			for cmd, def in pairs(minetest.chatcommands) do
+				if minetest.check_player_privs(name, def.privs) then
+					minetest.chat_send_player(name, format_help_line(cmd, def))
+				end
+			end
+		elseif param == "privs" then
+			minetest.chat_send_player(name, "Available privileges:")
+			for priv, def in pairs(minetest.registered_privileges) do
+				minetest.chat_send_player(name, priv..": "..def.description)
+			end
+		else
+			local cmd = param
+			def = minetest.chatcommands[cmd]
+			if not def then
+				minetest.chat_send_player(name, "Command not available: "..cmd)
+			else
+				minetest.chat_send_player(name, format_help_line(cmd, def))
+			end
+		end
+	end,
+})
+minetest.register_chatcommand("privs", {
+	params = "<name>",
+	description = "print out privileges of player",
+	func = function(name, param)
+		if param == "" then
+			param = name
+		else
+			if not minetest.check_player_privs(name, {privs=true}) then
+				minetest.chat_send_player(name, "Privileges of "..param.." are hidden from you.")
+			end
+		end
+		minetest.chat_send_player(name, "Privileges of "..param..": "..minetest.privs_to_string(minetest.get_player_privs(param), ' '))
+	end,
+})
+minetest.register_chatcommand("grant", {
+	params = "<name> <privilege>|all",
+	description = "Give privilege to player",
+	privs = {privs=true},
+	func = function(name, param)
+		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
+		if not grantname or not grantprivstr then
+			minetest.chat_send_player(name, "Invalid parameters (see /help grant)")
+			return
+		end
+		local grantprivs = minetest.string_to_privs(grantprivstr)
+		if grantprivstr == "all" then
+			grantprivs = minetest.registered_privileges
+		end
+		local privs = minetest.get_player_privs(grantname)
+		local privs_known = true
+		for priv, _ in pairs(grantprivs) do
+			if not minetest.registered_privileges[priv] then
+				minetest.chat_send_player(name, "Unknown privilege: "..priv)
+				privs_known = false
+			end
+			privs[priv] = true
+		end
+		if not privs_known then
+			return
+		end
+		minetest.set_player_privs(grantname, privs)
+		minetest.chat_send_player(name, "Privileges of "..grantname..": "..minetest.privs_to_string(minetest.get_player_privs(grantname), ' '))
+		if grantname ~= name then
+			minetest.chat_send_player(grantname, name.." granted you privileges: "..minetest.privs_to_string(grantprivs, ' '))
+		end
+	end,
+})
+minetest.register_chatcommand("revoke", {
+	params = "<name> <privilege>|all",
+	description = "Remove privilege from player",
+	privs = {privs=true},
+	func = function(name, param)
+		local revokename, revokeprivstr = string.match(param, "([^ ]+) (.+)")
+		if not revokename or not revokeprivstr then
+			minetest.chat_send_player(name, "Invalid parameters (see /help revoke)")
+			return
+		end
+		local revokeprivs = minetest.string_to_privs(revokeprivstr)
+		local privs = minetest.get_player_privs(revokename)
+		if revokeprivstr == "all" then
+			privs = {}
+		else
+			for priv, _ in pairs(revokeprivs) do
+				privs[priv] = nil
+			end
+		end
+		minetest.set_player_privs(revokename, privs)
+		minetest.chat_send_player(name, "Privileges of "..revokename..": "..minetest.privs_to_string(minetest.get_player_privs(revokename), ' '))
+		if revokename ~= name then
+			minetest.chat_send_player(revokename, name.." revoked privileges from you: "..minetest.privs_to_string(revokeprivs, ' '))
+		end
+	end,
+})
+minetest.register_chatcommand("setpassword", {
+	params = "<name> <password>",
+	description = "set given password",
+	privs = {password=true},
+	func = function(name, param)
+		if param == "" then
+			minetest.chat_send_player(name, "Password field required")
+			return
+		end
+		minetest.set_player_password(name, param)
+		minetest.chat_send_player(name, "Password set")
+	end,
+})
+minetest.register_chatcommand("clearpassword", {
+	params = "<name>",
+	description = "set empty password",
+	privs = {password=true},
+	func = function(name, param)
+		minetest.set_player_password(name, '')
+		minetest.chat_send_player(name, "Password cleared")
+	end,
+})
+
+minetest.register_chatcommand("auth_reload", {
+	params = "",
+	description = "reload authentication data",
+	privs = {server=true},
+	func = function(name, param)
+		local done = minetest.auth_reload()
+		if done then
+			minetest.chat_send_player(name, "Done.")
+		else
+			minetest.chat_send_player(name, "Failed.")
+		end
+	end,
+})
+
+minetest.register_chatcommand("teleport", {
+	params = "<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>",
+	description = "teleport to given position",
+	privs = {teleport=true},
+	func = function(name, param)
+		-- Returns (pos, true) if found, otherwise (pos, false)
+		local function find_free_position_near(pos)
+			local tries = {
+				{x=1,y=0,z=0},
+				{x=-1,y=0,z=0},
+				{x=0,y=0,z=1},
+				{x=0,y=0,z=-1},
+			}
+			for _, d in ipairs(tries) do
+				local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
+				local n = minetest.env:get_node(p)
+				if not minetest.registered_nodes[n.name].walkable then
+					return p, true
+				end
+			end
+			return pos, false
+		end
+
+		local teleportee = nil
+		local p = {}
+		p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
+		teleportee = minetest.env:get_player_by_name(name)
+		if teleportee and p.x and p.y and p.z then
+			minetest.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
+			teleportee:setpos(p)
+			return
+		end
+		
+		local teleportee = nil
+		local p = nil
+		local target_name = nil
+		target_name = string.match(param, "^([^ ]+)$")
+		teleportee = minetest.env:get_player_by_name(name)
+		if target_name then
+			local target = minetest.env:get_player_by_name(target_name)
+			if target then
+				p = target:getpos()
+			end
+		end
+		if teleportee and p then
+			p = find_free_position_near(p)
+			minetest.chat_send_player(name, "Teleporting to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
+			teleportee:setpos(p)
+			return
+		end
+		
+		if minetest.check_player_privs(name, {bring=true}) then
+			local teleportee = nil
+			local p = {}
+			local teleportee_name = nil
+			teleportee_name, p.x, p.y, p.z = string.match(param, "^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
+			if teleportee_name then
+				teleportee = minetest.env:get_player_by_name(teleportee_name)
+			end
+			if teleportee and p.x and p.y and p.z then
+				minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
+				teleportee:setpos(p)
+				return
+			end
+			
+			local teleportee = nil
+			local p = nil
+			local teleportee_name = nil
+			local target_name = nil
+			teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
+			if teleportee_name then
+				teleportee = minetest.env:get_player_by_name(teleportee_name)
+			end
+			if target_name then
+				local target = minetest.env:get_player_by_name(target_name)
+				if target then
+					p = target:getpos()
+				end
+			end
+			if teleportee and p then
+				p = find_free_position_near(p)
+				minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
+				teleportee:setpos(p)
+				return
+			end
+		end
+
+		minetest.chat_send_player(name, "Invalid parameters (\""..param.."\") or player not found (see /help teleport)")
+		return
+	end,
+})
+
+minetest.register_chatcommand("set", {
+	params = "[-n] <name> <value> | <name>",
+	description = "set or read server configuration setting",
+	privs = {server=true},
+	func = function(name, param)
+		local arg, setname, setvalue = string.match(param, "(-[n]) ([^ ]+) (.+)")
+		if arg and arg == "n" and setname and setvalue then
+			minetest.setting_set(setname, setvalue)
+			minetest.chat_send_player(name, setname.." = "..setvalue)
+			return
+		end
+		local setname, setvalue = string.match(param, "([^ ]+) (.+)")
+		if setname and setvalue then
+			if not minetest.setting_get(setname) then
+				minetest.chat_send_player(name, "Failed. Use '/set -n <name> <value>' to create a new setting.")
+				return
+			end
+			minetest.setting_set(setname, setvalue)
+			minetest.chat_send_player(name, setname.." = "..setvalue)
+			return
+		end
+		local setname = string.match(param, "([^ ]+)")
+		if setname then
+			local setvalue = minetest.setting_get(setname)
+			if not setvalue then
+				setvalue = "<not set>"
+			end
+			minetest.chat_send_player(name, setname.." = "..setvalue)
+			return
+		end
+		minetest.chat_send_player(name, "Invalid parameters (see /help set)")
+	end,
+})
+

builtin/deprecated.lua

@@ -0,0 +1,19 @@
+-- Minetest: builtin/deprecated.lua
+
+--
+-- Default material types
+--
+function digprop_err()
+	minetest.log("info", debug.traceback())
+	minetest.log("info", "WARNING: The minetest.digprop_* functions are obsolete and need to be replaced by item groups.")
+end
+
+minetest.digprop_constanttime = digprop_err
+minetest.digprop_stonelike = digprop_err
+minetest.digprop_dirtlike = digprop_err
+minetest.digprop_gravellike = digprop_err
+minetest.digprop_woodlike = digprop_err
+minetest.digprop_leaveslike = digprop_err
+minetest.digprop_glasslike = digprop_err
+
+

builtin/item.lua

@@ -0,0 +1,389 @@
+-- Minetest: builtin/item.lua
+
+--
+-- Item definition helpers
+--
+
+function minetest.inventorycube(img1, img2, img3)
+	img2 = img2 or img1
+	img3 = img3 or img1
+	return "[inventorycube"
+			.. "{" .. img1:gsub("%^", "&")
+			.. "{" .. img2:gsub("%^", "&")
+			.. "{" .. img3:gsub("%^", "&")
+end
+
+function minetest.get_pointed_thing_position(pointed_thing, above)
+	if pointed_thing.type == "node" then
+		if above then
+			-- The position where a node would be placed
+			return pointed_thing.above
+		else
+			-- The position where a node would be dug
+			return pointed_thing.under
+		end
+	elseif pointed_thing.type == "object" then
+		obj = pointed_thing.ref
+		if obj ~= nil then
+			return obj:getpos()
+		else
+			return nil
+		end
+	else
+		return nil
+	end
+end
+
+function minetest.dir_to_facedir(dir)
+	if math.abs(dir.x) > math.abs(dir.z) then
+		if dir.x < 0 then
+			return 3
+		else
+			return 1
+		end
+	else
+		if dir.z < 0 then
+			return 2
+		else
+			return 0
+		end
+	end
+end
+
+function minetest.dir_to_wallmounted(dir)
+	if math.abs(dir.y) > math.max(math.abs(dir.x), math.abs(dir.z)) then
+		if dir.y < 0 then
+			return 1
+		else
+			return 0
+		end
+	elseif math.abs(dir.x) > math.abs(dir.z) then
+		if dir.x < 0 then
+			return 3
+		else
+			return 2
+		end
+	else
+		if dir.z < 0 then
+			return 5
+		else
+			return 4
+		end
+	end
+end
+
+function minetest.get_node_drops(nodename, toolname)
+	local drop = ItemStack({name=nodename}):get_definition().drop
+	if drop == nil then
+		-- default drop
+		return {ItemStack({name=nodename})}
+	elseif type(drop) == "string" then
+		-- itemstring drop
+		return {ItemStack(drop)}
+	elseif drop.items == nil then
+		-- drop = {} to disable default drop
+		return {}
+	end
+
+	-- Extended drop table
+	local got_items = {}
+	local got_count = 0
+	local _, item, tool
+	for _, item in ipairs(drop.items) do
+		local good_rarity = true
+		local good_tool = true
+		if item.rarity ~= nil then
+			good_rarity = item.rarity < 1 or math.random(item.rarity) == 1
+		end
+		if item.tools ~= nil then
+			good_tool = false
+			for _, tool in ipairs(item.tools) do
+				if tool:sub(1, 1) == '~' then
+					good_tool = toolname:find(tool:sub(2)) ~= nil
+				else
+					good_tool = toolname == tool
+				end
+				if good_tool then
+					break
+				end
+			end
+        	end
+		if good_rarity and good_tool then
+			got_count = got_count + 1
+			for _, add_item in ipairs(item.items) do
+				got_items[#got_items+1] = add_item
+			end
+			if drop.max_items ~= nil and got_count == drop.max_items then
+				break
+			end
+		end
+	end
+	return got_items
+end
+
+function minetest.item_place_node(itemstack, placer, pointed_thing)
+	local item = itemstack:peek_item()
+	local def = itemstack:get_definition()
+	if def.type == "node" and pointed_thing.type == "node" then
+		local pos = pointed_thing.above
+		local oldnode = minetest.env:get_node(pos)
+		local olddef = ItemStack({name=oldnode.name}):get_definition()
+
+		if not olddef.buildable_to then
+			minetest.log("info", placer:get_player_name() .. " tried to place"
+				.. " node in invalid position " .. minetest.pos_to_string(pos)
+				.. ", replacing " .. oldnode.name)
+			return
+		end
+
+		minetest.log("action", placer:get_player_name() .. " places node "
+			.. def.name .. " at " .. minetest.pos_to_string(pos))
+
+		local newnode = {name = def.name, param1 = 0, param2 = 0}
+
+		-- Calculate direction for wall mounted stuff like torches and signs
+		if def.paramtype2 == 'wallmounted' then
+			local under = pointed_thing.under
+			local above = pointed_thing.above
+			local dir = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
+			newnode.param2 = minetest.dir_to_wallmounted(dir)
+		-- Calculate the direction for furnaces and chests and stuff
+		elseif def.paramtype2 == 'facedir' then
+			local playerpos = placer:getpos()
+			local dir = {x = pos.x - playerpos.x, y = pos.y - playerpos.y, z = pos.z - playerpos.z}
+			newnode.param2 = minetest.dir_to_facedir(dir)
+			minetest.log("action", "facedir: " .. newnode.param2)
+		end
+
+		-- Add node and update
+		minetest.env:add_node(pos, newnode)
+
+		-- Set metadata owner
+		if def.metadata_name ~= "" then
+			minetest.env:get_meta(pos):set_owner(placer:get_player_name())
+		end
+
+		-- Run script hook
+		local _, callback
+		for _, callback in ipairs(minetest.registered_on_placenodes) do
+			callback(pos, newnode, placer)
+		end
+
+		itemstack:take_item()
+	end
+	return itemstack
+end
+
+function minetest.item_place_object(itemstack, placer, pointed_thing)
+	local pos = minetest.get_pointed_thing_position(pointed_thing, true)
+	if pos ~= nil then
+		local item = itemstack:take_item()
+		minetest.env:add_item(pos, item)
+	end
+	return itemstack
+end
+
+function minetest.item_place(itemstack, placer, pointed_thing)
+	if itemstack:get_definition().type == "node" then
+		return minetest.item_place_node(itemstack, placer, pointed_thing)
+	else
+		return minetest.item_place_object(itemstack, placer, pointed_thing)
+	end
+end
+
+function minetest.item_drop(itemstack, dropper, pos)
+	if dropper.get_player_name then
+		local v = dropper:get_look_dir()
+		local p = {x=pos.x+v.x, y=pos.y+1.5+v.y, z=pos.z+v.z}
+		local obj = minetest.env:add_item(p, itemstack)
+		v.x = v.x*2
+		v.y = v.y*2 + 1
+		v.z = v.z*2
+		obj:setvelocity(v)
+	else
+		minetest.env:add_item(pos, itemstack)
+	end
+	return ""
+end
+
+function minetest.item_eat(hp_change, replace_with_item)
+	return function(itemstack, user, pointed_thing)  -- closure
+		if itemstack:take_item() ~= nil then
+			user:set_hp(user:get_hp() + hp_change)
+			itemstack:add_item(replace_with_item) -- note: replace_with_item is optional
+		end
+		return itemstack
+	end
+end
+
+function minetest.node_punch(pos, node, puncher)
+	-- Run script hook
+	local _, callback
+	for _, callback in ipairs(minetest.registered_on_punchnodes) do
+		callback(pos, node, puncher)
+	end
+
+end
+
+function minetest.node_dig(pos, node, digger)
+	minetest.debug("node_dig")
+
+	local def = ItemStack({name=node.name}):get_definition()
+	if not def.diggable then
+		minetest.debug("not diggable")
+		minetest.log("info", digger:get_player_name() .. " tried to dig "
+			.. node.name .. " which is not diggable "
+			.. minetest.pos_to_string(pos))
+		return
+	end
+
+	local meta = minetest.env:get_meta(pos)
+	if meta ~= nil and not meta:get_allow_removal() then
+		minetest.debug("dig prevented by metadata")
+		minetest.log("info", digger:get_player_name() .. " tried to dig "
+			.. node.name .. ", but removal is disabled by metadata "
+			.. minetest.pos_to_string(pos))
+		return
+	end
+
+	minetest.log('action', digger:get_player_name() .. " digs "
+		.. node.name .. " at " .. minetest.pos_to_string(pos))
+
+	if not minetest.setting_getbool("creative_mode") then
+		local wielded = digger:get_wielded_item()
+		local drops = minetest.get_node_drops(node.name, wielded:get_name())
+
+		-- Wear out tool
+		tp = wielded:get_tool_capabilities()
+		dp = minetest.get_dig_params(def.groups, tp)
+		wielded:add_wear(dp.wear)
+		digger:set_wielded_item(wielded)
+
+		-- Add dropped items
+		local _, dropped_item
+		for _, dropped_item in ipairs(drops) do
+			digger:get_inventory():add_item("main", dropped_item)
+		end
+	end
+
+	-- Remove node and update
+	minetest.env:remove_node(pos)
+
+	-- Run script hook
+	local _, callback
+	for _, callback in ipairs(minetest.registered_on_dignodes) do
+		callback(pos, node, digger)
+	end
+end
+
+--
+-- Item definition defaults
+--
+
+minetest.nodedef_default = {
+	-- Item properties
+	type="node",
+	-- name intentionally not defined here
+	description = "",
+	groups = {},
+	inventory_image = "",
+	wield_image = "",
+	wield_scale = {x=1,y=1,z=1},
+	stack_max = 99,
+	usable = false,
+	liquids_pointable = false,
+	tool_capabilities = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_drop = minetest.item_drop,
+	on_use = nil,
+
+	on_punch = minetest.node_punch,
+	on_dig = minetest.node_dig,
+
+	-- Node properties
+	drawtype = "normal",
+	visual_scale = 1.0,
+	tile_images = {""},
+	special_materials = {
+		{image="", backface_culling=true},
+		{image="", backface_culling=true},
+	},
+	alpha = 255,
+	post_effect_color = {a=0, r=0, g=0, b=0},
+	paramtype = "none",
+	paramtype2 = "none",
+	is_ground_content = false,
+	sunlight_propagates = false,
+	walkable = true,
+	pointable = true,
+	diggable = true,
+	climbable = false,
+	buildable_to = false,
+	metadata_name = "",
+	liquidtype = "none",
+	liquid_alternative_flowing = "",
+	liquid_alternative_source = "",
+	liquid_viscosity = 0,
+	light_source = 0,
+	damage_per_second = 0,
+	selection_box = {type="regular"},
+	legacy_facedir_simple = false,
+	legacy_wallmounted = false,
+}
+
+minetest.craftitemdef_default = {
+	type="craft",
+	-- name intentionally not defined here
+	description = "",
+	groups = {},
+	inventory_image = "",
+	wield_image = "",
+	wield_scale = {x=1,y=1,z=1},
+	stack_max = 99,
+	liquids_pointable = false,
+	tool_capabilities = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_drop = minetest.item_drop,
+	on_use = nil,
+}
+
+minetest.tooldef_default = {
+	type="tool",
+	-- name intentionally not defined here
+	description = "",
+	groups = {},
+	inventory_image = "",
+	wield_image = "",
+	wield_scale = {x=1,y=1,z=1},
+	stack_max = 1,
+	liquids_pointable = false,
+	tool_capabilities = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_drop = minetest.item_drop,
+	on_use = nil,
+}
+
+minetest.noneitemdef_default = {  -- This is used for the hand and unknown items
+	type="none",
+	-- name intentionally not defined here
+	description = "",
+	groups = {},
+	inventory_image = "",
+	wield_image = "",
+	wield_scale = {x=1,y=1,z=1},
+	stack_max = 99,
+	liquids_pointable = false,
+	tool_capabilities = nil,
+
+	-- Interaction callbacks
+	on_place = nil,
+	on_drop = nil,
+	on_use = nil,
+}
+

builtin/item_entity.lua

@@ -0,0 +1,103 @@
+-- Minetest: builtin/item_entity.lua
+
+function minetest.spawn_item(pos, item)
+	-- Take item in any format
+	local stack = ItemStack(item)
+	local obj = minetest.env:add_entity(pos, "__builtin:item")
+	obj:get_luaentity():set_item(stack:to_string())
+	return obj
+end
+
+minetest.register_entity("__builtin:item", {
+	initial_properties = {
+		hp_max = 1,
+		physical = true,
+		collisionbox = {-0.17,-0.17,-0.17, 0.17,0.17,0.17},
+		visual = "sprite",
+		visual_size = {x=0.5, y=0.5},
+		textures = {""},
+		spritediv = {x=1, y=1},
+		initial_sprite_basepos = {x=0, y=0},
+		is_visible = false,
+	},
+	
+	itemstring = '',
+	physical_state = true,
+
+	set_item = function(self, itemstring)
+		self.itemstring = itemstring
+		local stack = ItemStack(itemstring)
+		local itemtable = stack:to_table()
+		local itemname = nil
+		if itemtable then
+			itemname = stack:to_table().name
+		end
+		local item_texture = nil
+		local item_type = ""
+		if minetest.registered_items[itemname] then
+			item_texture = minetest.registered_items[itemname].inventory_image
+			item_type = minetest.registered_items[itemname].type
+		end
+		prop = {
+			is_visible = true,
+			visual = "sprite",
+			textures = {"unknown_item.png"}
+		}
+		if item_texture and item_texture ~= "" then
+			prop.visual = "sprite"
+			prop.textures = {item_texture}
+			prop.visual_size = {x=0.50, y=0.50}
+		else
+			prop.visual = "wielditem"
+			prop.textures = {itemname}
+			prop.visual_size = {x=0.20, y=0.20}
+			prop.automatic_rotate = math.pi * 0.25
+		end
+		self.object:set_properties(prop)
+	end,
+
+	get_staticdata = function(self)
+		return self.itemstring
+	end,
+
+	on_activate = function(self, staticdata)
+		self.itemstring = staticdata
+		self.object:set_armor_groups({immortal=1})
+		self.object:setvelocity({x=0, y=2, z=0})
+		self.object:setacceleration({x=0, y=-10, z=0})
+		self:set_item(self.itemstring)
+	end,
+
+	on_step = function(self, dtime)
+		local p = self.object:getpos()
+		p.y = p.y - 0.3
+		local nn = minetest.env:get_node(p).name
+		if minetest.registered_nodes[nn].walkable then
+			if self.physical_state then
+				self.object:setvelocity({x=0,y=0,z=0})
+				self.object:setacceleration({x=0, y=0, z=0})
+				self.physical_state = false
+				self.object:set_properties({
+					physical = false
+				})
+			end
+		else
+			if not self.physical_state then
+				self.object:setvelocity({x=0,y=0,z=0})
+				self.object:setacceleration({x=0, y=-10, z=0})
+				self.physical_state = true
+				self.object:set_properties({
+					physical = true
+				})
+			end
+		end
+	end,
+
+	on_punch = function(self, hitter)
+		if self.itemstring ~= '' then
+			hitter:get_inventory():add_item("main", self.itemstring)
+		end
+		self.object:remove()
+	end,
+})
+

builtin/misc.lua

@@ -0,0 +1,65 @@
+-- Minetest: builtin/misc.lua
+
+--
+-- Misc. API functions
+--
+
+minetest.timers_to_add = {}
+minetest.timers = {}
+minetest.register_globalstep(function(dtime)
+	for _, timer in ipairs(minetest.timers_to_add) do
+		table.insert(minetest.timers, timer)
+	end
+	minetest.timers_to_add = {}
+	for index, timer in ipairs(minetest.timers) do
+		timer.time = timer.time - dtime
+		if timer.time <= 0 then
+			timer.func(timer.param)
+			table.remove(minetest.timers,index)
+		end
+	end
+end)
+
+function minetest.after(time, func, param)
+	table.insert(minetest.timers_to_add, {time=time, func=func, param=param})
+end
+
+function minetest.check_player_privs(name, privs)
+	local player_privs = minetest.get_player_privs(name)
+	local missing_privileges = {}
+	for priv, val in pairs(privs) do
+		if val then
+			if not player_privs[priv] then
+				table.insert(missing_privileges, priv)
+			end
+		end
+	end
+	if #missing_privileges > 0 then
+		return false, missing_privileges
+	end
+	return true, ""
+end
+
+function minetest.get_connected_players()
+	-- This could be optimized a bit, but leave that for later
+	local list = {}
+	for _, obj in pairs(minetest.env:get_objects_inside_radius({x=0,y=0,z=0}, 1000000)) do
+		if obj:get_player_name() then
+			table.insert(list, obj)
+		end
+	end
+	return list
+end
+
+function minetest.hash_node_position(pos)
+	return (pos.z+32768)*65536*65536 + (pos.y+32768)*65536 + pos.x+32768
+end
+
+function minetest.get_node_group(name, group)
+	if not minetest.registered_nodes[name] or not
+			minetest.registered_nodes[name].groups[group] then
+		return 0
+	end
+	return minetest.registered_nodes[name].groups[group]
+end
+

builtin/misc_helpers.lua

@@ -0,0 +1,94 @@
+-- Minetest: builtin/misc_helpers.lua
+
+function basic_dump2(o)
+	if type(o) == "number" then
+		return tostring(o)
+	elseif type(o) == "string" then
+		return string.format("%q", o)
+	elseif type(o) == "boolean" then
+		return tostring(o)
+	elseif type(o) == "function" then
+		return "<function>"
+	elseif type(o) == "userdata" then
+		return "<userdata>"
+	elseif type(o) == "nil" then
+		return "nil"
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+function dump2(o, name, dumped)
+	name = name or "_"
+	dumped = dumped or {}
+	io.write(name, " = ")
+	if type(o) == "number" or type(o) == "string" or type(o) == "boolean"
+			or type(o) == "function" or type(o) == "nil"
+			or type(o) == "userdata" then
+		io.write(basic_dump2(o), "\n")
+	elseif type(o) == "table" then
+		if dumped[o] then
+			io.write(dumped[o], "\n")
+		else
+			dumped[o] = name
+			io.write("{}\n") -- new table
+			for k,v in pairs(o) do
+				local fieldname = string.format("%s[%s]", name, basic_dump2(k))
+				dump2(v, fieldname, dumped)
+			end
+		end
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+function dump(o, dumped)
+	dumped = dumped or {}
+	if type(o) == "number" then
+		return tostring(o)
+	elseif type(o) == "string" then
+		return string.format("%q", o)
+	elseif type(o) == "table" then
+		if dumped[o] then
+			return "<circular reference>"
+		end
+		dumped[o] = true
+		local t = {}
+		for k,v in pairs(o) do
+			t[#t+1] = "" .. k .. " = " .. dump(v, dumped)
+		end
+		return "{" .. table.concat(t, ", ") .. "}"
+	elseif type(o) == "boolean" then
+		return tostring(o)
+	elseif type(o) == "function" then
+		return "<function>"
+	elseif type(o) == "userdata" then
+		return "<userdata>"
+	elseif type(o) == "nil" then
+		return "nil"
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+function string:split(sep)
+	local sep, fields = sep or ",", {}
+	local pattern = string.format("([^%s]+)", sep)
+	self:gsub(pattern, function(c) fields[#fields+1] = c end)
+	return fields
+end
+
+function string:trim()
+	return (self:gsub("^%s*(.-)%s*$", "%1"))
+end
+
+assert(string.trim("\n \t\tfoo bar\t ") == "foo bar")
+
+function minetest.pos_to_string(pos)
+	return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
+end
+
+

builtin/misc_register.lua

@@ -0,0 +1,314 @@
+-- Minetest: builtin/misc_register.lua
+
+--
+-- Make raw registration functions inaccessible to anyone except this file
+--
+
+local register_item_raw = minetest.register_item_raw
+minetest.register_item_raw = nil
+
+local register_alias_raw = minetest.register_alias_raw
+minetest.register_item_raw = nil
+
+--
+-- Item / entity / ABM registration functions
+--
+
+minetest.registered_abms = {}
+minetest.registered_entities = {}
+minetest.registered_items = {}
+minetest.registered_nodes = {}
+minetest.registered_craftitems = {}
+minetest.registered_tools = {}
+minetest.registered_aliases = {}
+
+-- For tables that are indexed by item name:
+-- If table[X] does not exist, default to table[minetest.registered_aliases[X]]
+local function set_alias_metatable(table)
+	setmetatable(table, {
+		__index = function(name)
+			return rawget(table, minetest.registered_aliases[name])
+		end
+	})
+end
+set_alias_metatable(minetest.registered_items)
+set_alias_metatable(minetest.registered_nodes)
+set_alias_metatable(minetest.registered_craftitems)
+set_alias_metatable(minetest.registered_tools)
+
+-- These item names may not be used because they would interfere
+-- with legacy itemstrings
+local forbidden_item_names = {
+	MaterialItem = true,
+	MaterialItem2 = true,
+	MaterialItem3 = true,
+	NodeItem = true,
+	node = true,
+	CraftItem = true,
+	craft = true,
+	MBOItem = true,
+	ToolItem = true,
+	tool = true,
+}
+
+local function check_modname_prefix(name)
+	if name:sub(1,1) == ":" then
+		-- Escape the modname prefix enforcement mechanism
+		return name:sub(2)
+	else
+		-- Modname prefix enforcement
+		local expected_prefix = minetest.get_current_modname() .. ":"
+		if name:sub(1, #expected_prefix) ~= expected_prefix then
+			error("Name " .. name .. " does not follow naming conventions: " ..
+				"\"modname:\" or \":\" prefix required")
+		end
+		local subname = name:sub(#expected_prefix+1)
+		if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
+			error("Name " .. name .. " does not follow naming conventions: " ..
+				"contains unallowed characters")
+		end
+		return name
+	end
+end
+
+function minetest.register_abm(spec)
+	-- Add to minetest.registered_abms
+	minetest.registered_abms[#minetest.registered_abms+1] = spec
+end
+
+function minetest.register_entity(name, prototype)
+	-- Check name
+	if name == nil then
+		error("Unable to register entity: Name is nil")
+	end
+	name = check_modname_prefix(tostring(name))
+
+	prototype.name = name
+	prototype.__index = prototype  -- so that it can be used as a metatable
+
+	-- Add to minetest.registered_entities
+	minetest.registered_entities[name] = prototype
+end
+
+function minetest.register_item(name, itemdef)
+	-- Check name
+	if name == nil then
+		error("Unable to register item: Name is nil")
+	end
+	name = check_modname_prefix(tostring(name))
+	if forbidden_item_names[name] then
+		error("Unable to register item: Name is forbidden: " .. name)
+	end
+	itemdef.name = name
+
+	-- Apply defaults and add to registered_* table
+	if itemdef.type == "node" then
+		setmetatable(itemdef, {__index = minetest.nodedef_default})
+		minetest.registered_nodes[itemdef.name] = itemdef
+	elseif itemdef.type == "craft" then
+		setmetatable(itemdef, {__index = minetest.craftitemdef_default})
+		minetest.registered_craftitems[itemdef.name] = itemdef
+	elseif itemdef.type == "tool" then
+		setmetatable(itemdef, {__index = minetest.tooldef_default})
+		minetest.registered_tools[itemdef.name] = itemdef
+	elseif itemdef.type == "none" then
+		setmetatable(itemdef, {__index = minetest.noneitemdef_default})
+	else
+		error("Unable to register item: Type is invalid: " .. dump(itemdef))
+	end
+
+	-- Flowing liquid uses param2
+	if itemdef.type == "node" and itemdef.liquidtype == "flowing" then
+		itemdef.paramtype2 = "flowingliquid"
+	end
+
+	-- BEGIN Legacy stuff
+	if itemdef.cookresult_itemstring ~= nil and itemdef.cookresult_itemstring ~= "" then
+		minetest.register_craft({
+			type="cooking",
+			output=itemdef.cookresult_itemstring,
+			recipe=itemdef.name,
+			cooktime=itemdef.furnace_cooktime
+		})
+	end
+	if itemdef.furnace_burntime ~= nil and itemdef.furnace_burntime >= 0 then
+		minetest.register_craft({
+			type="fuel",
+			recipe=itemdef.name,
+			burntime=itemdef.furnace_burntime
+		})
+	end
+	-- END Legacy stuff
+
+	-- Disable all further modifications
+	getmetatable(itemdef).__newindex = {}
+
+	--minetest.log("Registering item: " .. itemdef.name)
+	minetest.registered_items[itemdef.name] = itemdef
+	minetest.registered_aliases[itemdef.name] = nil
+	register_item_raw(itemdef)
+end
+
+function minetest.register_node(name, nodedef)
+	nodedef.type = "node"
+	minetest.register_item(name, nodedef)
+end
+
+function minetest.register_craftitem(name, craftitemdef)
+	craftitemdef.type = "craft"
+
+	-- BEGIN Legacy stuff
+	if craftitemdef.inventory_image == nil and craftitemdef.image ~= nil then
+		craftitemdef.inventory_image = craftitemdef.image
+	end
+	-- END Legacy stuff
+
+	minetest.register_item(name, craftitemdef)
+end
+
+function minetest.register_tool(name, tooldef)
+	tooldef.type = "tool"
+	tooldef.stack_max = 1
+
+	-- BEGIN Legacy stuff
+	if tooldef.inventory_image == nil and tooldef.image ~= nil then
+		tooldef.inventory_image = tooldef.image
+	end
+	if tooldef.tool_capabilities == nil and
+	   (tooldef.full_punch_interval ~= nil or
+	    tooldef.basetime ~= nil or
+	    tooldef.dt_weight ~= nil or
+	    tooldef.dt_crackiness ~= nil or
+	    tooldef.dt_crumbliness ~= nil or
+	    tooldef.dt_cuttability ~= nil or
+	    tooldef.basedurability ~= nil or
+	    tooldef.dd_weight ~= nil or
+	    tooldef.dd_crackiness ~= nil or
+	    tooldef.dd_crumbliness ~= nil or
+	    tooldef.dd_cuttability ~= nil) then
+		tooldef.tool_capabilities = {
+			full_punch_interval = tooldef.full_punch_interval,
+			basetime = tooldef.basetime,
+			dt_weight = tooldef.dt_weight,
+			dt_crackiness = tooldef.dt_crackiness,
+			dt_crumbliness = tooldef.dt_crumbliness,
+			dt_cuttability = tooldef.dt_cuttability,
+			basedurability = tooldef.basedurability,
+			dd_weight = tooldef.dd_weight,
+			dd_crackiness = tooldef.dd_crackiness,
+			dd_crumbliness = tooldef.dd_crumbliness,
+			dd_cuttability = tooldef.dd_cuttability,
+		}
+	end
+	-- END Legacy stuff
+
+	minetest.register_item(name, tooldef)
+end
+
+function minetest.register_alias(name, convert_to)
+	if forbidden_item_names[name] then
+		error("Unable to register alias: Name is forbidden: " .. name)
+	end
+	if minetest.registered_items[name] ~= nil then
+		minetest.log("WARNING: Not registering alias, item with same name" ..
+			" is already defined: " .. name .. " -> " .. convert_to)
+	else
+		--minetest.log("Registering alias: " .. name .. " -> " .. convert_to)
+		minetest.registered_aliases[name] = convert_to
+		register_alias_raw(name, convert_to)
+	end
+end
+
+-- Alias the forbidden item names to "" so they can't be
+-- created via itemstrings (e.g. /give)
+local name
+for name in pairs(forbidden_item_names) do
+	minetest.registered_aliases[name] = ""
+	register_alias_raw(name, "")
+end
+
+
+-- Deprecated:
+-- Aliases for minetest.register_alias (how ironic...)
+--minetest.alias_node = minetest.register_alias
+--minetest.alias_tool = minetest.register_alias
+--minetest.alias_craftitem = minetest.register_alias
+
+--
+-- Built-in node definitions. Also defined in C.
+--
+
+minetest.register_item(":unknown", {
+	type = "none",
+	description = "Unknown Item",
+	inventory_image = "unknown_item.png",
+	on_place = minetest.item_place,
+	on_drop = minetest.item_drop,
+})
+
+minetest.register_node(":air", {
+	description = "Air (you hacker you!)",
+	inventory_image = "unknown_block.png",
+	wield_image = "unknown_block.png",
+	drawtype = "airlike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	air_equivalent = true,
+})
+
+minetest.register_node(":ignore", {
+	description = "Ignore (you hacker you!)",
+	inventory_image = "unknown_block.png",
+	wield_image = "unknown_block.png",
+	drawtype = "airlike",
+	paramtype = "none",
+	sunlight_propagates = false,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true, -- A way to remove accidentally placed ignores
+	air_equivalent = true,
+})
+
+-- The hand (bare definition)
+minetest.register_item(":", {
+	type = "none",
+})
+
+--
+-- Creative inventory
+--
+
+minetest.creative_inventory = {}
+
+minetest.add_to_creative_inventory = function(itemstring)
+	table.insert(minetest.creative_inventory, itemstring)
+end
+
+--
+-- Callback registration
+--
+
+local function make_registration()
+	local t = {}
+	local registerfunc = function(func) table.insert(t, func) end
+	return t, registerfunc
+end
+
+minetest.registered_on_chat_messages, minetest.register_on_chat_message = make_registration()
+minetest.registered_globalsteps, minetest.register_globalstep = make_registration()
+minetest.registered_on_placenodes, minetest.register_on_placenode = make_registration()
+minetest.registered_on_dignodes, minetest.register_on_dignode = make_registration()
+minetest.registered_on_punchnodes, minetest.register_on_punchnode = make_registration()
+minetest.registered_on_generateds, minetest.register_on_generated = make_registration()
+minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
+minetest.registered_on_dieplayers, minetest.register_on_dieplayer = make_registration()
+minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make_registration()
+minetest.registered_on_joinplayers, minetest.register_on_joinplayer = make_registration()
+minetest.registered_on_leaveplayers, minetest.register_on_leaveplayer = make_registration()
+
+

builtin/privileges.lua

@@ -0,0 +1,47 @@
+-- Minetest: builtin/privileges.lua
+
+--
+-- Privileges
+--
+
+minetest.registered_privileges = {}
+
+function minetest.register_privilege(name, param)
+	local function fill_defaults(def)
+		if def.give_to_singleplayer == nil then
+			def.give_to_singleplayer = true
+		end
+		if def.description == nil then
+			def.description = "(no description)"
+		end
+	end
+	local def = {}
+	if type(param) == "table" then
+		def = param
+	else
+		def = {description = param}
+	end
+	fill_defaults(def)
+	minetest.registered_privileges[name] = def
+end
+
+minetest.register_privilege("interact", "Can interact with things and modify the world")
+minetest.register_privilege("teleport", "Can use /teleport command")
+minetest.register_privilege("bring", "Can teleport other players")
+minetest.register_privilege("settime", "Can use /time")
+minetest.register_privilege("privs", "Can modify privileges")
+minetest.register_privilege("server", "Can do server maintenance stuff")
+minetest.register_privilege("shout", "Can speak in chat")
+minetest.register_privilege("ban", "Can ban and unban players")
+minetest.register_privilege("give", "Can use /give and /giveme")
+minetest.register_privilege("password", "Can use /setpassword and /clearpassword")
+minetest.register_privilege("fly", {
+	description = "Can fly using the free_move mode",
+	give_to_singleplayer = false,
+})
+minetest.register_privilege("fast", {
+	description = "Can walk fast using the fast_move mode",
+	give_to_singleplayer = false,
+})
+
+

cmake/Modules/FindVorbis.cmake

@@ -0,0 +1,46 @@
+# - Find vorbis
+# Find the native vorbis includes and libraries
+#
+#  VORBIS_INCLUDE_DIR - where to find vorbis.h, etc.
+#  OGG_INCLUDE_DIR    - where to find ogg/ogg.h, etc.
+#  VORBIS_LIBRARIES   - List of libraries when using vorbis(file).
+#  VORBIS_FOUND       - True if vorbis found.
+
+if(NOT GP2XWIZ)
+    if(VORBIS_INCLUDE_DIR)
+        # Already in cache, be silent
+        set(VORBIS_FIND_QUIETLY TRUE)
+    endif(VORBIS_INCLUDE_DIR)
+    find_path(OGG_INCLUDE_DIR ogg/ogg.h)
+    find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
+    # MSVC built ogg/vorbis may be named ogg_static and vorbis_static
+    find_library(OGG_LIBRARY NAMES ogg ogg_static)
+    find_library(VORBIS_LIBRARY NAMES vorbis vorbis_static)
+    find_library(VORBISFILE_LIBRARY NAMES vorbisfile vorbisfile_static)
+    # Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND
+    # to TRUE if all listed variables are TRUE.
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(VORBIS DEFAULT_MSG
+        OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR
+        OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
+else(NOT GP2XWIZ)
+    find_path(VORBIS_INCLUDE_DIR tremor/ivorbisfile.h)
+    find_library(VORBIS_LIBRARY NAMES vorbis_dec)
+    find_package_handle_standard_args(VORBIS DEFAULT_MSG
+        VORBIS_INCLUDE_DIR VORBIS_LIBRARY)
+endif(NOT GP2XWIZ)
+    
+if(VORBIS_FOUND)
+  if(NOT GP2XWIZ)
+     set(VORBIS_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
+           ${OGG_LIBRARY})
+  else(NOT GP2XWIZ)
+     set(VORBIS_LIBRARIES ${VORBIS_LIBRARY})
+  endif(NOT GP2XWIZ)
+else(VORBIS_FOUND)
+  set(VORBIS_LIBRARIES)
+endif(VORBIS_FOUND)
+
+mark_as_advanced(OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR)
+mark_as_advanced(OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
+

doc/mapformat.txt

@@ -1,7 +1,462 @@
-I'll try to quickly document the newest block format in here (might contain
-errors). Refer to the mapgen or minetestmapper script for the directory
-structure and file naming. There are two sector namings possible,
-sector/XXXXZZZZ and sector/XXX/ZZZ.
+=================================================
+Minetest World Format used as of 0.4.dev-20120322
+=================================================
+
+This applies to a world format carrying the block serialization version 22
+which is used at least in version 0.4.dev-20120322.
+
+The block serialization version used is 22. It does not fully specify every
+aspect of this format; if compliance with this format is to be checked, it
+needs to be done by detecting if the files and data indeed follows it.
+
+Legacy stuff
+=============
+Data can, in theory, be contained in the flat file directory structure
+described below in Version 17, but it is not officially supported. Also you
+may stumble upon all kinds of oddities in not-so-recent formats.
+
+Files
+======
+Everything is contained in a directory, the name of which is freeform, but
+often serves as the name of the world.
+
+Currently the authentication and ban data is stored on a per-world basis. It
+can be copied over from an old world to a newly created world.
+
+World
+|-- auth.txt ----- Authentication data
+|-- env_meta.txt - Environment metadata
+|-- ipban.txt ---- Banned ips/users
+|-- map_meta.txt - Map metadata
+|-- map.sqlite --- Map data
+|-- players ------ Player directory
+|   |-- player1 -- Player file
+|   '-- Foo ------ Player file
+`-- world.mt ----- World metadata
+
+auth.txt
+---------
+Contains authentication data, player per line.
+  <name>:<password hash>:<privilege1,...>
+Format of password hash is <name><password> SHA1'd, in the base64 encoding.
+
+Example lines:
+- Player "celeron55", no password, privileges "interact" and "shout":
+    celeron55::interact,shout
+- Player "Foo", password "bar", privilege "shout":
+    foo:iEPX+SQWIR3p67lj/0zigSWTKHg:shout
+- Player "bar", no password, no privileges:
+    bar::
+
+env_meta.txt
+-------------
+Simple global environment variables.
+Example content (added indentation):
+  game_time = 73471
+  time_of_day = 19118
+  EnvArgsEnd
+
+ipban.txt
+----------
+Banned IP addresses and usernames.
+Example content (added indentation):
+  123.456.78.9|foo
+  123.456.78.10|bar
+
+map_meta.txt
+-------------
+Simple global map variables.
+Example content (added indentation):
+  seed = 7980462765762429666
+  [end_of_params]
+
+map.sqlite
+-----------
+Map data.
+See Map File Format below.
+
+player1, Foo
+-------------
+Player data.
+Filename can be anything.
+See Player File Format below.
+
+world.mt
+---------
+World metadata.
+Example content (added indentation):
+  gameid = mesetint
+
+Player File Format
+===================
+
+- Should be pretty self-explanatory.
+- Note: position is in nodes * 10
+
+Example content (added indentation):
+  hp = 11
+  name = celeron55
+  pitch = 39.77
+  position = (-5231.97,15,1961.41)
+  version = 1
+  yaw = 101.37
+  PlayerArgsEnd
+  List main 32
+  Item default:torch 13
+  Item default:pick_steel 1 50112
+  Item experimental:tnt
+  Item default:cobble 99
+  Item default:pick_stone 1 13104
+  Item default:shovel_steel 1 51838
+  Item default:dirt 61
+  Item default:rail 78
+  Item default:coal_lump 3
+  Item default:cobble 99
+  Item default:leaves 22
+  Item default:gravel 52
+  Item default:axe_steel 1 2045
+  Item default:cobble 98
+  Item default:sand 61
+  Item default:water_source 94
+  Item default:glass 2
+  Item default:mossycobble
+  Item default:pick_steel 1 64428
+  Item animalmaterials:bone
+  Item default:sword_steel
+  Item default:sapling
+  Item default:sword_stone 1 10647
+  Item default:dirt 99
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  EndInventoryList
+  List craft 9
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  Empty
+  EndInventoryList
+  List craftpreview 1
+  Empty
+  EndInventoryList
+  List craftresult 1
+  Empty
+  EndInventoryList
+  EndInventory
+
+Map File Format
+================
+
+Minetest maps consist of MapBlocks, chunks of 16x16x16 nodes.
+
+In addition to the bulk node data, MapBlocks stored on disk also contain
+other things.
+
+History
+--------
+We need a bit of history in here. Initially Minetest stored maps in a
+format called the "sectors" format. It was a directory/file structure like
+this:
+  sectors2/XXX/ZZZ/YYYY
+For example, the MapBlock at (0,1,-2) was this file:
+  sectors2/000/ffd/0001
+
+Eventually Minetest outgrow this directory structure, as filesystems were
+struggling under the amount of files and directories.
+
+Large servers seriously needed a new format, and thus the base of the
+current format was invented, suggested by celeron55 and implemented by
+JacobF.
+
+SQLite3 was slammed in, and blocks files were directly inserted as blobs
+in a single table, indexed by integer primary keys, oddly mangled from
+coordinates.
+
+Today we know that SQLite3 allows multiple primary keys (which would allow
+storing coordinates separately), but the format has been kept unchanged for
+that part. So, this is where it has come.
+</history>
+
+So here goes
+-------------
+map.sqlite is an sqlite3 database, containg a single table, called
+"blocks". It looks like this:
+
+  CREATE TABLE `blocks` (`pos` INT NOT NULL PRIMARY KEY,`data` BLOB);
+
+The key
+--------
+"pos" is created from the three coordinates of a MapBlock using this
+algorithm, defined here in Python:
+
+  def getBlockAsInteger(p):
+      return int64(p[2]*16777216 + p[1]*4096 + p[0])
+  
+  def int64(u):
+      while u >= 2**63:
+          u -= 2**64
+      while u <= -2**63:
+          u += 2**64
+      return u
+  
+It can be converted the other way by using this code:
+
+  def getIntegerAsBlock(i):
+      x = unsignedToSigned(i % 4096, 2048)
+      i = int((i - x) / 4096)
+      y = unsignedToSigned(i % 4096, 2048)
+      i = int((i - y) / 4096)
+      z = unsignedToSigned(i % 4096, 2048)
+      return x,y,z
+  
+  def unsignedToSigned(i, max_positive):
+      if i < max_positive:
+          return i
+      else:
+          return i - 2*max_positive
+
+The blob
+---------
+The blob is the data that would have otherwise gone into the file.
+
+See below for description.
+
+MapBlock serialization format
+==============================
+NOTE: Byte order is MSB first (big-endian).
+NOTE: Zlib data is in such a format that Python's zlib at least can
+      directly decompress.
+
+u8 version
+- map format version number, this one is version 22
+
+u8 flags
+- Flag bitmasks:
+  - 0x01: is_underground: Should be set to 0 if there will be no light
+    obstructions above the block. If/when sunlight of a block is updated
+    and there is no block above it, this value is checked for determining
+    whether sunlight comes from the top.
+  - 0x02: day_night_differs: Whether the lighting of the block is different
+    on day and night. Only blocks that have this bit set are updated when
+    day transforms to night.
+  - 0x04: lighting_expired: If true, lighting is invalid and should be
+    updated.  If you can't calculate lighting in your generator properly,
+    you could try setting this 1 to everything and setting the uppermost
+    block in every sector as is_underground=0. I am quite sure it doesn't
+    work properly, though.
+  - 0x08: generated: True if the block has been generated. If false, block
+    is mostly filled with CONTENT_IGNORE and is likely to contain eg. parts
+    of trees of neighboring blocks.
+
+u8 content_width
+- Number of bytes in the content (param0) fields of nodes
+- Always 1
+
+u8 params_width
+- Number of bytes used for parameters per node
+- Always 2
+
+zlib-compressed node data:
+- content:
+  u8[4096]: param0 fields
+  u8[4096]: param1 fields
+  u8[4096]: param2 fields
+- The location of a node in each of those arrays is (z*16*16 + y*16 + x).
+
+zlib-compressed node metadata list
+- content:
+  u16 version (=1)
+  u16 count of metadata
+  foreach count:
+    u16 position (p.Z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + p.Y*MAP_BLOCKSIZE + p.X)
+    u16 type_id
+    u16 content_size
+    u8[content_size] (content of metadata)
+
+u16 mapblockobject_count
+- Always 0
+- Should be removed in version 23 (TODO)
+
+u8 static object version:
+- Always 0
+
+u16 static_object_count
+
+foreach static_object_count:
+  u8 type (object type-id)
+  s32 pos_x_nodes * 10000
+  s32 pos_y_nodes * 10000
+  s32 pos_z_nodes * 10000
+  u16 data_size
+  u8[data_size] data
+
+u32 timestamp
+- Timestamp when last saved, as seconds from starting the game.
+- 0xffffffff = invalid/unknown timestamp, nothing should be done with the time
+               difference when loaded
+
+u8 name-id-mapping version
+- Always 0
+
+u16 num_name_id_mappings
+
+foreach num_name_id_mappings
+  u16 id
+  u16 name_len
+  u8[name_len] name
+
+EOF.
+
+Format of nodes
+----------------
+A node is composed of the u8 fields param0, param1 and param2.
+
+The content id of a node is determined as so:
+- If param0 < 0x80,
+    content_id = param0
+- Otherwise
+    content_id = (param0<<4) + (param2>>4)
+
+The purpose of param1 and param2 depend on the definition of the node.
+
+The name-id-mapping
+--------------------
+The mapping maps node content ids to node names.
+
+Node metadata format
+---------------------
+
+1: Generic metadata
+  serialized inventory
+  u32 len
+  u8[len] text
+  u16 len
+  u8[len] owner
+  u16 len
+  u8[len] infotext
+  u16 len
+  u8[len] inventory drawspec
+  u8 allow_text_input (bool)
+  u8 removal_disabled (bool)
+  u8 enforce_owner (bool)
+  u32 num_vars
+  foreach num_vars
+    u16 len
+    u8[len] name
+    u32 len
+    u8[len] value
+
+14: Sign metadata
+  u16 text_len
+  u8[text_len] text
+
+15: Chest metadata
+  serialized inventory
+
+16: Furnace metadata
+  TBD
+
+17: Locked Chest metadata
+  u16 len
+  u8[len] owner
+  serialized inventory
+
+Static objects
+---------------
+Static objects are persistent freely moving objects in the world.
+
+Object types:
+1: Test object
+2: Item
+3: Rat (deprecated)
+4: Oerkki (deprecated)
+5: Firefly (deprecated)
+6: MobV2 (deprecated)
+7: LuaEntity
+
+1: Item:
+  u8 version
+  version 0:
+    u16 len
+    u8[len] itemstring
+
+7: LuaEntity:
+  u8 version
+  version 1:
+    u16 len
+    u8[len] entity name
+    u32 len
+    u8[len] static data
+    s16 hp
+    s32 velocity.x * 10000
+    s32 velocity.y * 10000
+    s32 velocity.z * 10000
+    s32 yaw * 1000
+
+Itemstring format
+------------------
+eg. 'default:dirt 5'
+eg. 'default:pick_wood 21323'
+eg. '"default:apple" 2'
+eg. 'default:apple'
+- The wear value in tools is 0...65535
+- There are also a number of older formats that you might stumble upon:
+eg. 'node "default:dirt" 5'
+eg. 'NodeItem default:dirt 5'
+eg. 'ToolItem WPick 21323'
+
+Inventory serialization format
+-------------------------------
+- The inventory serialization format is line-based
+- The newline character used is "\n"
+- The end condition of a serialized inventory is always "EndInventory\n"
+- All the slots in a list must always be serialized.
+
+Example (format does not include "---"):
+---
+List foo 4
+Item default:sapling
+Item default:sword_stone 1 10647
+Item default:dirt 99
+Empty
+EndInventoryList
+List bar 9
+Empty
+Empty
+Empty
+Empty
+Empty
+Empty
+Empty
+Empty
+Empty
+EndInventoryList
+EndInventory
+---
+
+==============================================
+Minetest World Format used as of 2011-05 or so
+==============================================
+
+Map data serialization format version 17.
+
+0.3.1 does not use this format, but a more recent one. This exists here for
+historical reasons.
+
+Directory structure:
+sectors/XXXXZZZZ or sectors2/XXX/ZZZ
+XXXX, ZZZZ, XXX and ZZZ being the hexadecimal X and Z coordinates.
+Under these, the block files are stored, called YYYY.
 
 There also exists files map_meta.txt and chunk_meta, that are used by the
 generator. If they are not found or invalid, the generator will currently

doc/minetest.6

@@ -61,9 +61,15 @@ Run dedicated server
 \-\-speedtests
 Run speed tests
 .TP
-\-\-verbose
+\-\-info
 Print more information to console
 .TP
+\-\-verbose
+Print even more information to console
+.TP
+\-\-trace
+Print enormous amounts of information to console
+.TP
 \-\-world <value>
 Set world path
 

doc/minetestserver.6

@@ -40,9 +40,15 @@ Same as --world (deprecated)
 \-\-port <value>
 Set network port (UDP) to use
 .TP
-\-\-verbose
+\-\-info
 Print more information to console
 .TP
+\-\-verbose
+Print even more information to console
+.TP
+\-\-trace
+Print enormous amounts of information to console
+.TP
 \-\-world <value>
 Set world path
 

games/mesetint/mods/give_initial_stuff/init.lua

@@ -1,12 +0,0 @@
-minetest.register_on_newplayer(function(player)
-	print("on_newplayer")
-	if minetest.setting_getbool("give_initial_stuff") then
-		print("giving give_initial_stuff to player")
-		player:get_inventory():add_item('main', 'default:pick_steel')
-		player:get_inventory():add_item('main', 'default:torch 99')
-		player:get_inventory():add_item('main', 'default:axe_steel')
-		player:get_inventory():add_item('main', 'default:shovel_steel')
-		player:get_inventory():add_item('main', 'default:cobble 99')
-	end
-end)
-

games/minimal/game.conf

@@ -0,0 +1,2 @@
+name = Minimal development test
+

games/minimal/mods/default/init.lua

@@ -1,446 +1,7 @@
 -- default (Minetest 0.4 mod)
 -- Most default stuff
 
--- Quick documentation about the API
--- =================================
---
--- Helper functions defined by builtin.lua:
--- dump2(obj, name="_", dumped={})
--- dump(obj, dumped={})
---
--- Mod load path
--- -------------
--- Generic:
--- $path_data/mods/
--- $path_userdata/usermods/
--- $mapdir/worldmods/
---
--- On a run-in-place version (eg. the distributed windows version):
--- minetest-0.4.x/data/mods/
--- minetest-0.4.x/usermods/
--- minetest-0.4.x/world/worldmods/
---
--- On an installed version on linux:
--- /usr/share/minetest/mods/
--- ~/.minetest/usermods
--- ~/.minetest/world/worldmods
---
--- Naming convention for registered textual names
--- ----------------------------------------------
--- "modname:<whatever>" (<whatever> can have characters a-zA-Z0-9_)
---
--- This is to prevent conflicting names from corrupting maps and is
--- enforced by the mod loader.
---
--- Example: mod "experimental", ideal item/node/entity name "tnt":
---          -> the name should be "experimental:tnt".
---
--- Enforcement can be overridden by prefixing the name with ":". This can
--- be used for overriding the registrations of some other mod.
---
--- Example: Any mod can redefine experimental:tnt by using the name
---          ":experimental:tnt" when registering it.
--- (also that mods is required to have "experimental" as a dependency)
---
--- The legacy mod uses ":" for maintaining backwards compatibility.
---
--- Textures
--- --------
--- Mods should generally prefix their textures with modname_, eg. given
--- the mod name "foomod", a texture could be called "default_foomod_superfurnace.png"
---
--- This is not crucial and a conflicting name will not corrupt maps.
---
--- Representations of simple things
--- --------------------------------
---
--- MapNode representation:
--- {name="name", param1=num, param2=num}
---
--- param1 and param2 are 8 bit and 4 bit integers, respectively. They
--- are reserved for certain automated functions. If you don't use these
--- functions, you can use them to store arbitrary values.
---
--- param1 is reserved for the engine when:
---   paramtype != "none"
--- param2 is reserved for the engine when any of these are used:
---   liquidtype == "flowing"
---   drawtype == "flowingliquid"
---   drawtype == "torchlike"
---   drawtype == "signlike"
---
--- Position representation:
--- {x=num, y=num, z=num}
---
--- stackstring/itemstring: A stack of items in serialized format.
--- eg. 'node "default:dirt" 5'
--- eg. 'tool "default:pick_wood" 21323'
--- eg. 'craft "default:apple" 2'
---
--- item: A stack of items in Lua table format.
--- eg. {name="default:dirt", count=1, wear=0, metadata=""} 
---     ^ a single dirt node
--- eg. {name="default:pick_wood", count=1, wear=21323, metadata=""}
---     ^ a wooden pick about 1/3 weared out
--- eg. {name="default:apple", count=1, wear=0, metadata=""}
---     ^ an apple.
---
--- Any time an item must be passed to a function, it can be an
--- ItemStack (see below), an itemstring or a table in the above format.
---
--- Global functions:
--- minetest.register_entity(name, prototype table)
--- minetest.register_abm(abm definition)
--- minetest.register_node(name, node definition)
--- minetest.register_tool(name, item definition)
--- minetest.register_craftitem(name, item definition)
--- minetest.register_alias(name, convert_to)
--- minetest.register_craft(recipe)
--- minetest.register_globalstep(func(dtime))
--- minetest.register_on_placenode(func(pos, newnode, placer))
--- minetest.register_on_dignode(func(pos, oldnode, digger))
--- minetest.register_on_punchnode(func(pos, node, puncher))
--- minetest.register_on_generated(func(minp, maxp))
--- minetest.register_on_newplayer(func(ObjectRef))
--- minetest.register_on_dieplayer(func(ObjectRef))
--- minetest.register_on_respawnplayer(func(ObjectRef))
--- ^ return true in func to disable regular player placement
--- ^ currently called _before_ repositioning of player occurs
--- minetest.register_on_chat_message(func(name, message))
--- minetest.add_to_creative_inventory(itemstring)
--- minetest.setting_get(name) -> string or nil
--- minetest.setting_getbool(name) -> boolean value or nil
--- minetest.chat_send_all(text)
--- minetest.chat_send_player(name, text)
--- minetest.get_player_privs(name) -> set of privs
--- minetest.get_inventory(location) -> InvRef
--- ^ location = eg. {type="player", name="celeron55"}
---                  {type="node", pos={x=, y=, z=}}
--- minetest.get_current_modname() -> string
--- minetest.get_modpath(modname) -> eg. "/home/user/.minetest/usermods/modname"
--- ^ Useful for loading additional .lua modules or static data from mod
--- minetest.get_worldpath(modname) -> eg. "/home/user/.minetest/world"
--- ^ Useful for storing custom data
---
--- minetest.debug(line)
--- ^ Goes to dstream
--- minetest.log(line)
--- minetest.log(loglevel, line)
--- ^ loglevel one of "error", "action", "info", "verbose"
---
--- minetest.digprop_constanttime(time)
--- minetest.digprop_stonelike(toughness)
--- minetest.digprop_dirtlike(toughness)
--- minetest.digprop_gravellike(toughness)
--- minetest.digprop_woodlike(toughness)
--- minetest.digprop_leaveslike(toughness)
--- minetest.digprop_glasslike(toughness)
---
--- Global objects:
--- minetest.env - environment reference
---
--- Global tables:
--- minetest.registered_items
--- ^ List of registered items, indexed by name
--- minetest.registered_nodes
--- ^ List of registered node definitions, indexed by name
--- minetest.registered_craftitems
--- ^ List of registered craft item definitions, indexed by name
--- minetest.registered_tools
--- ^ List of registered tool definitions, indexed by name
--- minetest.registered_entities
--- ^ List of registered entity prototypes, indexed by name
--- minetest.object_refs
--- ^ List of object references, indexed by active object id
--- minetest.luaentities
--- ^ List of lua entities, indexed by active object id
---
--- EnvRef is basically ServerEnvironment and ServerMap combined.
--- EnvRef methods:
--- - add_node(pos, node)
--- - remove_node(pos)
--- - get_node(pos)
---   ^ Returns {name="ignore", ...} for unloaded area
--- - get_node_or_nil(pos)
---   ^ Returns nil for unloaded area
--- - get_node_light(pos, timeofday) -> 0...15 or nil
---   ^ timeofday: nil = current time, 0 = night, 0.5 = day
--- - add_entity(pos, name): Returns ObjectRef or nil if failed
--- - add_item(pos, itemstring)
--- - add_rat(pos)
--- - add_firefly(pos)
--- - get_meta(pos) -- Get a NodeMetaRef at that position
--- - get_player_by_name(name) -- Get an ObjectRef to a player
--- - get_objects_inside_radius(pos, radius)
--- - set_timeofday(val): val: 0...1; 0 = midnight, 0.5 = midday
--- - get_timeofday()
---
--- NodeMetaRef (this stuff is subject to change in a future version)
--- - get_type()
--- - allows_text_input()
--- - set_text(text) -- eg. set the text of a sign
--- - get_text()
--- - get_owner()
--- - set_owner(string)
--- Generic node metadata specific:
--- - set_infotext(infotext)
--- - get_inventory() -> InvRef
--- - set_inventory_draw_spec(string)
--- - set_allow_text_input(bool)
--- - set_allow_removal(bool)
--- - set_enforce_owner(bool)
--- - is_inventory_modified()
--- - reset_inventory_modified()
--- - is_text_modified()
--- - reset_text_modified()
--- - set_string(name, value)
--- - get_string(name)
---
--- ObjectRef is basically ServerActiveObject.
--- ObjectRef methods:
--- - remove(): remove object (after returning from Lua)
--- - getpos() -> {x=num, y=num, z=num}
--- - setpos(pos); pos={x=num, y=num, z=num}
--- - moveto(pos, continuous=false): interpolated move
--- - punch(puncher, time_from_last_punch, tool_capabilities, direction)
---   ^ puncher = an another ObjectRef,
---   ^ time_from_last_punch = time since last punch action of the puncher
--- - right_click(clicker); clicker = an another ObjectRef
--- - get_hp(): returns number of hitpoints (2 * number of hearts)
--- - set_hp(hp): set number of hitpoints (2 * number of hearts)
--- - get_inventory() -> InvRef
--- - get_wield_list(): returns the name of the inventory list the wielded item is in
--- - get_wield_index(): returns the index of the wielded item
--- - get_wielded_item() -> ItemStack
--- - set_wielded_item(item): replaces the wielded item, returns true if successful
--- LuaEntitySAO-only: (no-op for other objects)
--- - setvelocity({x=num, y=num, z=num})
--- - getvelocity() -> {x=num, y=num, z=num}
--- - setacceleration({x=num, y=num, z=num})
--- - getacceleration() -> {x=num, y=num, z=num}
--- - setyaw(radians)
--- - getyaw() -> radians
--- - settexturemod(mod)
--- - setsprite(p={x=0,y=0}, num_frames=1, framelength=0.2,
--- -           select_horiz_by_yawpitch=false)
--- - ^ Select sprite from spritesheet with optional animation and DM-style
--- -   texture selection based on yaw relative to camera
--- - set_armor_groups({group1=rating, group2=rating, ...})
--- - get_entity_name() (DEPRECATED: Will be removed in a future version)
--- - get_luaentity()
--- Player-only: (no-op for other objects)
--- - get_player_name(): will return nil if is not a player
--- - get_look_dir(): get camera direction as a unit vector
--- - get_look_pitch(): pitch in radians
--- - get_look_yaw(): yaw in radians (wraps around pretty randomly as of now)
---
--- InvRef methods:
--- - get_size(listname): get size of a list
--- - set_size(listname, size): set size of a list
--- - get_stack(listname, i): get a copy of stack index i in list
--- - set_stack(listname, i, stack): copy stack to index i in list
--- - get_list(listname): return full list
--- - set_list(listname, list): set full list (size will not change)
--- - add_item(listname, stack): add item somewhere in list, returns leftover ItemStack
--- - room_for_item(listname, stack): returns true if the stack of items
---     can be fully added to the list
--- - contains_item(listname, stack): returns true if the stack of items
---     can be fully taken from the list
---   remove_item(listname, stack): take as many items as specified from the list,
---     returns the items that were actually removed (as an ItemStack)
---
--- ItemStack methods:
--- - is_empty(): return true if stack is empty
--- - get_name(): returns item name (e.g. "default:stone")
--- - get_count(): returns number of items on the stack
--- - get_wear(): returns tool wear (0-65535), 0 for non-tools
--- - get_metadata(): returns metadata (a string attached to an item stack)
--- - clear(): removes all items from the stack, making it empty
--- - replace(item): replace the contents of this stack (item can also
---     be an itemstring or table)
--- - to_string(): returns the stack in itemstring form
--- - to_table(): returns the stack in Lua table form
--- - get_stack_max(): returns the maximum size of the stack (depends on the item)
--- - get_free_space(): returns get_stack_max() - get_count()
--- - is_known(): returns true if the item name refers to a defined item type
--- - get_definition(): returns the item definition table
--- - get_tool_capabilities(): returns the digging properties of the item,
---   ^ or those of the hand if none are defined for this item type
--- - add_wear(amount): increases wear by amount if the item is a tool
--- - add_item(item): put some item or stack onto this stack,
---   ^ returns leftover ItemStack
--- - item_fits(item): returns true if item or stack can be fully added to this one
--- - take_item(n): take (and remove) up to n items from this stack
---   ^ returns taken ItemStack
---   ^ if n is omitted, n=1 is used
--- - peek_item(n): copy (don't remove) up to n items from this stack
---   ^ returns copied ItemStack
---   ^ if n is omitted, n=1 is used
---
--- Registered entities:
--- - Functions receive a "luaentity" as self:
---   - It has the member .name, which is the registered name ("mod:thing")
---   - It has the member .object, which is an ObjectRef pointing to the object
---   - The original prototype stuff is visible directly via a metatable
--- - Callbacks:
---   - on_activate(self, staticdata)
---   - on_step(self, dtime)
---   - on_punch(self, hitter)
---   - on_rightclick(self, clicker)
---   - get_staticdata(self)
---     ^ return string that will be passed to on_activate when the object
---       is created next time
---
--- Entity prototype table:
--- {
---     physical = true,
---     collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
---     visual = "cube"/"sprite",
---     visual_size = {x=1, y=1},
---     textures = {texture,texture,texture,texture,texture,texture},
---     spritediv = {x=1, y=1},
---     initial_sprite_basepos = {x=0, y=0},
---     on_activate = function(self, staticdata),
---     on_step = function(self, dtime),
---     on_punch = function(self, hitter),
---     on_rightclick = function(self, clicker),
---     get_staticdata = function(self),
---     # Also you can define arbitrary member variables here
---     myvariable = whatever,
--- }
---
--- Item definition options (register_node, register_craftitem, register_tool)
--- {
---     description = "Steel Axe",
---     groups = {}, -- key=name, value=rating; rating=1..3.
---                     if rating not applicable, use 1.
---                     eg. {wool=1, fluffy=3}
---                         {soil=2, outerspace=1, crumbly=1}
---                         {bendy=2, snappy=1},
---                         {hard=1, metal=1, spikes=1}
---     inventory_image = "default_tool_steelaxe.png",
---     wield_image = "",
---     wield_scale = {x=1,y=1,z=1},
---     stack_max = 99,
---     liquids_pointable = false,
---     tool_capabilities = {
---         full_punch_interval = 1.0,
---         max_drop_level=0,
---         groupcaps={
---             -- For example:
---             fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
---             snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
---             choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
---         }
---     }
---     on_drop = func(item, dropper, pos),
---     on_place = func(item, placer, pointed_thing),
---     on_use = func(item, user, pointed_thing),
--- }
---
--- Node definition options (register_node):
--- {
---     <all fields allowed in item definitions>,
---     drawtype = "normal",
---     visual_scale = 1.0,
---     tile_images = {"default_unknown_block.png"},
---     special_materials = {
---         {image="", backface_culling=true},
---         {image="", backface_culling=true},
---     },
---     alpha = 255,
---     post_effect_color = {a=0, r=0, g=0, b=0},
---     paramtype = "none",
---     paramtype2 = "none",
---     is_ground_content = false,
---     sunlight_propagates = false,
---     walkable = true,
---     pointable = true,
---     diggable = true,
---     climbable = false,
---     buildable_to = false,
---     drop = "",
---     -- alternatively drop = { max_items = ..., items = { ... } }
---     metadata_name = "",
---     liquidtype = "none",
---     liquid_alternative_flowing = "",
---     liquid_alternative_source = "",
---     liquid_viscosity = 0,
---     light_source = 0,
---     damage_per_second = 0,
---     selection_box = {type="regular"},
---     legacy_facedir_simple = false, -- Support maps made in and before January 2012
---     legacy_wallmounted = false, -- Support maps made in and before January 2012
--- }
---
--- Recipe:
--- {
---     output = 'default:pick_stone',
---     recipe = {
---         {'default:cobble', 'default:cobble', 'default:cobble'},
---         {'', 'default:stick', ''},
---         {'', 'default:stick', ''},
---     },
---     replacements = <optional list of item pairs,
---                     replace one input item with another item on crafting>
--- }
---
--- Recipe (shapeless):
--- {
---     type = "shapeless",
---     output = 'mushrooms:mushroom_stew',
---     recipe = {
---         "mushrooms:bowl",
---         "mushrooms:mushroom_brown",
---         "mushrooms:mushroom_red",
---     },
---     replacements = <optional list of item pairs,
---                     replace one input item with another item on crafting>
--- }
---
--- Recipe (tool repair):
--- {
---     type = "toolrepair",
---     additional_wear = -0.02,
--- }
---
--- Recipe (cooking):
--- {
---     type = "cooking",
---     output = "default:glass",
---     recipe = "default:sand",
---     cooktime = 3,
--- }
---
--- Recipe (furnace fuel):
--- {
---     type = "fuel",
---     recipe = "default:leaves",
---     burntime = 1,
--- }
---
--- ABM (ActiveBlockModifier) definition:
--- {
---     nodenames = {"default:lava_source"},
---     neighbors = {"default:water_source", "default:water_flowing"}, -- (any of these)
---      ^ If left out or empty, any neighbor will do
---      ^ This might get removed in the future
---     interval = 1.0, -- (operation interval)
---     chance = 1, -- (chance of trigger is 1.0/this)
---     action = func(pos, node, active_object_count, active_object_count_wider),
--- }
---
--- Item groups:
--- - Groups always have a rating associated with them. If there is no
---   useful meaning for a rating for a given group, it shall be 1.
--- - When not defined, the rating of a group defaults to 0.
---
--- Special groups:
--- - dig_immediate:
---   - 2: node is removed without tool wear after 1 second or so
---   - 3: node is removed without tool wear immediately (like a torch)
--- - level: Can be used to give an additional sense of progression in the game.
---   - 0 is something that is directly accessible at the start of gameplay
+-- The API documentation in here was moved into doc/lua_api.txt
 
 WATER_ALPHA = 160
 WATER_VISC = 1
@@ -450,6 +11,9 @@ LIGHT_MAX = 14
 -- Definitions made by this mod that other mods can use too
 default = {}
 
+-- Load other files
+dofile(minetest.get_modpath("default").."/mapgen.lua")
+
 --
 -- Tool definition
 --
@@ -463,10 +27,10 @@ minetest.register_item(":", {
 		full_punch_interval = 1.0,
 		max_drop_level = 0,
 		groupcaps = {
-			fleshy = {times={[2]=2.00, [3]=1.00}, maxwear=0, maxlevel=1},
-			crumbly = {times={[3]=0.70}, maxwear=0, maxlevel=1},
-			snappy = {times={[3]=0.40}, maxwear=0, maxlevel=1},
-			oddly_breakable_by_hand = {times={[1]=3.50,[2]=2.00,[3]=0.70}, maxwear=0, maxlevel=3},
+			fleshy = {times={[2]=2.00, [3]=1.00}, uses=0, maxlevel=1},
+			crumbly = {times={[2]=3.00, [3]=0.70}, uses=0, maxlevel=1},
+			snappy = {times={[3]=0.40}, uses=0, maxlevel=1},
+			oddly_breakable_by_hand = {times={[1]=7.00,[2]=4.00,[3]=1.40}, uses=0, maxlevel=3},
 		}
 	}
 })
@@ -477,7 +41,7 @@ minetest.register_tool("default:pick_wood", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			cracky={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
+			cracky={times={[2]=2.00, [3]=1.20}, uses=10, maxlevel=1}
 		}
 	},
 })
@@ -487,7 +51,7 @@ minetest.register_tool("default:pick_stone", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			cracky={times={[1]=1.50, [2]=0.80, [3]=0.60}, maxwear=0.05, maxlevel=1}
+			cracky={times={[1]=2.00, [2]=1.20, [3]=0.80}, uses=20, maxlevel=1}
 		}
 	},
 })
@@ -497,7 +61,7 @@ minetest.register_tool("default:pick_steel", {
 	tool_capabilities = {
 		max_drop_level=1,
 		groupcaps={
-			cracky={times={[1]=1.00, [2]=0.60, [3]=0.40}, maxwear=0.1, maxlevel=2}
+			cracky={times={[1]=4.00, [2]=1.60, [3]=1.00}, uses=10, maxlevel=2}
 		}
 	},
 })
@@ -508,9 +72,9 @@ minetest.register_tool("default:pick_mese", {
 		full_punch_interval = 1.0,
 		max_drop_level=3,
 		groupcaps={
-			cracky={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3},
-			crumbly={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3},
-			snappy={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3}
+			cracky={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
+			crumbly={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
+			snappy={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3}
 		}
 	},
 })
@@ -520,7 +84,7 @@ minetest.register_tool("default:shovel_wood", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			crumbly={times={[1]=1.50, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=1}
+			crumbly={times={[1]=2.00, [2]=0.80, [3]=0.50}, uses=10, maxlevel=1}
 		}
 	},
 })
@@ -530,7 +94,7 @@ minetest.register_tool("default:shovel_stone", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			crumbly={times={[1]=0.80, [2]=0.50, [3]=0.30}, maxwear=0.05, maxlevel=1}
+			crumbly={times={[1]=1.20, [2]=0.50, [3]=0.30}, uses=20, maxlevel=1}
 		}
 	},
 })
@@ -540,7 +104,7 @@ minetest.register_tool("default:shovel_steel", {
 	tool_capabilities = {
 		max_drop_level=1,
 		groupcaps={
-			crumbly={times={[1]=0.50, [2]=0.35, [3]=0.30}, maxwear=0.1, maxlevel=2}
+			crumbly={times={[1]=1.00, [2]=0.70, [3]=0.60}, uses=10, maxlevel=2}
 		}
 	},
 })
@@ -550,8 +114,8 @@ minetest.register_tool("default:axe_wood", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			choppy={times={[2]=1.40, [3]=0.80}, maxwear=0.1, maxlevel=1},
-			fleshy={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
+			choppy={times={[2]=1.40, [3]=0.80}, uses=10, maxlevel=1},
+			fleshy={times={[2]=1.50, [3]=0.80}, uses=10, maxlevel=1}
 		}
 	},
 })
@@ -561,8 +125,8 @@ minetest.register_tool("default:axe_stone", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			choppy={times={[1]=1.50, [2]=1.00, [3]=0.60}, maxwear=0.05, maxlevel=1},
-			fleshy={times={[2]=1.30, [3]=0.70}, maxwear=0.05, maxlevel=1}
+			choppy={times={[1]=1.50, [2]=1.00, [3]=0.60}, uses=20, maxlevel=1},
+			fleshy={times={[2]=1.30, [3]=0.70}, uses=20, maxlevel=1}
 		}
 	},
 })
@@ -572,8 +136,8 @@ minetest.register_tool("default:axe_steel", {
 	tool_capabilities = {
 		max_drop_level=1,
 		groupcaps={
-			choppy={times={[1]=1.00, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=2},
-			fleshy={times={[2]=1.10, [3]=0.60}, maxwear=0.03, maxlevel=1}
+			choppy={times={[1]=2.00, [2]=1.60, [3]=1.00}, uses=10, maxlevel=2},
+			fleshy={times={[2]=1.10, [3]=0.60}, uses=40, maxlevel=1}
 		}
 	},
 })
@@ -584,9 +148,9 @@ minetest.register_tool("default:sword_wood", {
 		full_punch_interval = 1.0,
 		max_drop_level=0,
 		groupcaps={
-			fleshy={times={[2]=1.10, [3]=0.60}, maxwear=0.1, maxlevel=1},
-			snappy={times={[2]=1.00, [3]=0.50}, maxwear=0.1, maxlevel=1},
-			choppy={times={[3]=1.00}, maxwear=0.05, maxlevel=0}
+			fleshy={times={[2]=1.10, [3]=0.60}, uses=10, maxlevel=1},
+			snappy={times={[2]=1.00, [3]=0.50}, uses=10, maxlevel=1},
+			choppy={times={[3]=1.00}, uses=20, maxlevel=0}
 		}
 	}
 })
@@ -597,9 +161,9 @@ minetest.register_tool("default:sword_stone", {
 		full_punch_interval = 1.0,
 		max_drop_level=0,
 		groupcaps={
-			fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-			snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-			choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
+			fleshy={times={[2]=0.80, [3]=0.40}, uses=20, maxlevel=1},
+			snappy={times={[2]=0.80, [3]=0.40}, uses=20, maxlevel=1},
+			choppy={times={[3]=0.90}, uses=20, maxlevel=0}
 		}
 	}
 })
@@ -610,9 +174,9 @@ minetest.register_tool("default:sword_steel", {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
 		groupcaps={
-			fleshy={times={[1]=1.00, [2]=0.40, [3]=0.20}, maxwear=0.1, maxlevel=2},
-			snappy={times={[2]=0.70, [3]=0.30}, maxwear=0.03, maxlevel=1},
-			choppy={times={[3]=0.70}, maxwear=0.03, maxlevel=0}
+			fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=10, maxlevel=2},
+			snappy={times={[2]=0.70, [3]=0.30}, uses=40, maxlevel=1},
+			choppy={times={[3]=0.70}, uses=40, maxlevel=0}
 		}
 	}
 })
@@ -1062,6 +626,79 @@ minetest.register_craft({
 -- Node definitions
 --
 
+-- Default node sounds
+
+function default.node_sound_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="", gain=1.0}
+	table.dug = table.dug or
+			{name="default_dug_node", gain=1.0}
+	return table
+end
+
+function default.node_sound_stone_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_hard_footstep", gain=0.2}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_dirt_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="", gain=0.5}
+	--table.dug = table.dug or
+	--		{name="default_dirt_break", gain=0.5}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_sand_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_grass_footstep", gain=0.25}
+	--table.dug = table.dug or
+	--		{name="default_dirt_break", gain=0.25}
+	table.dug = table.dug or
+			{name="", gain=0.25}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_wood_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_hard_footstep", gain=0.3}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_leaves_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_grass_footstep", gain=0.25}
+	table.dig = table.dig or
+			{name="default_dig_crumbly", gain=0.4}
+	table.dug = table.dug or
+			{name="", gain=1.0}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_glass_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_stone_footstep", gain=0.25}
+	table.dug = table.dug or
+			{name="default_break_glass", gain=1.0}
+	default.node_sound_defaults(table)
+	return table
+end
+
+--
+
 minetest.register_node("default:stone", {
 	description = "Stone",
 	tile_images = {"default_stone.png"},
@@ -1069,6 +706,7 @@ minetest.register_node("default:stone", {
 	groups = {cracky=3},
 	drop = 'default:cobble',
 	legacy_mineral = true,
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:stone_with_coal", {
@@ -1077,6 +715,7 @@ minetest.register_node("default:stone_with_coal", {
 	is_ground_content = true,
 	groups = {cracky=3},
 	drop = 'default:coal_lump',
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:stone_with_iron", {
@@ -1085,6 +724,7 @@ minetest.register_node("default:stone_with_iron", {
 	is_ground_content = true,
 	groups = {cracky=3},
 	drop = 'default:iron_lump',
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:dirt_with_grass", {
@@ -1093,6 +733,9 @@ minetest.register_node("default:dirt_with_grass", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'default:dirt',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.4},
+	}),
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
@@ -1101,6 +744,9 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'default:dirt',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.4},
+	}),
 })
 
 minetest.register_node("default:dirt", {
@@ -1108,6 +754,7 @@ minetest.register_node("default:dirt", {
 	tile_images = {"default_dirt.png"},
 	is_ground_content = true,
 	groups = {crumbly=3},
+	sounds = default.node_sound_dirt_defaults(),
 })
 
 minetest.register_node("default:sand", {
@@ -1115,6 +762,7 @@ minetest.register_node("default:sand", {
 	tile_images = {"default_sand.png"},
 	is_ground_content = true,
 	groups = {crumbly=3},
+	sounds = default.node_sound_sand_defaults(),
 })
 
 minetest.register_node("default:gravel", {
@@ -1122,6 +770,9 @@ minetest.register_node("default:gravel", {
 	tile_images = {"default_gravel.png"},
 	is_ground_content = true,
 	groups = {crumbly=2},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_gravel_footstep", gain=0.45},
+	}),
 })
 
 minetest.register_node("default:sandstone", {
@@ -1130,6 +781,7 @@ minetest.register_node("default:sandstone", {
 	is_ground_content = true,
 	groups = {crumbly=2,cracky=2},
 	drop = 'default:sand',
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:clay", {
@@ -1138,6 +790,9 @@ minetest.register_node("default:clay", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'default:clay_lump 4',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = "",
+	}),
 })
 
 minetest.register_node("default:brick", {
@@ -1146,6 +801,7 @@ minetest.register_node("default:brick", {
 	is_ground_content = true,
 	groups = {cracky=3},
 	drop = 'default:clay_brick 4',
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:tree", {
@@ -1153,6 +809,7 @@ minetest.register_node("default:tree", {
 	tile_images = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	is_ground_content = true,
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:jungletree", {
@@ -1160,6 +817,7 @@ minetest.register_node("default:jungletree", {
 	tile_images = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
 	is_ground_content = true,
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:junglegrass", {
@@ -1172,6 +830,7 @@ minetest.register_node("default:junglegrass", {
 	paramtype = "light",
 	walkable = false,
 	groups = {snappy=3},
+	sounds = default.node_sound_leaves_defaults(),
 })
 
 minetest.register_node("default:leaves", {
@@ -1196,6 +855,7 @@ minetest.register_node("default:leaves", {
 			}
 		}
 	},
+	sounds = default.node_sound_leaves_defaults(),
 })
 
 minetest.register_node("default:cactus", {
@@ -1203,6 +863,7 @@ minetest.register_node("default:cactus", {
 	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	is_ground_content = true,
 	groups = {snappy=2,choppy=3},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:papyrus", {
@@ -1215,6 +876,7 @@ minetest.register_node("default:papyrus", {
 	is_ground_content = true,
 	walkable = false,
 	groups = {snappy=3},
+	sounds = default.node_sound_leaves_defaults(),
 })
 
 minetest.register_node("default:bookshelf", {
@@ -1222,6 +884,7 @@ minetest.register_node("default:bookshelf", {
 	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
 	is_ground_content = true,
 	groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:glass", {
@@ -1233,6 +896,7 @@ minetest.register_node("default:glass", {
 	sunlight_propagates = true,
 	is_ground_content = true,
 	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("default:fence_wood", {
@@ -1248,6 +912,7 @@ minetest.register_node("default:fence_wood", {
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:rail", {
@@ -1285,6 +950,7 @@ minetest.register_node("default:ladder", {
 	},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
 	legacy_wallmounted = true,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:wood", {
@@ -1292,19 +958,22 @@ minetest.register_node("default:wood", {
 	tile_images = {"default_wood.png"},
 	is_ground_content = true,
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese",
 	tile_images = {"default_mese.png"},
 	is_ground_content = true,
-	groups = {cracky=1},
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:cloud", {
 	description = "Cloud",
 	tile_images = {"default_cloud.png"},
 	is_ground_content = true,
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:water_flowing", {
@@ -1420,6 +1089,7 @@ minetest.register_node("default:torch", {
 	},
 	groups = {choppy=2,dig_immediate=3},
 	legacy_wallmounted = true,
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:sign_wall", {
@@ -1441,6 +1111,7 @@ minetest.register_node("default:sign_wall", {
 	},
 	groups = {choppy=2,dig_immediate=2},
 	legacy_wallmounted = true,
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:chest", {
@@ -1451,6 +1122,7 @@ minetest.register_node("default:chest", {
 	metadata_name = "chest",
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:chest_locked", {
@@ -1461,6 +1133,7 @@ minetest.register_node("default:chest_locked", {
 	metadata_name = "locked_chest",
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("default:furnace", {
@@ -1471,6 +1144,7 @@ minetest.register_node("default:furnace", {
 	metadata_name = "furnace",
 	groups = {cracky=2},
 	legacy_facedir_simple = true,
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:cobble", {
@@ -1478,6 +1152,7 @@ minetest.register_node("default:cobble", {
 	tile_images = {"default_cobble.png"},
 	is_ground_content = true,
 	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:mossycobble", {
@@ -1485,6 +1160,7 @@ minetest.register_node("default:mossycobble", {
 	tile_images = {"default_mossycobble.png"},
 	is_ground_content = true,
 	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:steelblock", {
@@ -1492,6 +1168,7 @@ minetest.register_node("default:steelblock", {
 	tile_images = {"default_steel_block.png"},
 	is_ground_content = true,
 	groups = {snappy=1,bendy=2},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:nyancat", {
@@ -1502,6 +1179,7 @@ minetest.register_node("default:nyancat", {
 	paramtype2 = "facedir",
 	groups = {cracky=2},
 	legacy_facedir_simple = true,
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:nyancat_rainbow", {
@@ -1509,6 +1187,7 @@ minetest.register_node("default:nyancat_rainbow", {
 	tile_images = {"default_nc_rb.png"},
 	inventory_image = "default_nc_rb.png",
 	groups = {cracky=2},
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:sapling", {
@@ -1521,6 +1200,7 @@ minetest.register_node("default:sapling", {
 	paramtype = "light",
 	walkable = false,
 	groups = {snappy=2,dig_immediate=3},
+	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:apple", {
@@ -1534,6 +1214,7 @@ minetest.register_node("default:apple", {
 	walkable = false,
 	groups = {fleshy=3,dig_immediate=3},
 	on_use = minetest.item_eat(4),
+	sounds = default.node_sound_defaults(),
 })
 
 --
@@ -1620,6 +1301,29 @@ minetest.add_to_creative_inventory('default:water_source')
 minetest.add_to_creative_inventory('default:lava_source')
 minetest.add_to_creative_inventory('default:ladder')
 
+--
+-- Aliases for the current map generator outputs
+--
+
+minetest.register_alias("mapgen_air", "air")
+minetest.register_alias("mapgen_stone", "default:stone")
+minetest.register_alias("mapgen_tree", "default:tree")
+minetest.register_alias("mapgen_leaves", "default:leaves")
+minetest.register_alias("mapgen_apple", "default:apple")
+minetest.register_alias("mapgen_water_source", "default:water_source")
+minetest.register_alias("mapgen_dirt", "default:dirt")
+minetest.register_alias("mapgen_sand", "default:sand")
+minetest.register_alias("mapgen_gravel", "default:gravel")
+minetest.register_alias("mapgen_clay", "default:clay")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
+minetest.register_alias("mapgen_cobble", "default:cobble")
+minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
+minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
+minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
+minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
+minetest.register_alias("mapgen_mese", "default:mese")
+
 --
 -- Some common functions
 --

games/minimal/mods/default/mapgen.lua

@@ -0,0 +1,114 @@
+-- minetest/default/mapgen.lua
+
+--
+-- Aliases for map generator outputs
+--
+
+minetest.register_alias("mapgen_air", "air")
+minetest.register_alias("mapgen_stone", "default:stone")
+minetest.register_alias("mapgen_tree", "default:tree")
+minetest.register_alias("mapgen_leaves", "default:leaves")
+minetest.register_alias("mapgen_apple", "default:apple")
+minetest.register_alias("mapgen_water_source", "default:water_source")
+minetest.register_alias("mapgen_dirt", "default:dirt")
+minetest.register_alias("mapgen_sand", "default:sand")
+minetest.register_alias("mapgen_gravel", "default:gravel")
+minetest.register_alias("mapgen_clay", "default:clay")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
+minetest.register_alias("mapgen_cobble", "default:cobble")
+minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
+minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
+minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
+minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
+minetest.register_alias("mapgen_mese", "default:mese")
+
+--
+-- Ore generation
+--
+
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, ore_per_chunk, height_min, height_max)
+	if maxp.y < height_min or minp.y > height_max then
+		return
+	end
+	local y_min = math.max(minp.y, height_min)
+	local y_max = math.min(maxp.y, height_max)
+	local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
+	local pr = PseudoRandom(seed)
+	local num_chunks = math.floor(chunks_per_volume * volume)
+	local chunk_size = 3
+	if ore_per_chunk <= 4 then
+		chunk_size = 2
+	end
+	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
+	--print("generate_ore num_chunks: "..dump(num_chunks))
+	for i=1,num_chunks do
+		local y0 = pr:next(y_min, y_max-chunk_size+1)
+		if y0 >= height_min and y0 <= height_max then
+			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
+			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
+			local p0 = {x=x0, y=y0, z=z0}
+			for x1=0,chunk_size-1 do
+			for y1=0,chunk_size-1 do
+			for z1=0,chunk_size-1 do
+				if pr:next(1,inverse_chance) == 1 then
+					local x2 = x0+x1
+					local y2 = y0+y1
+					local z2 = z0+z1
+					local p2 = {x=x2, y=y2, z=z2}
+					if minetest.env:get_node(p2).name == wherein then
+						minetest.env:set_node(p2, {name=name})
+					end
+				end
+			end
+			end
+			end
+		end
+	end
+	--print("generate_ore done")
+end
+
+minetest.register_on_generated(function(minp, maxp, seed)
+	generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed,   1/8/8/8,    5, -31000,  64)
+	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/16/16/16, 5,   -5,   7)
+	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/12/12/12, 5, -16,   -5)
+	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/9/9/9,    5, -31000, -17)
+	-- Generate clay
+	if maxp.y >= 2 and minp.y <= 0 then
+		-- Assume X and Z lengths are equal
+		local divlen = 4
+		local divs = (maxp.x-minp.x)/divlen+1;
+		for divx=0+1,divs-1-1 do
+		for divz=0+1,divs-1-1 do
+			local cx = minp.x + math.floor((divx+0.5)*divlen)
+			local cz = minp.z + math.floor((divz+0.5)*divlen)
+			if minetest.env:get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
+					minetest.env:get_node({x=cx,y=0,z=cz}).name == "default:sand" then
+				local is_shallow = true
+				local num_water_around = 0
+				if minetest.env:get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+					num_water_around = num_water_around + 1 end
+				if minetest.env:get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+					num_water_around = num_water_around + 1 end
+				if minetest.env:get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
+					num_water_around = num_water_around + 1 end
+				if minetest.env:get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
+					num_water_around = num_water_around + 1 end
+				if num_water_around >= 2 then
+					is_shallow = false
+				end	
+				if is_shallow then
+					for x1=-divlen,divlen do
+					for z1=-divlen,divlen do
+						if minetest.env:get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
+							minetest.env:set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
+						end
+					end
+					end
+				end
+			end
+		end
+		end
+	end
+end)
+