From b13487c26c7d9d0441053ddcd9938d8b51455af2 Mon Sep 17 00:00:00 2001
From: root <root@milan-minetest2-devel-testing.lxd>
Date: Sat, 22 May 2021 19:45:55 +0200
Subject: [PATCH] update

---
 mods/ambience/init.lua                        |  51 +++++++------
 mods/ambience/soundsets.lua                   |   2 +-
 .../home_workshop_misc/init.lua               |   4 +
 .../homedecor_kitchen/init.lua                |  28 +++----
 mods/mobs_animal/lucky_block.lua              |   2 +-
 mods/mobs_redo/mount.lua                      |   2 +
 mods/skinsdb/meta/character_2031.txt          |   3 +
 mods/skinsdb/meta/character_2032.txt          |   3 +
 mods/skinsdb/meta/character_2033.txt          |   3 +
 mods/skinsdb/textures/character_2031.png      | Bin 0 -> 3455 bytes
 mods/skinsdb/textures/character_2032.png      | Bin 0 -> 2144 bytes
 mods/skinsdb/textures/character_2033.png      | Bin 0 -> 2955 bytes
 mods/ts_furniture/init.lua                    |  69 +++++++++++-------
 mods/tubelib2/internal1.lua                   |   2 +-
 14 files changed, 105 insertions(+), 64 deletions(-)
 create mode 100644 mods/skinsdb/meta/character_2031.txt
 create mode 100644 mods/skinsdb/meta/character_2032.txt
 create mode 100644 mods/skinsdb/meta/character_2033.txt
 create mode 100644 mods/skinsdb/textures/character_2031.png
 create mode 100644 mods/skinsdb/textures/character_2032.png
 create mode 100644 mods/skinsdb/textures/character_2033.png

diff --git a/mods/ambience/init.lua b/mods/ambience/init.lua
index 88dfc735..31a0edef 100644
--- a/mods/ambience/init.lua
+++ b/mods/ambience/init.lua
@@ -7,6 +7,7 @@ minetest.override_item("default:water_flowing", { sounds = {} })
 minetest.override_item("default:river_water_source", { sounds = {} })
 minetest.override_item("default:river_water_flowing", { sounds = {} })
 
+
 -- settings
 local SOUNDVOLUME = 1.0
 local MUSICVOLUME = 1.0
@@ -19,8 +20,6 @@ local sound_set_order = {} -- needed because pairs loops randomly through tables
 local set_nodes = {} -- all the nodes needed for sets
 
 
--- global functions
-
 -- add set to list
 ambience.add_set = function(set_name, def)
 
@@ -73,10 +72,7 @@ end
 
 -- return set from list using name
 ambience.get_set = function(set_name)
-
-	if sound_sets[set_name] then
-		return sound_sets[set_name]
-	end
+	return sound_sets[set_name]
 end
 
 
@@ -100,11 +96,22 @@ ambience.del_set = function(set_name)
 end
 
 
+-- setup table when player joins
+minetest.register_on_joinplayer(function(player)
+	playing[player:get_player_name()] = {}
+end)
+
+-- remove table when player leaves
+minetest.register_on_leaveplayer(function(player)
+	playing[player:get_player_name()] = nil
+end)
+
+
 -- plays music and selects sound set
 local get_ambience = function(player, tod, name)
 
 	-- play server or local music if available
-	if play_music and playing[name] then
+	if play_music then
 
 		-- play at midnight
 		if tod >= 0.0 and tod <= 0.01 then
@@ -112,7 +119,7 @@ local get_ambience = function(player, tod, name)
 			if not playing[name].music then
 
 				playing[name].music = minetest.sound_play("ambience_music", {
-					to_player = player:get_player_name(),
+					to_player = name,
 					gain = MUSICVOLUME
 				})
 			end
@@ -123,7 +130,6 @@ local get_ambience = function(player, tod, name)
 		end
 	end
 
-
 	-- get foot and head level nodes at player position
 	local pos = player:get_pos() ; if not pos then return end
 
@@ -168,6 +174,8 @@ local get_ambience = function(player, tod, name)
 			end
 		end
 	end
+
+	return nil, nil -- ADDED
 end
 
 
