Increase chance for getting seeds

README.txt

@@ -48,3 +48,6 @@ See README.txt in each mod directory for information about other authors.
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 http://creativecommons.org/licenses/by-sa/3.0/
 
+License of menu/header.png
+Copyright (C) 2013 BlockMen CC BY-3.0
+

game.conf

@@ -1,2 +1 @@
 name = Minetest
-

mods/bones/README.txt

@@ -0,0 +1,17 @@
+Minetest 0.4 mod: bones
+=======================
+
+License of source code:
+-----------------------
+Copyright (C) 2012 PilzAdam
+
+WTFPL
+
+License of media (textures and sounds)
+--------------------------------------
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+http://creativecommons.org/licenses/by-sa/3.0/
+
+Authors of media files
+----------------------
+Bad_Command_

mods/bones/depends.txt

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

mods/bones/init.lua

@@ -0,0 +1,130 @@
+-- Minetest 0.4 mod: bones
+-- See README.txt for licensing and other information. 
+
+local function is_owner(pos, name)
+	local owner = minetest.get_meta(pos):get_string("owner")
+	if owner == "" or owner == name then
+		return true
+	end
+	return false
+end
+
+minetest.register_node("bones:bones", {
+	description = "Bones",
+	tiles = {
+		"bones_top.png",
+		"bones_bottom.png",
+		"bones_side.png",
+		"bones_side.png",
+		"bones_rear.png",
+		"bones_front.png"
+	},
+	paramtype2 = "facedir",
+	groups = {dig_immediate=2},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_gravel_footstep", gain=0.45},
+	}),
+	
+	can_dig = function(pos, player)
+		local inv = minetest.get_meta(pos):get_inventory()
+		return is_owner(pos, player:get_player_name()) and inv:is_empty("main")
+	end,
+	
+	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		if is_owner(pos, player:get_player_name()) then
+			return count
+		end
+		return 0
+	end,
+	
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		return 0
+	end,
+	
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		if is_owner(pos, player:get_player_name()) then
+			return stack:get_count()
+		end
+		return 0
+	end,
+	
+	on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("owner") ~= "" and meta:get_inventory():is_empty("main") then
+			meta:set_string("infotext", meta:get_string("owner").."'s old bones")
+			meta:set_string("formspec", "")
+			meta:set_string("owner", "")
+		end
+	end,
+	
+	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
+			meta:set_string("infotext", meta:get_string("owner").."'s old bones")
+			meta:set_string("owner", "")
+		else
+			return true
+		end
+	end,
+})
+
+minetest.register_on_dieplayer(function(player)
+	if minetest.setting_getbool("creative_mode") then
+		return
+	end
+	
+	local pos = player:getpos()
+	pos.x = math.floor(pos.x+0.5)
+	pos.y = math.floor(pos.y+0.5)
+	pos.z = math.floor(pos.z+0.5)
+	local param2 = minetest.dir_to_facedir(player:get_look_dir())
+	
+	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
+		local player_inv = player:get_inventory()
+
+		for i=1,player_inv:get_size("main") do
+			player_inv:set_stack("main", i, nil)
+		end
+		for i=1,player_inv:get_size("craft") do
+			player_inv:set_stack("craft", i, nil)
+		end
+		return
+	end
+	
+	minetest.dig_node(pos)
+	minetest.add_node(pos, {name="bones:bones", param2=param2})
+	
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	local player_inv = player:get_inventory()
+	inv:set_size("main", 8*4)
+	
+	local empty_list = inv:get_list("main")
+	inv:set_list("main", player_inv:get_list("main"))
+	player_inv:set_list("main", empty_list)
+	
+	for i=1,player_inv:get_size("craft") do
+		inv:add_item("main", player_inv:get_stack("craft", i))
+		player_inv:set_stack("craft", i, nil)
+	end
+	
+	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:get_player_name().."'s fresh bones")
+	meta:set_string("owner", player:get_player_name())
+	meta:set_int("time", 0)
+	
+	local timer  = minetest.get_node_timer(pos)
+	timer:start(10)
+end)

mods/bucket/init.lua

@@ -1,6 +1,8 @@
 -- 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")
@@ -22,7 +24,7 @@ bucket.liquids = {}
 --   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)
 -- This function can be called from any mod (that depends on bucket).
