Update version to 0.4.dev-20120318

- Do not rewrite if nothing needs to be changed
- Update at program exit, in addition to updating when continuing from main menu to game

.gitignore

@@ -1,3 +1,4 @@
+*~
 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-20120122-1)
+set(VERSION_PATCH dev-20120318)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -49,26 +49,44 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-	set(DATADIR "data")
+	set(SHAREDIR "share")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
-	set(EXAMPLE_CONF_DIR ".")
+	set(EXAMPLE_CONF_DIR "user")
 elseif(APPLE)
 	# random placeholders
-	set(DATADIR "share/${PROJECT_NAME}")
+	set(SHAREDIR "share/${PROJECT_NAME}")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR ".")
+	set(EXAMPLE_CONF_DIR ${DOCDIR})
 elseif(UNIX) # Linux, BSD etc
-	set(DATADIR "share/${PROJECT_NAME}")
-	set(BINDIR "bin")
-	set(DOCDIR "share/doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
+	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()
 endif()
 
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
-install(FILES "minetest.conf.example" 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()
 
 #
 # Subdirectories

README.txt

@@ -277,3 +277,21 @@ 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/mods/stairs/depends.txt

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

data/mods/stairs/init.lua

@@ -1,93 +0,0 @@
-stairs = {}
-
--- Node will be called stairs:stair_<subname>
-function stairs.register_stair(subname, recipeitem, material, images, description)
-	minetest.register_node("stairs:stair_" .. subname, {
-		description = description,
-		drawtype = "nodebox",
-		tile_images = images,
-		paramtype = "light",
-		paramtype2 = "facedir",
-		is_ground_content = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-				{-0.5, 0, 0, 0.5, 0.5, 0.5},
-			},
-		},
-		material = material,
-	})
-
-	minetest.register_craft({
-		output = 'stairs:stair_' .. subname .. ' 4',
-		recipe = {
-			{recipeitem, "", ""},
-			{recipeitem, recipeitem, ""},
-			{recipeitem, recipeitem, recipeitem},
-		},
-	})
-end
-
--- Node will be called stairs:slab_<subname>
-function stairs.register_slab(subname, recipeitem, material, images, description)
-	minetest.register_node("stairs:slab_" .. subname, {
-		description = description,
-		drawtype = "nodebox",
-		tile_images = images,
-		paramtype = "light",
-		is_ground_content = true,
-		node_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-		},
-		material = material,
-	})
-
-	minetest.register_craft({
-		output = 'stairs:slab_' .. subname .. ' 3',
-		recipe = {
-			{recipeitem, recipeitem, recipeitem},
-		},
-	})
-end
-
--- Nodes will be called stairs:{stair,slab}_<subname>
-function stairs.register_stair_and_slab(subname, recipeitem, material, images, desc_stair, desc_slab)
-	stairs.register_stair(subname, recipeitem, material, images, desc_stair)
-	stairs.register_slab(subname, recipeitem, material, images, desc_slab)
-end
-
-stairs.register_stair_and_slab("wood", "default:wood",
-		minetest.digprop_woodlike(0.75),
-		{"default_wood.png"},
-		"Wooden stair",
-		"Wooden slab")
-
-stairs.register_stair_and_slab("stone", "default:stone",
-		minetest.digprop_stonelike(0.75),
-		{"default_stone.png"},
-		"Stone stair",
-		"Stone slab")
-
-stairs.register_stair_and_slab("cobble", "default:cobble",
-		minetest.digprop_stonelike(0.75),
-		{"default_cobble.png"},
-		"Cobble stair",
-		"Cobble slab")
-
-stairs.register_stair_and_slab("brick", "default:brick",
-		minetest.digprop_stonelike(0.75),
-		{"default_brick.png"},
-		"Brick stair",
-		"Brick slab")
-
-stairs.register_stair_and_slab("sandstone", "default:sandstone",
-		minetest.digprop_stonelike(0.75),
-		{"default_sandstone.png"},
-		"Sandstone stair",
-		"Sandstone slab")

doc/minetest.6

