Update version in CMakeLists.txt to 0.4.dev-20111201-0

Conflicts:

	src/test.cpp

.gitignore

@@ -21,3 +21,7 @@ src/jthread/libjthread.a
 debug.txt
 bin/debug.txt
 minetestmapper/map.png
+locale/
+src/lua/build/
+src/lua/CMakeFiles/
+*bak*

CMakeLists.txt

@@ -9,8 +9,8 @@ project(minetest)
 
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH dev-20111201-0)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -66,7 +66,7 @@ elseif(UNIX) # Linux, BSD etc
 	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
-install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 

README.txt

@@ -54,12 +54,12 @@ 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
+$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev
 
 Download source, extract (this is the URL to the latest of source repository, which might not work at all times):
-$ wget https://bitbucket.org/celeron55/minetest/get/tip.tar.gz
-$ tar xf tip.tar.gz
-$ cd minetest
+$ wget https://github.com/celeron55/minetest/tarball/master -O master.tar.gz
+$ tar xf master.tar.gz
+$ cd celeron55-minetest-286edd4 (or similar)
 
 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=1
@@ -73,7 +73,7 @@ $ ./minetest
 - If you want to install it system-wide (or are making a distribution package), you will want to use -DRUN_IN_PLACE=0
 - You can build a bare server or a bare client by specifying -DBUILD_CLIENT=0 or -DBUILD_SERVER=0
 - You can select between Release and Debug build by -DCMAKE_BUILD_TYPE=<Debug or Release>
-  - Note that the Debug build is considerably slower
+  - Debug build is slower, but gives much more useful output in a debugger
 
 Compiling on Windows:
 ---------------------
@@ -90,16 +90,18 @@ Compiling on Windows:
 		http://www.winimage.com/zLibDll/index.html
 	* Zlib library (zlibwapi.lib and zlibwapi.dll from zlib125dll.zip):
 		http://www.winimage.com/zLibDll/index.html
-	* gettext bibrary and tools:
+	* Optional: gettext bibrary and tools:
 		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
 - Steps:
 	- Select a directory called DIR hereafter in which you will operate.
 	- Make sure you have CMake and a compiler installed.
-	- Download all the other stuff to DIR and extract them into there. All those
-	  packages contain a nice base directory in them, which should end up being
-	  the direct subdirectories of DIR.
+	- Download all the other stuff to DIR and extract them into there.
+	  ("extract here", not "extract to packagename/")
+	- All those packages contain a nice base directory in them, which
+	  should end up being the direct subdirectories of DIR.
 	- You will end up with a directory structure like this (+=dir, -=file):
 	-----------------
 	+ DIR
@@ -119,7 +121,7 @@ Compiling on Windows:
 			+ lib
 			+ include
 			...
-		+ gettext
+		+ gettext (optional)
 			+bin
 			+include
 			+lib
@@ -163,7 +165,8 @@ Compiling on Windows:
 	If using MSVC:
 		- Open the generated minetest.sln
 		- The project defaults to the "Debug" configuration. Make very sure to