-function bucket.register_liquid(source, flowing, itemname, inventory_image)
+function bucket.register_liquid(source, flowing, itemname, inventory_image, name)
 	bucket.liquids[source] = {
 		source = source,
 		flowing = flowing,
@@ -32,25 +34,48 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
 
 	if itemname ~= nil then
 		minetest.register_craftitem(itemname, {
+			description = name,
 			inventory_image = inventory_image,
 			stack_max = 1,
 			liquids_pointable = true,
-			on_use = function(itemstack, user, pointed_thing)
+			groups = {not_in_creative_inventory=1},
+			on_place = function(itemstack, user, pointed_thing)
 				-- Must be pointing to node
 				if pointed_thing.type ~= "node" then
 					return
 				end
+
+				local place_liquid = function(pos, node, source, flowing, fullness)
+					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
+				end
+
 				-- Check if pointing to a buildable node
-				n = minetest.env:get_node(pointed_thing.under)
-				if minetest.registered_nodes[n.name].buildable_to then
+				local node = minetest.get_node(pointed_thing.under)
+				local fullness = tonumber(itemstack:get_metadata())
+				if not fullness then fullness = LIQUID_MAX end
+
+				if minetest.registered_nodes[node.name].buildable_to then
 					-- buildable; replace the node
-					minetest.env:add_node(pointed_thing.under, {name=source})
+					place_liquid(pointed_thing.under, node, source, flowing, fullness)
 				else
 					-- not buildable to; place the liquid above
 					-- check if the node above can be replaced
-					n = minetest.env:get_node(pointed_thing.above)
-					if minetest.registered_nodes[n.name].buildable_to then
-						minetest.env:add_node(pointed_thing.above,{name=source})
+					local node = minetest.get_node(pointed_thing.above)
+					if minetest.registered_nodes[node.name].buildable_to then
+						place_liquid(pointed_thing.above, node, source, flowing, fullness)
 					else
 						-- do not remove the bucket with the liquid
 						return
@@ -73,11 +98,15 @@ minetest.register_craftitem("bucket:bucket_empty", {
 			return
 		end
 		-- Check if pointing to a liquid source
-		n = minetest.env:get_node(pointed_thing.under)
-		liquiddef = bucket.liquids[n.name]
-		if liquiddef ~= nil and liquiddef.source == n.name and liquiddef.itemname ~= nil then
-			minetest.env:add_node(pointed_thing.under, {name="air"})
-			return {name=liquiddef.itemname}
+		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
+
+			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)})
 		end
 	end,
 })
@@ -86,18 +115,21 @@ bucket.register_liquid(
 	"default:water_source",
 	"default:water_flowing",
 	"bucket:bucket_water",
-	"bucket_water.png"
+	"bucket_water.png",
+	"Water Bucket"
 )
 
 bucket.register_liquid(
 	"default:lava_source",
 	"default:lava_flowing",
 	"bucket:bucket_lava",
-	"bucket_lava.png"
+	"bucket_lava.png",
+	"Lava Bucket"
 )
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "bucket:bucket_lava",
 	burntime = 60,
+	replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
 })

mods/creative/init.lua

@@ -1,6 +1,6 @@
 -- minetest/creative/init.lua
 
-local creative_inventory = {}
+creative_inventory = {}
 creative_inventory.creative_inventory_size = 0
 
 -- Create detached creative inventory after loading all mods
@@ -136,7 +136,8 @@ if minetest.setting_getbool("creative_mode") then
 				snappy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
 				choppy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
 				oddly_breakable_by_hand = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-			}
+			},
+			damage_groups = {fleshy = 10},
 		}
 	})
 	

mods/default/README.txt

@@ -31,7 +31,7 @@ Cisoun's WTFPL texture pack:
   default_chest_lock.png
   default_chest_side.png
   default_chest_top.png
-  default_cobble.png
+  default_stone_brick.png
   default_dirt.png
   default_grass.png
   default_grass_side.png
@@ -39,8 +39,6 @@ Cisoun's WTFPL texture pack:
   default_jungletree_top.png
   default_lava.png
   default_leaves.png
-  default_mossycobble.png
-  default_sand.png
   default_sapling.png
   default_sign_wall.png
   default_stone.png
@@ -60,6 +58,7 @@ Originating from G4JC's Almost MC Texture Pack:
   default_torch.png
   default_torch_on_ceiling.png
   default_torch_on_floor.png
+  default_cobble.png
 
 VanessaE's animated torches (WTFPL):
   default_torch_animated.png
@@ -71,17 +70,27 @@ RealBadAngel's animated water (WTFPL):
   default_water_source_animated.png
   default_water_flowing_animated.png
 
-VanessaE:
+VanessaE (WTFPL):
   default_nc_back.png
   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
 
-Calinou's improved default textures (CC BY-SA):
+Calinou (CC BY-SA):
   default_brick.png
   default_clay_brick.png
   default_papyrus.png
   default_tool_steelsword.png
+  default_bronze_ingot.png
+  default_copper_ingot.png
+  default_copper_lump.png
+  default_mineral_copper.png
 
 MirceaKitsune (WTFPL):
   character.x
@@ -89,6 +98,49 @@ MirceaKitsune (WTFPL):
 Jordach (CC BY-SA 3.0):
   character.png
 