@@ -0,0 +1,85 @@
+.\" Minetest man page
+.TH minetest 6 "11 March 2012" "" ""
+
+.SH NAME
+minetest \- Multiplayer infinite-world block sandbox
+
+.SH SYNOPSIS
+.B minetest
+[ OPTION ... ]
+
+.SH DESCRIPTION
+.B Minetest
+is one of the first InfiniMiner/Minecraft(/whatever) inspired games (started October 2010), with a goal of taking the survival multiplayer gameplay to a slightly different direction.
+.PP
+The main design philosophy is to keep it technically simple, stable and portable. It will be kept lightweight enough to run on fairly old hardware.
+
+.SH OPTIONS
+.TP
+\-\-address <value>
+Address to connect to
+.TP
+\-\-config <value>
+Load configuration from specified file
+.TP
+\-\-disable\-unittests
+Disable unit tests
+.TP
+\-\-enable\-unittests
+Enable unit tests
+.TP
+\-\-gameid <value>
+Set gameid
+.TP
+\-\-go
+Disable main menu
+.TP
+\-\-help
+Show allowed options
+.TP
+\-\-logfile <value>
+Set logfile path (debug.txt)
+.TP
+\-\-map\-dir <value>
+Same as --world (deprecated)
+.TP
+\-\-name <value>
+Set player name
+.TP
+\-\-password <value>
+Set password
+.TP
+\-\-port <value>
+Set network port (UDP) to use
+.TP
+\-\-random\-input
+Enable random user input, for testing
+.TP
+\-\-server
+Run dedicated server
+.TP
+\-\-speedtests
+Run speed tests
+.TP
+\-\-verbose
+Print more information to console
+.TP
+\-\-world <value>
+Set world path
+
+.SH BUGS
+Please report all bugs to Perttu Ahola <celeron55@gmail.com>.
+
+.SH AUTHOR
+.PP
+Perttu Ahola <celeron55@gmail.com>
+and contributors.
+.PP
+This man page was originally written by
+Juhani Numminen <juhaninumminen0@gmail.com>.
+
+.SH WWW
+http://c55.me/minetest/
+
+.SH "SEE ALSO"
+.BR minetestserver(6)

doc/minetestserver.6

@@ -0,0 +1,64 @@
+.\" Minetestserver man page
+.TH minetestserver 6 "11 March 2012" "" ""
+
+.SH NAME
+minetestserver \- Minetest server
+
+.SH SYNOPSIS
+.B minetestserver
+[ OPTION ... ]
+
+.SH DESCRIPTION
+.B Minetest
+is one of the first InfiniMiner/Minecraft(/whatever) inspired games (started October 2010), with a goal of taking the survival multiplayer gameplay to a slightly different direction.
+.PP
+The main design philosophy is to keep it technically simple, stable and portable. It will be kept lightweight enough to run on fairly old hardware.
+
+.SH OPTIONS
+.TP
+\-\-config <value>
+Load configuration from specified file
+.TP
+\-\-disable\-unittests
+Disable unit tests
+.TP
+\-\-enable\-unittests
+Enable unit tests
+.TP
+\-\-gameid <value>
+Set gameid
+.TP
+\-\-help
+Show allowed options
+.TP
+\-\-logfile <value>
+Set logfile path (debug.txt)
+.TP
+\-\-map\-dir <value>
+Same as --world (deprecated)
+.TP
+\-\-port <value>
+Set network port (UDP) to use
+.TP
+\-\-verbose
+Print more information to console
+.TP
+\-\-world <value>
+Set world path
+
+.SH BUGS
+Please report all bugs to Perttu Ahola <celeron55@gmail.com>.
+
+.SH AUTHOR
+.PP
+Perttu Ahola <celeron55@gmail.com>
+and contributors.
+.PP
+This man page was originally written by
+Juhani Numminen <juhaninumminen0@gmail.com>.
+
+.SH WWW
+http://c55.me/minetest/
+
+.SH "SEE ALSO"
+.BR minetest(6)

minetest.conf.example

@@ -42,6 +42,8 @@
 # Go down ladder / go down in fly mode / go fast in fast mode
 #keymap_special1 = KEY_KEY_E
 #keymap_chat = KEY_KEY_T
+#keymap_cmd = /
+#keyman_console = KEY_F10
 #keymap_rangeselect = KEY_KEY_R
 #keymap_freemove = KEY_KEY_K
 #keymap_fastmove = KEY_KEY_J
@@ -104,11 +106,17 @@
 #screenshot_path = .
 # Amount of view bobbing (0 = no view bobbing, 1.0 = normal, 2.0 = double)
 #view_bobbing_amount = 1.0
+# In-game chat console background color (R,G,B)
+#console_color = (0,0,0)
+# In-game chat console background alpha (opaqueness, between 0 and 255)
+#console_alpha = 200
 
 #
 # Server stuff
 #
 
