Update mods from minetest_game

Also move changes to default into a default_tweaks mod

mods/bucket/init.lua

@@ -44,6 +44,15 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 				if pointed_thing.type ~= "node" then
 					return
 				end
+				
+				-- Call on_rightclick if the pointed node defines it
+				if user and not user:get_player_control().sneak then
+					local n = minetest.get_node(pointed_thing.under)
+					local nn = n.name
+					if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
+						return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, user, itemstack) or itemstack
+					end
+				end
 
 				local place_liquid = function(pos, node, source, flowing, fullness)
 					if math.floor(fullness/128) == 1 or (not minetest.setting_getbool("liquid_finite")) then

mods/default/README.txt

@@ -137,6 +137,9 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
   default_diamond_block.png
 
+kaeza (WTFPL):
+  bubble.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

@@ -292,9 +292,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'default:furnace',
 	recipe = {
-		{'default:cobble', 'default:cobble', 'default:cobble'},
-		{'default:cobble', '', 'default:cobble'},
-		{'default:cobble', 'default:cobble', 'default:cobble'},
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'group:stone', '', 'group:stone'},
+		{'group:stone', 'group:stone', 'group:stone'},
 	}
 })
 

mods/default/functions.lua

@@ -131,27 +131,13 @@ minetest.register_on_punchnode(on_punchnode)
 --
 
 default.cool_lava_source = function(pos)
-	if default.search_nearby_nodes(pos,"default:water_source")
-		or default.search_nearby_nodes(pos,"default:water_flowing") then
-			minetest.env:set_node(pos, {name="default:obsidian"})
-	end
+	minetest.set_node(pos, {name="default:obsidian"})
+	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
 end
 
 default.cool_lava_flowing = function(pos)
-	if default.search_nearby_nodes(pos,"default:water_source")
-		or default.search_nearby_nodes(pos,"default:water_flowing") then
-			minetest.env:set_node(pos, {name="default:stone"})
-	end
-end
-
-default.search_nearby_nodes = function(pos, node)
-	if minetest.env:get_node({x=pos.x-1, y=pos.y, z=pos.z}).name == node then return true end
-	if minetest.env:get_node({x=pos.x+1, y=pos.y, z=pos.z}).name == node then return true end
-	if minetest.env:get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == node then return true end
-	if minetest.env:get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == node then return true end
-	if minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z-1}).name == node then return true end
-	if minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z+1}).name == node then return true end
-	return false
+	minetest.set_node(pos, {name="default:stone"})
+	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
 end
 
 minetest.register_abm({
@@ -161,7 +147,7 @@ minetest.register_abm({
 	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,
+	end,
 })
 
 minetest.register_abm({
@@ -171,7 +157,7 @@ minetest.register_abm({
 	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,
+	end,
 })
 
 --

mods/default/mapgen.lua

@@ -26,6 +26,7 @@ minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
 minetest.register_alias("mapgen_mese", "default:mese")
 minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
 minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
+minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
 
 --
 -- Ore generation
@@ -270,6 +271,17 @@ if minetest.setting_get("mg_name") == "indev" then
 	})
 end
 
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:clay",
+	wherein        = "default:sand",
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 64,
+	clust_size     = 5,
+	height_max     = 0,
+	height_min     = -10,
+})
+
 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")
 