+PilzAdam (WTFPL):
+  default_jungleleaves.png
+  default_junglesapling.png
+  default_junglewood.png
+  default_obsidian_glass.png
+  default_obsidian_shard.png
+  default_mossycobble.png
+  default_gold_ingot.png
+  default_gold_lump.png
+  default_mineral_gold.png
+  default_diamond.png
+  default_tool_diamondpick.png
+  default_tool_diamondsword.png
+  default_tool_diamondshovel.png
+  default_tool_diamondaxe.png
+  default_tool_meseaxe.png
+  default_tool_meseshovel.png
+  default_tool_mesesword.png
+  default_tool_bronzeaxe.png
+  default_tool_bronzepick.png
+  default_tool_bronzeshovel.png
+  default_tool_bronzesword.png
+  default_snowball.png
+
+jojoa1997 (WTFPL):
+  default_obsidian.png
+
+InfinityProject (WTFPL):
+  default_mineral_diamond.png
+
+Splizard (CC BY-SA 3.0):
+  default_snow.png
+  default_snow_side.png
+  default_ice.png
+
+Zeg9 (CC BY-SA 3.0):
+  default_coal_block.png
+  default_steel_block.png
+  default_copper_block.png
+  default_bronze_block.png
+  default_gold_block.png
+  default_diamond_block.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/crafting.lua