+# Default game (default when creating a new world)
+#default_game = mesetint
 # Map directory (everything in the world is stored here)
 #map-dir = /custom/map
 # Message of the Day
@@ -139,17 +147,23 @@
 # Profiler data print interval. #0 = disable.
 #profiler_print_interval = 0
 #enable_mapgen_debug_info = false
+# from how far client knows about objects
 #active_object_send_range_blocks = 3
+# how large area of blocks are subject to the active block stuff (active = objects are loaded and ABMs run)
 #active_block_range = 2
+# how many blocks are flying in the wire simultaneously per client
 #max_simultaneous_block_sends_per_client = 2
+# how many blocks are flying in the wire simultaneously per server
 #max_simultaneous_block_sends_server_total = 8
 #max_block_send_distance = 7
 #max_block_generate_distance = 5
 #time_send_interval = 20
-# Length of day/night cycle. 72=20min, 360=4min, 1=24hour
+# Length of day/night cycle. 72=20min, 360=4min, 1=24hour, 0=day/night/whatever stays unchanged
 #time_speed = 72
 #server_unload_unused_data_timeout = 29
 #server_map_save_interval = 5.3
+# To reduce lag, block transfers are slowed down when a player is building something.
+# This determines how long they are slowed down after placing or removing a node.
 #full_block_send_enable_min_time_from_building = 2.0
 # Set to true to enable experimental features or stuff that is tested
 # (varies from version to version, usually not useful at all)

old/ancient_main_comment.txt

