Merge pull request 'ITEMS/mcl_chests: Spawn small chest entities only if animated chests are enabled' (#207) from fix-animchest-setting into master

Reviewed-on: Mineclonia/Mineclonia#207
Reviewed-by: erlehmann <nils+git.minetest.land@dieweltistgarnichtso.net>

mods/ITEMS/mcl_chests/init.lua

@@ -152,7 +152,10 @@ if minetest.get_modpath("screwdriver") then
 			local nodename = node.name
 			local nodedef = minetest.registered_nodes[nodename]
 			local dir = minetest.facedir_to_dir(new_param2)
-			find_or_create_entity(pos, nodename, nodedef._chest_entity_textures, new_param2, false, nodedef._chest_entity_sound, nodedef._chest_entity_mesh, nodedef._chest_entity_animation_type, dir):set_yaw(dir)
+
+			if animate_chests then
+				find_or_create_entity(pos, nodename, nodedef._chest_entity_textures, new_param2, false, nodedef._chest_entity_sound, nodedef._chest_entity_mesh, nodedef._chest_entity_animation_type, dir):set_yaw(dir)
+			end
 		else
 			return false
 		end
@@ -181,6 +184,10 @@ local player_chest_open = function(player, pos, node_name, textures, param2, dou
 		local dir = minetest.facedir_to_dir(param2)
 		local blocked = not shulker and (back_is_blocked(pos, dir) or double and back_is_blocked(mcl_util.get_double_container_neighbor_pos(pos, param2, node_name:sub(-4)), dir))
 		find_or_create_entity(pos, node_name, textures, param2, double, sound, mesh, shulker and "shulker" or "chest", dir):open(name, blocked)
+	else
+		minetest.sound_play(sound .. "_open", {
+			pos = pos,
+		})
 	end
 end
 
@@ -212,7 +219,10 @@ local chest_update_after_close = function(pos)
 
 	if node.name == "mcl_chests:trapped_chest_on_small" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_small", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+
+		if animate_chests then
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+		end
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)
 	elseif node.name == "mcl_chests:trapped_chest_on_left" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_left", param2 = node.param2})
@@ -242,6 +252,10 @@ local player_chest_close = function(player)
 	end
 	if animate_chests then
 		find_or_create_entity(open_chest.pos, open_chest.node_name, open_chest.textures, open_chest.param2, open_chest.double, open_chest.sound, open_chest.mesh, open_chest.shulker and "shulker" or "chest"):close(name)
+	else
+		minetest.sound_play(open_chest.sound .. "_close", {
+			pos = open_chest.pos,
+		})
 	end
 	chest_update_after_close(open_chest.pos)
 
@@ -380,12 +394,21 @@ minetest.register_node(small_name, {
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usagehelp,
 	_doc_items_hidden = hidden,
-	drawtype = "nodebox",
+	drawtype = animate_chests and "nodebox" or "mesh",
-	node_box = {
+	mesh = not animate_chests and "mcl_chests_chest.obj" or nil,
+	node_box = animate_chests and {
 		type = "fixed",
-        fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
+		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
+	} or nil,
+	collision_box = {
+		type = "fixed",
+		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
 	},
-	tiles = {"mcl_chests_blank.png"},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
+	},
+	tiles = animate_chests and {"mcl_chests_blank.png"} or small_textures,
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
 	_chest_entity_textures = small_textures,
 	_chest_entity_sound = "default_chest",
@@ -435,7 +458,10 @@ minetest.register_node(small_name, {
 			minetest.swap_node(p, { name = "mcl_chests:"..canonical_basename.."_right", param2 = param2 })
 		else
 			minetest.swap_node(pos, { name = "mcl_chests:"..canonical_basename.."_small", param2 = param2 })
-			create_entity(pos, small_name, small_textures, param2, false, "default_chest", "mcl_chests_chest", "chest")
+
+			if animate_chests then
+				create_entity(pos, small_name, small_textures, param2, false, "default_chest", "mcl_chests_chest", "chest")
+			end
 		end
 	end,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
@@ -865,7 +891,9 @@ register_chest("trapped_chest",
 	}},
 	function(pos, node, clicker)
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_small", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small")
+		if animate_chests then
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small")
+		end
 		mesecon.receptor_on(pos, trapped_chest_mesecons_rules)
 	end,
 	function(pos, node, clicker)
@@ -908,7 +936,9 @@ local function close_if_trapped_chest(pos, player)
 
 	if node.name == "mcl_chests:trapped_chest_on_small" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_small", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+		if animate_chests then
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+		end
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)
 
 		player_chest_close(player)
@@ -1015,16 +1045,25 @@ minetest.register_node("mcl_chests:ender_chest_small", {
 	_tt_help = S("27 interdimensional inventory slots") .. "\n" .. S("Put items inside, retrieve them from any ender chest"),
 	_doc_items_longdesc = S("Ender chests grant you access to a single personal interdimensional inventory with 27 slots. This inventory is the same no matter from which ender chest you access it from. If you put one item into one ender chest, you will find it in all other ender chests. Each player will only see their own items, but not the items of other players."),
 	_doc_items_usagehelp = S("Rightclick the ender chest to access your personal interdimensional inventory."),
-	drawtype = "nodebox",
+	drawtype = animate_chests and "nodebox" or "mesh",
-	node_box = {
+	mesh = not animate_chests and "mcl_chests_chest.obj" or nil,
+	node_box = animate_chests and {
 		type = "fixed",
-        fixed = {-0.4375, -0.5, -0.4375, 0.5, 0.375, 0.4375},
+        fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
+	} or nil,
+	collision_box = {
+		type = "fixed",
+		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
 	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
+	},
+	tiles = animate_chests and {"mcl_chests_blank.png"} or {"mcl_chests_ender.png"},
 	_chest_entity_textures = {"mcl_chests_ender.png"},
 	_chest_entity_sound = "mcl_chests_enderchest",
 	_chest_entity_mesh = "mcl_chests_chest",
 	_chest_entity_animation_type = "chest",
-	tiles = {"mcl_chests_blank.png"},
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
 	--[[{"mcl_chests_ender_chest_top.png", "mcl_chests_ender_chest_bottom.png",
 		"mcl_chests_ender_chest_right.png", "mcl_chests_ender_chest_left.png",
@@ -1041,7 +1080,10 @@ minetest.register_node("mcl_chests:ender_chest_small", {
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", formspec_ender_chest)
-		create_entity(pos, "mcl_chests:ender_chest_small", {"mcl_chests_ender.png"}, minetest.get_node(pos).param2, false, "mcl_chests_enderchest", "mcl_chests_chest", "chest")
+
+		if animate_chests then
+			create_entity(pos, "mcl_chests:ender_chest_small", {"mcl_chests_ender.png"}, minetest.get_node(pos).param2, false, "mcl_chests_enderchest", "mcl_chests_chest", "chest")
+		end
 	end,
 	on_rightclick = function(pos, node, clicker)
 		player_chest_open(clicker, pos, "mcl_chests:ender_chest_small", {"mcl_chests_ender.png"}, node.param2, false, "mcl_chests_enderchest", "mcl_chests_chest")
@@ -1236,8 +1278,9 @@ for color, desc in pairs(boxtypes) do
 		_doc_items_entry_name = entry_name,
 		_doc_items_longdesc = longdesc,
 		_doc_items_usagehelp = usagehelp,
-		drawtype = "nodebox",
+		drawtype = animate_chests and "nodebox" or "mesh",
-		tiles = {"mcl_chests_blank.png"},
+		mesh = not animate_chests and "mcl_chests_shulker.obj" or nil,
+		tiles = animate_chests and {"mcl_chests_blank.png"} or {mob_texture},
 		use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
 		_chest_entity_textures = {mob_texture},
 		_chest_entity_sound = "mcl_chests_shulker",
@@ -1258,7 +1301,10 @@ for color, desc in pairs(boxtypes) do
 			meta:set_string("formspec", formspec_shulker_box(nil))
 			local inv = meta:get_inventory()
 			inv:set_size("main", 9*3)
-			create_entity(pos, small_name, {mob_texture}, minetest.get_node(pos).param2, false, "mcl_chests_shulker", "mcl_chests_shulker", "shulker")
+
+			if animate_chests then
+				create_entity(pos, small_name, {mob_texture}, minetest.get_node(pos).param2, false, "mcl_chests_shulker", "mcl_chests_shulker", "shulker")
+			end
 		end,
 		after_place_node = function(pos, placer, itemstack, pointed_thing)
 			local nmeta = minetest.get_meta(pos)
@@ -1377,6 +1423,11 @@ local function select_and_spawn_entity(pos, node)
 	local node_name = node.name
 	local node_def = minetest.registered_nodes[node_name]
 	local double_chest = minetest.get_item_group(node_name, "double_chest") > 0
+
+	if not animate_chests and not double_chest then
+		return
+	end
+
 	find_or_create_entity(pos, node_name, node_def._chest_entity_textures, node.param2, double_chest, node_def._chest_entity_sound, node_def._chest_entity_mesh, node_def._chest_entity_animation_type)
 end