-		  select "Release", unless you want to debug some stuff (it's slower)
+		  select "Release", unless you want to debug some stuff (it's slower
+		  and might not even work at all)
 		- Build the ALL_BUILD project
 		- Build the INSTALL project
 		- You should now have a working game with the executable in
@@ -176,6 +179,30 @@ Compiling on Windows:
 		- You should now have a working game with the executable in
 			DIR/minetest/bin/minetest.exe
 
+Windows releases of minetest are built using a bat script like this:
+--------------------------------------------------------------------
+
+set installpath="C:\tmp\minetest_install"
+set irrlichtpath="C:\tmp\irrlicht-1.7.2"
+
+set sourcedir=%CD%
+set builddir=%sourcedir%\bvc10
+mkdir %builddir%
+pushd %builddir%
+cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DRUN_IN_PLACE=1 -DCMAKE_INSTALL_PREFIX=%installpath%
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration=Release
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" INSTALL.vcxproj /p:Configuration=Release
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release
+popd
+
+License of Minetest-c55 textures
+--------------------------------
+
+This does not apply to texture packs made by others.
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+http://creativecommons.org/licenses/by-sa/3.0/
+
 License of Minetest-c55
 -----------------------
 

data/builtin.lua

@@ -0,0 +1,349 @@
+--
+-- This file contains built-in stuff in Minetest implemented in Lua.
+--
+-- It is always loaded and executed after registration of the C API,
+-- before loading and running any mods.
+--
+
+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
+
+--
+-- Built-in node definitions. Also defined in C.
+--
+
+minetest.register_nodedef_defaults({
+	-- name intentionally not defined here
+	drawtype = "normal",
+	visual_scale = 1.0,
+	tile_images = {"unknown_block.png"},
+	inventory_image = "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",
+	is_ground_content = false,
+	light_propagates = false,
+	sunlight_propagates = false,
+	walkable = true,
+	pointable = true,
+	diggable = true,
+	climbable = false,
+	buildable_to = false,
+	wall_mounted = false,
+	often_contains_mineral = false,
+	dug_item = "",
+	extra_dug_item = "",
+	extra_dug_item_rarity = 2,
+	metadata_name = "",
+	liquidtype = "none",
+	liquid_alternative_flowing = "",
+	liquid_alternative_source = "",
+	liquid_viscosity = 0,
+	light_source = 0,
+	damage_per_second = 0,
+	selection_box = {type="regular"},
+	material = {
+		diggablity = "normal",
+		weight = 0,
+		crackiness = 0,
+		crumbliness = 0,
+		cuttability = 0,
+		flammability = 0,
+	},
+	cookresult_item = "", -- Cannot be cooked
+	furnace_cooktime = 3.0,
+	furnace_burntime = -1, -- Cannot be used as fuel
+})
+
+minetest.register_node("air", {
+	drawtype = "airlike",
+	paramtype = "light",
+	light_propagates = true,
+	sunlight_propagates = true,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	air_equivalent = true,
+})
+
+minetest.register_node("ignore", {
+	drawtype = "airlike",
+	paramtype = "none",
+	light_propagates = false,
+	sunlight_propagates = false,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true, -- A way to remove accidentally placed ignores
+	air_equivalent = true,
+})
+
+--
+-- stackstring manipulation functions
+-- example stackstring: 'CraftItem "apple" 4'
+-- example item: {type="CraftItem", name="apple"}
+-- example item: {type="ToolItem", name="SteelPick", wear="23272"}
+--
+
+function stackstring_take_item(stackstring)
+	if stackstring == nil then
+		return '', nil
+	end
+	local stacktype = nil
+	stacktype = string.match(stackstring,
+			'([%a%d]+Item[%a%d]*)')
+	if stacktype == "NodeItem" or stacktype == "CraftItem" then
+		local itemtype = nil
+		local itemname = nil
+		local itemcount = nil
+		itemtype, itemname, itemcount = string.match(stackstring,
+				'([%a%d]+Item[%a%d]*) "([^"]*)" (%d+)')
+		itemcount = tonumber(itemcount)
+		if itemcount == 0 then
+			return '', nil
+		elseif itemcount == 1 then
+			return '', {type=itemtype, name=itemname}
+		else
+			return itemtype.." \""..itemname.."\" "..(itemcount-1),
+					{type=itemtype, name=itemname}
+		end
+	elseif stacktype == "ToolItem" then
+		local itemtype = nil
+		local itemname = nil
+		local itemwear = nil
+		itemtype, itemname, itemwear = string.match(stackstring,
+				'([%a%d]+Item[%a%d]*) "([^"]*)" (%d+)')
+		itemwear = tonumber(itemwear)
+		return '', {type=itemtype, name=itemname, wear=itemwear}
+	end
+end
+
+function stackstring_put_item(stackstring, item)
+	if item == nil then
+		return stackstring, false
+	end
+	stackstring = stackstring or ''
+	local stacktype = nil
+	stacktype = string.match(stackstring,
+			'([%a%d]+Item[%a%d]*)')
+	stacktype = stacktype or ''
+	if stacktype ~= '' and stacktype ~= item.type then
+		return stackstring, false
+	end
+	if item.type == "NodeItem" or item.type == "CraftItem" then
+		local itemtype = nil
+		local itemname = nil
+		local itemcount = nil
+		itemtype, itemname, itemcount = string.match(stackstring,
+				'([%a%d]+Item[%a%d]*) "([^"]*)" (%d+)')
+		itemtype = itemtype or item.type
+		itemname = itemname or item.name
+		if itemcount == nil then
+			itemcount = 0
+		end
+		itemcount = itemcount + 1
+		return itemtype.." \""..itemname.."\" "..itemcount, true
+	elseif item.type == "ToolItem" then
+		if stacktype ~= nil then
+			return stackstring, false
+		end
+		local itemtype = nil
+		local itemname = nil
+		local itemwear = nil
+		itemtype, itemname, itemwear = string.match(stackstring,
+				'([%a%d]+Item[%a%d]*) "([^"]*)" (%d+)')
+		itemwear = tonumber(itemwear)
+		return itemtype.." \""..itemname.."\" "..itemwear, true
+	end
+	return stackstring, false
+end
+
+function stackstring_put_stackstring(stackstring, src)
+	while src ~= '' do
+		--print("src="..dump(src))
+		src, item = stackstring_take_item(src)
+		--print("src="..dump(src).." item="..dump(item))
+		local success
+		stackstring, success = stackstring_put_item(stackstring, item)
+		if not success then
+			return stackstring, false
+		end
+	end
+	return stackstring, true
+end
+
+function test_stackstring()
+	local stack
+	local item
+	local success
+
+	stack, item = stackstring_take_item('NodeItem "TNT" 3')
+	assert(stack == 'NodeItem "TNT" 2')
+	assert(item.type == 'NodeItem')
+	assert(item.name == 'TNT')
+
+	stack, item = stackstring_take_item('CraftItem "with spaces" 2')
+	assert(stack == 'CraftItem "with spaces" 1')
+	assert(item.type == 'CraftItem')
+	assert(item.name == 'with spaces')
+
+	stack, item = stackstring_take_item('CraftItem "with spaces" 1')
+	assert(stack == '')
+	assert(item.type == 'CraftItem')
+	assert(item.name == 'with spaces')
+
+	stack, item = stackstring_take_item('CraftItem "s8df2kj3" 0')
+	assert(stack == '')
+	assert(item == nil)
+
+	stack, item = stackstring_take_item('ToolItem "With Spaces" 32487')
+	assert(stack == '')
+	assert(item.type == 'ToolItem')
+	assert(item.name == 'With Spaces')
+	assert(item.wear == 32487)
+
+	stack, success = stackstring_put_item('NodeItem "With Spaces" 40',
+			{type='NodeItem', name='With Spaces'})
+	assert(stack == 'NodeItem "With Spaces" 41')
+	assert(success == true)
+
+	stack, success = stackstring_put_item('CraftItem "With Spaces" 40',
+			{type='CraftItem', name='With Spaces'})
+	assert(stack == 'CraftItem "With Spaces" 41')
+	assert(success == true)
+
+	stack, success = stackstring_put_item('ToolItem "With Spaces" 32487',
+			{type='ToolItem', name='With Spaces'})
+	assert(stack == 'ToolItem "With Spaces" 32487')
+	assert(success == false)
+
+	stack, success = stackstring_put_item('NodeItem "With Spaces" 40',
+			{type='ToolItem', name='With Spaces'})
+	assert(stack == 'NodeItem "With Spaces" 40')
+	assert(success == false)
+	
+	assert(stackstring_put_stackstring('NodeItem "With Spaces" 2',
+			'NodeItem "With Spaces" 1') == 'NodeItem "With Spaces" 3')
+end
+test_stackstring()
+
+--
+-- craftitem helpers
+--
+
+minetest.craftitem_place_item = function(item, placer, pos)
+	--print("craftitem_place_item")
+	--print("item: " .. dump(item))
+	--print("placer: " .. dump(placer))
+	--print("pos: " .. dump(pos))
+	minetest.env:add_item(pos, 'CraftItem "' .. item .. '" 1')
+	return true
+end
+
+minetest.craftitem_eat = function(hp_change)
+	return function(item, user, pointed_thing)  -- closure
+		--print("craftitem_eat(" .. hp_change .. ")")
+		--print("item: " .. dump(item))
+		--print("user: " .. dump(user))
+		--print("pointed_thing: " .. dump(pointed_thing))
+		user:set_hp(user:get_hp() + hp_change)
+		return true
+	end
+end
+
+--
+-- Callback registration
+--
+
+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_respawnplayers, minetest.register_on_respawnplayer = make_registration()
+
+-- END

data/mods/bucket/depends.txt

@@ -0,0 +1,2 @@
+default
+

data/mods/bucket/init.lua

@@ -0,0 +1,73 @@
+minetest.register_craft({
+	output = 'CraftItem "bucket" 1',
+	recipe = {
+		{'CraftItem "steel_ingot"', '', 'CraftItem "steel_ingot"'},
+		{'', 'CraftItem "steel_ingot"', ''},
+	}
+})
+
+minetest.register_craftitem("bucket", {
+	image = "bucket.png",
+	stack_max = 1,
+	liquids_pointable = true,
+	on_place_on_ground = minetest.craftitem_place_item,
+	on_use = function(item, player, pointed_thing)
+		if pointed_thing.type == "node" then
+			n = minetest.env:get_node(pointed_thing.under)
+			if n.name == "water_source" then
+				minetest.env:add_node(pointed_thing.under, {name="air"})
+				player:add_to_inventory_later('CraftItem "bucket_water" 1')
+				return true
+			elseif n.name == "lava_source" then
+				minetest.env:add_node(pointed_thing.under, {name="air"})
+				player:add_to_inventory_later('CraftItem "bucket_lava" 1')
+				return true
+			end
+		end
+		return false
+	end,
+})
+
+minetest.register_craftitem("bucket_water", {
+	image = "bucket_water.png",
+	stack_max = 1,
+	liquids_pointable = true,
+	on_place_on_ground = minetest.craftitem_place_item,
+	on_use = function(item, player, pointed_thing)
+		if pointed_thing.type == "node" then
+			n = minetest.env:get_node(pointed_thing.under)
+			if n.name == "water_source" then
+				-- unchanged
+			elseif n.name == "water_flowing" or n.name == "lava_source" or n.name == "lava_flowing" then
+				minetest.env:add_node(pointed_thing.under, {name="water_source"})
+			else
+				minetest.env:add_node(pointed_thing.above, {name="water_source"})
+			end
+			player:add_to_inventory_later('CraftItem "bucket" 1')
+			return true
+		end
+		return false
+	end,
+})
+
+minetest.register_craftitem("bucket_lava", {
+	image = "bucket_lava.png",
+	stack_max = 1,
+	liquids_pointable = true,
+	on_place_on_ground = minetest.craftitem_place_item,
+	on_use = function(item, player, pointed_thing)
+		if pointed_thing.type == "node" then
+			n = minetest.env:get_node(pointed_thing.under)
+			if n.name == "lava_source" then
+				-- unchanged
+			elseif n.name == "water_source" or n.name == "water_flowing" or n.name == "lava_flowing" then
+				minetest.env:add_node(pointed_thing.under, {name="lava_source"})
+			else
+				minetest.env:add_node(pointed_thing.above, {name="lava_source"})
+			end
+			player:add_to_inventory_later('CraftItem "bucket" 1')
+			return true
+		end
+		return false
+	end,
+})