@@ -0,0 +1,345 @@
+------------------------------------------------------------------
+The ancient comment from the beginning of main.cpp is stored here.
+------------------------------------------------------------------
+
+/*
+=============================== NOTES ==============================
+NOTE: Things starting with TODO are sometimes only suggestions.
+
+NOTE: iostream.imbue(std::locale("C")) is very slow
+NOTE: Global locale is now set at initialization
+
+NOTE: If VBO (EHM_STATIC) is used, remember to explicitly free the
+      hardware buffer (it is not freed automatically)
+
+NOTE: A random to-do list saved here as documentation:
+A list of "active blocks" in which stuff happens. (+=done)
+	+ Add a never-resetted game timer to the server
+	+ Add a timestamp value to blocks
+	+ The simple rule: All blocks near some player are "active"
+	- Do stuff in real time in active blocks
+		+ Handle objects
+		- Grow grass, delete leaves without a tree
+		- Spawn some mobs based on some rules
+		- Transform cobble to mossy cobble near water
+		- Run a custom script
+		- ...And all kinds of other dynamic stuff
+	+ Keep track of when a block becomes active and becomes inactive
+	+ When a block goes inactive:
+		+ Store objects statically to block
+		+ Store timer value as the timestamp
+	+ When a block goes active:
+		+ Create active objects out of static objects
+		- Simulate the results of what would have happened if it would have
+		  been active for all the time
+		  	- Grow a lot of grass and so on
+	+ Initially it is fine to send information about every active object
+	  to every player. Eventually it should be modified to only send info
+	  about the nearest ones.
+	  	+ This was left to be done by the old system and it sends only the
+		  nearest ones.
+
+NOTE: Seeds in 1260:6c77e7dbfd29:
+5721858502589302589:
+	Spawns you on a small sand island with a surface dungeon
+2983455799928051958:
+	Enormous jungle + a surface dungeon at ~(250,0,0)
+
+Old, wild and random suggestions that probably won't be done:
+-------------------------------------------------------------
+
+SUGG: If player is on ground, mainly fetch ground-level blocks
+
+SUGG: Expose Connection's seqnums and ACKs to server and client.
+      - This enables saving many packets and making a faster connection
+	  - This also enables server to check if client has received the
+	    most recent block sent, for example.
+SUGG: Add a sane bandwidth throttling system to Connection
+
+SUGG: More fine-grained control of client's dumping of blocks from
+      memory
+	  - ...What does this mean in the first place?
+
+SUGG: A map editing mode (similar to dedicated server mode)
+
+SUGG: Transfer more blocks in a single packet
+SUGG: A blockdata combiner class, to which blocks are added and at
+      destruction it sends all the stuff in as few packets as possible.
+SUGG: Make a PACKET_COMBINED which contains many subpackets. Utilize
+      it by sending more stuff in a single packet.
+	  - Add a packet queue to RemoteClient, from which packets will be
+	    combined with object data packets
+		- This is not exactly trivial: the object data packets are
+		  sometimes very big by themselves
+	  - This might not give much network performance gain though.
+
+SUGG: Precalculate lighting translation table at runtime (at startup)
+      - This is not doable because it is currently hand-made and not
+	    based on some mathematical function.
+		- Note: This has been changing lately
+
+SUGG: A version number to blocks, which increments when the block is
+      modified (node add/remove, water update, lighting update)
+	  - This can then be used to make sure the most recent version of
+	    a block has been sent to client, for example
+
+SUGG: Make the amount of blocks sending to client and the total
+	  amount of blocks dynamically limited. Transferring blocks is the
+	  main network eater of this system, so it is the one that has
+	  to be throttled so that RTTs stay low.
+
+SUGG: Meshes of blocks could be split into 6 meshes facing into
+      different directions and then only those drawn that need to be
+
+SUGG: Background music based on cellular automata?
+      http://www.earslap.com/projectslab/otomata
+
+SUGG: Simple light color information to air
+
+SUGG: Server-side objects could be moved based on nodes to enable very
+      lightweight operation and simple AI
+	- Not practical; client would still need to show smooth movement.
+
+SUGG: Make a system for pregenerating quick information for mapblocks, so
+	  that the client can show them as cubes before they are actually sent
+	  or even generated.
+
+SUGG: Erosion simulation at map generation time
+    - This might be plausible if larger areas of map were pregenerated
+	  without lighting (which is slow)
+	- Simulate water flows, which would carve out dirt fast and
+	  then turn stone into gravel and sand and relocate it.
+	- How about relocating minerals, too? Coal and gold in
+	  downstream sand and gravel would be kind of cool
+	  - This would need a better way of handling minerals, mainly
+		to have mineral content as a separate field. the first
+		parameter field is free for this.
+	- Simulate rock falling from cliffs when water has removed
+	  enough solid rock from the bottom
+
+SUGG: For non-mapgen FarMesh: Add a per-sector database to store surface
+      stuff as simple flags/values
+      - Light?
+	  - A building?
+	  And at some point make the server send this data to the client too,
+	  instead of referring to the noise functions
+	  - Ground height
+	  - Surface ground type
+	  - Trees?
+
+Gaming ideas:
+-------------
+
+- Aim for something like controlling a single dwarf in Dwarf Fortress
+- The player could go faster by a crafting a boat, or riding an animal
+- Random NPC traders. what else?
+
+Game content:
+-------------
+
+- When furnace is destroyed, move items to player's inventory
+- Add lots of stuff
+- Glass blocks
+- Growing grass, decaying leaves
+	- This can be done in the active blocks I guess.
+	- Lots of stuff can be done in the active blocks.
+	- Uh, is there an active block list somewhere? I think not. Add it.
+- Breaking weak structures
+	- This can probably be accomplished in the same way as grass
+- Player health points
+	- When player dies, throw items on map (needs better item-on-map
+	  implementation)
+- Cobble to get mossy if near water
+- More slots in furnace source list, so that multiple ingredients
+  are possible.
+- Keys to chests?
+
+- The Treasure Guard; a big monster with a hammer
+	- The hammer does great damage, shakes the ground and removes a block
+	- You can drop on top of it, and have some time to attack there
+	  before he shakes you off
+
+- Maybe the difficulty could come from monsters getting tougher in
+  far-away places, and the player starting to need something from
+  there when time goes by.
+  - The player would have some of that stuff at the beginning, and
+    would need new supplies of it when it runs out
+
+- A bomb
+- A spread-items-on-map routine for the bomb, and for dying players
+
+- Fighting:
+  - Proper sword swing simulation
+  - Player should get damage from colliding to a wall at high speed
+
+Documentation:
+--------------
+
+Build system / running:
+-----------------------
+
+Networking and serialization:
+-----------------------------
+
+SUGG: Fix address to be ipv6 compatible
+
+User Interface:
+---------------
+
+Graphics:
+---------
+
+SUGG: Combine MapBlock's face caches to so big pieces that VBO
+      can be used
+      - That is >500 vertices
+	  - This is not easy; all the MapBlocks close to the player would
+	    still need to be drawn separately and combining the blocks
+		would have to happen in a background thread
+
+SUGG: Make fetching sector's blocks more efficient when rendering
+      sectors that have very large amounts of blocks (on client)
+	  - Is this necessary at all?
+
+SUGG: Draw cubes in inventory directly with 3D drawing commands, so that
+      animating them is easier.
+
+SUGG: Option for enabling proper alpha channel for textures
+
+TODO: Flowing water animation
+
+TODO: A setting for enabling bilinear filtering for textures
+
+TODO: Better control of draw_control.wanted_max_blocks
+
+TODO: Further investigate the use of GPU lighting in addition to the
+      current one
+
+TODO: Artificial (night) light could be more yellow colored than sunlight.
+      - This is technically doable.
+	  - Also the actual colors of the textures could be made less colorful
+	    in the dark but it's a bit more difficult.
+
+SUGG: Somehow make the night less colorful
+
+TODO: Occlusion culling
+      - At the same time, move some of the renderMap() block choosing code
+        to the same place as where the new culling happens.
+      - Shoot some rays per frame and when ready, make a new list of
+	    blocks for usage of renderMap and give it a new pointer to it.
+
+Configuration:
+--------------
+
+Client:
+-------
+
+TODO: Untie client network operations from framerate
+      - Needs some input queues or something
+	  - This won't give much performance boost because calculating block
+	    meshes takes so long
+
+SUGG: Make morning and evening transition more smooth and maybe shorter
+
+TODO: Don't update all meshes always on single node changes, but
+      check which ones should be updated
+	  - implement Map::updateNodeMeshes() and the usage of it
+	  - It will give almost always a 4x boost in mesh update performance.
+
+- A weapon engine
+
+- Tool/weapon visualization
+
+FIXME: When disconnected to the menu, memory is not freed properly
+
+TODO: Investigate how much the mesh generator thread gets used when
+      transferring map data
+
+Server:
+-------
+
+SUGG: Make an option to the server to disable building and digging near
+      the starting position
+
+FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
+
+* Fix the problem with the server constantly saving one or a few
+  blocks? List the first saved block, maybe it explains.
+  - It is probably caused by oscillating water
+  - TODO: Investigate if this still happens (this is a very old one)
+* Make a small history check to transformLiquids to detect and log
+  continuous oscillations, in such detail that they can be fixed.
+
+FIXME: The new optimized map sending doesn't sometimes send enough blocks
+       from big caves and such
+FIXME: Block send distance configuration does not take effect for some reason
+
+Environment:
+------------
+
+TODO: Add proper hooks to when adding and removing active blocks
+
+TODO: Finish the ActiveBlockModifier stuff and use it for something
+
+Objects:
+--------
+
+TODO: Get rid of MapBlockObjects and use only ActiveObjects
+	- Skipping the MapBlockObject data is nasty - there is no "total
+	  length" stored; have to make a SkipMBOs function which contains
+	  enough of the current code to skip them properly.
+
+SUGG: MovingObject::move and Player::move are basically the same.
+      combine them.
+	- NOTE: This is a bit tricky because player has the sneaking ability
+	- NOTE: Player::move is more up-to-date.
+	- NOTE: There is a simple move implementation now in collision.{h,cpp}
+	- NOTE: MovingObject will be deleted (MapBlockObject)
+
+TODO: Add a long step function to objects that is called with the time
+      difference when block activates
+
+Map:
+----
+
+TODO: Flowing water to actually contain flow direction information
+      - There is a space for this - it just has to be implemented.
+
+TODO: Consider smoothening cave floors after generating them
+
+TODO: Fix make_tree, make_* to use seed-position-consistent pseudorandom
+	  - delta also
+
+Misc. stuff:
+------------
+TODO: Make sure server handles removing grass when a block is placed (etc)
+      - The client should not do it by itself
+	  - NOTE: I think nobody does it currently...
+TODO: Block cube placement around player's head
+TODO: Protocol version field
+TODO: Think about using same bits for material for fences and doors, for
+	  example
+
+SUGG: Restart irrlicht completely when coming back to main menu from game.
+	- This gets rid of everything that is stored in irrlicht's caches.
+	- This might be needed for texture pack selection in menu
+
+TODO: Merge bahamada's audio stuff (clean patch available)
+
+Making it more portable:
+------------------------
+ 
+Stuff to do before release:
+---------------------------
+
+Fixes to the current release:
+-----------------------------
+
+Stuff to do after release:
+---------------------------
+
+Doing currently:
+----------------
+
+======================================================================
+
+*/