@@ -0,0 +1,742 @@
+-- mods/default/crafting.lua
+
+minetest.register_craft({
+	output = 'default:wood 4',
+	recipe = {
+		{'default:tree'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:junglewood 4',
+	recipe = {
+		{'default:jungletree'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:stick 4',
+	recipe = {
+		{'group:wood'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:fence_wood 2',
+	recipe = {
+		{'default:stick', 'default:stick', 'default:stick'},
+		{'default:stick', 'default:stick', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sign_wall',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:torch 4',
+	recipe = {
+		{'default:coal_lump'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_wood',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_stone',
+	recipe = {
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_steel',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_bronze',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_mese',
+	recipe = {
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:pick_diamond',
+	recipe = {
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'', 'default:stick', ''},
+		{'', 'default:stick', ''},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_wood',
+	recipe = {
+		{'group:wood'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_stone',
+	recipe = {
+		{'group:stone'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_steel',
+	recipe = {
+		{'default:steel_ingot'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_bronze',
+	recipe = {
+		{'default:bronze_ingot'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_mese',
+	recipe = {
+		{'default:mese_crystal'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:shovel_diamond',
+	recipe = {
+		{'default:diamond'},
+		{'default:stick'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_wood',
+	recipe = {
+		{'group:wood', 'group:wood'},
+		{'group:wood', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_stone',
+	recipe = {
+		{'group:stone', 'group:stone'},
+		{'group:stone', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_steel',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_bronze',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_mese',
+	recipe = {
+		{'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:axe_diamond',
+	recipe = {
+		{'default:diamond', 'default:diamond'},
+		{'default:diamond', 'default:stick'},
+		{'', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_wood',
+	recipe = {
+		{'group:wood'},
+		{'group:wood'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_stone',
+	recipe = {
+		{'group:stone'},
+		{'group:stone'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_steel',
+	recipe = {
+		{'default:steel_ingot'},
+		{'default:steel_ingot'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_bronze',
+	recipe = {
+		{'default:bronze_ingot'},
+		{'default:bronze_ingot'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_mese',
+	recipe = {
+		{'default:mese_crystal'},
+		{'default:mese_crystal'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sword_diamond',
+	recipe = {
+		{'default:diamond'},
+		{'default:diamond'},
+		{'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:rail 15',
+	recipe = {
+		{'default:steel_ingot', '', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:stick', 'default:steel_ingot'},
+		{'default:steel_ingot', '', 'default:steel_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:chest',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', '', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:chest_locked',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'default:steel_ingot', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:furnace',
+	recipe = {
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'group:stone', '', 'group:stone'},
+		{'group:stone', 'group:stone', 'group:stone'},
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "default:bronze_ingot",
+	recipe = {"default:steel_ingot", "default:copper_ingot"},
+})
+
+minetest.register_craft({
+	output = 'default:coalblock',
+	recipe = {
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:coal_lump 9',
+	recipe = {
+		{'default:coalblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:steelblock',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:steel_ingot 9',
+	recipe = {
+		{'default:steelblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:copperblock',
+	recipe = {
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:copper_ingot 9',
+	recipe = {
+		{'default:copperblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:bronzeblock',
+	recipe = {
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:bronze_ingot 9',
+	recipe = {
+		{'default:bronzeblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:goldblock',
+	recipe = {
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:gold_ingot 9',
+	recipe = {
+		{'default:goldblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:diamondblock',
+	recipe = {
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:diamond 9',
+	recipe = {
+		{'default:diamondblock'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sandstone',
+	recipe = {
+		{'group:sand', 'group:sand'},
+		{'group:sand', 'group:sand'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sand 4',
+	recipe = {
+		{'default:sandstone'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:sandstonebrick',
+	recipe = {
+		{'default:sandstone', 'default:sandstone'},
+		{'default:sandstone', 'default:sandstone'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:clay',
+	recipe = {
+		{'default:clay_lump', 'default:clay_lump'},
+		{'default:clay_lump', 'default:clay_lump'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:brick',
+	recipe = {
+		{'default:clay_brick', 'default:clay_brick'},
+		{'default:clay_brick', 'default:clay_brick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:clay_brick 4',
+	recipe = {
+		{'default:brick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:paper',
+	recipe = {
+		{'default:papyrus', 'default:papyrus', 'default:papyrus'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:book',
+	recipe = {
+		{'default:paper'},
+		{'default:paper'},
+		{'default:paper'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:bookshelf',
+	recipe = {
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'default:book', 'default:book', 'default:book'},
+		{'group:wood', 'group:wood', 'group:wood'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:ladder',
+	recipe = {
+		{'default:stick', '', 'default:stick'},
+		{'default:stick', 'default:stick', 'default:stick'},
+		{'default:stick', '', 'default:stick'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese',
+	recipe = {
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese_crystal 9',
+	recipe = {
+		{'default:mese'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese_crystal_fragment 9',
+	recipe = {
+		{'default:mese_crystal'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:obsidian_shard 9',
+	recipe = {
+		{'default:obsidian'}
+	}
+})
+
+minetest.register_craft({
+	output = 'default:obsidian',
+	recipe = {
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:stonebrick',
+	recipe = {
+		{'default:stone', 'default:stone'},
+		{'default:stone', 'default:stone'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:desert_stonebrick',
+	recipe = {
+		{'default:desert_stone', 'default:desert_stone'},
+		{'default:desert_stone', 'default:desert_stone'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:snowblock',
+	recipe = {
+		{'default:snow', 'default:snow', 'default:snow'},
+		{'default:snow', 'default:snow', 'default:snow'},
+		{'default:snow', 'default:snow', 'default:snow'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:snow 9',
+	recipe = {
+		{'default:snowblock'},
+	}
+})
+
+--
+-- Crafting (tool repair)
+--
+minetest.register_craft({
+	type = "toolrepair",
+	additional_wear = -0.02,
+})
+
+--
+-- Cooking recipes
+--
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:glass",
+	recipe = "group:sand",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:obsidian_glass",
+	recipe = "default:obsidian_shard",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:stone",
+	recipe = "default:cobble",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:steel_ingot",
+	recipe = "default:iron_lump",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:copper_ingot",
+	recipe = "default:copper_lump",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:gold_ingot",
+	recipe = "default:gold_lump",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:clay_brick",
+	recipe = "default:clay_lump",
+})
+
+--
+-- Fuels
+--
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:tree",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:junglegrass",
+	burntime = 2,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:leaves",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:cactus",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:papyrus",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:bookshelf",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_wood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:ladder",
+	burntime = 5,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:wood",
+	burntime = 7,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:lava_source",
+	burntime = 60,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:torch",
+	burntime = 4,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:sign_wall",
+	burntime = 10,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:chest",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:chest_locked",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:nyancat",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:nyancat_rainbow",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:sapling",
+	burntime = 10,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:apple",
+	burntime = 3,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:coal_lump",
+	burntime = 40,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:coalblock",
+	burntime = 370,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:junglesapling",
+	burntime = 10,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:grass_1",
+	burntime = 2,
+})

mods/default/craftitems.lua

@@ -0,0 +1,91 @@
+-- mods/default/craftitems.lua
+
+minetest.register_craftitem("default:stick", {
+	description = "Stick",
+	inventory_image = "default_stick.png",
+})
+
+minetest.register_craftitem("default:paper", {
+	description = "Paper",
+	inventory_image = "default_paper.png",
+})
+
+minetest.register_craftitem("default:book", {
+	description = "Book",
+	inventory_image = "default_book.png",
+})
+
+minetest.register_craftitem("default:coal_lump", {
+	description = "Coal Lump",
+	inventory_image = "default_coal_lump.png",
+})
+
+minetest.register_craftitem("default:iron_lump", {
+	description = "Iron Lump",
+	inventory_image = "default_iron_lump.png",
+})
+
+minetest.register_craftitem("default:copper_lump", {
+	description = "Copper Lump",
+	inventory_image = "default_copper_lump.png",
+})
+
+minetest.register_craftitem("default:mese_crystal", {
+	description = "Mese Crystal",
+	inventory_image = "default_mese_crystal.png",
+})
+
+minetest.register_craftitem("default:gold_lump", {
+	description = "Gold Lump",
+	inventory_image = "default_gold_lump.png",
+})
+
+minetest.register_craftitem("default:diamond", {
+	description = "Diamond",
+	inventory_image = "default_diamond.png",
+})
+
+minetest.register_craftitem("default:clay_lump", {
+	description = "Clay Lump",
+	inventory_image = "default_clay_lump.png",
+})
+
+minetest.register_craftitem("default:steel_ingot", {
+	description = "Steel Ingot",
+	inventory_image = "default_steel_ingot.png",
+})
+
+minetest.register_craftitem("default:copper_ingot", {
+	description = "Copper Ingot",
+	inventory_image = "default_copper_ingot.png",
+})
+
+minetest.register_craftitem("default:bronze_ingot", {
+	description = "Bronze Ingot",
+	inventory_image = "default_bronze_ingot.png",
+})
+
+minetest.register_craftitem("default:gold_ingot", {
+	description = "Gold Ingot",
+	inventory_image = "default_gold_ingot.png"
+})
+
+minetest.register_craftitem("default:mese_crystal_fragment", {
+	description = "Mese Crystal Fragment",
+	inventory_image = "default_mese_crystal_fragment.png",
+})
+
+minetest.register_craftitem("default:clay_brick", {
+	description = "Clay Brick",
+	inventory_image = "default_clay_brick.png",
+})
+
+minetest.register_craftitem("default:scorched_stuff", {
+	description = "Scorched Stuff",
+	inventory_image = "default_scorched_stuff.png",
+})
+
+minetest.register_craftitem("default:obsidian_shard", {
+	description = "Obsidian Shard",
+	inventory_image = "default_obsidian_shard.png",
+})

mods/default/functions.lua

@@ -0,0 +1,305 @@
+-- mods/default/functions.lua
+
+--
+-- Sounds
+--
+
+function default.node_sound_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="", gain=1.0}
+	table.dug = table.dug or
+			{name="default_dug_node", gain=1.0}
+	table.place = table.place or
+			{name="default_place_node", gain=0.5}
+	return table
+end
+
+function default.node_sound_stone_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_hard_footstep", gain=0.2}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_dirt_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="", gain=0.5}
+	--table.dug = table.dug or
+	--		{name="default_dirt_break", gain=0.5}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_sand_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_grass_footstep", gain=0.25}
+	--table.dug = table.dug or
+	--		{name="default_dirt_break", gain=0.25}
+	table.dug = table.dug or
+			{name="", gain=0.25}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_wood_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_hard_footstep", gain=0.3}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_leaves_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_grass_footstep", gain=0.25}
+	table.dig = table.dig or
+			{name="default_dig_crumbly", gain=0.4}
+	table.dug = table.dug or
+			{name="", gain=1.0}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_glass_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_hard_footstep", gain=0.25}
+	table.dug = table.dug or
+			{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)
+
+--
+-- Lavacooling
+--
+
+default.cool_lava_source = function(pos)
+	minetest.set_node(pos, {name="default:obsidian"})
+end
+
+default.cool_lava_flowing = function(pos)
+	minetest.set_node(pos, {name="default:stone"})
+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)
+	end,
+})
+
+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)
+	end,
+})
+
+--
+-- Papyrus and cactus growing
+--
+
+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,
+})
+
+minetest.register_abm({
+	nodenames = {"default:papyrus"},
+	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,
+})
+
+--
+-- 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
+default.leafdecay_trunk_find_allow_accumulator = 0
+
+minetest.register_globalstep(function(dtime)
+	local finds_per_second = 5000
+	default.leafdecay_trunk_find_allow_accumulator =
+			math.floor(dtime * finds_per_second)
+end)
+
+minetest.register_abm({
+	nodenames = {"group:leafdecay"},
+	neighbors = {"air", "group:liquid"},
+	-- A low interval and a high inverse chance spreads the load
+	interval = 2,
+	chance = 5,
+
+	action = function(p0, node, _, _)
+		--print("leafdecay ABM at "..p0.x..", "..p0.y..", "..p0.z..")")
+		local do_preserve = false
+		local d = minetest.registered_nodes[node.name].groups.leafdecay
+		if not d or d == 0 then
+			--print("not groups.leafdecay")
+			return
+		end
+		local n0 = minetest.get_node(p0)
+		if n0.param2 ~= 0 then
+			--print("param2 ~= 0")
+			return
+		end
+		local p0_hash = nil
+		if default.leafdecay_enable_cache then
+			p0_hash = minetest.hash_node_position(p0)
+			local trunkp = default.leafdecay_trunk_cache[p0_hash]
+			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
+					--print("cached trunk still exists")
+					return
+				end
+				--print("cached trunk is invalid")
+				-- Cache is invalid
+				table.remove(default.leafdecay_trunk_cache, p0_hash)
+			end
+		end
+		if default.leafdecay_trunk_find_allow_accumulator <= 0 then
+			return
+		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
+		local p1 = minetest.find_node_near(p0, d, {"ignore", "group:tree"})
+		if p1 then
+			do_preserve = true
+			if default.leafdecay_enable_cache then
+				--print("caching trunk")
+				-- Cache the trunk
+				default.leafdecay_trunk_cache[p0_hash] = p1
+			end
+		end
+		if not do_preserve then
+			-- Drop stuff other than the node itself
+			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
+					local p_drop = {
+						x = p0.x - 0.5 + math.random(),
+						y = p0.y - 0.5 + math.random(),
+						z = p0.z - 0.5 + math.random(),
+					}
+					minetest.add_item(p_drop, itemname)
+				end
+			end
+			-- Remove node
+			minetest.remove_node(p0)
+			nodeupdate(p0)
+		end
+	end
+})

mods/default/leafdecay.lua

@@ -1,93 +0,0 @@
--- minetest/default/leafdecay.lua
-
--- 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.
-
-default.leafdecay_trunk_cache = {}
-default.leafdecay_enable_cache = true
--- Spread the load of finding trunks
-default.leafdecay_trunk_find_allow_accumulator = 0
-
-minetest.register_globalstep(function(dtime)
-	local finds_per_second = 5000
-	default.leafdecay_trunk_find_allow_accumulator =
-			math.floor(dtime * finds_per_second)
-end)
-
-minetest.register_abm({
-	nodenames = {"group:leafdecay"},
-	neighbors = {"air", "group:liquid"},
-	-- A low interval and a high inverse chance spreads the load
-	interval = 2,
-	chance = 5,
-
-	action = function(p0, node, _, _)
-		--print("leafdecay ABM at "..p0.x..", "..p0.y..", "..p0.z..")")
-		local do_preserve = false
-		local d = minetest.registered_nodes[node.name].groups.leafdecay
-		if not d or d == 0 then
-			--print("not groups.leafdecay")
-			return
-		end
-		local n0 = minetest.env:get_node(p0)
-		if n0.param2 ~= 0 then
-			--print("param2 ~= 0")
-			return
-		end
-		local p0_hash = nil
-		if default.leafdecay_enable_cache then
-			p0_hash = minetest.hash_node_position(p0)
-			local trunkp = default.leafdecay_trunk_cache[p0_hash]
-			if trunkp then
-				local n = minetest.env: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
-					--print("cached trunk still exists")
-					return
-				end
-				--print("cached trunk is invalid")
-				-- Cache is invalid
-				table.remove(default.leafdecay_trunk_cache, p0_hash)
-			end
-		end
-		if default.leafdecay_trunk_find_allow_accumulator <= 0 then
-			return
-		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
-		local p1 = minetest.env:find_node_near(p0, d, {"ignore", "group:tree"})
-		if p1 then
-			do_preserve = true
-			if default.leafdecay_enable_cache then
-				--print("caching trunk")
-				-- Cache the trunk
-				default.leafdecay_trunk_cache[p0_hash] = p1
-			end
-		end
-		if not do_preserve then
-			-- Drop stuff other than the node itself
-			itemstacks = minetest.get_node_drops(n0.name)
-			for _, itemname in ipairs(itemstacks) do
-				if itemname ~= n0.name then
-					local p_drop = {
-						x = p0.x - 0.5 + math.random(),
-						y = p0.y - 0.5 + math.random(),
-						z = p0.z - 0.5 + math.random(),
-					}
-					minetest.env:add_item(p_drop, itemname)
-				end
-			end
-			-- Remove node
-			minetest.env:remove_node(p0)
-			nodeupdate(p0)
-		end
-	end
-})
-

mods/default/mapgen.lua

@@ -1,4 +1,4 @@
--- minetest/default/mapgen.lua
+-- mods/default/mapgen.lua
 
 --
 -- Aliases for map generator outputs
@@ -8,6 +8,8 @@ minetest.register_alias("mapgen_air", "air")
 minetest.register_alias("mapgen_stone", "default:stone")
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
+minetest.register_alias("mapgen_jungletree", "default:jungletree")
+minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
 minetest.register_alias("mapgen_apple", "default:apple")
 minetest.register_alias("mapgen_water_source", "default:water_source")
 minetest.register_alias("mapgen_dirt", "default:dirt")
@@ -29,12 +31,256 @@ minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
 -- Ore generation
 --
 
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_coal",
+	wherein        = "default:stone",
+	clust_scarcity = 8*8*8,
+	clust_num_ores = 8,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = 64,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_coal",
+	wherein        = "default:stone",
+	clust_scarcity = 24*24*24,
+	clust_num_ores = 27,
+	clust_size     = 6,
+	height_min     = -31000,
+	height_max     = 0,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "default:stone",
+	clust_scarcity = 12*12*12,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -15,
+	height_max     = 2,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "default:stone",
+	clust_scarcity = 9*9*9,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "default:stone",
+	clust_scarcity = 7*7*7,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "default:stone",
+	clust_scarcity = 24*24*24,
+	clust_num_ores = 27,
+	clust_size     = 6,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_mese",
+	wherein        = "default:stone",
+	clust_scarcity = 18*18*18,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -255,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_mese",
+	wherein        = "default:stone",
+	clust_scarcity = 14*14*14,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -256,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:mese",
+	wherein        = "default:stone",
+	clust_scarcity = 36*36*36,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -31000,
+	height_max     = -1024,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_gold",
+	wherein        = "default:stone",
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -255,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_gold",
+	wherein        = "default:stone",
+	clust_scarcity = 13*13*13,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -256,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_diamond",
+	wherein        = "default:stone",
+	clust_scarcity = 17*17*17,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	height_min     = -255,
+	height_max     = -128,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_diamond",
+	wherein        = "default:stone",
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -256,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_copper",
+	wherein        = "default:stone",
+	clust_scarcity = 12*12*12,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_copper",
+	wherein        = "default:stone",
+	clust_scarcity = 9*9*9,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+if minetest.setting_get("mg_name") == "indev" then
+	-- Floatlands and high mountains springs
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:water_source",
+		ore_param2     = 128,
+		wherein        = "default:stone",
+		clust_scarcity = 40*40*40,
+		clust_num_ores = 8,
+		clust_size     = 3,
+		height_min     = 100,
+		height_max     = 31000,
+	})
+
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:lava_source",
+		ore_param2     = 128,
+		wherein        = "default:stone",
+		clust_scarcity = 50*50*50,
+		clust_num_ores = 5,
+		clust_size     = 2,
+		height_min     = 10000,
+		height_max     = 31000,
+	})
+
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:sand",
+		wherein        = "default:stone",
+		clust_scarcity = 20*20*20,
+		clust_num_ores = 5*5*3,
+		clust_size     = 5,
+		height_min     = 500,
+		height_max     = 31000,
+	})
+
+	-- Underground springs
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:water_source",
+		ore_param2     = 128,
+		wherein        = "default:stone",
+		clust_scarcity = 25*25*25,
+		clust_num_ores = 8,
+		clust_size     = 3,
+		height_min     = -10000,
+		height_max     = -10,
+	})
+
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:lava_source",
+		ore_param2     = 128,
+		wherein        = "default:stone",
+		clust_scarcity = 35*35*35,
+		clust_num_ores = 5,
+		clust_size     = 2,
+		height_min     = -31000,
+		height_max     = -100,
+	})
+end
+
 function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
+	minetest.log('action', "WARNING: default.generate_ore is deprecated")
+
 	if maxp.y < height_min or minp.y > height_max then
 		return
 	end
 	local y_min = math.max(minp.y, height_min)
 	local y_max = math.min(maxp.y, height_max)
+	if chunk_size >= y_max - y_min + 1 then
+		return
+	end
 	local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
 	local pr = PseudoRandom(seed)
 	local num_chunks = math.floor(chunks_per_volume * volume)
@@ -54,8 +300,8 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume
 					local y2 = y0+y1
 					local z2 = z0+z1
 					local p2 = {x=x2, y=y2, z=z2}
-					if minetest.env:get_node(p2).name == wherein then
-						minetest.env:set_node(p2, {name=name})
+					if minetest.get_node(p2).name == wherein then
+						minetest.set_node(p2, {name=name})
 					end
 				end
 			end
@@ -69,10 +315,10 @@ end
 function default.make_papyrus(pos, size)
 	for y=0,size-1 do
 		local p = {x=pos.x, y=pos.y+y, z=pos.z}
-		local nn = minetest.env:get_node(p).name
+		local nn = minetest.get_node(p).name
 		if minetest.registered_nodes[nn] and
 			minetest.registered_nodes[nn].buildable_to then
-			minetest.env:set_node(p, {name="default:papyrus"})
+			minetest.set_node(p, {name="default:papyrus"})
 		else
 			return
 		end
@@ -82,10 +328,10 @@ end
 function default.make_cactus(pos, size)
 	for y=0,size-1 do
 		local p = {x=pos.x, y=pos.y+y, z=pos.z}
-		local nn = minetest.env:get_node(p).name
+		local nn = minetest.get_node(p).name
 		if minetest.registered_nodes[nn] and
 			minetest.registered_nodes[nn].buildable_to then
-			minetest.env:set_node(p, {name="default:cactus"})
+			minetest.set_node(p, {name="default:cactus"})
 		else
 			return
 		end
@@ -110,11 +356,11 @@ function default.make_nyancat(pos, facedir, length)
 		tailvec.z = 1
 	end
 	local p = {x=pos.x, y=pos.y, z=pos.z}
-	minetest.env:set_node(p, {name="default:nyancat", param2=facedir})
+	minetest.set_node(p, {name="default:nyancat", param2=facedir})
 	for i=1,length do
 		p.x = p.x + tailvec.x
 		p.z = p.z + tailvec.z
-		minetest.env:set_node(p, {name="default:nyancat_rainbow"})
+		minetest.set_node(p, {name="default:nyancat_rainbow"})
 	end
 end
 
@@ -141,19 +387,6 @@ function generate_nyancats(seed, minp, maxp)
 end
 
 minetest.register_on_generated(function(minp, maxp, seed)
-	-- Generate regular ores
-	default.generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+0, 1/8/8/8,    3, 8, -31000,  64)
-	default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/12/12/12, 2, 3,    -15,   2)
-	default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/9/9/9,    3, 5,    -63, -16)
-	default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/7/7/7,    3, 5, -31000, -64)
-	
-	default.generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+4, 1/16/16/16, 2, 3,   -127,  -64)
-	default.generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+5, 1/9/9/9,    3, 5, -31000, -128)
-	default.generate_ore("default:mese",            "default:stone", minp, maxp, seed+8, 1/16/16/16, 2, 3, -31000,-1024)
-	
-	default.generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+7, 1/24/24/24, 6,27, -31000,  0)
-	default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+6, 1/24/24/24, 6,27, -31000, -64)
-
 	if maxp.y >= 2 and minp.y <= 0 then
 		-- Generate clay
 		-- Assume X and Z lengths are equal
@@ -163,17 +396,17 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		for divz=0+1,divs-1-1 do
 			local cx = minp.x + math.floor((divx+0.5)*divlen)
 			local cz = minp.z + math.floor((divz+0.5)*divlen)
-			if minetest.env:get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
-					minetest.env:get_node({x=cx,y=0,z=cz}).name == "default:sand" then
+			if minetest.get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
+					minetest.get_node({x=cx,y=0,z=cz}).name == "default:sand" then
 				local is_shallow = true
 				local num_water_around = 0
-				if minetest.env:get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+				if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
 					num_water_around = num_water_around + 1 end
-				if minetest.env:get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+				if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
 					num_water_around = num_water_around + 1 end
-				if minetest.env:get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
+				if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
 					num_water_around = num_water_around + 1 end
-				if minetest.env:get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
+				if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
 					num_water_around = num_water_around + 1 end
 				if num_water_around >= 2 then
 					is_shallow = false
@@ -181,8 +414,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				if is_shallow then
 					for x1=-divlen,divlen do
 					for z1=-divlen,divlen do
-						if minetest.env:get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
-							minetest.env:set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
+						if minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
+							minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
 						end
 					end
 					end
@@ -191,7 +424,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		end
 		end
 		-- Generate papyrus
-		local perlin1 = minetest.env:get_perlin(354, 3, 0.7, 100)
+		local perlin1 = minetest.get_perlin(354, 3, 0.7, 100)
 		-- Assume X and Z lengths are equal
 		local divlen = 8
 		local divs = (maxp.x-minp.x)/divlen+1;
@@ -208,15 +441,15 @@ minetest.register_on_generated(function(minp, maxp, seed)
 			for i=0,papyrus_amount do
 				local x = pr:next(x0, x1)
 				local z = pr:next(z0, z1)
-				if minetest.env:get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and
-						minetest.env:find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then
+				if minetest.get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and
+						minetest.find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then
 					default.make_papyrus({x=x,y=2,z=z}, pr:next(2, 4))
 				end
 			end
 		end
 		end
 		-- Generate cactuses
-		local perlin1 = minetest.env:get_perlin(230, 3, 0.6, 100)
+		local perlin1 = minetest.get_perlin(230, 3, 0.6, 100)
 		-- Assume X and Z lengths are equal
 		local divlen = 16
 		local divs = (maxp.x-minp.x)/divlen+1;
@@ -236,20 +469,20 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				-- Find ground level (0...15)
 				local ground_y = nil
 				for y=30,0,-1 do
-					if minetest.env:get_node({x=x,y=y,z=z}).name ~= "air" then
+					if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
 						ground_y = y
 						break
 					end
 				end
 				-- If desert sand, make cactus
-				if ground_y and minetest.env:get_node({x=x,y=ground_y,z=z}).name == "default:desert_sand" then
+				if ground_y and minetest.get_node({x=x,y=ground_y,z=z}).name == "default:desert_sand" then
 					default.make_cactus({x=x,y=ground_y+1,z=z}, pr:next(3, 4))
 				end
 			end
 		end
 		end
 		-- Generate grass
-		local perlin1 = minetest.env:get_perlin(329, 3, 0.6, 100)
+		local perlin1 = minetest.get_perlin(329, 3, 0.6, 100)
 		-- Assume X and Z lengths are equal
 		local divlen = 16
 		local divs = (maxp.x-minp.x)/divlen+1;
@@ -260,7 +493,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 			local x1 = minp.x + math.floor((divx+1)*divlen)
 			local z1 = minp.z + math.floor((divz+1)*divlen)
 			-- Determine grass amount from perlin noise
-			local grass_amount = math.floor(perlin1:get2d({x=x0, y=z0}) * 5 + 0)
+			local grass_amount = math.floor(perlin1:get2d({x=x0, y=z0}) ^ 3 * 9)
 			-- Find random positions for grass based on this random
 			local pr = PseudoRandom(seed+1)
 			for i=0,grass_amount do
@@ -269,7 +502,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				-- Find ground level (0...15)
 				local ground_y = nil
 				for y=30,0,-1 do
-					if minetest.env:get_node({x=x,y=y,z=z}).name ~= "air" then
+					if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
 						ground_y = y
 						break
 					end
@@ -277,18 +510,18 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				
 				if ground_y then
 					local p = {x=x,y=ground_y+1,z=z}
-					local nn = minetest.env:get_node(p).name
+					local nn = minetest.get_node(p).name
 					-- Check if the node can be replaced
 					if minetest.registered_nodes[nn] and
 						minetest.registered_nodes[nn].buildable_to then
-						nn = minetest.env:get_node({x=x,y=ground_y,z=z}).name
-						-- If desert sand, make dry shrub
+						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
+						-- If desert sand, add dry shrub
 						if nn == "default:desert_sand" then
-							minetest.env:set_node(p,{name="default:dry_shrub"})
+							minetest.set_node(p,{name="default:dry_shrub"})
 							
-						-- If grass, make junglegrass
+						-- If dirt with grass, add grass
 						elseif nn == "default:dirt_with_grass" then
-							minetest.env:set_node(p,{name="default:junglegrass"})
+							minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
 						end
 					end
 				end