Fire: Slow down fire spread and reduce lua load

Increase chance value of ABMs
Disable ignition from a distance
Only detect neighbouring extinguishing nodes
Fix code style issues and add comments

.gitignore

@@ -5,3 +5,5 @@
 tags
 *.vim
 
+## Files related to minetest development cycle
+*.patch

README.txt

@@ -17,7 +17,7 @@ Additionally, when the minetest engine is tagged to be a certain version (eg.
 0.4.10), minetest_game is tagged with the version too.
 
 When stable releases are made, minetest_game is packaged and made available in
-  http://minetest.net/download.php
+  http://minetest.net/download
 and in case the repository has grown too much, it may be reset. In that sense,
 this is not a "real" git repository. (Package maintainers please note!)
 

game_api.txt

@@ -23,15 +23,57 @@ The bucket API allows registering new types of buckets for non-default liquids.
 		"bucket_lava.png",			-- Bucket texture (for wielditem and inventory_image)
 		"Lava Bucket"				-- Bucket description
 	)
-	
+
+Beds API
+--------
+	beds.register_bed(
+		"beds:bed",			-- Bed name
+		def: See [#Bed definition]	-- Bed definition
+	)
+
+	beds.read_spawns()			-- returns a table containing players respawn positions
+	beds.kick_players()			-- forces all players to leave bed
+	beds.skip_night()			-- sets world time to morning and saves respawn position of all players currently sleeping
+
+#Bed definition
+---------------
+{
+	description = "Simple Bed",
+	inventory_image = "beds_bed.png",
+	wield_image = "beds_bed.png",
+	tiles = {
+	    bottom = {[Tile definition],
+		^ the tiles of the bottom part of the bed
+	    },
+	    top = {[Tile definition],
+		^ the tiles of the bottom part of the bed
+	    }
+	},
+	nodebox = {
+	    bottom = regular nodebox, see [Node boxes],		-- bottm part of bed
+	    top = regular nodebox, see [Node boxes],		-- top part of bed
+	},
+	selectionbox = regular nodebox, see [Node boxes],	-- for both nodeboxes
+	recipe = {	-- Craft recipe
+		{"group:wool", "group:wool", "group:wool"},
+		{"group:wood", "group:wood", "group:wood"}
+	}
+}
+
 Doors API
 ---------
-The doors mod allows modders to register custom doors.
+The doors mod allows modders to register custom doors and trapdoors.
+
+doors.register_door(name, def)
+^ name: "Door name"
+^ def: See [#Door definition]
+ -> Registers new door
+
+doors.register_trapdoor(name, def)
+^ name: "Trapdoor name"
+^ def: See [#Trapdoor definition]
+ -> Registers new trapdoor
 
-	doors.register_door(name, def)
-	^ name: "Door name"
-	^ def: See [#Door definition]
-	
 #Door definition
 ----------------
 {
@@ -46,17 +88,34 @@ The doors mod allows modders to register custom doors.
 	node_box_top = regular nodebox, see [Node boxes], OPTIONAL,
 	selection_box_bottom = regular nodebox, see [Node boxes], OPTIONAL,
 	selection_box_top = regular nodebox, see [Node boxes], OPTIONAL,
+	sound_open_door = sound play for open door, OPTIONAL,
+	sound_close_door = sound play for close door, OPTIONAL,
 	only_placer_can_open = true/false,
 	^ If true, only placer can open the door (locked for others)
 }
 
+#Trapdoor definition
+----------------
+{
+	tile_front = "doors_trapdoor.png",
+	^ the texture for the front and back of the trapdoor
+	tile_side: "doors_trapdoor_side.png",
+	^ the tiles of the four side parts of the trapdoor
+	sound_open = sound to play when opening the trapdoor, OPTIONAL,
+	sound_close = sound to play when closing the trapdoor, OPTIONAL,
+	-> You can add any other node definition properties for minetest.register_node,
+	   such as wield_image, inventory_image, sounds, groups, description, ...
+	   Only node_box, selection_box, tiles, drop, drawtype, paramtype, paramtype2, on_rightclick
+	   will be overwritten by the trapdoor registration function
+}
+
 Farming API
 -----------
 The farming API allows you to easily register plants and hoes.
 
 farming.register_hoe(name, hoe definition)
  -> Register a new hoe, see [#hoe definition]
- 
+
 farming.register_plant(name, Plant definition)
  -> Register a new growing plant, see [#Plant definition]
 
@@ -66,7 +125,8 @@ farming.register_plant(name, Plant definition)
 	description = "",	-- Description for tooltip
 	inventory_image = "unknown_item.png",	-- Image to be used as wield- and inventory image
 	max_uses = 30,	-- Uses until destroyed
-	recipe = {	-- Craft recipe
+	material = "",	-- Material for recipes
+	recipe = {	-- Craft recipe, if material isn't used
 		{"air", "air", "air"},
 		{"", "group:stick"},
 		{"", "group:stick"},
@@ -79,11 +139,26 @@ farming.register_plant(name, Plant definition)
 	description = "",	-- Description of seed item
 	inventory_image = "unknown_item.png",	-- Image to be used as seed's wield- and inventory image
 	steps = 8,	-- How many steps the plant has to grow, until it can be harvested
-	^ Always provide a plant texture for ech step, format: modname_plantname_i.png (i = stepnumber)
+	^ Always provide a plant texture for each step, format: modname_plantname_i.png (i = stepnumber)
 	minlight = 13, -- Minimum light to grow
-	maxlight = LIGHT_MAX -- Maximum light to grow
+	maxlight = default.LIGHT_MAX -- Maximum light to grow
 }
 
+Screwdriver API
+---------------
+The screwdriver API allows you to control a node's behaviour when a screwdriver is used on it.
+To use it, add the on_screwdriver function to the node definition.
+on_rotate(pos, node, user, mode, new_param2)
+^ pos: position of the node that the screwdriver is being used on
+^ node: that node
+^ user: the player who used the screwdriver
+^ mode: screwdriver.ROTATE_FACE or screwdriver.ROTATE_AXIS
+^ new_param2: the new value of param2 that would have been set if on_rotate wasn't there
+^ return value: false to disallow rotation, nil to keep default behaviour, true to allow
+  it but to indicate that changed have already been made (so the screwdriver will wear out)
+^ use on_rotate = screwdriver.disallow to always disallow rotation
+^ use on_rotate = screwdriver.rotate_simple to allow only face rotation
+
 Stairs API
 ----------
 The stairs API lets you register stairs and slabs and ensures that they are registered the same way as those
@@ -97,7 +172,7 @@ stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
  -> images: see [Tile definition]
  -> description: used for the description field in the stair's definition
  -> sounds: see [#Default sounds]
- 
+
 stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
  -> Registers a slabs
  -> subname: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_subname"
@@ -106,19 +181,19 @@ stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
  -> images: see [Tile definition]
  -> description: used for the description field in the stair's definition
  -> sounds: see [#Default sounds]
- 
+
 stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds)
  -> A wrapper for stairs.register_stair and stairs.register_slab
  -> Uses almost the same arguments as stairs.register_stair
  -> desc_stair: Description for stair node
  -> desc_slab: Description for slab node
- 
+
 Xpanes API
 ----------
 Creates panes that automatically connect to each other
 
 xpanes.register_pane(subname, def)
- -> subname: used for nodename. Result: "xpanes:subname_{1..16}"
+ -> subname: used for nodename. Result: "xpanes:subname" and "xpanes:subname_{2..15}"
  -> def: See [#Pane definition]
 
 #Pane definition
@@ -132,12 +207,26 @@ xpanes.register_pane(subname, def)
 	^ See [#Default sounds]
 	recipe = {{"","","","","","","","",""}},
 	^ Recipe field only
-	on_construct = function(pos)
-		update_pane(pos, "pane")
-    end,
-	^ Required to handle rotation correctly
 }
 
+Raillike definitions
+--------------------
+The following nodes use the group `connect_to_raillike` and will only connect to
+raillike nodes within this group and the same group value.
+Use `minetest.raillike_group(<Name>)` to get the group value.
+
+| Node type		| Raillike group name
++-----------------------+----------------------------------
+| default:rail		| "rail"
+| tnt:gunpowder		| "gunpowder"
+| tnt:gunpowder_burning	| "gunpowder"
+
+Example:
+If you want to add a new rail type and want it to connect with default:rail,
+add `connect_to_raillike=minetest.raillike_group("rail")` into the `groups` table
+of your node.
+
+
 Default sounds
 --------------
 Sounds inside the default table can be used within the sounds field of node definitions.
@@ -150,6 +239,11 @@ default.node_sound_wood_defaults()
 default.node_sound_leaves_defaults()
 default.node_sound_glass_defaults()
 
+Default constants
+-----------------
+default.LIGHT_MAX
+^ The maximum light level (see [Node definition] light_source)
+
 Player API
 ----------
 The player API can register player models and update the player's appearence
@@ -197,3 +291,94 @@ Model Definition
 		-- ...
 	},
 }
+
+Leafdecay
+---------
+To enable leaf decay for a node, add it to the "leafdecay" group.
+
+The rating of the group determines how far from a node in the group "tree"
+the node can be without decaying.
+
+If param2 of the node is ~= 0, the node will always be preserved. Thus, if
+the player places a node of that kind, you will want to set param2=1 or so.
+
+The function default.after_place_leaves can be set as after_place_node of a node
+to set param2 to 1 if the player places the node (should not be used for nodes
+that use param2 otherwise (e.g. facedir)).
+
+If the node is in the leafdecay_drop group then it will always be dropped as an
+item.
+
+Dyes
+----
+To make recipes that will work with any dye ever made by anybody, define
+them based on groups. You can select any group of groups, based on your need for
+amount of colors.
+
+#Color groups
+-------------
+Base color groups:
+- basecolor_white
+- basecolor_grey
+- basecolor_black
+- basecolor_red
+- basecolor_yellow
+- basecolor_green
+- basecolor_cyan
+- basecolor_blue
+- basecolor_magenta
+
+Extended color groups (* = equal to a base color):
+* excolor_white
+- excolor_lightgrey
+* excolor_grey
+- excolor_darkgrey
+* excolor_black
+* excolor_red
+- excolor_orange
+* excolor_yellow
+- excolor_lime
+* excolor_green
+- excolor_aqua
+* excolor_cyan
+- excolor_sky_blue
+* excolor_blue
+- excolor_violet
+* excolor_magenta
+- excolor_red_violet
+
+The whole unifieddyes palette as groups:
+- unicolor_<excolor>
+For the following, no white/grey/black is allowed:
+- unicolor_medium_<excolor>
+- unicolor_dark_<excolor>
+- unicolor_light_<excolor>
+- unicolor_<excolor>_s50
+- unicolor_medium_<excolor>_s50
+- unicolor_dark_<excolor>_s50
+
+Example of one shapeless recipe using a color group:
+minetest.register_craft({
+	type = "shapeless",
+	output = '<mod>:item_yellow',
+	recipe = {'<mod>:item_no_color', 'group:basecolor_yellow'},
+})
+
+#Color lists
+------------
+dye.basecolors
+^ Array containing the names of available base colors
+
+dye.excolors
+^ Array containing the names of the available extended colors
+
+Trees
+-----
+default.grow_tree(pos, is_apple_tree)
+^ Grows a tree or apple tree at pos
+
+default.grow_jungle_tree(pos)
+^ Grows a jungletree at pos
+
+default.grow_pine_tree(pos)
+^ Grows a pinetree at pos

minetest.conf

@@ -1,6 +0,0 @@
-mgv6_spflags = biomeblend, jungles
-
-movement_liquid_sink = 25
-movement_speed_jump = 6.2
-movement_liquid_fluidity = 0.8
-movement_liquid_fluidity_smooth = 2

minetest.conf.example

@@ -0,0 +1,28 @@
+# This file contains settings of minetest_game that can be changed in
+# minetest.conf
+#
+# By default, all the settings are commented and not functional.
+# Uncomment settings by removing the preceding #.
+
+# Whether creative mode (fast digging of all blocks, unlimited resources) should be enabled
+#creative_mode = false
+
+# The time in seconds after which the bones of a dead player can be looted by everyone
+# 0 to disable
+#share_bones_time = 1200
+
+# Whether fire should be disabled (all fire nodes will instantly disappear)
+#disable_fire = false
+
+# Whether steel tools, torches and cobblestone should be given to new players
+#give_initial_stuff = false
+
+# Whether the TNT mod should be enabled
+#enable_tnt = <true in singleplayer, false in multiplayer>
+
+# The radius of a TNT explosion
+#tnt_radius = 3
+
+# Enable the stairs mod ABM that replaces the old 'upside down'
+# stair and slab nodes in old maps with the new param2 versions.
+#enable_stairs_replace_abm = false

mods/beds/Changelog.txt

@@ -0,0 +1,18 @@
+1.0.1 beta
+----------
+- Add backwards compatibility with PilzAdam's beds mod
+- Fix placement
+- Fix small bugs
+- Prevent possible crash
+
+1.1
+---
+- Add fancy bed model (based on jp's model)
+- Add API to register beds
+- Allow players always to detach from bed (by donat-b) 
+- If more than 50% of players want sleep they can skip the night
+- Don't show sleep dialog in singleplayer
+
+1.1.1
+-----
+- Prevent possbile crash by trying to reposition leaving players

mods/beds/README.txt

@@ -0,0 +1,29 @@
+Minetest mod "Beds"
+===================
+by BlockMen (c) 2014-2015
+
+Version: 1.1.1
+
+About
+~~~~~
+This mod adds a bed to Minetest which allows to skip the night. To sleep rightclick the bed, if playing 
+in singleplayer mode the night gets skipped imideatly. If playing on server you get shown how many other
+players are in bed too. If all players are sleeping the night gets skipped aswell. Also the night skip can be forced
+if more than 50% of the players are lying in bed and use this option.
+
+Another feature is a controled respawning. If you have slept in bed (not just lying in it) your respawn point
+is set to the beds location and you will respawn there after death.
+You can disable the respawn at beds by setting "enable_bed_respawn = false" in minetest.conf
+
+
+
+License of source code, textures: WTFPL
+---------------------------------------
+(c) Copyright BlockMen (2014-2015)
+
+
+This program is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.

mods/beds/api.lua

@@ -0,0 +1,111 @@
+function beds.register_bed(name, def)
+	minetest.register_node(name .. "_bottom", {
+		description = def.description,
+		inventory_image = def.inventory_image,
+		wield_image = def.wield_image,
+		drawtype = "nodebox",
+		tiles = def.tiles.bottom,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		stack_max = 1,
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
+		sounds = default.node_sound_wood_defaults(),
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.bottom,
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selectionbox,
+				
+		},
+		after_place_node = function(pos, placer, itemstack)
+			local n = minetest.get_node_or_nil(pos)
+			if not n or not n.param2 then
+				minetest.remove_node(pos)
+				return true
+			end
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node_or_nil(p)
+			local def = n2 and minetest.registered_items[n2.name]
+			if not def or not def.buildable_to then
+				minetest.remove_node(pos)
+				return true
+			end
+			minetest.set_node(p, {name = n.name:gsub("%_bottom", "_top"), param2 = n.param2})
+			return false
+		end,	
+		on_destruct = function(pos)
+			local n = minetest.get_node_or_nil(pos)
+			if not n then return end
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node(p)
+			if minetest.get_item_group(n2.name, "bed") == 2 and n.param2 == n2.param2 then
+				minetest.remove_node(p)
+			end
+		end,
+		on_rightclick = function(pos, node, clicker)
+			beds.on_rightclick(pos, clicker)
+		end,
+		on_rotate = function(pos, node, user, mode, new_param2)
+			local dir = minetest.facedir_to_dir(node.param2)
+			local p = vector.add(pos, dir)
+			local node2 = minetest.get_node_or_nil(p)
+			if not node2 or not minetest.get_item_group(node2.name, "bed") == 2 or
+					not node.param2 == node2.param2 then
+				return false
+			end
+			if minetest.is_protected(p, user:get_player_name()) then
+				minetest.record_protection_violation(p, user:get_player_name())
+				return false
+			end
+			if mode ~= screwdriver.ROTATE_FACE then
+				return false
+			end
+			local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
+			local node3 = minetest.get_node_or_nil(newp)
+			local def = node3 and minetest.registered_nodes[node3.name]
+			if not def or not def.buildable_to then
+				return false
+			end
+			if minetest.is_protected(newp, user:get_player_name()) then
+				minetest.record_protection_violation(newp, user:get_player_name())
+				return false
+			end
+			node.param2 = new_param2
+			minetest.swap_node(pos, node)
+			minetest.remove_node(p)
+			minetest.set_node(newp, {name = node.name:gsub("%_bottom", "_top"), param2 = new_param2})
+			return true
+		end,
+	})
+
+	minetest.register_node(name .. "_top", {
+		drawtype = "nodebox",
+		tiles = def.tiles.top,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
+		sounds = default.node_sound_wood_defaults(),
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.top,
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = {0, 0, 0, 0, 0, 0},
+		},
+	})
+
+	minetest.register_alias(name, name .. "_bottom")
+
+	-- register recipe
+	minetest.register_craft({
+		output = name,
+		recipe = def.recipe
+	})
+end

mods/beds/beds.lua

@@ -0,0 +1,88 @@
+-- fancy shaped bed
+beds.register_bed("beds:fancy_bed", {
+	description = "Fancy Bed",
+	inventory_image = "beds_bed_fancy.png",
+	wield_image = "beds_bed_fancy.png",
+	tiles = {
+	    bottom = {
+		"beds_bed_top1.png",
+		"default_wood.png",
+		"beds_bed_side1.png",
+		"beds_bed_side1.png^[transformFX",
+		"default_wood.png",
+		"beds_bed_foot.png",
+	    },
+	    top = {
+		"beds_bed_top2.png",
+		"default_wood.png",
+		"beds_bed_side2.png",
+		"beds_bed_side2.png^[transformFX",
+		"beds_bed_head.png",
+		"default_wood.png",
+	    }
+	},
+	nodebox = {
+	    bottom = {
+		{-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375},
+		{0.375, -0.5, -0.5, 0.5, -0.065, -0.4375},
+		{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375},
+		{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+		{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+		{-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5},
+	      },
+	      top = {
+		{-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5},
+		{0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5},
+		{-0.5, 0, 0.4375, 0.5, 0.125, 0.5},
+		{-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5},
+		{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+		{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+		{-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375},
+	      }
+	},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	recipe = {
+		{"", "", "group:stick"},
+		{"wool:red", "wool:red", "wool:white"},
+		{"group:wood", "group:wood", "group:wood"},
+	},
+})
+
+-- simple shaped bed
+beds.register_bed("beds:bed", {
+	description = "Simple Bed",
+	inventory_image = "beds_bed.png",
+	wield_image = "beds_bed.png",
+	tiles = {
+	    bottom = {
+		"beds_bed_top_bottom.png^[transformR90",
+		"default_wood.png",
+		"beds_bed_side_bottom_r.png",
+		"beds_bed_side_bottom_r.png^[transformfx",
+		"beds_transparent.png",
+		"beds_bed_side_bottom.png"
+	    },
+	    top = {
+		"beds_bed_top_top.png^[transformR90",
+		"default_wood.png", 
+		"beds_bed_side_top_r.png",
+		"beds_bed_side_top_r.png^[transformfx",
+		"beds_bed_side_top.png",
+		"beds_transparent.png",
+	    }
+	},
+	nodebox = {
+	    bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+	    top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+	},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	recipe = {
+		{"wool:red", "wool:red", "wool:white"},
+		{"group:wood", "group:wood", "group:wood"}
+	},
+
+})
+
+-- aliases for PA's beds mod
+minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom")
+minetest.register_alias("beds:bed_top_red", "beds:bed_top")

mods/beds/depends.txt

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

mods/beds/functions.lua

@@ -0,0 +1,213 @@
+local player_in_bed = 0
+local is_sp = minetest.is_singleplayer()
+local enable_respawn = minetest.setting_getbool("enable_bed_respawn")
+if enable_respawn == nil then
+	enable_respawn = true
+end
+
+
+-- helper functions
+
+local function get_look_yaw(pos)
+	local n = minetest.get_node(pos)
+	if n.param2 == 1 then
+		return 7.9, n.param2
+	elseif n.param2 == 3 then
+		return 4.75, n.param2
+	elseif n.param2 == 0 then
+		return 3.15, n.param2
+	else
+		return 6.28, n.param2
+	end
+end
+
+local function check_in_beds(players)
+	local in_bed = beds.player
+	if not players then
+		players = minetest.get_connected_players()
+	end
+
+	for n, player in ipairs(players) do
+		local name = player:get_player_name()
+		if not in_bed[name] then
+			return false
+		end
+	end
+
+	return #players > 0
+end
+
+local function lay_down(player, pos, bed_pos, state, skip)
+	local name = player:get_player_name()
+	local hud_flags = player:hud_get_flags()
+
+	if not player or not name then
+		return
+	end
+
+	-- stand up
+	if state ~= nil and not state then
+		local p = beds.pos[name] or nil
+		if beds.player[name] ~= nil then
+			beds.player[name] = nil
+			player_in_bed = player_in_bed - 1
+		end
+		-- skip here to prevent sending player specific changes (used for leaving players)
+		if skip then
+			return
+		end
+		if p then 
+			player:setpos(p)
+		end
+
+		-- physics, eye_offset, etc
+		player:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0})
+		player:set_look_yaw(math.random(1, 180)/100)
+		default.player_attached[name] = false
+		player:set_physics_override(1, 1, 1)
+		hud_flags.wielditem = true
+		default.player_set_animation(player, "stand" , 30)
+
+	-- lay down
+	else
+		beds.player[name] = 1
+		beds.pos[name] = pos
+		player_in_bed = player_in_bed + 1
+
+		-- physics, eye_offset, etc
+		player:set_eye_offset({x=0,y=-13,z=0}, {x=0,y=0,z=0})
+		local yaw, param2 = get_look_yaw(bed_pos)
+		player:set_look_yaw(yaw)
+		local dir = minetest.facedir_to_dir(param2)
+		local p = {x=bed_pos.x+dir.x/2,y=bed_pos.y,z=bed_pos.z+dir.z/2}
+		player:set_physics_override(0, 0, 0)
+		player:setpos(p)
+		default.player_attached[name] = true
+		hud_flags.wielditem = false
+		default.player_set_animation(player, "lay" , 0)
+	end
+
+	player:hud_set_flags(hud_flags)
+end
+
+local function update_formspecs(finished)
+	local ges = #minetest.get_connected_players()
+	local form_n = ""
+	local is_majority = (ges/2) < player_in_bed
+
+	if finished then
+		form_n = beds.formspec ..
+			"label[2.7,11; Good morning.]"
+	else
+		form_n = beds.formspec ..
+			"label[2.2,11;"..tostring(player_in_bed).." of "..tostring(ges).." players are in bed]"	
+		if is_majority then
+			form_n = form_n ..
+				"button_exit[2,8;4,0.75;force;Force night skip]"
+		end
+	end
+
+	for name,_ in pairs(beds.player) do
+		minetest.show_formspec(name, "beds_form", form_n)
+	end
+end
+
+
+-- public functions
+
+function beds.kick_players()
+	for name,_ in pairs(beds.player) do
+		local player = minetest.get_player_by_name(name)
+		lay_down(player, nil, nil, false)
+	end
+end
+
+function beds.skip_night()
+	minetest.set_timeofday(0.23)
+	beds.set_spawns()
+end
+
+function beds.on_rightclick(pos, player)
+	local name = player:get_player_name()
+	local ppos = player:getpos()
+	local tod = minetest.get_timeofday()
+
+	if tod > 0.2 and tod < 0.805 then
+		if beds.player[name] then
+			lay_down(player, nil, nil, false)
+		end
+		minetest.chat_send_player(name, "You can only sleep at night.")
+		return
+	end
+
+	-- move to bed
+	if not beds.player[name] then
+		lay_down(player, ppos, pos)
+	else
+		lay_down(player, nil, nil, false)
+	end
+
+	if not is_sp then
+		update_formspecs(false)
+	end
+
+	-- skip the night and let all players stand up
+	if check_in_beds() then
+		minetest.after(2, function()
+			beds.skip_night()
+			if not is_sp then
+				update_formspecs(true)
+			end
+			beds.kick_players()
+		end)
+	end
+end
+
+
+-- callbacks
+
+minetest.register_on_joinplayer(function(player)
+	beds.read_spawns()
+end)
+
+-- respawn player at bed if enabled and valid position is found
+minetest.register_on_respawnplayer(function(player)
+	if not enable_respawn then
+		return false
+	end
+	local name = player:get_player_name()
+	local pos = beds.spawn[name] or nil
+	if pos then
+		player:setpos(pos)
+		return true
+	end
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	lay_down(player, nil, nil, false, true)
+	beds.player[name] = nil
+	if check_in_beds() then
+		minetest.after(2, function()
+			beds.skip_night()
+			update_formspecs(true)
+			beds.kick_players()
+		end)
+	end
+end)
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if formname ~= "beds_form" then
+		return
+	end
+	if fields.quit or fields.leave then
+		lay_down(player, nil, nil, false)
+		update_formspecs(false)
+	end
+
+	if fields.force then
+		beds.skip_night()
+		update_formspecs(true)
+		beds.kick_players()
+	end
+end)

mods/beds/init.lua

@@ -0,0 +1,16 @@
+beds = {}
+beds.player = {}
+beds.pos = {}
+beds.spawn = {}
+
+beds.formspec = "size[8,15;true]"..
+		"bgcolor[#080808BB; true]"..
+		"button_exit[2,12;4,0.75;leave;Leave Bed]"
+
+local modpath = minetest.get_modpath("beds")
+
+-- load files
+dofile(modpath.."/functions.lua")
+dofile(modpath.."/api.lua")
+dofile(modpath.."/beds.lua")
+dofile(modpath.."/spawns.lua")

mods/beds/spawns.lua

@@ -0,0 +1,58 @@
+local world_path = minetest.get_worldpath()
+local org_file = world_path .. "/beds_spawns"
+local file = world_path .. "/beds_spawns"
+local bkwd = false
+
+-- check for PA's beds mod spawns
+local cf = io.open(world_path .. "/beds_player_spawns", "r")
+if cf ~= nil then
+	io.close(cf)
+	file = world_path .. "/beds_player_spawns"
+	bkwd = true
+end
+
+function beds.read_spawns()
+	local spawns = beds.spawn
+	local input = io.open(file, "r")
+	if input and not bkwd then
+		repeat
+			local x = input:read("*n")
+			if x == nil then
+            			break
+            		end
+			local y = input:read("*n")
+			local z = input:read("*n")
+			local name = input:read("*l")
+			spawns[name:sub(2)] = {x = x, y = y, z = z}
+		until input:read(0) == nil
+		io.close(input)
+	elseif input and bkwd then
+		beds.spawn = minetest.deserialize(input:read("*all"))
+		input:close()
+		beds.save_spawns()
+		os.rename(file, file .. ".backup")
+		file = org_file
+	else
+		spawns = {}
+	end
+end
+
+function beds.save_spawns()
+	if not beds.spawn then
+		return
+	end
+	local output = io.open(org_file, "w")
+	for i, v in pairs(beds.spawn) do
+		output:write(v.x.." "..v.y.." "..v.z.." "..i.."\n")
+	end
+	io.close(output)
+end
+
+function beds.set_spawns()
+	for name,_ in pairs(beds.player) do
+		local player = minetest.get_player_by_name(name)
+		local p = player:getpos()
+		beds.spawn[name] = p
+	end
+	beds.save_spawns()
+end

mods/boats/init.lua

@@ -1,4 +1,3 @@
-
 --
 -- Helper functions
 --
@@ -8,22 +7,25 @@ local function is_water(pos)
 	return minetest.get_item_group(nn, "water") ~= 0
 end
 
+
 local function get_sign(i)
 	if i == 0 then
 		return 0
 	else
-		return i/math.abs(i)
+		return i / math.abs(i)
 	end
 end
 
+
 local function get_velocity(v, yaw, y)
-	local x = -math.sin(yaw)*v
-	local z = math.cos(yaw)*v
-	return {x=x, y=y, z=z}
+	local x = -math.sin(yaw) * v
+	local z =  math.cos(yaw) * v
+	return {x = x, y = y, z = z}
 end
 
+
 local function get_v(v)
-	return math.sqrt(v.x^2+v.z^2)
+	return math.sqrt(v.x ^ 2 + v.z ^ 2)
 end
 
 --
@@ -32,9 +34,9 @@ end
 
 local boat = {
 	physical = true,
-	collisionbox = {-0.6,-0.4,-0.6, 0.6,0.3,0.6},
+	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
 	visual = "mesh",
-	mesh = "boat.x",
+	mesh = "boat.obj",
 	textures = {"default_wood.png"},
 
 	driver = nil,
@@ -43,6 +45,7 @@ local boat = {
 	removed = false
 }
 
+
 function boat.on_rightclick(self, clicker)
 	if not clicker or not clicker:is_player() then
 		return
@@ -53,118 +56,140 @@ function boat.on_rightclick(self, clicker)
 		clicker:set_detach()
 		default.player_attached[name] = false
 		default.player_set_animation(clicker, "stand" , 30)
+		local pos = clicker:getpos()
+		pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
+		minetest.after(0.1, function()
+			clicker:setpos(pos)
+		end)
 	elseif not self.driver then
 		self.driver = clicker
-		clicker:set_attach(self.object, "", {x=0,y=11,z=-3}, {x=0,y=0,z=0})
+		clicker:set_attach(self.object, "",
+			{x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
 		default.player_attached[name] = true
 		minetest.after(0.2, function()
 			default.player_set_animation(clicker, "sit" , 30)
 		end)
-		self.object:setyaw(clicker:get_look_yaw()-math.pi/2)
+		self.object:setyaw(clicker:get_look_yaw() - math.pi / 2)
 	end
 end
 
+
 function boat.on_activate(self, staticdata, dtime_s)
-	self.object:set_armor_groups({immortal=1})
+	self.object:set_armor_groups({immortal = 1})
 	if staticdata then
 		self.v = tonumber(staticdata)
 	end
 	self.last_v = self.v
 end
 
-function boat.get_staticdata()
-	return tostring(v)
+
+function boat.get_staticdata(self)
+	return tostring(self.v)
 end
 
-function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, direction)
+
+function boat.on_punch(self, puncher, time_from_last_punch,
+		tool_capabilities, direction)
 	if not puncher or not puncher:is_player() or self.removed then
 		return
 	end
-	puncher:set_detach()
-	default.player_attached[puncher:get_player_name()] = false
-
-	self.removed = true
-	-- delay remove to ensure player is detached
-	minetest.after(0.1,function()
-		self.object:remove()
-	end)
-	if not minetest.setting_getbool("creative_mode") then
-		puncher:get_inventory():add_item("main", "boats:boat")
+	if self.driver and puncher == self.driver then
+		self.driver = nil
+		puncher:set_detach()
+		default.player_attached[puncher:get_player_name()] = false
+	end
+	if not self.driver then
+		self.removed = true
+		-- delay remove to ensure player is detached
+		minetest.after(0.1, function()
+			self.object:remove()
+		end)
+		if not minetest.setting_getbool("creative_mode") then
+			puncher:get_inventory():add_item("main", "boats:boat")
+		end
 	end
 end
 
+
 function boat.on_step(self, dtime)
-	self.v = get_v(self.object:getvelocity())*get_sign(self.v)
+	self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
 	if self.driver then
 		local ctrl = self.driver:get_player_control()
 		local yaw = self.object:getyaw()
 		if ctrl.up then
-			self.v = self.v+0.1
-		end
-		if ctrl.down then
-			self.v = self.v-0.08
+			self.v = self.v + 0.1
+		elseif ctrl.down then
+			self.v = self.v - 0.1
 		end
 		if ctrl.left then
-			if ctrl.down then
-				self.object:setyaw(yaw-math.pi/120-dtime*math.pi/120)
+			if self.v < 0 then
+				self.object:setyaw(yaw - (1 + dtime) * 0.03)
 			else
-				self.object:setyaw(yaw+math.pi/120+dtime*math.pi/120)
+				self.object:setyaw(yaw + (1 + dtime) * 0.03)
 			end
-		end
-		if ctrl.right then
-			if ctrl.down then
-				self.object:setyaw(yaw+math.pi/120+dtime*math.pi/120)
+		elseif ctrl.right then
+			if self.v < 0 then
+				self.object:setyaw(yaw + (1 + dtime) * 0.03)
 			else
-				self.object:setyaw(yaw-math.pi/120-dtime*math.pi/120)
+				self.object:setyaw(yaw - (1 + dtime) * 0.03)
 			end
 		end
 	end
 	local velo = self.object:getvelocity()
-	if self.v == 0 and velo.x == 0 and velo.z == 0 then
+	if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
+		self.object:setpos(self.object:getpos())
 		return
 	end
 	local s = get_sign(self.v)
-	self.v = self.v - 0.02*s
+	self.v = self.v - 0.02 * s
 	if s ~= get_sign(self.v) then
-		self.object:setvelocity({x=0, y=0, z=0})
+		self.object:setvelocity({x = 0, y = 0, z = 0})
 		self.v = 0
 		return
 	end
 	if math.abs(self.v) > 4.5 then
-		self.v = 4.5*get_sign(self.v)
+		self.v = 4.5 * get_sign(self.v)
 	end
 
 	local p = self.object:getpos()
-	p.y = p.y-0.5
-	local new_velo = {x=0,y=0,z=0}
-	local new_acce = {x=0,y=0,z=0}
+	p.y = p.y - 0.5
+	local new_velo = {x = 0, y = 0, z = 0}
+	local new_acce = {x = 0, y = 0, z = 0}
 	if not is_water(p) then
-		if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+		local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
+		if (not nodedef) or nodedef.walkable then
 			self.v = 0
+			new_acce = {x = 0, y = 1, z = 0}
+		else
+			new_acce = {x = 0, y = -9.8, z = 0}
 		end
-		new_acce = {x=0, y=-10, z=0}
-		new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
+		new_velo = get_velocity(self.v, self.object:getyaw(),
+			self.object:getvelocity().y)
+		self.object:setpos(self.object:getpos())
 	else
-		p.y = p.y+1
+		p.y = p.y + 1
 		if is_water(p) then
-			new_acce = {x=0, y=3, z=0}
 			local y = self.object:getvelocity().y
-			if y > 2 then
-				y = 2
-			end
-			if y < 0 then
-				self.object:setacceleration({x=0, y=10, z=0})
+			if y >= 4.5 then
+				y = 4.5
+			elseif y < 0 then
+				new_acce = {x = 0, y = 20, z = 0}
+			else
+				new_acce = {x = 0, y = 5, z = 0}
 			end
 			new_velo = get_velocity(self.v, self.object:getyaw(), y)
+			self.object:setpos(self.object:getpos())
 		else
-			new_acce = {x=0, y=0, z=0}
+			new_acce = {x = 0, y = 0, z = 0}
 			if math.abs(self.object:getvelocity().y) < 1 then
 				local pos = self.object:getpos()
-				pos.y = math.floor(pos.y)+0.5
+				pos.y = math.floor(pos.y) + 0.5
 				self.object:setpos(pos)
 				new_velo = get_velocity(self.v, self.object:getyaw(), 0)
 			else
-				new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
+				new_velo = get_velocity(self.v, self.object:getyaw(),
+					self.object:getvelocity().y)
+				self.object:setpos(self.object:getpos())
 			end
 		end
 	end
@@ -172,6 +197,7 @@ function boat.on_step(self, dtime)
 	self.object:setacceleration(new_acce)
 end
 
+
 minetest.register_entity("boats:boat", boat)
 
 
@@ -179,7 +205,7 @@ minetest.register_craftitem("boats:boat", {
 	description = "Boat",
 	inventory_image = "boat_inventory.png",
 	wield_image = "boat_wield.png",
-	wield_scale = {x=2, y=2, z=1},
+	wield_scale = {x = 2, y = 2, z = 1},
 	liquids_pointable = true,
 
 	on_place = function(itemstack, placer, pointed_thing)
@@ -189,7 +215,7 @@ minetest.register_craftitem("boats:boat", {
 		if not is_water(pointed_thing.under) then
 			return
 		end
-		pointed_thing.under.y = pointed_thing.under.y+0.5
+		pointed_thing.under.y = pointed_thing.under.y + 0.5
 		minetest.add_entity(pointed_thing.under, "boats:boat")
 		if not minetest.setting_getbool("creative_mode") then
 			itemstack:take_item()
@@ -198,11 +224,12 @@ minetest.register_craftitem("boats:boat", {
 	end,
 })
 
+
 minetest.register_craft({
 	output = "boats:boat",
 	recipe = {
-		{"", "", ""},
-		{"group:wood", "", "group:wood"},
+		{"",           "",           ""          },
+		{"group:wood", "",           "group:wood"},
 		{"group:wood", "group:wood", "group:wood"},
 	},
 })

mods/bones/init.lua

@@ -1,6 +1,8 @@
 -- Minetest 0.4 mod: bones
 -- See README.txt for licensing and other information. 
 
+bones = {}
+
 local function is_owner(pos, name)
 	local owner = minetest.get_meta(pos):get_string("owner")
 	if owner == "" or owner == name then
@@ -9,6 +11,19 @@ local function is_owner(pos, name)
 	return false
 end
 
+bones.bones_formspec =
+	"size[8,9]"..
+	default.gui_bg..
+	default.gui_bg_img..
+	default.gui_slots..
+	"list[current_name;main;0,0.3;8,4;]"..
+	"list[current_player;main;0,4.85;8,1;]"..
+	"list[current_player;main;0,6.08;8,3;8]"..
+	default.get_hotbar_bg(0,4.85)
+
+local share_bones_time = tonumber(minetest.setting_get("share_bones_time") or 1200)
+local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early") or (share_bones_time/4))
+
 minetest.register_node("bones:bones", {
 	description = "Bones",
 	tiles = {
@@ -84,23 +99,47 @@ minetest.register_node("bones:bones", {
 	
 	on_timer = function(pos, elapsed)
 		local meta = minetest.get_meta(pos)
-		local time = meta:get_int("time")+elapsed
-		local publish = 1200
-		if tonumber(minetest.setting_get("share_bones_time")) then
-			publish = tonumber(minetest.setting_get("share_bones_time"))
-		end
-		if publish == 0 then
-			return
-		end
-		if time >= publish then
+		local time = meta:get_int("time") + elapsed
+		if time >= share_bones_time then
 			meta:set_string("infotext", meta:get_string("owner").."'s old bones")
 			meta:set_string("owner", "")
 		else
+			meta:set_int("time", time)
 			return true
 		end
 	end,
 })
 
+local function may_replace(pos, player)
+	local node_name = minetest.get_node(pos).name
+	local node_definition = minetest.registered_nodes[node_name]
+
+	-- if the node is unknown, we let the protection mod decide
+	-- this is consistent with when a player could dig or not dig it
+	-- unknown decoration would often be removed
+	-- while unknown building materials in use would usually be left
+	if not node_definition then
+		-- only replace nodes that are not protected
+		return not minetest.is_protected(pos, player:get_player_name())
+	end
+
+	-- allow replacing air and liquids
+	if node_name == "air" or node_definition.liquidtype ~= "none" then
+		return true
+	end
+
+	-- don't replace filled chests and other nodes that don't allow it
+	local can_dig_func = node_definition.can_dig
+	if can_dig_func and not can_dig_func(pos, player) then
+		return false
+	end
+
+	-- default to each nodes buildable_to; if a placed block would replace it, why shouldn't bones?
+	-- flowers being squished by bones are more realistical than a squished stone, too
+	-- exception are of course any protected buildable_to
+	return node_definition.buildable_to and not minetest.is_protected(pos, player:get_player_name())
+end
+
 minetest.register_on_dieplayer(function(player)
 	if minetest.setting_getbool("creative_mode") then
 		return
@@ -119,26 +158,29 @@ minetest.register_on_dieplayer(function(player)
 	local param2 = minetest.dir_to_facedir(player:get_look_dir())
 	local player_name = player:get_player_name()
 	local player_inv = player:get_inventory()
-	
-	local nn = minetest.get_node(pos).name
-	if minetest.registered_nodes[nn].can_dig and
-		not minetest.registered_nodes[nn].can_dig(pos, player) then
 
-		-- drop items instead of delete
-		for i=1,player_inv:get_size("main") do
-			minetest.add_item(pos, player_inv:get_stack("main", i))
+	if (not may_replace(pos, player)) then
+		if (may_replace({x=pos.x, y=pos.y+1, z=pos.z}, player)) then
+			-- drop one node above if there's space
+			-- this should solve most cases of protection related deaths in which players dig straight down
+			-- yet keeps the bones reachable
+			pos.y = pos.y+1
+		else
+			-- drop items instead of delete
+			for i=1,player_inv:get_size("main") do
+				minetest.add_item(pos, player_inv:get_stack("main", i))
+			end
+			for i=1,player_inv:get_size("craft") do
+				minetest.add_item(pos, player_inv:get_stack("craft", i))
+			end
+			-- empty lists main and craft
+			player_inv:set_list("main", {})
+			player_inv:set_list("craft", {})
+			return
 		end
-		for i=1,player_inv:get_size("craft") do
-			minetest.add_item(pos, player_inv:get_stack("craft", i))
-		end
-		-- empty lists main and craft
-		player_inv:set_list("main", {})
-		player_inv:set_list("craft", {})
-		return
 	end
 	
-	minetest.dig_node(pos)
-	minetest.add_node(pos, {name="bones:bones", param2=param2})
+	minetest.set_node(pos, {name="bones:bones", param2=param2})
 	
 	local meta = minetest.get_meta(pos)
 	local inv = meta:get_inventory()
@@ -158,13 +200,20 @@ minetest.register_on_dieplayer(function(player)
 	player_inv:set_list("main", {})
 	player_inv:set_list("craft", {})
 	
-	meta:set_string("formspec", "size[8,9;]"..
-			"list[current_name;main;0,0;8,4;]"..
-			"list[current_player;main;0,5;8,4;]")
-	meta:set_string("infotext", player_name.."'s fresh bones")
+	meta:set_string("formspec", bones.bones_formspec)
 	meta:set_string("owner", player_name)
-	meta:set_int("time", 0)
 	
-	local timer  = minetest.get_node_timer(pos)
-	timer:start(10)
+	if share_bones_time ~= 0 then
+		meta:set_string("infotext", player_name.."'s fresh bones")
+
+		if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
+			meta:set_int("time", 0)
+		else
+			meta:set_int("time", (share_bones_time - share_bones_time_early))
+		end
+
+		minetest.get_node_timer(pos):start(10)
+	else
+		meta:set_string("infotext", player_name.."'s bones")
+	end
 end)

mods/bucket/init.lua

@@ -1,8 +1,6 @@
 -- Minetest 0.4 mod: bucket
 -- See README.txt for licensing and other information.
 
-local LIQUID_MAX = 8  --The number of water levels when liquid_finite is enabled
-
 minetest.register_alias("bucket", "bucket:bucket_empty")
 minetest.register_alias("bucket_water", "bucket:bucket_water")
 minetest.register_alias("bucket_lava", "bucket:bucket_lava")
@@ -32,12 +30,14 @@ local function check_protection(pos, name, text)
 end
 
 -- Register a new liquid
---   source = name of the source node
---   flowing = name of the flowing node
---   itemname = name of the new bucket item (or nil if liquid is not takeable)
---   inventory_image = texture of the new bucket item (ignored if itemname == nil)
+--    source = name of the source node
+--    flowing = name of the flowing node
+--    itemname = name of the new bucket item (or nil if liquid is not takeable)
+--    inventory_image = texture of the new bucket item (ignored if itemname == nil)
+--    name = text description of the bucket item
+--    groups = (optional) groups of the bucket item, for example {water_bucket = 1}
 -- This function can be called from any mod (that depends on bucket).
-function bucket.register_liquid(source, flowing, itemname, inventory_image, name)
+function bucket.register_liquid(source, flowing, itemname, inventory_image, name, groups)
 	bucket.liquids[source] = {
 		source = source,
 		flowing = flowing,
@@ -51,7 +51,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 			inventory_image = inventory_image,
 			stack_max = 1,
 			liquids_pointable = true,
-			groups = {not_in_creative_inventory=1},
+			groups = groups,
 			on_place = function(itemstack, user, pointed_thing)
 				-- Must be pointing to node
 				if pointed_thing.type ~= "node" then
@@ -72,40 +72,20 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 						itemstack) or itemstack
 				end
 
-				local place_liquid = function(pos, node, source, flowing, fullness)
+				local place_liquid = function(pos, node, source, flowing)
 					if check_protection(pos,
 							user and user:get_player_name() or "",
 							"place "..source) then
 						return
 					end
-					if math.floor(fullness/128) == 1 or
-						not minetest.setting_getbool("liquid_finite") then
-						minetest.add_node(pos, {name=source,
-								param2=fullness})
-						return
-					elseif node.name == flowing then
-						fullness = fullness + node.param2
-					elseif node.name == source then
-						fullness = LIQUID_MAX
-					end
-
-					if fullness >= LIQUID_MAX then
-						minetest.add_node(pos, {name=source,
-								param2=LIQUID_MAX})
-					else
-						minetest.add_node(pos, {name=flowing,
-								param2=fullness})
-					end
+					minetest.add_node(pos, {name=source})
 				end
 
 				-- Check if pointing to a buildable node
-				local fullness = tonumber(itemstack:get_metadata())
-				if not fullness then fullness = LIQUID_MAX end
-
 				if ndef and ndef.buildable_to then
 					-- buildable; replace the node
 					place_liquid(pointed_thing.under, node,
-							source, flowing, fullness)
+							source, flowing)
 				else
 					-- not buildable to; place the liquid above
 					-- check if the node above can be replaced
@@ -113,7 +93,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 					if node and minetest.registered_nodes[node.name].buildable_to then
 						place_liquid(pointed_thing.above,
 								node, source,
-								flowing, fullness)
+								flowing)
 					else
 						-- do not remove the bucket with the liquid
 						return
@@ -128,7 +108,7 @@ end
 minetest.register_craftitem("bucket:bucket_empty", {
 	description = "Empty Bucket",
 	inventory_image = "bucket.png",
-	stack_max = 1,
+	stack_max = 99,
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		-- Must be pointing to node
@@ -136,25 +116,43 @@ minetest.register_craftitem("bucket:bucket_empty", {
 			return
 		end
 		-- Check if pointing to a liquid source
-		node = minetest.get_node(pointed_thing.under)
-		liquiddef = bucket.liquids[node.name]
-		if liquiddef ~= nil and liquiddef.itemname ~= nil and
-			(node.name == liquiddef.source or
-			(node.name == liquiddef.flowing and
-				minetest.setting_getbool("liquid_finite"))) then
+		local node = minetest.get_node(pointed_thing.under)
+		local liquiddef = bucket.liquids[node.name]
+		local item_count = user:get_wielded_item():get_count()
+
+		if liquiddef ~= nil
+		and liquiddef.itemname ~= nil
+		and node.name == liquiddef.source then
 			if check_protection(pointed_thing.under,
 					user:get_player_name(),
 					"take ".. node.name) then
 				return
 			end
 
+			-- default set to return filled bucket
+			local giving_back = liquiddef.itemname
+
+			-- check if holding more than 1 empty bucket
+			if item_count > 1 then
+
+				-- if space in inventory add filled bucked, otherwise drop as item
+				local inv = user:get_inventory()
+				if inv:room_for_item("main", {name=liquiddef.itemname}) then
+					inv:add_item("main", liquiddef.itemname)
+				else
+					local pos = user:getpos()
+					pos.y = math.floor(pos.y + 0.5)
+					core.add_item(pos, liquiddef.itemname)
+				end
+
+				-- set to return empty buckets minus 1
+				giving_back = "bucket:bucket_empty "..tostring(item_count-1)
+
+			end
+
 			minetest.add_node(pointed_thing.under, {name="air"})
 
-			if node.name == liquiddef.source then
-				node.param2 = LIQUID_MAX
-			end
-			return ItemStack({name = liquiddef.itemname,
-					metadata = tostring(node.param2)})
+			return ItemStack(giving_back)
 		end
 	end,
 })
@@ -164,7 +162,17 @@ bucket.register_liquid(
 	"default:water_flowing",
 	"bucket:bucket_water",
 	"bucket_water.png",
-	"Water Bucket"
+	"Water Bucket",
+	{water_bucket = 1}
+)
+
+bucket.register_liquid(
+	"default:river_water_source",
+	"default:river_water_flowing",
+	"bucket:bucket_river_water",
+	"bucket_river_water.png",
+	"River Water Bucket",
+	{water_bucket = 1}
 )
 
 bucket.register_liquid(
@@ -181,3 +189,4 @@ minetest.register_craft({
 	burntime = 60,
 	replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
 })
+

mods/creative/init.lua

@@ -82,10 +82,15 @@ creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
 			"list[current_player;main;5,4.75;8,3;8]"..
 			"list[current_player;craft;8,0;3,3;]"..
 			"list[current_player;craftpreview;12,1;1,1;]"..
+			"image[11,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
 			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
 			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
 			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
 			"button[2.7,6.5;1.6,1;creative_next;>>]"..
+			"listring[current_player;main]"..
+			"listring[current_player;craft]"..
+			"listring[current_player;main]"..
+			"listring[detached:creative;main]"..
 			"label[5,1.5;Trash:]"..
 			"list[detached:creative_trash;main;5,2;1,1;]"..
 			default.get_hotbar_bg(5,3.5)

mods/default/README.txt

@@ -23,15 +23,7 @@ Everything not listed in here:
 Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 Cisoun's WTFPL texture pack:
-  default_chest_front.png
-  default_chest_lock.png
-  default_chest_side.png
-  default_chest_top.png
-  default_dirt.png
-  default_grass.png
-  default_grass_side.png
   default_jungletree.png
-  default_jungletree_top.png
   default_lava.png
   default_leaves.png
   default_sapling.png
@@ -41,6 +33,9 @@ Cisoun's WTFPL texture pack:
   default_tree_top.png
   default_water.png
 
+Cisoun's conifers mod (WTFPL):
+  default_pine_needles.png
+
 Originating from G4JC's Almost MC Texture Pack:
   default_torch.png
   default_torch_on_ceiling.png
@@ -61,18 +56,16 @@ VanessaE (WTFPL):
   default_nc_front.png
   default_nc_rb.png
   default_nc_side.png
-  default_grass_*.png
   default_desert_sand.png
   default_desert_stone.png
-  default_desert_stone_brick.png
   default_sand.png
-  default_sandstone_brick.png
+  default_jungletree_top.png
 
 Calinou (CC BY-SA):
   default_brick.png
   default_papyrus.png
-  default_copper_lump.png
   default_mineral_copper.png
+  default_glass_detail.png
 
 MirceaKitsune (WTFPL):
   character.x
@@ -83,11 +76,8 @@ Jordach (CC BY-SA 3.0):
 PilzAdam (WTFPL):
   default_jungleleaves.png
   default_junglesapling.png
-  default_junglewood.png
   default_obsidian_glass.png
   default_obsidian_shard.png
-  default_mossycobble.png
-  default_gold_lump.png
   default_mineral_gold.png
   default_snowball.png
 
@@ -100,7 +90,7 @@ InfinityProject (WTFPL):
 Splizard (CC BY-SA 3.0):
   default_snow.png
   default_snow_side.png
-  default_ice.png
+  default_pine_sapling.png
 
 Zeg9 (CC BY-SA 3.0):
   default_coal_block.png
@@ -110,32 +100,76 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
-  wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0)
+  wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0)
+  default_pinetree.png
+  default_pinetree_top.png
+  default_pinewood.png
+  default_sandstone_brick.png
+  default_obsidian_brick.png
+  default_river_water.png
+  default_river_water_source_animated.png
+  default_river_water_flowing_animated.png
+  default_acacia_leaves.png
+  default_acacia_sapling.png
+  default_acacia_tree.png
+  default_acacia_tree_top.png
+  default_acacia_wood.png
+  default_dry_grass.png
+  default_dry_grass_side.png
+  default_dry_grass_*.png
+  default_junglewood.png, derived from a texture by BlockMen (CC BY-SA 3.0)
+  default_grass.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
+  default_grass_side.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
+  default_stone_brick.png, derived from a texture by Cisoun (WTFPL)
+  default_desert_stone_brick.png, derived from a texture by VanessaE (WTFPL)
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
 
 BlockMen (CC BY-SA 3.0):
-  default_stone_brick.png
   default_wood.png
-  default_cobble.png
   default_clay_brick.png
-  default_tool_steelsword.png
-  default_bronze_ingot.png
-  default_copper_ingot.png
+  default_iron_ingot.png
   default_gold_ingot.png
+  default_tool_steelsword.png
   default_diamond.png
-  default_diamond_block.png
+  default_book.png
   default_tool_*.png
   default_lava_source_animated.png
   default_lava_flowing_animated.png
-  default_book.png
-  default_paper.png
   default_stick.png
+  default_chest_front.png
+  default_chest_lock.png
+  default_chest_side.png
+  default_chest_top.png
+  default_mineral_mese.png
+  default_meselamp.png
   bubble.png
   heart.png
   gui_*.png
 
+Neuromancer (CC BY-SA 2.0):
+  default_cobble.png, based on texture by Brane praefect
+  default_mossycobble.png, based on texture by Brane praefect
+Neuromancer (CC BY-SA 3.0):
+  default_dirt.png
+  default_furnace_*.png
+
+Gambit (WTFPL):
+  default_bronze_ingot.png
+  default_copper_ingot.png
+  default_copper_lump.png
+  default_iron_lump.png
+  default_gold_lump.png
+  default_clay_lump.png
+  default_coal.png
+  default_grass_*.png
+  default_paper.png
+  default_diamond_block.png
+
+asl97 (WTFPL):
+  default_ice.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/

mods/default/aliases.lua

@@ -1,6 +1,7 @@
--- aliases (Minetest 0.4 mod)
--- Provides alias for most default items
+-- mods/default/aliases.lua
 
+-- Aliases to support loading worlds using nodes following the old naming convention
+-- These can also be helpful when using chat commands, for example /giveme
 minetest.register_alias("stone", "default:stone")
 minetest.register_alias("stone_with_coal", "default:stone_with_coal")
 minetest.register_alias("stone_with_iron", "default:stone_with_iron")
@@ -65,3 +66,11 @@ minetest.register_alias("lump_of_iron", "default:iron_lump")
 minetest.register_alias("lump_of_clay", "default:clay_lump")
 minetest.register_alias("steel_ingot", "default:steel_ingot")
 minetest.register_alias("clay_brick", "default:clay_brick")
+minetest.register_alias("snow", "default:snow")
+
+-- 'mese_block' was used for a while for the block form of mese
+minetest.register_alias("default:mese_block", "default:mese")
+
+-- Aliases for corrected pine node names
+minetest.register_alias("default:pinetree", "default:pine_tree")
+minetest.register_alias("default:pinewood", "default:pine_wood")

mods/default/crafting.lua

@@ -14,6 +14,20 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:pine_wood 4',
+	recipe = {
+		{'default:pine_tree'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:acacia_wood 4',
+	recipe = {
+		{'default:acacia_tree'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -212,8 +226,8 @@ minetest.register_craft({
 	output = 'default:axe_wood',
 	recipe = {
 		{'group:wood', 'group:wood'},
-		{'default:stick', 'group:wood'},
-		{'default:stick',''},
+		{'group:stick', 'group:wood'},
+		{'group:stick',''},
 	}
 })
 
@@ -221,8 +235,8 @@ minetest.register_craft({
 	output = 'default:axe_stone',
 	recipe = {
 		{'group:stone', 'group:stone'},
-		{'default:stick', 'group:stone'},
-		{'default:stick', ''},
+		{'group:stick', 'group:stone'},
+		{'group:stick', ''},
 	}
 })
 
@@ -230,8 +244,8 @@ minetest.register_craft({
 	output = 'default:axe_steel',
 	recipe = {
 		{'default:steel_ingot', 'default:steel_ingot'},
-		{'default:stick', 'default:steel_ingot'},
-		{'default:stick', ''},
+		{'group:stick', 'default:steel_ingot'},
+		{'group:stick', ''},
 	}
 })
 
@@ -239,8 +253,8 @@ minetest.register_craft({
 	output = 'default:axe_bronze',
 	recipe = {
 		{'default:bronze_ingot', 'default:bronze_ingot'},
-		{'default:stick', 'default:bronze_ingot'},
-		{'default:stick', ''},
+		{'group:stick', 'default:bronze_ingot'},
+		{'group:stick', ''},
 	}
 })
 
@@ -248,8 +262,8 @@ minetest.register_craft({
 	output = 'default:axe_mese',
 	recipe = {
 		{'default:mese_crystal', 'default:mese_crystal'},
-		{'default:stick', 'default:mese_crystal'},
-		{'default:stick', ''},
+		{'group:stick', 'default:mese_crystal'},
+		{'group:stick', ''},
 	}
 })
 
@@ -257,8 +271,8 @@ minetest.register_craft({
 	output = 'default:axe_diamond',
 	recipe = {
 		{'default:diamond', 'default:diamond'},
-		{'default:stick', 'default:diamond'},
-		{'default:stick', ''},
+		{'group:stick', 'default:diamond'},
+		{'group:stick', ''},
 	}
 })
 
@@ -317,7 +331,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:rail 15',
+	output = 'default:rail 24',
 	recipe = {
 		{'default:steel_ingot', '', 'default:steel_ingot'},
 		{'default:steel_ingot', 'group:stick', 'default:steel_ingot'},
@@ -557,6 +571,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:meselamp 1',
+	recipe = {
+		{'', 'default:mese_crystal',''},
+		{'default:mese_crystal', 'default:glass', 'default:mese_crystal'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:obsidian_shard 9',
 	recipe = {
@@ -573,6 +595,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:obsidianbrick 4',
+	recipe = {
+		{'default:obsidian', 'default:obsidian'},
+		{'default:obsidian', 'default:obsidian'}
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stonebrick 4',
 	recipe = {
@@ -635,6 +665,12 @@ minetest.register_craft({
 	recipe = "default:cobble",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:stone",
+	recipe = "default:mossycobble",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:desert_stone",
@@ -767,7 +803,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:sapling",
+	recipe = "group:sapling",
 	burntime = 10,
 })
 
@@ -791,12 +827,13 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:junglesapling",
-	burntime = 10,
+	recipe = "default:grass_1",
+	burntime = 2,
 })
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:grass_1",
+	recipe = "default:dry_grass_1",
 	burntime = 2,
 })
+

mods/default/craftitems.lua

@@ -11,14 +11,86 @@ minetest.register_craftitem("default:paper", {
 	inventory_image = "default_paper.png",
 })
 
+local function book_on_use(itemstack, user, pointed_thing)
+	local player_name = user:get_player_name()
+	local data = minetest.deserialize(itemstack:get_metadata())
+	local title, text, owner = "", "", player_name
+	if data then
+		title, text, owner = data.title, data.text, data.owner
+	end
+	local formspec
+	if owner == player_name then
+		formspec = "size[8,8]"..default.gui_bg..
+			"field[0.5,1;7.5,0;title;Title:;"..
+				minetest.formspec_escape(title).."]"..
+			"textarea[0.5,1.5;7.5,7;text;Contents:;"..
+				minetest.formspec_escape(text).."]"..
+			"button_exit[2.5,7.5;3,1;save;Save]"
+	else
+		formspec = "size[8,8]"..default.gui_bg..
+			"label[0.5,0.5;by "..owner.."]"..
+			"label[0.5,0;"..minetest.formspec_escape(title).."]"..
+			"textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]"
+	end
+	minetest.show_formspec(user:get_player_name(), "default:book", formspec)
+end
+
+minetest.register_on_player_receive_fields(function(player, form_name, fields)
+	if form_name ~= "default:book" or not fields.save or
+			fields.title == "" or fields.text == "" then
+		return
+	end
+	local inv = player:get_inventory()
+	local stack = player:get_wielded_item()
+	local new_stack, data
+	if stack:get_name() ~= "default:book_written" then
+		local count = stack:get_count()
+		if count == 1 then
+			stack:set_name("default:book_written")
+		else
+			stack:set_count(count - 1)
+			new_stack = ItemStack("default:book_written")
+		end
+	else
+		data = minetest.deserialize(stack:get_metadata())
+	end
+	if not data then data = {} end
+	data.title = fields.title
+	data.text = fields.text
+	data.owner = player:get_player_name()
+	local data_str = minetest.serialize(data)
+	if new_stack then
+		new_stack:set_metadata(data_str)
+		if inv:room_for_item("main", new_stack) then
+			inv:add_item("main", new_stack)
+		else
+			minetest.add_item(player:getpos(), new_stack)
+		end
+	else
+		stack:set_metadata(data_str)
+	end
+	player:set_wielded_item(stack)
+end)
+
 minetest.register_craftitem("default:book", {
 	description = "Book",
 	inventory_image = "default_book.png",
+	groups = {book=1},
+	on_use = book_on_use,
+})
+
+minetest.register_craftitem("default:book_written", {
+	description = "Book With Text",
+	inventory_image = "default_book.png",
+	groups = {book=1, not_in_creative_inventory=1},
+	stack_max = 1,
+	on_use = book_on_use,
 })
 
 minetest.register_craftitem("default:coal_lump", {
 	description = "Coal Lump",
 	inventory_image = "default_coal_lump.png",
+	groups = {coal = 1}
 })
 
 minetest.register_craftitem("default:iron_lump", {

mods/default/functions.lua

@@ -7,20 +7,20 @@
 function default.node_sound_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="", gain=1.0}
+			{name = "", gain = 1.0}
 	table.dug = table.dug or
-			{name="default_dug_node", gain=0.25}
+			{name = "default_dug_node", gain = 0.25}
 	table.place = table.place or
-			{name="default_place_node_hard", gain=1.0}
+			{name = "default_place_node_hard", gain = 1.0}
 	return table
 end
 
 function default.node_sound_stone_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_hard_footstep", gain=0.5}
+			{name = "default_hard_footstep", gain = 0.5}
 	table.dug = table.dug or
-			{name="default_hard_footstep", gain=1.0}
+			{name = "default_hard_footstep", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -28,11 +28,11 @@ end
 function default.node_sound_dirt_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_dirt_footstep", gain=1.0}
+			{name = "default_dirt_footstep", gain = 1.0}
 	table.dug = table.dug or
-			{name="default_dirt_footstep", gain=1.5}
+			{name = "default_dirt_footstep", gain = 1.5}
 	table.place = table.place or
-			{name="default_place_node", gain=1.0}
+			{name = "default_place_node", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -40,11 +40,11 @@ end
 function default.node_sound_sand_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_sand_footstep", gain=0.5}
+			{name = "default_sand_footstep", gain = 0.2}
 	table.dug = table.dug or
-			{name="default_sand_footstep", gain=1.0}
+			{name = "default_sand_footstep", gain = 0.4}
 	table.place = table.place or
-			{name="default_place_node", gain=1.0}
+			{name = "default_place_node", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -52,9 +52,9 @@ end
 function default.node_sound_wood_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_wood_footstep", gain=0.5}
+			{name = "default_wood_footstep", gain = 0.5}
 	table.dug = table.dug or
-			{name="default_wood_footstep", gain=1.0}
+			{name = "default_wood_footstep", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -62,13 +62,13 @@ end
 function default.node_sound_leaves_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_grass_footstep", gain=0.35}
+			{name = "default_grass_footstep", gain = 0.35}
 	table.dug = table.dug or
-			{name="default_grass_footstep", gain=0.85}
+			{name = "default_grass_footstep", gain = 0.7}
 	table.dig = table.dig or
-			{name="default_dig_crumbly", gain=0.4}
+			{name = "default_dig_crumbly", gain = 0.4}
 	table.place = table.place or
-			{name="default_place_node", gain=1.0}
+			{name = "default_place_node", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -76,128 +76,37 @@ end
 function default.node_sound_glass_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="default_glass_footstep", gain=0.5}
+			{name = "default_glass_footstep", gain = 0.5}
 	table.dug = table.dug or
-			{name="default_break_glass", gain=1.0}
+			{name = "default_break_glass", gain = 1.0}
 	default.node_sound_defaults(table)
 	return table
 end
 
---
--- Legacy
---
-
-function default.spawn_falling_node(p, nodename)
-	spawn_falling_node(p, nodename)
-end
-
--- Horrible crap to support old code
--- Don't use this and never do what this does, it's completely wrong!
--- (More specifically, the client and the C++ code doesn't get the group)
-function default.register_falling_node(nodename, texture)
-	minetest.log("error", debug.traceback())
-	minetest.log('error', "WARNING: default.register_falling_node is deprecated")
-	if minetest.registered_nodes[nodename] then
-		minetest.registered_nodes[nodename].groups.falling_node = 1
-	end
-end
-
---
--- Global callbacks
---
-
--- Global environment step function
-function on_step(dtime)
-	-- print("on_step")
-end
-minetest.register_globalstep(on_step)
-
-function on_placenode(p, node)
-	--print("on_placenode")
-end
-minetest.register_on_placenode(on_placenode)
-
-function on_dignode(p, node)
-	--print("on_dignode")
-end
-minetest.register_on_dignode(on_dignode)
-
-function on_punchnode(p, node)
-end
-minetest.register_on_punchnode(on_punchnode)
-
-
---
--- Grow trees
---
-
-minetest.register_abm({
-	nodenames = {"default:sapling"},
-	interval = 10,
-	chance = 50,
-	action = function(pos, node)
-		local nu =  minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
-		local is_soil = minetest.get_item_group(nu, "soil")
-		if is_soil == 0 then
-			return
-		end
-		
-		minetest.log("action", "A sapling grows into a tree at "..minetest.pos_to_string(pos))
-		local vm = minetest.get_voxel_manip()
-		local minp, maxp = vm:read_from_map({x=pos.x-16, y=pos.y, z=pos.z-16}, {x=pos.x+16, y=pos.y+16, z=pos.z+16})
-		local a = VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
-		local data = vm:get_data()
-		default.grow_tree(data, a, pos, math.random(1, 4) == 1, math.random(1,100000))
-		vm:set_data(data)
-		vm:write_to_map(data)
-		vm:update_map()
-	end
-})
-
-minetest.register_abm({
-	nodenames = {"default:junglesapling"},
-	interval = 10,
-	chance = 50,
-	action = function(pos, node)
-		local nu =  minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
-		local is_soil = minetest.get_item_group(nu, "soil")
-		if is_soil == 0 then
-			return
-		end
-		
-		minetest.log("action", "A jungle sapling grows into a tree at "..minetest.pos_to_string(pos))
-		local vm = minetest.get_voxel_manip()
-		local minp, maxp = vm:read_from_map({x=pos.x-16, y=pos.y-1, z=pos.z-16}, {x=pos.x+16, y=pos.y+16, z=pos.z+16})
-		local a = VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
-		local data = vm:get_data()
-		default.grow_jungletree(data, a, pos, math.random(1,100000))
-		vm:set_data(data)
-		vm:write_to_map(data)
-		vm:update_map()
-	end
-})
 
 --
 -- Lavacooling
 --
 
 default.cool_lava_source = function(pos)
-	minetest.set_node(pos, {name="default:obsidian"})
-	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
+	minetest.set_node(pos, {name = "default:obsidian"})
+	minetest.sound_play("default_cool_lava",
+		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
 default.cool_lava_flowing = function(pos)
-	minetest.set_node(pos, {name="default:stone"})
-	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
+	minetest.set_node(pos, {name = "default:stone"})
+	minetest.sound_play("default_cool_lava",
+		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
 minetest.register_abm({
 	nodenames = {"default:lava_flowing"},
 	neighbors = {"group:water"},
 	interval = 1,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		default.cool_lava_flowing(pos, node, active_object_count, active_object_count_wider)
+	chance = 2,
+	action = function(...)
+		default.cool_lava_flowing(...)
 	end,
 })
 
@@ -205,38 +114,72 @@ minetest.register_abm({
 	nodenames = {"default:lava_source"},
 	neighbors = {"group:water"},
 	interval = 1,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		default.cool_lava_source(pos, node, active_object_count, active_object_count_wider)
+	chance = 2,
+	action = function(...)
+		default.cool_lava_source(...)
 	end,
 })
 
+
 --
 -- Papyrus and cactus growing
 --
 
+-- wrapping the functions in abm action is necessary to make overriding them possible
+
+function default.grow_cactus(pos, node)
+	if node.param2 >= 4 then
+		return
+	end
+	pos.y = pos.y - 1
+	if minetest.get_item_group(minetest.get_node(pos).name, "sand") == 0 then
+		return
+	end
+	pos.y = pos.y + 1
+	local height = 0
+	while node.name == "default:cactus" and height < 4 do
+		height = height + 1
+		pos.y = pos.y + 1
+		node = minetest.get_node(pos)
+	end
+	if height == 4 or node.name ~= "air" then
+		return
+	end
+	minetest.set_node(pos, {name = "default:cactus"})
+	return true
+end
+
+function default.grow_papyrus(pos, node)
+	pos.y = pos.y - 1
+	local name = minetest.get_node(pos).name
+	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
+		return
+	end
+	if not minetest.find_node_near(pos, 3, {"group:water"}) then
+		return
+	end
+	pos.y = pos.y + 1
+	local height = 0
+	while node.name == "default:papyrus" and height < 4 do
+		height = height + 1
+		pos.y = pos.y + 1
+		node = minetest.get_node(pos)
+	end
+	if height == 4 or node.name ~= "air" then
+		return
+	end
+	minetest.set_node(pos, {name = "default:papyrus"})
+	return true
+end
+
 minetest.register_abm({
 	nodenames = {"default:cactus"},
 	neighbors = {"group:sand"},
 	interval = 50,
 	chance = 20,
-	action = function(pos, node)
-		pos.y = pos.y-1
-		local name = minetest.get_node(pos).name
-		if minetest.get_item_group(name, "sand") ~= 0 then
-			pos.y = pos.y+1
-			local height = 0
-			while minetest.get_node(pos).name == "default:cactus" and height < 4 do
-				height = height+1
-				pos.y = pos.y+1
-			end
-			if height < 4 then
-				if minetest.get_node(pos).name == "air" then
-					minetest.set_node(pos, {name="default:cactus"})
-				end
-			end
-		end
-	end,
+	action = function(...)
+		default.grow_cactus(...)
+	end
 })
 
 minetest.register_abm({
@@ -244,28 +187,12 @@ minetest.register_abm({
 	neighbors = {"default:dirt", "default:dirt_with_grass"},
 	interval = 50,
 	chance = 20,
-	action = function(pos, node)
-		pos.y = pos.y-1
-		local name = minetest.get_node(pos).name
-		if name == "default:dirt" or name == "default:dirt_with_grass" then
-			if minetest.find_node_near(pos, 3, {"group:water"}) == nil then
-				return
-			end
-			pos.y = pos.y+1
-			local height = 0
-			while minetest.get_node(pos).name == "default:papyrus" and height < 4 do
-				height = height+1
-				pos.y = pos.y+1
-			end
-			if height < 4 then
-				if minetest.get_node(pos).name == "air" then
-					minetest.set_node(pos, {name="default:papyrus"})
-				end
-			end
-		end
-	end,
+	action = function(...)
+		default.grow_papyrus(...)
+	end
 })
 
+
 --
 -- dig upwards
 --
@@ -279,21 +206,11 @@ function default.dig_up(pos, node, digger)
 	end
 end
 
+
 --
 -- Leafdecay
 --
 
--- To enable leaf decay for a node, add it to the "leafdecay" group.
---
--- The rating of the group determines how far from a node in the group "tree"
--- the node can be without decaying.
---
--- If param2 of the node is ~= 0, the node will always be preserved. Thus, if
--- the player places a node of that kind, you will want to set param2=1 or so.
---
--- If the node is in the leafdecay_drop group then the it will always be dropped
--- as an item
-
 default.leafdecay_trunk_cache = {}
 default.leafdecay_enable_cache = true
 -- Spread the load of finding trunks
@@ -305,6 +222,12 @@ minetest.register_globalstep(function(dtime)
 			math.floor(dtime * finds_per_second)
 end)
 
+default.after_place_leaves = function(pos, placer, itemstack, pointed_thing)
+	local node = minetest.get_node(pos)
+	node.param2 = 1
+	minetest.set_node(pos, node)
+end
+
 minetest.register_abm({
 	nodenames = {"group:leafdecay"},
 	neighbors = {"air", "group:liquid"},
@@ -332,8 +255,10 @@ minetest.register_abm({
 			if trunkp then
 				local n = minetest.get_node(trunkp)
 				local reg = minetest.registered_nodes[n.name]
-				-- Assume ignore is a trunk, to make the thing work at the border of the active area
-				if n.name == "ignore" or (reg and reg.groups.tree and reg.groups.tree ~= 0) then
+				-- Assume ignore is a trunk, to make the thing
+				-- work at the border of the active area
+				if n.name == "ignore" or (reg and reg.groups.tree and
+						reg.groups.tree ~= 0) then
 					--print("cached trunk still exists")
 					return
 				end
@@ -347,7 +272,8 @@ minetest.register_abm({
 		end
 		default.leafdecay_trunk_find_allow_accumulator =
 				default.leafdecay_trunk_find_allow_accumulator - 1
-		-- Assume ignore is a trunk, to make the thing work at the border of the active area
+		-- Assume ignore is a trunk, to make the thing
+		-- work at the border of the active area
 		local p1 = minetest.find_node_near(p0, d, {"ignore", "group:tree"})
 		if p1 then
 			do_preserve = true
@@ -359,7 +285,7 @@ minetest.register_abm({
 		end
 		if not do_preserve then
 			-- Drop stuff other than the node itself
-			itemstacks = minetest.get_node_drops(n0.name)
+			local itemstacks = minetest.get_node_drops(n0.name)
 			for _, itemname in ipairs(itemstacks) do
 				if minetest.get_item_group(n0.name, "leafdecay_drop") ~= 0 or
 						itemname ~= n0.name then
@@ -378,3 +304,44 @@ minetest.register_abm({
 	end
 })
 
+
+--
+-- Grass growing
+--
+
+minetest.register_abm({
+	nodenames = {"default:dirt"},
+	interval = 2,
+	chance = 200,
+	action = function(pos, node)
+		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
+		local name = minetest.get_node(above).name
+		local nodedef = minetest.registered_nodes[name]
+		if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light") and
+				nodedef.liquidtype == "none" and
+				(minetest.get_node_light(above) or 0) >= 13 then
+			if name == "default:snow" or name == "default:snowblock" then
+				minetest.set_node(pos, {name = "default:dirt_with_snow"})
+			else
+				minetest.set_node(pos, {name = "default:dirt_with_grass"})
+			end
+		end
+	end
+})
+
+minetest.register_abm({
+	nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
+	interval = 2,
+	chance = 20,
+	action = function(pos, node)
+		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
+		local name = minetest.get_node(above).name
+		local nodedef = minetest.registered_nodes[name]
+		if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or
+				nodedef.paramtype == "light") and
+				nodedef.liquidtype == "none") then
+			minetest.set_node(pos, {name = "default:dirt"})
+		end
+	end
+})
+

mods/default/furnace.lua

@@ -0,0 +1,291 @@
+
+--
+-- Formspecs
+--
+
+local function active_formspec(fuel_percent, item_percent)
+	local formspec = 
+		"size[8,8.5]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"list[current_name;src;2.75,0.5;1,1;]"..
+		"list[current_name;fuel;2.75,2.5;1,1;]"..
+		"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
+		(100-fuel_percent)..":default_furnace_fire_fg.png]"..
+		"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:"..
+		(item_percent)..":gui_furnace_arrow_fg.png^[transformR270]"..
+		"list[current_name;dst;4.75,0.96;2,2;]"..
+		"list[current_player;main;0,4.25;8,1;]"..
+		"list[current_player;main;0,5.5;8,3;8]"..
+		"listring[current_name;dst]"..
+		"listring[current_player;main]"..
+		"listring[current_name;src]"..
+		"listring[current_player;main]"..
+		default.get_hotbar_bg(0, 4.25)
+	return formspec
+end
+
+local inactive_formspec =
+	"size[8,8.5]"..
+	default.gui_bg..
+	default.gui_bg_img..
+	default.gui_slots..
+	"list[current_name;src;2.75,0.5;1,1;]"..
+	"list[current_name;fuel;2.75,2.5;1,1;]"..
+	"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
+	"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+	"list[current_name;dst;4.75,0.96;2,2;]"..
+	"list[current_player;main;0,4.25;8,1;]"..
+	"list[current_player;main;0,5.5;8,3;8]"..
+	"listring[current_name;dst]"..
+	"listring[current_player;main]"..
+	"listring[current_name;src]"..
+	"listring[current_player;main]"..
+	default.get_hotbar_bg(0, 4.25)
+
+--
+-- Node callback functions that are the same for active and inactive furnace
+--
+
+local function can_dig(pos, player)
+	local meta = minetest.get_meta(pos);
+	local inv = meta:get_inventory()
+	return inv:is_empty("fuel") and inv:is_empty("dst") and inv:is_empty("src")
+end
+
+local function allow_metadata_inventory_put(pos, listname, index, stack, player)
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return 0
+	end
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	if listname == "fuel" then
+		if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then
+			if inv:is_empty("src") then
+				meta:set_string("infotext", "Furnace is empty")
+			end
+			return stack:get_count()
+		else
+			return 0
+		end
+	elseif listname == "src" then
+		return stack:get_count()
+	elseif listname == "dst" then
+		return 0
+	end
+end
+
+local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	local stack = inv:get_stack(from_list, from_index)
+	return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
+end
+
+local function allow_metadata_inventory_take(pos, listname, index, stack, player)
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return 0
+	end
+	return stack:get_count()
+end
+
+--
+-- Node definitions
+--
+
+minetest.register_node("default:furnace", {
+	description = "Furnace",
+	tiles = {
+		"default_furnace_top.png", "default_furnace_bottom.png",
+		"default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_front.png"
+	},
+	paramtype2 = "facedir",
+	groups = {cracky=2},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+	
+	can_dig = can_dig,
+	
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+})
+
+minetest.register_node("default:furnace_active", {
+	description = "Furnace",
+	tiles = {
+		"default_furnace_top.png", "default_furnace_bottom.png",
+		"default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png",
+		{
+			image = "default_furnace_front_active.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 1.5
+			},
+		}
+	},
+	paramtype2 = "facedir",
+	light_source = 8,
+	drop = "default:furnace",
+	groups = {cracky=2, not_in_creative_inventory=1},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+	
+	can_dig = can_dig,
+	
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+})
+
+--
+-- ABM
+--
+
+local function swap_node(pos, name)
+	local node = minetest.get_node(pos)
+	if node.name == name then
+		return
+	end
+	node.name = name
+	minetest.swap_node(pos, node)
+end
+
+minetest.register_abm({
+	nodenames = {"default:furnace", "default:furnace_active"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		--
+		-- Inizialize metadata
+		--
+		local meta = minetest.get_meta(pos)
+		local fuel_time = meta:get_float("fuel_time") or 0
+		local src_time = meta:get_float("src_time") or 0
+		local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
+		
+		--
+		-- Inizialize inventory
+		--
+		local inv = meta:get_inventory()
+		for listname, size in pairs({
+				src = 1,
+				fuel = 1,
+				dst = 4,
+		}) do
+			if inv:get_size(listname) ~= size then
+				inv:set_size(listname, size)
+			end
+		end
+		local srclist = inv:get_list("src")
+		local fuellist = inv:get_list("fuel")
+		local dstlist = inv:get_list("dst")
+		
+		--
+		-- Cooking
+		--
+		
+		-- Check if we have cookable content
+		local cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
+		local cookable = true
+		
+		if cooked.time == 0 then
+			cookable = false
+		end
+		
+		-- Check if we have enough fuel to burn
+		if fuel_time < fuel_totaltime then
+			-- The furnace is currently active and has enough fuel
+			fuel_time = fuel_time + 1
+			
+			-- If there is a cookable item then check if it is ready yet
+			if cookable then
+				src_time = src_time + 1
+				if src_time >= cooked.time then
+					-- Place result in dst list if possible
+					if inv:room_for_item("dst", cooked.item) then
+						inv:add_item("dst", cooked.item)
+						inv:set_stack("src", 1, aftercooked.items[1])
+						src_time = 0
+					end
+				end
+			end
+		else
+			-- Furnace ran out of fuel
+			if cookable then
+				-- We need to get new fuel
+				local fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
+				
+				if fuel.time == 0 then
+					-- No valid fuel in fuel list
+					fuel_totaltime = 0
+					fuel_time = 0
+					src_time = 0
+				else
+					-- Take fuel from fuel list
+					inv:set_stack("fuel", 1, afterfuel.items[1])
+					
+					fuel_totaltime = fuel.time
+					fuel_time = 0
+					
+				end
+			else
+				-- We don't need to get new fuel since there is no cookable item
+				fuel_totaltime = 0
+				fuel_time = 0
+				src_time = 0
+			end
+		end
+		
+		--
+		-- Update formspec, infotext and node
+		--
+		local formspec = inactive_formspec
+		local item_state = ""
+		local item_percent = 0
+		if cookable then
+			item_percent =  math.floor(src_time / cooked.time * 100)
+			item_state = item_percent .. "%"
+		else
+			if srclist[1]:is_empty() then
+				item_state = "Empty"
+			else
+				item_state = "Not cookable"
+			end
+		end
+		
+		local fuel_state = "Empty"
+		local active = "inactive "
+		if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then
+			active = "active "
+			local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
+			fuel_state = fuel_percent .. "%"
+			formspec = active_formspec(fuel_percent, item_percent)
+			swap_node(pos, "default:furnace_active")
+		else
+			if not fuellist[1]:is_empty() then
+				fuel_state = "0%"
+			end
+			swap_node(pos, "default:furnace")
+		end
+		
+		local infotext =  "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
+		
+		--
+		-- Set meta values
+		--
+		meta:set_float("fuel_totaltime", fuel_totaltime)
+		meta:set_float("fuel_time", fuel_time)
+		meta:set_float("src_time", src_time)
+		meta:set_string("formspec", formspec)
+		meta:set_string("infotext", infotext)
+	end,
+})

mods/default/init.lua

@@ -1,16 +1,13 @@
 -- Minetest 0.4 mod: default
 -- See README.txt for licensing and other information.
 
--- The API documentation in here was moved into doc/lua_api.txt
-
-WATER_ALPHA = 160
-WATER_VISC = 1
-LAVA_VISC = 7
-LIGHT_MAX = 14
+-- The API documentation in here was moved into game_api.txt
 
 -- Definitions made by this mod that other mods can use too
 default = {}
 
+default.LIGHT_MAX = 14
+
 -- GUI related stuff
 default.gui_bg = "bgcolor[#080808BB;true]"
 default.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]"
@@ -24,7 +21,7 @@ function default.get_hotbar_bg(x,y)
 	return out
 end
 
-default.gui_suvival_form = "size[8,8.5]"..
+default.gui_survival_form = "size[8,8.5]"..
 			default.gui_bg..
 			default.gui_bg_img..
 			default.gui_slots..
@@ -33,11 +30,14 @@ default.gui_suvival_form = "size[8,8.5]"..
 			"list[current_player;craft;1.75,0.5;3,3;]"..
 			"list[current_player;craftpreview;5.75,1.5;1,1;]"..
 			"image[4.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+			"listring[current_player;main]"..
+			"listring[current_player;craft]"..
 			default.get_hotbar_bg(0,4.25)
 
 -- Load files
 dofile(minetest.get_modpath("default").."/functions.lua")
 dofile(minetest.get_modpath("default").."/nodes.lua")
+dofile(minetest.get_modpath("default").."/furnace.lua")
 dofile(minetest.get_modpath("default").."/tools.lua")
 dofile(minetest.get_modpath("default").."/craftitems.lua")
 dofile(minetest.get_modpath("default").."/crafting.lua")
@@ -45,3 +45,4 @@ dofile(minetest.get_modpath("default").."/mapgen.lua")
 dofile(minetest.get_modpath("default").."/player.lua")
 dofile(minetest.get_modpath("default").."/trees.lua")
 dofile(minetest.get_modpath("default").."/aliases.lua")
+dofile(minetest.get_modpath("default").."/legacy.lua")

mods/default/legacy.lua

@@ -0,0 +1,25 @@
+-- mods/default/legacy.lua
+
+-- Horrible crap to support old code registering falling nodes
+-- Don't use this and never do what this does, it's completely wrong!
+-- (More specifically, the client and the C++ code doesn't get the group)
+function default.register_falling_node(nodename, texture)
+	minetest.log("error", debug.traceback())
+	minetest.log('error', "WARNING: default.register_falling_node is deprecated")
+	if minetest.registered_nodes[nodename] then
+		minetest.registered_nodes[nodename].groups.falling_node = 1
+	end
+end
+
+function default.spawn_falling_node(p, nodename)
+	spawn_falling_node(p, nodename)
+end
+
+-- Liquids
+WATER_ALPHA = minetest.registered_nodes["default:water_source"].alpha
+WATER_VISC = minetest.registered_nodes["default:water_source"].liquid_viscosity
+LAVA_VISC = minetest.registered_nodes["default:lava_source"].liquid_viscosity
+LIGHT_MAX = default.LIGHT_MAX
+
+-- Formspecs
+default.gui_suvival_form = default.gui_survival_form

mods/default/player.lua

@@ -1,55 +1,6 @@
 -- Minetest 0.4 mod: player
 -- See README.txt for licensing and other information.
 
---[[
-
-API
----
-
-default.player_register_model(name, def)
-^ Register a new model to be used by players.
-^ <name> is the model filename such as "character.x", "foo.b3d", etc.
-^ See Model Definition below for format of <def>.
-
-default.registered_player_models[name]
-^ See Model Definition below for format.
-
-default.player_set_model(player, model_name)
-^ <player> is a PlayerRef.
-^ <model_name> is a model registered with player_register_model.
-
-default.player_set_animation(player, anim_name [, speed])
-^ <player> is a PlayerRef.
-^ <anim_name> is the name of the animation.
-^ <speed> is in frames per second. If nil, default from the model is used
-
-default.player_set_textures(player, textures)
-^ <player> is a PlayerRef.
-^ <textures> is an array of textures
-^ If <textures> is nil, the default textures from the model def are used
-
-default.player_get_animation(player)
-^ <player> is a PlayerRef.
-^ Returns a table containing fields "model", "textures" and "animation".
-^ Any of the fields of the returned table may be nil.
-
-Model Definition
-----------------
-
-model_def = {
-	animation_speed = 30, -- Default animation speed, in FPS.
-	textures = {"character.png", }, -- Default array of textures.
-	visual_size = {x=1, y=1,}, -- Used to scale the model.
-	animations = {
-		-- <anim_name> = { x=<start_frame>, y=<end_frame>, },
-		foo = { x= 0, y=19, },
-		bar = { x=20, y=39, },
-		-- ...
-	},
-}
-
-]]
-
 -- Player animation blending
 -- Note: This is currently broken due to a bug in Irrlicht, leave at 0
 local animation_blend = 0
@@ -64,7 +15,7 @@ function default.player_register_model(name, def)
 end
 
 -- Default player appearance
-default.player_register_model("character.x", {
+default.player_register_model("character.b3d", {
 	animation_speed = 30,
 	textures = {"character.png", },
 	animations = {
@@ -142,12 +93,12 @@ end
 -- Update appearance when the player joins
 minetest.register_on_joinplayer(function(player)
 	default.player_attached[player:get_player_name()] = false
-	default.player_set_model(player, "character.x")
+	default.player_set_model(player, "character.b3d")
 	player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
 	
 	-- set GUI
 	if not minetest.setting_getbool("creative_mode") then
-		player:set_inventory_formspec(default.gui_suvival_form)
+		player:set_inventory_formspec(default.gui_survival_form)
 	end
 	player:hud_set_hotbar_image("gui_hotbar.png")
 	player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
@@ -162,6 +113,7 @@ end)
 
 -- Localize for better performance.
 local player_set_animation = default.player_set_animation
+local player_attached = default.player_attached
 
 -- Check each player and apply animations
 minetest.register_globalstep(function(dtime)
@@ -169,7 +121,7 @@ minetest.register_globalstep(function(dtime)
 		local name = player:get_player_name()
 		local model_name = player_model[name]
 		local model = model_name and models[model_name]
-		if model and not default.player_attached[name] then
+		if model and not player_attached[name] then
 			local controls = player:get_player_control()
 			local walking = false
 			local animation_speed_mod = model.animation_speed or 30