share/server/builtin.lua

@@ -5,6 +5,16 @@
 -- 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)
@@ -106,7 +116,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
@@ -327,9 +337,8 @@ function minetest.node_dig(pos, node, digger)
 		local drops = minetest.get_node_drops(node.name, wielded:get_name())
 
 		-- Wear out tool
-		mp = def.material
-		tp = wielded:get_tool_digging_properties()
-		dp = minetest.get_digging_properties(mp, tp)
+		tp = wielded:get_tool_capabilities()
+		dp = minetest.get_dig_params(def.groups, tp)
 		wielded:add_wear(dp.wear)
 		digger:set_wielded_item(wielded)
 
@@ -366,7 +375,7 @@ minetest.nodedef_default = {
 	stack_max = 99,
 	usable = false,
 	liquids_pointable = false,
-	tool_digging_properties = nil,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -403,14 +412,6 @@ 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,
 }
@@ -425,7 +426,7 @@ minetest.craftitemdef_default = {
 	wield_scale = {x=1,y=1,z=1},
 	stack_max = 99,
 	liquids_pointable = false,
-	tool_digging_properties = nil,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -443,7 +444,7 @@ minetest.tooldef_default = {
 	wield_scale = {x=1,y=1,z=1},
 	stack_max = 1,
 	liquids_pointable = false,
-	tool_digging_properties = nil,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -461,7 +462,7 @@ minetest.noneitemdef_default = {  -- This is used for the hand and unknown items
 	wield_scale = {x=1,y=1,z=1},
 	stack_max = 99,
 	liquids_pointable = false,
-	tool_digging_properties = nil,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = nil,
@@ -643,7 +644,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_digging_properties == nil and
+	if tooldef.tool_capabilities == nil and
 	   (tooldef.full_punch_interval ~= nil or
 	    tooldef.basetime ~= nil or
 	    tooldef.dt_weight ~= nil or
@@ -655,7 +656,7 @@ function minetest.register_tool(name, tooldef)
 	    tooldef.dd_crackiness ~= nil or
 	    tooldef.dd_crumbliness ~= nil or
 	    tooldef.dd_cuttability ~= nil) then
-		tooldef.tool_digging_properties = {
+		tooldef.tool_capabilities = {
 			full_punch_interval = tooldef.full_punch_interval,
 			basetime = tooldef.basetime,
 			dt_weight = tooldef.dt_weight,
@@ -707,25 +708,6 @@ 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",
@@ -762,6 +744,11 @@ minetest.register_node(":ignore", {
 	air_equivalent = true,
 })
 
+-- The hand (bare definition)
+minetest.register_item(":", {
+	type = "none",
+})
+
 --
 -- Default material types
 --

share/server/games/mesetint/mods/default/init.lua

@@ -118,6 +118,9 @@
 --                  {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
@@ -199,7 +202,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)
+-- - 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
@@ -222,6 +225,7 @@
 -- -           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)
@@ -260,7 +264,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_digging_properties(): returns the digging properties of the item,
+-- - 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,
@@ -312,25 +316,22 @@
 --                     if rating not applicable, use 1.
 --                     eg. {wool=1, fluffy=3}
 --                         {soil=2, outerspace=1, crumbly=1}
---                         {hard=3, brittle=3, spikes=2
+--                         {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_digging_properties = {
+--     tool_capabilities = {
 --         full_punch_interval = 1.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,
+--         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),
@@ -368,14 +369,6 @@
 --     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
 -- }
@@ -436,6 +429,18 @@
 --     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
@@ -449,212 +454,166 @@ 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_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,
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			cracky={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
+		}
 	},
 })
 minetest.register_tool("default:pick_stone", {
 	description = "Stone Pickaxe",
 	inventory_image = "default_tool_stonepick.png",
-	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,
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			cracky={times={[1]=1.50, [2]=0.80, [3]=0.60}, maxwear=0.05, maxlevel=1}
+		}
 	},
 })
 minetest.register_tool("default:pick_steel", {
 	description = "Steel Pickaxe",
 	inventory_image = "default_tool_steelpick.png",
-	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,
+	tool_capabilities = {
+		max_drop_level=1,
+		groupcaps={
+			cracky={times={[1]=1.00, [2]=0.60, [3]=0.40}, maxwear=0.1, maxlevel=2}
+		}
 	},
 })
 minetest.register_tool("default:pick_mese", {
 	description = "Mese Pickaxe",
 	inventory_image = "default_tool_mesepick.png",
-	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,
+	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}
+		}
 	},
 })
 minetest.register_tool("default:shovel_wood", {
 	description = "Wooden Shovel",
 	inventory_image = "default_tool_woodshovel.png",
-	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,
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			crumbly={times={[1]=1.50, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=1}
+		}
 	},
 })
 minetest.register_tool("default:shovel_stone", {
 	description = "Stone Shovel",
 	inventory_image = "default_tool_stoneshovel.png",
-	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,
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			crumbly={times={[1]=0.80, [2]=0.50, [3]=0.30}, maxwear=0.05, maxlevel=1}
+		}
 	},
 })
 minetest.register_tool("default:shovel_steel", {
 	description = "Steel Shovel",
 	inventory_image = "default_tool_steelshovel.png",
-	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,
+	tool_capabilities = {
+		max_drop_level=1,
+		groupcaps={
+			crumbly={times={[1]=0.50, [2]=0.35, [3]=0.30}, maxwear=0.1, maxlevel=2}
+		}
 	},
 })
 minetest.register_tool("default:axe_wood", {
 	description = "Wooden Axe",
 	inventory_image = "default_tool_woodaxe.png",
-	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,
+	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}
+		}
 	},
 })
 minetest.register_tool("default:axe_stone", {
 	description = "Stone Axe",
 	inventory_image = "default_tool_stoneaxe.png",
-	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,
+	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}
+		}
 	},
 })
 minetest.register_tool("default:axe_steel", {
 	description = "Steel Axe",
 	inventory_image = "default_tool_steelaxe.png",
-	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,
+	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}
+		}
 	},
 })
 minetest.register_tool("default:sword_wood", {
 	description = "Wooden Sword",
 	inventory_image = "default_tool_woodsword.png",
-	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,
+	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}
+		}
 	}
 })
 minetest.register_tool("default:sword_stone", {
 	description = "Stone Sword",
 	inventory_image = "default_tool_stonesword.png",
-	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,
+	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}
+		}
 	}
 })
 minetest.register_tool("default:sword_steel", {
 	description = "Steel Sword",
 	inventory_image = "default_tool_steelsword.png",
-	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,
+	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}
+		}
 	}
 })
 