@@ -388,41 +400,6 @@ end
 
 minetest.register_on_generated(function(minp, maxp, seed)
 	if maxp.y >= 2 and minp.y <= 0 then
-		-- Generate clay
-		-- Assume X and Z lengths are equal
-		local divlen = 4
-		local divs = (maxp.x-minp.x)/divlen+1;
-		for divx=0+1,divs-1-1 do
-		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.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.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.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.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.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
-				end	
-				if is_shallow then
-					for x1=-divlen,divlen do
-					for z1=-divlen,divlen do
-						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
-				end
-			end
-		end
-		end
 		-- Generate papyrus
 		local perlin1 = minetest.get_perlin(354, 3, 0.7, 100)
 		-- Assume X and Z lengths are equal

mods/default/nodes.lua

@@ -48,7 +48,7 @@ minetest.register_node("default:stone_with_copper", {
 })
 
 minetest.register_node("default:stone_with_mese", {
-	description = "Mese Crystals in Stone",
+	description = "Mese Ore",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
 	is_ground_content = true,
 	groups = {cracky=1},
@@ -66,7 +66,7 @@ minetest.register_node("default:stone_with_gold", {
 })
 	
 minetest.register_node("default:stone_with_diamond", {
-	description = "Diamonds in Stone",
+	description = "Diamond Ore",
 	tiles = {"default_stone.png^default_mineral_diamond.png"},
 	is_ground_content = true,
 	groups = {cracky=1},
@@ -427,17 +427,20 @@ minetest.register_node("default:water_flowing", {
 	},
 	alpha = WATER_ALPHA,
 	paramtype = "light",
+	paramtype2 = "flowingliquid",
 	walkable = false,
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
 	drop = "",
+	drowning = 1,
 	liquidtype = "flowing",
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = WATER_VISC,
+	freezemelt = "default:snow",
 	post_effect_color = {a=64, r=100, g=100, b=200},
-	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
+	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1},
 })
 
 minetest.register_node("default:water_source", {
@@ -462,12 +465,14 @@ minetest.register_node("default:water_source", {
 	diggable = false,
 	buildable_to = true,
 	drop = "",
+	drowning = 1,
 	liquidtype = "source",
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = WATER_VISC,
+	freezemelt = "default:ice",
 	post_effect_color = {a=64, r=100, g=100, b=200},
-	groups = {water=3, liquid=3, puts_out_fire=1},
+	groups = {water=3, liquid=3, puts_out_fire=1, freezes=1},
 })
 
 minetest.register_node("default:lava_flowing", {
@@ -488,16 +493,19 @@ minetest.register_node("default:lava_flowing", {
 		},
 	},
 	paramtype = "light",
+	paramtype2 = "flowingliquid",
 	light_source = LIGHT_MAX - 1,
 	walkable = false,
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
 	drop = "",
+	drowning = 1,
 	liquidtype = "flowing",
 	liquid_alternative_flowing = "default:lava_flowing",
 	liquid_alternative_source = "default:lava_source",
 	liquid_viscosity = LAVA_VISC,
+	liquid_renewable = false,
 	damage_per_second = 4*2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
@@ -525,10 +533,12 @@ minetest.register_node("default:lava_source", {
 	diggable = false,
 	buildable_to = true,
 	drop = "",
+	drowning = 1,
 	liquidtype = "source",
 	liquid_alternative_flowing = "default:lava_flowing",
 	liquid_alternative_source = "default:lava_source",
 	liquid_viscosity = LAVA_VISC,
+	liquid_renewable = false,
 	damage_per_second = 4*2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	groups = {lava=3, liquid=2, hot=3, igniter=1},
@@ -556,7 +566,7 @@ minetest.register_node("default:torch", {
 		wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
 		wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
 	},
-	groups = {choppy=2,dig_immediate=3,flammable=1,attached_node=1},
+	groups = {choppy=2,dig_immediate=3,flammable=1,attached_node=1,hot=2},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
 })
@@ -598,24 +608,16 @@ minetest.register_node("default:sign_wall", {
 })
 
 default.chest_formspec = 
-	"size[8,10]"..
-	"list[current_name;main;0,1;8,4;]"..
-	"list[current_player;main;0,6;8,4;]"..
-	"label[0,0;Wooden Chest]"..
-	"background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"..
-	"background[0,1;8,4;ui_wooden_chest_inventory.png]"..
-	"background[0,6;8,4;ui_main_inventory.png]"
+	"size[8,9]"..
+	"list[current_name;main;0,0;8,4;]"..
+	"list[current_player;main;0,5;8,4;]"
 
 function default.get_locked_chest_formspec(pos)
 	local spos = pos.x .. "," .. pos.y .. "," ..pos.z
 	local formspec =
-		"size[8,10]"..
-		"list[nodemeta:".. spos .. ";main;0,1;8,4;]"..
-		"list[current_player;main;0,6;8,4;]"..
-		"label[0,0;Wooden Locked Chest]"..
-		"background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"..
-		"background[0,1;8,4;ui_wooden_chest_inventory.png]"..
-		"background[0,6;8,4;ui_main_inventory.png]"
+		"size[8,9]"..
+		"list[nodemeta:".. spos .. ";main;0,0;8,4;]"..
+		"list[current_player;main;0,5;8,4;]"
 	return formspec
 end
 
@@ -746,32 +748,24 @@ minetest.register_node("default:chest_locked", {
 
 function default.get_furnace_active_formspec(pos, percent)
 	local formspec =
-		"size[8,10]"..
+		"size[8,9]"..
 		"image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:"..
 		(100-percent)..":default_furnace_fire_fg.png]"..
 		"list[current_name;fuel;2,3;1,1;]"..
 		"list[current_name;src;2,1;1,1;]"..
 		"list[current_name;dst;5,1;2,2;]"..
-		"list[current_player;main;0,6;8,4;]"..
-		"label[0,0;Furnace]"..
-		"background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"..
-		"background[0,6;8,4;ui_main_inventory.png]"..
-		"background[0,1;8,4;ui_furnace_inventory.png]"
+		"list[current_player;main;0,5;8,4;]"
 	return formspec
 end
 
 default.furnace_inactive_formspec =
-	"size[8,10]"..
+	"size[8,9]"..
 	"image[2,2;1,1;default_furnace_fire_bg.png]"..
 	"list[current_name;fuel;2,3;1,1;]"..
 	"list[current_name;src;2,1;1,1;]"..
 	"list[current_name;dst;5,1;2,2;]"..
-	"list[current_player;main;0,6;8,4;]"..
-	"label[0,0;Furnace]"..
-	"background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"..
-	"background[0,6;8,4;ui_main_inventory.png]"..
-	"background[0,1;8,4;ui_furnace_inventory.png]"
-	
+	"list[current_player;main;0,5;8,4;]"
+
 minetest.register_node("default:furnace", {
 	description = "Furnace",
 	tiles = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png",
@@ -847,7 +841,7 @@ minetest.register_node("default:furnace_active", {
 	paramtype2 = "facedir",
 	light_source = 8,
 	drop = "default:furnace",
-	groups = {cracky=2, not_in_creative_inventory=1},
+	groups = {cracky=2, not_in_creative_inventory=1,hot=1},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = function(pos)
@@ -1286,7 +1280,8 @@ minetest.register_node("default:ice", {
 	tiles = {"default_ice.png"},
 	is_ground_content = true,
 	paramtype = "light",
-	groups = {cracky=3},
+	freezemelt = "default:water_source",
+	groups = {cracky=3, melts=1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -1298,14 +1293,16 @@ minetest.register_node("default:snow", {
 	is_ground_content = true,
 	paramtype = "light",
 	buildable_to = true,
+	leveled = 7,
 	drawtype = "nodebox",
+	freezemelt = "default:water_flowing",
 	node_box = {
-		type = "fixed",
+		type = "leveled",
 		fixed = {
 			{-0.5, -0.5, -0.5,  0.5, -0.5+2/16, 0.5},
 		},
 	},
-	groups = {crumbly=3,falling_node=1},
+	groups = {crumbly=3,falling_node=1, melts=1, float=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_snow_footstep", gain=0.25},
 		dug = {name="default_snow_footstep", gain=0.75},
@@ -1323,7 +1320,8 @@ minetest.register_node("default:snowblock", {
 	description = "Snow Block",
 	tiles = {"default_snow.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	freezemelt = "default:water_source",
+	groups = {crumbly=3, melts=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_snow_footstep", gain=0.25},
 		dug = {name="default_snow_footstep", gain=0.75},

mods/default_tweaks/README.md

@@ -0,0 +1,10 @@
+default\_tweaks -- Mischelaneous tweaks to the default mod
+==========================================================
+
+Tweaks included:
+----------------
+1. Renewable lava
+2. Lava doesn't cool diagonally
+3. Background images for chests and furnaces
+4. 32x textures
+

mods/default_tweaks/depends.txt

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

mods/default_tweaks/init.lua

@@ -0,0 +1,83 @@
+
+-------------------------
+-- Make lava renewable --
+-------------------------
+
+minetest.registered_nodes["default:lava_source"].liquid_renewable = true
+minetest.registered_nodes["default:lava_flowing"].liquid_renewable = true
+
+minetest.register_node(":default:lava_source", minetest.registered_nodes["default:lava_source"])
+minetest.register_node(":default:lava_flowing", minetest.registered_nodes["default:lava_flowing"])
+
+----------------------------------------------------
+-- Only cool lava that is actually touching water --
+----------------------------------------------------
+
+local function check_nearby_nodes(pos, nodename)
+	if minetest.get_node({x=pos.x+1, y=pos.y,   z=pos.z  }).name == nodename or
+	   minetest.get_node({x=pos.x-1, y=pos.y,   z=pos.z  }).name == nodename or
+	   minetest.get_node({x=pos.x,   y=pos.y+1, z=pos.z  }).name == nodename or
+	   minetest.get_node({x=pos.x,   y=pos.y-1, z=pos.z  }).name == nodename or
+	   minetest.get_node({x=pos.x,   y=pos.y,   z=pos.z+1}).name == nodename or
+	   minetest.get_node({x=pos.x,   y=pos.y,   z=pos.z-1}).name == nodename then
+		return true
+	end
+end
+
+
+local old_cool_lava_source = default.cool_lava_source
+function default.cool_lava_source(pos)
+	if check_nearby_nodes(pos, "default:water_source") or
+	   check_nearby_nodes(pos, "default:water_flowing") then
+		old_cool_lava_source(pos)
+	end
+end
+
+
+local old_cool_lava_flowing = default.cool_lava_flowing
+function default.cool_lava_flowing(pos)
+	if check_nearby_nodes(pos, "default:water_source") or
+	   check_nearby_nodes(pos, "default:water_flowing") then
+		old_cool_lava_flowing(pos)
+	end
+end
+
+------------------------------------
+-- Add backgrounds to wood chests --
+------------------------------------
+
+
+default.chest_formspec = default.chest_formspec
+	.."label[0,0;Wooden Chest]"
+	.."background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"
+	.."background[0,1;8,4;ui_wooden_chest_inventory.png]"
+	.."background[0,6;8,4;ui_main_inventory.png]"
+
+local old_get_locked_chest_formspec = default.get_locked_chect_formspec
+function default.get_locked_chest_formspec(pos)
+	return old_get_locked_chest_formspec(pos)
+		.."label[0,0;Wooden Locked Chest]"
+		.."background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"
+		.."background[0,1;8,4;ui_wooden_chest_inventory.png]"
+		.."background[0,6;8,4;ui_main_inventory.png]"
+end
+
+-----------------------
+-- Same for furnaces --
+-----------------------
+
+default.furnace_inactive_formspec = default.furnace_inactive_formspec
+	.."label[0,0;Furnace]"
+	.."background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"
+	.."background[0,6;8,4;ui_main_inventory.png]"
+	.."background[0,1;8,4;ui_furnace_inventory.png]"
+
+local old_get_furnace_active_formspec = default.get_furnace_active_formspec
+function default.get_furnace_active_formspec(pos)
+	return old_get_furnace_active_formspec(pos)
+		.."label[0,0;Furnace Active]"
+		.."background[-0.19,-0.25;8.4,10.75;ui_form_bg.png]"
+		.."background[0,6;8,4;ui_main_inventory.png]"
+		.."background[0,1;8,4;ui_furnace_inventory.png]"
+end
+