added drawallfaces to luaentities

Conflicts:
	src/scriptapi.cpp

.gitignore

@@ -1,4 +1,3 @@
-*~
 map/*
 world/*
 CMakeFiles/*

CMakeLists.txt

@@ -10,7 +10,7 @@ project(minetest)
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20120318)
+set(VERSION_PATCH dev-20120122-1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -49,44 +49,26 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-	set(SHAREDIR "share")
+	set(DATADIR "data")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
-	set(EXAMPLE_CONF_DIR "user")
+	set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
 	# random placeholders
-	set(SHAREDIR "share/${PROJECT_NAME}")
+	set(DATADIR "share/${PROJECT_NAME}")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR ${DOCDIR})
+	set(EXAMPLE_CONF_DIR ".")
 elseif(UNIX) # Linux, BSD etc
-	if(RUN_IN_PLACE)
-		set(SHAREDIR "share")
-		set(BINDIR "bin")
-		set(DOCDIR "doc")
-		set(MANDIR "share/unix/man")
-		set(EXAMPLE_CONF_DIR ${DOCDIR})
-		set(XDG_APPS_DIR "share/unix/applications")
-		set(ICONDIR "share/unix/icons")
-	else()
-		set(SHAREDIR "share/${PROJECT_NAME}")
-		set(BINDIR "bin")
-		set(DOCDIR "share/doc/${PROJECT_NAME}")
-		set(MANDIR "share/man")
-		set(EXAMPLE_CONF_DIR ${DOCDIR})
-		set(XDG_APPS_DIR "share/applications")
-		set(ICONDIR "share/icons")
-	endif()
+	set(DATADIR "share/${PROJECT_NAME}")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/${PROJECT_NAME}")
+	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
-install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
-
-if(UNIX)
-	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-endif()
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
 # Subdirectories

README.txt

@@ -277,21 +277,3 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
 
-Fonts
----------------
-
-DejaVu Sans Mono:
-
-  Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-  Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-  Bitstream Vera Fonts Copyright:
-
-  Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-  a trademark of Bitstream, Inc.
-
-  Arev Fonts Copyright:
-
-  Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-

data/builtin.lua

@@ -5,16 +5,6 @@
 -- before loading and running any mods.
 --
 
---
--- Override some Lua library functions
---
-
-print = minetest.debug
-
---
---
---
-
 function basic_dump2(o)
 	if type(o) == "number" then
 		return tostring(o)
@@ -116,7 +106,7 @@ function minetest.get_pointed_thing_position(pointed_thing, above)
 			return pointed_thing.under
 		end
 	elseif pointed_thing.type == "object" then
-		obj = pointed_thing.ref
+		obj = pointed.thing.ref
 		if obj ~= nil then
 			return obj:getpos()
 		else
@@ -337,8 +327,9 @@ function minetest.node_dig(pos, node, digger)
 		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)
+		mp = def.material
+		tp = wielded:get_tool_digging_properties()
+		dp = minetest.get_digging_properties(mp, tp)
 		wielded:add_wear(dp.wear)
 		digger:set_wielded_item(wielded)
 
@@ -368,14 +359,13 @@ minetest.nodedef_default = {
 	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,
+	tool_digging_properties = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -412,6 +402,14 @@ minetest.nodedef_default = {
 	light_source = 0,
 	damage_per_second = 0,
 	selection_box = {type="regular"},
+	material = {
+		diggablity = "normal",
+		weight = 0,
+		crackiness = 0,
+		crumbliness = 0,
+		cuttability = 0,
+		flammability = 0,
+	},
 	legacy_facedir_simple = false,
 	legacy_wallmounted = false,
 }
@@ -420,13 +418,12 @@ 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,
+	tool_digging_properties = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -438,13 +435,12 @@ 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,
+	tool_digging_properties = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -456,13 +452,12 @@ 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,
+	tool_digging_properties = nil,
 
 	-- Interaction callbacks
 	on_place = nil,
@@ -644,7 +639,7 @@ function minetest.register_tool(name, tooldef)
 	if tooldef.inventory_image == nil and tooldef.image ~= nil then
 		tooldef.inventory_image = tooldef.image
 	end
-	if tooldef.tool_capabilities == nil and
+	if tooldef.tool_digging_properties == nil and
 	   (tooldef.full_punch_interval ~= nil or
 	    tooldef.basetime ~= nil or
 	    tooldef.dt_weight ~= nil or
@@ -656,7 +651,7 @@ function minetest.register_tool(name, tooldef)
 	    tooldef.dd_crackiness ~= nil or
 	    tooldef.dd_crumbliness ~= nil or
 	    tooldef.dd_cuttability ~= nil) then
-		tooldef.tool_capabilities = {
+		tooldef.tool_digging_properties = {
 			full_punch_interval = tooldef.full_punch_interval,
 			basetime = tooldef.basetime,
 			dt_weight = tooldef.dt_weight,
@@ -708,6 +703,25 @@ end
 -- Built-in node definitions. Also defined in C.
 --
 
+minetest.register_item(":", {
+	type = "none",
+	wield_image = "wieldhand.png",
+	wield_scale = {x=1,y=1,z=2.5},
+	tool_digging_properties = {
+		full_punch_interval = 2.0,
+		basetime = 0.5,
+		dt_weight = 1,
+		dt_crackiness = 0,
+		dt_crumbliness = -1,
+		dt_cuttability = 0,
+		basedurability = 50,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
+	}
+})
+
 minetest.register_item(":unknown", {
 	type = "none",
 	description = "Unknown Item",
@@ -744,11 +758,6 @@ minetest.register_node(":ignore", {
 	air_equivalent = true,
 })
 
--- The hand (bare definition)
-minetest.register_item(":", {
-	type = "none",
-})
-
 --
 -- Default material types
 --

data/mods/default/init.lua

@@ -118,9 +118,6 @@
 --                  {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
@@ -202,7 +199,7 @@
 -- - 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)
+-- - punch(puncher, time_from_last_punch)
 --   ^ puncher = an another ObjectRef,
 --   ^ time_from_last_punch = time since last punch action of the puncher
 -- - right_click(clicker); clicker = an another ObjectRef
@@ -225,7 +222,6 @@
 -- -           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)
@@ -264,7 +260,7 @@
 -- - 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,
+-- - get_tool_digging_properties(): 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,
@@ -312,26 +308,23 @@
 -- 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 = {
+--     tool_digging_properties = {
 --         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}
---         }
+--         basetime = 1.0,
+--         dt_weight = 0.5,
+--         dt_crackiness = -0.2,
+--         dt_crumbliness = 1,
+--         dt_cuttability = -0.5,
+--         basedurability = 330,
+--         dd_weight = 0,
+--         dd_crackiness = 0,
+--         dd_crumbliness = 0,
+--         dd_cuttability = 0,
 --     }
 --     on_drop = func(item, dropper, pos),
 --     on_place = func(item, placer, pointed_thing),
@@ -369,6 +362,14 @@
 --     light_source = 0,
 --     damage_per_second = 0,
 --     selection_box = {type="regular"},
+--     material = {
+--         diggablity = "normal",
+--         weight = 0,
+--         crackiness = 0,
+--         crumbliness = 0,
+--         cuttability = 0,
+--         flammability = 0,
+--     },
 --     legacy_facedir_simple = false, -- Support maps made in and before January 2012
 --     legacy_wallmounted = false, -- Support maps made in and before January 2012
 -- }
@@ -429,18 +430,6 @@
 --     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
 
 WATER_ALPHA = 160
 WATER_VISC = 1
@@ -454,166 +443,212 @@ default = {}
 -- Tool definition
 --
 
--- The hand
-minetest.register_item(":", {
-	type = "none",
-	wield_image = "wieldhand.png",
-	wield_scale = {x=1,y=1,z=2.5},
-	tool_capabilities = {
-		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]=1.50,[2]=1.00,[3]=0.70}, maxwear=0, maxlevel=3},
-		}
-	}
-})
-
 minetest.register_tool("default:pick_wood", {
 	description = "Wooden Pickaxe",
 	inventory_image = "default_tool_woodpick.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			cracky={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
-		}
+	tool_digging_properties = {
+		basetime = 2.0,
+		dt_weight = 0,
+		dt_crackiness = -0.5,
+		dt_crumbliness = 2,
+		dt_cuttability = 0,
+		basedurability = 30,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_stone", {
 	description = "Stone Pickaxe",
 	inventory_image = "default_tool_stonepick.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			cracky={times={[1]=1.50, [2]=0.80, [3]=0.60}, maxwear=0.05, maxlevel=1}
-		}
+	tool_digging_properties = {
+		basetime = 1.5,
+		dt_weight = 0,
+		dt_crackiness = -0.5,
+		dt_crumbliness = 2,
+		dt_cuttability = 0,
+		basedurability = 100,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_steel", {
 	description = "Steel Pickaxe",
 	inventory_image = "default_tool_steelpick.png",
-	tool_capabilities = {
-		max_drop_level=1,
-		groupcaps={
-			cracky={times={[1]=1.00, [2]=0.60, [3]=0.40}, maxwear=0.1, maxlevel=2}
-		}
+	tool_digging_properties = {
+		basetime = 1.0,
+		dt_weight = 0,
+		dt_crackiness = -0.5,
+		dt_crumbliness = 2,
+		dt_cuttability = 0,
+		basedurability = 333,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_mese", {
 	description = "Mese Pickaxe",
 	inventory_image = "default_tool_mesepick.png",
-	tool_capabilities = {
-		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}
-		}
+	tool_digging_properties = {
+		basetime = 0,
+		dt_weight = 0,
+		dt_crackiness = 0,
+		dt_crumbliness = 0,
+		dt_cuttability = 0,
+		basedurability = 1337,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_wood", {
 	description = "Wooden Shovel",
 	inventory_image = "default_tool_woodshovel.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			crumbly={times={[1]=1.50, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=1}
-		}
+	tool_digging_properties = {
+		basetime = 2.0,
+		dt_weight = 0.5,
+		dt_crackiness = 2,
+		dt_crumbliness = -1.5,
+		dt_cuttability = 0.3,
+		basedurability = 30,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_stone", {
 	description = "Stone Shovel",
 	inventory_image = "default_tool_stoneshovel.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			crumbly={times={[1]=0.80, [2]=0.50, [3]=0.30}, maxwear=0.05, maxlevel=1}
-		}
+	tool_digging_properties = {
+		basetime = 1.5,
+		dt_weight = 0.5,
+		dt_crackiness = 2,
+		dt_crumbliness = -1.5,
+		dt_cuttability = 0.1,
+		basedurability = 100,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_steel", {
 	description = "Steel Shovel",
 	inventory_image = "default_tool_steelshovel.png",
-	tool_capabilities = {
-		max_drop_level=1,
-		groupcaps={
-			crumbly={times={[1]=0.50, [2]=0.35, [3]=0.30}, maxwear=0.1, maxlevel=2}
-		}
+	tool_digging_properties = {
+		basetime = 1.0,
+		dt_weight = 0.5,
+		dt_crackiness = 2,
+		dt_crumbliness = -1.5,
+		dt_cuttability = 0.0,
+		basedurability = 330,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_wood", {
 	description = "Wooden Axe",
 	inventory_image = "default_tool_woodaxe.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			choppy={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1},
-			fleshy={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
-		}
+	tool_digging_properties = {
+		basetime = 2.0,
+		dt_weight = 0.5,
+		dt_crackiness = -0.2,
+		dt_crumbliness = 1,
+		dt_cuttability = -0.5,
+		basedurability = 30,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_stone", {
 	description = "Stone Axe",
 	inventory_image = "default_tool_stoneaxe.png",
-	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}
-		}
+	tool_digging_properties = {
+		basetime = 1.5,
+		dt_weight = 0.5,
+		dt_crackiness = -0.2,
+		dt_crumbliness = 1,
+		dt_cuttability = -0.5,
+		basedurability = 100,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_steel", {
 	description = "Steel Axe",
 	inventory_image = "default_tool_steelaxe.png",
-	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}
-		}
+	tool_digging_properties = {
+		basetime = 1.0,
+		dt_weight = 0.5,
+		dt_crackiness = -0.2,
+		dt_crumbliness = 1,
+		dt_cuttability = -0.5,
+		basedurability = 330,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:sword_wood", {
 	description = "Wooden Sword",
 	inventory_image = "default_tool_woodsword.png",
-	tool_capabilities = {
-		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}
-		}
+	tool_digging_properties = {
+		basetime = 3.0,
+		dt_weight = 3,
+		dt_crackiness = 0,
+		dt_crumbliness = 1,
+		dt_cuttability = -1,
+		basedurability = 30,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	}
 })
 minetest.register_tool("default:sword_stone", {
 	description = "Stone Sword",
 	inventory_image = "default_tool_stonesword.png",
-	tool_capabilities = {
-		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}
-		}
+	tool_digging_properties = {
+		basetime = 2.5,
+		dt_weight = 3,
+		dt_crackiness = 0,
+		dt_crumbliness = 1,
+		dt_cuttability = -1,
+		basedurability = 100,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	}
 })
 minetest.register_tool("default:sword_steel", {
 	description = "Steel Sword",
 	inventory_image = "default_tool_steelsword.png",
-	tool_capabilities = {
-		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}
-		}
+	tool_digging_properties = {
+		basetime = 2.0,
+		dt_weight = 3,
+		dt_crackiness = 0,
+		dt_crumbliness = 1,
+		dt_cuttability = -1,
+		basedurability = 330,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
 	}
 })
 
@@ -1066,7 +1101,7 @@ minetest.register_node("default:stone", {
 	description = "Stone",
 	tile_images = {"default_stone.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(1.0),
 	drop = 'default:cobble',
 	legacy_mineral = true,
 })
@@ -1075,7 +1110,7 @@ minetest.register_node("default:stone_with_coal", {
 	description = "Stone with coal",
 	tile_images = {"default_stone.png^default_mineral_coal.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(1.0),
 	drop = 'default:coal_lump',
 })
 
@@ -1083,7 +1118,7 @@ minetest.register_node("default:stone_with_iron", {
 	description = "Stone with iron",
 	tile_images = {"default_stone.png^default_mineral_iron.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(1.0),
 	drop = 'default:iron_lump',
 })
 
@@ -1091,7 +1126,7 @@ minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with grass",
 	tile_images = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	material = minetest.digprop_dirtlike(1.0),
 	drop = 'default:dirt',
 })
 
@@ -1099,7 +1134,7 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 	description = "Dirt with grass and footsteps",
 	tile_images = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	material = minetest.digprop_dirtlike(1.0),
 	drop = 'default:dirt',
 })
 
@@ -1107,28 +1142,28 @@ minetest.register_node("default:dirt", {
 	description = "Dirt",
 	tile_images = {"default_dirt.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	material = minetest.digprop_dirtlike(1.0),
 })
 
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tile_images = {"default_sand.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	material = minetest.digprop_dirtlike(1.0),
 })
 
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tile_images = {"default_gravel.png"},
 	is_ground_content = true,
-	groups = {crumbly=2},
+	material = minetest.digprop_gravellike(1.0),
 })
 
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tile_images = {"default_sandstone.png"},
 	is_ground_content = true,
-	groups = {crumbly=2,cracky=2},
+	material = minetest.digprop_dirtlike(1.0),  -- FIXME should this be stonelike?
 	drop = 'default:sand',
 })
 
@@ -1136,7 +1171,7 @@ minetest.register_node("default:clay", {
 	description = "Clay",
 	tile_images = {"default_clay.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	material = minetest.digprop_dirtlike(1.0),
 	drop = 'default:clay_lump 4',
 })
 
@@ -1144,7 +1179,7 @@ minetest.register_node("default:brick", {
 	description = "Brick",
 	tile_images = {"default_brick.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(1.0),
 	drop = 'default:clay_brick 4',
 })
 
@@ -1152,14 +1187,14 @@ minetest.register_node("default:tree", {
 	description = "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=2},
+	material = minetest.digprop_woodlike(1.0),
 })
 
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
 	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=2},
+	material = minetest.digprop_woodlike(1.0),
 })
 
 minetest.register_node("default:junglegrass", {
@@ -1171,7 +1206,7 @@ minetest.register_node("default:junglegrass", {
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {snappy=3},
+	material = minetest.digprop_leaveslike(1.0),
 })
 
 minetest.register_node("default:leaves", {
@@ -1180,7 +1215,7 @@ minetest.register_node("default:leaves", {
 	visual_scale = 1.3,
 	tile_images = {"default_leaves.png"},
 	paramtype = "light",
-	groups = {snappy=3},
+	material = minetest.digprop_leaveslike(1.0),
 	drop = {
 		max_items = 1,
 		items = {
@@ -1202,7 +1237,7 @@ minetest.register_node("default:cactus", {
 	description = "Cactus",
 	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=3},
+	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node("default:papyrus", {
@@ -1214,14 +1249,14 @@ minetest.register_node("default:papyrus", {
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
-	groups = {snappy=3},
+	material = minetest.digprop_leaveslike(0.5),
 })
 
 minetest.register_node("default:bookshelf", {
 	description = "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=3},
+	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node("default:glass", {
@@ -1232,7 +1267,7 @@ minetest.register_node("default:glass", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
-	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	material = minetest.digprop_glasslike(1.0),
 })
 
 minetest.register_node("default:fence_wood", {
@@ -1247,7 +1282,7 @@ minetest.register_node("default:fence_wood", {
 		type = "fixed",
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
 	},
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
+	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node("default:rail", {
@@ -1263,7 +1298,7 @@ minetest.register_node("default:rail", {
 		type = "fixed",
 		--fixed = <default>
 	},
-	groups = {bendy=2,snappy=1,dig_immediate=2},
+	material = minetest.digprop_dirtlike(0.75),
 })
 
 minetest.register_node("default:ladder", {
@@ -1283,7 +1318,7 @@ minetest.register_node("default:ladder", {
 		--wall_bottom = = <default>
 		--wall_side = = <default>
 	},
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
+	material = minetest.digprop_woodlike(0.5),
 	legacy_wallmounted = true,
 })
 
@@ -1291,14 +1326,14 @@ minetest.register_node("default:wood", {
 	description = "Wood",
 	tile_images = {"default_wood.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
+	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese",
 	tile_images = {"default_mese.png"},
 	is_ground_content = true,
-	groups = {cracky=1},
+	material = minetest.digprop_stonelike(0.5),
 })
 
 minetest.register_node("default:cloud", {
@@ -1327,7 +1362,6 @@ minetest.register_node("default:water_flowing", {
 		{image="default_water.png", backface_culling=false},
 		{image="default_water.png", backface_culling=true},
 	},
-	groups = {water=3, liquid=3},
 })
 
 minetest.register_node("default:water_source", {
@@ -1350,7 +1384,6 @@ minetest.register_node("default:water_source", {
 		-- New-style water source material (mostly unused)
 		{image="default_water.png", backface_culling=false},
 	},
-	groups = {water=3, liquid=3},
 })
 
 minetest.register_node("default:lava_flowing", {
@@ -1374,7 +1407,6 @@ minetest.register_node("default:lava_flowing", {
 		{image="default_lava.png", backface_culling=false},
 		{image="default_lava.png", backface_culling=true},
 	},
-	groups = {lava=3, liquid=2, hot=3},
 })
 
 minetest.register_node("default:lava_source", {
@@ -1398,7 +1430,6 @@ minetest.register_node("default:lava_source", {
 		-- New-style lava source material (mostly unused)
 		{image="default_lava.png", backface_culling=false},
 	},
-	groups = {lava=3, liquid=2, hot=3},
 })
 
 minetest.register_node("default:torch", {
@@ -1418,7 +1449,7 @@ minetest.register_node("default:torch", {
 		wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
 		wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
 	},
-	groups = {choppy=2,dig_immediate=3},
+	material = minetest.digprop_constanttime(0.0),
 	legacy_wallmounted = true,
 })
 
@@ -1439,7 +1470,7 @@ minetest.register_node("default:sign_wall", {
 		--wall_bottom = <default>
 		--wall_side = <default>
 	},
-	groups = {choppy=2,dig_immediate=2},
+	material = minetest.digprop_constanttime(0.5),
 	legacy_wallmounted = true,
 })
 
@@ -1449,7 +1480,7 @@ minetest.register_node("default:chest", {
 		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "chest",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	material = minetest.digprop_woodlike(1.0),
 	legacy_facedir_simple = true,
 })
 
@@ -1459,7 +1490,7 @@ minetest.register_node("default:chest_locked", {
 		"default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
 	paramtype2 = "facedir",
 	metadata_name = "locked_chest",
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	material = minetest.digprop_woodlike(1.0),
 	legacy_facedir_simple = true,
 })
 
@@ -1469,7 +1500,7 @@ minetest.register_node("default:furnace", {
 		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "furnace",
-	groups = {cracky=2},
+	material = minetest.digprop_stonelike(3.0),
 	legacy_facedir_simple = true,
 })
 
@@ -1477,21 +1508,21 @@ minetest.register_node("default:cobble", {
 	description = "Cobble",
 	tile_images = {"default_cobble.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(0.9),
 })
 
 minetest.register_node("default:mossycobble", {
 	description = "Mossy Cobble",
 	tile_images = {"default_mossycobble.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	material = minetest.digprop_stonelike(0.8),
 })
 
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tile_images = {"default_steel_block.png"},
 	is_ground_content = true,
-	groups = {snappy=1,bendy=2},
+	material = minetest.digprop_stonelike(5.0),
 })
 
 minetest.register_node("default:nyancat", {
@@ -1500,7 +1531,7 @@ minetest.register_node("default:nyancat", {
 		"default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
 	inventory_image = "default_nc_front.png",
 	paramtype2 = "facedir",
-	groups = {cracky=2},
+	material = minetest.digprop_stonelike(3.0),
 	legacy_facedir_simple = true,
 })
 
@@ -1508,7 +1539,7 @@ minetest.register_node("default:nyancat_rainbow", {
 	description = "Nyancat Rainbow",
 	tile_images = {"default_nc_rb.png"},
 	inventory_image = "default_nc_rb.png",
-	groups = {cracky=2},
+	material = minetest.digprop_stonelike(3.0),
 })
 
 minetest.register_node("default:sapling", {
@@ -1520,7 +1551,7 @@ minetest.register_node("default:sapling", {
 	wield_image = "default_sapling.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {snappy=2,dig_immediate=3},
+	material = minetest.digprop_constanttime(0.0),
 })
 
 minetest.register_node("default:apple", {
@@ -1532,7 +1563,7 @@ minetest.register_node("default:apple", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	groups = {fleshy=3,dig_immediate=3},
+	material = minetest.digprop_constanttime(0.0),
 	on_use = minetest.item_eat(4),
 })
 
@@ -1610,7 +1641,7 @@ minetest.add_to_creative_inventory('default:cactus')
 minetest.add_to_creative_inventory('default:papyrus')
 minetest.add_to_creative_inventory('default:bookshelf')
 minetest.add_to_creative_inventory('default:glass')
-minetest.add_to_creative_inventory('default:fence_wood')
+minetest.add_to_creative_inventory('default:fence')
 minetest.add_to_creative_inventory('default:rail')
 minetest.add_to_creative_inventory('default:mese')
 minetest.add_to_creative_inventory('default:chest')
@@ -1741,9 +1772,6 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
 	else
 		partiality = "partially "
 	end
-	-- The actual item stack string may be different from what the "giver"
-	-- entered (e.g. big numbers are always interpreted as 2^16-1).
-	stackstring = itemstack:to_string()
 	if giver == receiver then
 		minetest.chat_send_player(giver, '"'..stackstring
 			..'" '..partiality..'added to inventory.');