@@ -198,11 +206,10 @@ minetest.register_globalstep(function(dtime)
 
 --print(string.format("elapsed time: %.4f\n", os.clock() - t1))
 
-		ok = true -- everything starts off ok
+		ok = playing[player_name] -- everything starts off ok if player around
 
 		-- are we playing something already?
-		if playing[player_name]
-		and playing[player_name].handler then
+		if ok and playing[player_name].handler then
 
 			-- stop current sound if another set active or gain changed
 			if playing[player_name].set ~= set_name
@@ -213,8 +220,8 @@ minetest.register_globalstep(function(dtime)
 				minetest.sound_stop(playing[player_name].handler)
 
 				playing[player_name].set = nil
-				playing[player_name].handler = nil
 				playing[player_name].gain = nil
+				playing[player_name].handler = nil
 			else
 				ok = false -- sound set still playing, skip new sound
 			end
@@ -246,9 +253,9 @@ minetest.register_globalstep(function(dtime)
 --print("-- current handler", handler)
 
 				-- set what player is currently listening to
-				playing[player_name] = {
-					set = set_name, gain = MORE_GAIN, handler = handler
-				}
+				playing[player_name].set = set_name
+				playing[player_name].gain = MORE_GAIN
+				playing[player_name].handler = handler
 
 				-- set timer to stop sound
 				minetest.after(ambience.length, function()
@@ -264,10 +271,10 @@ minetest.register_globalstep(function(dtime)
 
 						minetest.sound_stop(handler)
 
-						-- reset player variables and backup handler
-						playing[player_name] = {
-							set = nil, gain = nil, handler = nil
-						}
+						-- reset player variables
+						playing[player_name].set = nil
+						playing[player_name].gain = nil
+						playing[player_name].handler = nil
 					end
 				end)
 			end
@@ -290,7 +297,7 @@ minetest.register_chatcommand("svol", {
 		if SOUNDVOLUME > 1.0 then SOUNDVOLUME = 1.0 end
 
 		return true, "Sound volume set to " .. SOUNDVOLUME
-	end,
+	end
 })
 
 
@@ -313,7 +320,7 @@ minetest.register_chatcommand("mvol", {
 		if MUSICVOLUME > 1.0 then MUSICVOLUME = 1.0 end
 
 		return true, "Music volume set to " .. MUSICVOLUME
-	end,
+	end
 })
 
 
diff --git a/mods/ambience/soundsets.lua b/mods/ambience/soundsets.lua
index 657674f9..01989669 100644
--- a/mods/ambience/soundsets.lua
+++ b/mods/ambience/soundsets.lua
@@ -32,7 +32,7 @@ ambience.add_set("splash", {
 	frequency = 1000,
 
 	sounds = {
-		{name = "swim_splashing", length = 3},
+		{name = "swim_splashing", length = 3}
 	},
 
 	sound_check = function(def)
diff --git a/mods/home_workshop_modpack/home_workshop_misc/init.lua b/mods/home_workshop_modpack/home_workshop_misc/init.lua
index 0959ab30..ed99009f 100644
--- a/mods/home_workshop_modpack/home_workshop_misc/init.lua
+++ b/mods/home_workshop_modpack/home_workshop_misc/init.lua
@@ -14,6 +14,7 @@ minetest.register_node("home_workshop_misc:tool_cabinet", {
 		"home_workshop_common_generic_metal_bright.png",
 		"home_workshop_misc_tool_cabinet_misc.png",
 	},
+	paramtype = "light",
 	paramtype2="facedir",
 	inventory_image = "home_workshop_misc_tool_cabinet_inv.png",
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
@@ -33,6 +34,7 @@ minetest.register_node("home_workshop_misc:beer_tap", {
 		{ name = "home_workshop_common_generic_metal.png", color = 0xff303030 }
 	},
 	inventory_image = "home_workshop_misc_beertap_inv.png",
+	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = { snappy=3 },
 	walkable = false,
@@ -70,6 +72,7 @@ minetest.register_node("home_workshop_misc:beer_mug", {
 	mesh = "home_workshop_misc_beer_mug.obj",
 	tiles = { "home_workshop_misc_beer_mug.png" },
 	inventory_image = "home_workshop_misc_beer_mug_inv.png",
+	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = { snappy=3, oddly_breakable_by_hand=3 },
 	walkable = false,
@@ -93,6 +96,7 @@ minetest.register_node("home_workshop_misc:soda_machine", {
 	drawtype = "mesh",
 	mesh = "home_workshop_misc_soda_machine.obj",
 	tiles = {"home_workshop_misc_soda_machine.png"},
+	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3},
 	selection_box = svm_cbox,
diff --git a/mods/homedecor_modpack/homedecor_kitchen/init.lua b/mods/homedecor_modpack/homedecor_kitchen/init.lua
index 4dc1af8d..9c321351 100644
--- a/mods/homedecor_modpack/homedecor_kitchen/init.lua
+++ b/mods/homedecor_modpack/homedecor_kitchen/init.lua
@@ -570,7 +570,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet",
+        output = "homedecor:kitchen_cabinet_colorable",
         recipe = {
 		{"group:wood", "group:stick", "group:wood", },
 		{"group:wood", "group:stick", "group:wood", },
@@ -579,53 +579,53 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_steel",
+        output = "homedecor:kitchen_cabinet_colorable_steel",
         recipe = {
 			{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-			{"", "homedecor:kitchen_cabinet", ""},
+			{"", "homedecor:kitchen_cabinet_colorable", ""},
 	}
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_steel",
+        output = "homedecor:kitchen_cabinet_colorable_steel",
         recipe = {
 			{"moreblocks:slab_steelblock_1"},
-			{ "homedecor:kitchen_cabinet" },
+			{ "homedecor:kitchen_cabinet_colorable" },
 	}
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_marble",
+        output = "homedecor:kitchen_cabinet_colorable_marble",
         recipe = {
 			{"building_blocks:slab_marble"},
-			{"homedecor:kitchen_cabinet"},
+			{"homedecor:kitchen_cabinet_colorable"},
 	}
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_marble",
+        output = "homedecor:kitchen_cabinet_colorable_marble",
         recipe = {
 			{"technic:slab_marble_1"},
-			{"homedecor:kitchen_cabinet"},
+			{"homedecor:kitchen_cabinet_colorable"},
 	}
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_granite",
+        output = "homedecor:kitchen_cabinet_colorable_granite",
         recipe = {
 			{"technic:slab_granite_1"},
-			{"homedecor:kitchen_cabinet"},
+			{"homedecor:kitchen_cabinet_colorable"},
 	}
 })
 
 minetest.register_craft({
 	type = "shapeless",
-        output = "homedecor:kitchen_cabinet_half 2",
-        recipe = { "homedecor:kitchen_cabinet" }
+        output = "homedecor:kitchen_cabinet_colorable_half 2",
+        recipe = { "homedecor:kitchen_cabinet_colorable" }
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_with_sink",
+        output = "homedecor:kitchen_cabinet_colorable_with_sink",
         recipe = {
 		{"group:wood", "default:steel_ingot", "group:wood", },
 		{"group:wood", "default:steel_ingot", "group:wood", },
diff --git a/mods/mobs_animal/lucky_block.lua b/mods/mobs_animal/lucky_block.lua
index e88b20d4..e2b028c2 100644
--- a/mods/mobs_animal/lucky_block.lua
+++ b/mods/mobs_animal/lucky_block.lua
@@ -12,7 +12,7 @@ if minetest.get_modpath("lucky_block") then
 		{"spw", "mobs:chicken", 5},
 		{"dro", {"mobs:egg"}, 5},
 		{"spw", "mobs:cow", 5},
-		{"dro", {"mobs:bucket_milk"}, 8},
+		{"dro", {"mobs:bucket_milk", "bucket:bucket_water"}, 8},
 		{"spw", "mobs:kitten", 2},
 		{"exp"},
 		{"dro", {"mobs:hairball"}, 3},
diff --git a/mods/mobs_redo/mount.lua b/mods/mobs_redo/mount.lua
index 550bf3e9..7a72c64c 100644
--- a/mods/mobs_redo/mount.lua
+++ b/mods/mobs_redo/mount.lua
@@ -387,6 +387,8 @@ function mobs.fly(entity, _, speed, shoots, arrow, moving_anim, stand_anim)
 	local dir = entity.driver:get_look_dir()
 	local yaw = entity.driver:get_look_horizontal() + 1.57 -- offset fix between old and new commands
 
+if not ctrl or not velo then return end
+
 	if ctrl.up then
 		entity.object:set_velocity({
 			x = dir.x * speed,
diff --git a/mods/skinsdb/meta/character_2031.txt b/mods/skinsdb/meta/character_2031.txt
new file mode 100644
index 00000000..e8272083
--- /dev/null
+++ b/mods/skinsdb/meta/character_2031.txt
@@ -0,0 +1,3 @@
+Iron Man MK. 7
+Jordach
+CC BY-SA 3.0
diff --git a/mods/skinsdb/meta/character_2032.txt b/mods/skinsdb/meta/character_2032.txt
new file mode 100644
index 00000000..2cdf6122
--- /dev/null
+++ b/mods/skinsdb/meta/character_2032.txt
@@ -0,0 +1,3 @@
+character_mumbo_0
+Sam_0
+CC BY 4.0
diff --git a/mods/skinsdb/meta/character_2033.txt b/mods/skinsdb/meta/character_2033.txt
new file mode 100644
index 00000000..6e73b4eb
--- /dev/null
+++ b/mods/skinsdb/meta/character_2033.txt
@@ -0,0 +1,3 @@
+character_sam_v4
+Sam_0
+CC BY 4.0
diff --git a/mods/skinsdb/textures/character_2031.png b/mods/skinsdb/textures/character_2031.png
new file mode 100644
index 0000000000000000000000000000000000000000..6914f12d3f44d420950b9d80a0bf6a06f2f93be9
GIT binary patch
literal 3455
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

literal 0
HcmV?d00001

diff --git a/mods/skinsdb/textures/character_2032.png b/mods/skinsdb/textures/character_2032.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f8ba6785c27537f19d0670311097ee8aafd7e1
GIT binary patch
literal 2144
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
W80G?{Y}6hA0000<MNUMnLSTXlaSm$$

literal 0
HcmV?d00001

diff --git a/mods/skinsdb/textures/character_2033.png b/mods/skinsdb/textures/character_2033.png
new file mode 100644
index 0000000000000000000000000000000000000000..77f0995d4401fece2eb1560112bdf294c93c172c
GIT binary patch
literal 2955
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
B#O441

literal 0
HcmV?d00001

diff --git a/mods/ts_furniture/init.lua b/mods/ts_furniture/init.lua
index 30702fe0..748707bc 100755
--- a/mods/ts_furniture/init.lua
+++ b/mods/ts_furniture/init.lua
@@ -8,6 +8,21 @@ ts_furniture.kneeling_bench = minetest.settings:get_bool("ts_furniture.kneeling_
 -- Used for localization
 local S = minetest.get_translator("ts_furniture")
 
+-- Get texture by node name
+local T = function (node_name)
+	local def = minetest.registered_nodes[node_name]
+	if not (def and def.tiles) then
+		return ""
+	end
+	local tile = def.tiles[5] or def.tiles[4] or def.tiles[3] or def.tiles[2] or def.tiles[1]
+	if type(tile) == "string" then
+		return tile
+	elseif type(tile) == "table" and tile.name then
+		return tile.name
+	end
+	return ""
+end
+
 -- The following code is from "Get Comfortable [cozy]" (by everamzah; published under WTFPL)
 -- Thomas S. modified it, so that it can be used in this mod
 if ts_furniture.enable_sitting then
@@ -174,6 +189,10 @@ local ignore_groups = {
 }
 
 function ts_furniture.register_furniture(recipe, description, tiles)
+	if not tiles then
+		tiles = T(recipe)
+	end
+
 	local recipe_def = minetest.registered_items[recipe]
 	if not recipe_def then
 		return
@@ -217,34 +236,34 @@ function ts_furniture.register_furniture(recipe, description, tiles)
 	end
 end
 
-ts_furniture.register_furniture("default:aspen_wood", "Aspen", "default_aspen_wood.png")
-ts_furniture.register_furniture("default:pine_wood", "Pine", "default_pine_wood.png")
-ts_furniture.register_furniture("default:acacia_wood", "Acacia", "default_acacia_wood.png")
-ts_furniture.register_furniture("default:wood", "Wooden", "default_wood.png")
-ts_furniture.register_furniture("default:junglewood", "Jungle Wood", "default_junglewood.png")
+ts_furniture.register_furniture("default:aspen_wood", "Aspen")
+ts_furniture.register_furniture("default:pine_wood", "Pine")
+ts_furniture.register_furniture("default:acacia_wood", "Acacia")
+ts_furniture.register_furniture("default:wood", "Wooden")
+ts_furniture.register_furniture("default:junglewood", "Jungle Wood")
 
 if (minetest.get_modpath("moretrees")) then
-	ts_furniture.register_furniture("moretrees:apple_tree_planks", "Apple Tree", "moretrees_apple_tree_wood.png")
-	ts_furniture.register_furniture("moretrees:beech_planks", "Beech", "moretrees_beech_wood.png")
-	ts_furniture.register_furniture("moretrees:birch_planks", "Birch", "moretrees_birch_wood.png")
-	ts_furniture.register_furniture("moretrees:fir_planks", "Fir", "moretrees_fir_wood.png")
-	ts_furniture.register_furniture("moretrees:oak_planks", "Oak", "moretrees_oak_wood.png")
-	ts_furniture.register_furniture("moretrees:palm_planks", "Palm", "moretrees_palm_wood.png")
-	ts_furniture.register_furniture("moretrees:rubber_tree_planks", "Rubber Tree", "moretrees_rubber_tree_wood.png")
-	ts_furniture.register_furniture("moretrees:sequoia_planks", "Sequoia", "moretrees_sequoia_wood.png")
-	ts_furniture.register_furniture("moretrees:spruce_planks", "Spruce", "moretrees_spruce_wood.png")
-	ts_furniture.register_furniture("moretrees:willow_planks", "Willow", "moretrees_willow_wood.png")
+	ts_furniture.register_furniture("moretrees:apple_tree_planks", "Apple Tree")
+	ts_furniture.register_furniture("moretrees:beech_planks", "Beech")
+	ts_furniture.register_furniture("moretrees:birch_planks", "Birch")
+	ts_furniture.register_furniture("moretrees:fir_planks", "Fir")
+	ts_furniture.register_furniture("moretrees:oak_planks", "Oak")
+	ts_furniture.register_furniture("moretrees:palm_planks", "Palm")
+	ts_furniture.register_furniture("moretrees:rubber_tree_planks", "Rubber Tree")
+	ts_furniture.register_furniture("moretrees:sequoia_planks", "Sequoia")
+	ts_furniture.register_furniture("moretrees:spruce_planks", "Spruce")
+	ts_furniture.register_furniture("moretrees:willow_planks", "Willow")
 end
 
 if minetest.get_modpath("ethereal") then
-	ts_furniture.register_furniture("ethereal:banana_wood", "Banana", "banana_wood.png")
-	ts_furniture.register_furniture("ethereal:birch_wood", "Birch", "moretrees_birch_wood.png")
-	ts_furniture.register_furniture("ethereal:frost_wood", "Frost", "frost_wood.png")
-	ts_furniture.register_furniture("ethereal:mushroom_trunk", "Mushroom", "mushroom_trunk.png")
-	ts_furniture.register_furniture("ethereal:palm_wood", "Palm", "moretrees_palm_wood.png")
-	ts_furniture.register_furniture("ethereal:redwood_wood", "Redwood", "redwood_wood.png")
-	ts_furniture.register_furniture("ethereal:sakura_wood", "Sakura", "ethereal_sakura_wood.png")
-	ts_furniture.register_furniture("ethereal:scorched_tree", "Scorched", "scorched_tree.png")
-	ts_furniture.register_furniture("ethereal:willow_wood", "Willow", "willow_wood.png")
-	ts_furniture.register_furniture("ethereal:yellow_wood", "Healing Tree", "yellow_wood.png")
+	ts_furniture.register_furniture("ethereal:banana_wood", "Banana")
+	ts_furniture.register_furniture("ethereal:birch_wood", "Birch")
+	ts_furniture.register_furniture("ethereal:frost_wood", "Frost")
+	ts_furniture.register_furniture("ethereal:mushroom_trunk", "Mushroom")
+	ts_furniture.register_furniture("ethereal:palm_wood", "Palm")
+	ts_furniture.register_furniture("ethereal:redwood_wood", "Redwood")
+	ts_furniture.register_furniture("ethereal:sakura_wood", "Sakura")
+	ts_furniture.register_furniture("ethereal:scorched_tree", "Scorched")
+	ts_furniture.register_furniture("ethereal:willow_wood", "Willow")
+	ts_furniture.register_furniture("ethereal:yellow_wood", "Healing Tree")
 end
diff --git a/mods/tubelib2/internal1.lua b/mods/tubelib2/internal1.lua
index 5d7f5faf..d4eeda0f 100644
--- a/mods/tubelib2/internal1.lua
+++ b/mods/tubelib2/internal1.lua
@@ -33,7 +33,7 @@ local function get_pos(pos, dir)
 end
 
 local function fdir(self, player)
-	local pitch = player:get_look_pitch()
+	local pitch = player:get_look_vertical()
 	if pitch > 1.0 and self.valid_dirs[6] then -- up?
 		return 6
 	elseif pitch < -1.0 and self.valid_dirs[5] then -- down?