@@ -1107,7 +1066,7 @@ minetest.register_node("default:stone", {
 	description = "Stone",
 	tile_images = {"default_stone.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:cobble',
 	legacy_mineral = true,
 })
@@ -1116,7 +1075,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,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:coal_lump',
 })
 
@@ -1124,7 +1083,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,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:iron_lump',
 })
 
@@ -1132,7 +1091,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,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:dirt',
 })
 
@@ -1140,7 +1099,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,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:dirt',
 })
 
@@ -1148,28 +1107,28 @@ minetest.register_node("default:dirt", {
 	description = "Dirt",
 	tile_images = {"default_dirt.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 })
 
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tile_images = {"default_sand.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 })
 
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tile_images = {"default_gravel.png"},
 	is_ground_content = true,
-	material = minetest.digprop_gravellike(1.0),
+	groups = {crumbly=2},
 })
 
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tile_images = {"default_sandstone.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),  -- FIXME should this be stonelike?
+	groups = {crumbly=2,cracky=2},
 	drop = 'default:sand',
 })
 
@@ -1177,7 +1136,7 @@ minetest.register_node("default:clay", {
 	description = "Clay",
 	tile_images = {"default_clay.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:clay_lump 4',
 })
 
@@ -1185,7 +1144,7 @@ minetest.register_node("default:brick", {
 	description = "Brick",
 	tile_images = {"default_brick.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:clay_brick 4',
 })
 
@@ -1193,14 +1152,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,
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 })
 
 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,
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 })
 
 minetest.register_node("default:junglegrass", {
@@ -1212,7 +1171,7 @@ minetest.register_node("default:junglegrass", {
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
 	walkable = false,
-	material = minetest.digprop_leaveslike(1.0),
+	groups = {snappy=3},
 })
 
 minetest.register_node("default:leaves", {
@@ -1221,7 +1180,7 @@ minetest.register_node("default:leaves", {
 	visual_scale = 1.3,
 	tile_images = {"default_leaves.png"},
 	paramtype = "light",
-	material = minetest.digprop_leaveslike(1.0),
+	groups = {snappy=3},
 	drop = {
 		max_items = 1,
 		items = {
@@ -1243,7 +1202,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,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=3},
 })
 
 minetest.register_node("default:papyrus", {
@@ -1255,14 +1214,14 @@ minetest.register_node("default:papyrus", {
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
-	material = minetest.digprop_leaveslike(0.5),
+	groups = {snappy=3},
 })
 
 minetest.register_node("default:bookshelf", {
 	description = "Bookshelf",
 	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=3,oddly_breakable_by_hand=3},
 })
 
 minetest.register_node("default:glass", {
@@ -1273,7 +1232,7 @@ minetest.register_node("default:glass", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
-	material = minetest.digprop_glasslike(1.0),
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
 })
 
 minetest.register_node("default:fence_wood", {
@@ -1288,7 +1247,7 @@ minetest.register_node("default:fence_wood", {
 		type = "fixed",
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
 	},
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
 })
 
 minetest.register_node("default:rail", {
@@ -1302,9 +1261,9 @@ minetest.register_node("default:rail", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+		--fixed = <default>
 	},
-	material = minetest.digprop_dirtlike(0.75),
+	groups = {bendy=2,snappy=1,dig_immediate=2},
 })
 
 minetest.register_node("default:ladder", {
@@ -1324,7 +1283,7 @@ minetest.register_node("default:ladder", {
 		--wall_bottom = = <default>
 		--wall_side = = <default>
 	},
-	material = minetest.digprop_woodlike(0.5),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
 	legacy_wallmounted = true,
 })
 
@@ -1332,14 +1291,14 @@ minetest.register_node("default:wood", {
 	description = "Wood",
 	tile_images = {"default_wood.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese",
 	tile_images = {"default_mese.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.5),
+	groups = {cracky=1},
 })
 
 minetest.register_node("default:cloud", {
@@ -1368,6 +1327,7 @@ 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", {
@@ -1390,6 +1350,7 @@ 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", {
@@ -1413,6 +1374,7 @@ 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", {
@@ -1436,6 +1398,7 @@ 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", {
@@ -1455,7 +1418,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},
 	},
-	material = minetest.digprop_constanttime(0.0),
+	groups = {choppy=2,dig_immediate=3},
 	legacy_wallmounted = true,
 })
 
@@ -1476,7 +1439,7 @@ minetest.register_node("default:sign_wall", {
 		--wall_bottom = <default>
 		--wall_side = <default>
 	},
-	material = minetest.digprop_constanttime(0.5),
+	groups = {choppy=2,dig_immediate=2},
 	legacy_wallmounted = true,
 })
 
@@ -1486,7 +1449,7 @@ minetest.register_node("default:chest", {
 		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "chest",
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1496,7 +1459,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",
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1506,7 +1469,7 @@ minetest.register_node("default:furnace", {
 		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "furnace",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1514,21 +1477,21 @@ minetest.register_node("default:cobble", {
 	description = "Cobble",
 	tile_images = {"default_cobble.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.9),
+	groups = {cracky=3},
 })
 
 minetest.register_node("default:mossycobble", {
 	description = "Mossy Cobble",
 	tile_images = {"default_mossycobble.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.8),
+	groups = {cracky=3},
 })
 
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tile_images = {"default_steel_block.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(5.0),
+	groups = {snappy=1,bendy=2},
 })
 
 minetest.register_node("default:nyancat", {
@@ -1537,7 +1500,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",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1545,7 +1508,7 @@ minetest.register_node("default:nyancat_rainbow", {
 	description = "Nyancat Rainbow",
 	tile_images = {"default_nc_rb.png"},
 	inventory_image = "default_nc_rb.png",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 })
 
 minetest.register_node("default:sapling", {
@@ -1557,7 +1520,7 @@ minetest.register_node("default:sapling", {
 	wield_image = "default_sapling.png",
 	paramtype = "light",
 	walkable = false,
-	material = minetest.digprop_constanttime(0.0),
+	groups = {snappy=2,dig_immediate=3},
 })
 
 minetest.register_node("default:apple", {
@@ -1569,7 +1532,7 @@ minetest.register_node("default:apple", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	material = minetest.digprop_constanttime(0.0),
+	groups = {fleshy=3,dig_immediate=3},
 	on_use = minetest.item_eat(4),
 })
 
@@ -1647,7 +1610,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')
+minetest.add_to_creative_inventory('default:fence_wood')
 minetest.add_to_creative_inventory('default:rail')
 minetest.add_to_creative_inventory('default:mese')
 minetest.add_to_creative_inventory('default:chest')
@@ -1778,6 +1741,9 @@ 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.');