Barrel formspec

mods/ITEMS/mcl_barrels/init.lua

@@ -8,6 +8,7 @@ local open_barrels = {}
 
 local drop_content = mcl_util.drop_items_from_meta_container("main")
 
+---@param pos Vector
 local function on_blast(pos)
 	local node = minetest.get_node(pos)
 	drop_content(pos, node)
@@ -47,15 +48,18 @@ local function barrel_open(pos, node, clicker)
 	minetest.show_formspec(playername,
 		"mcl_barrels:barrel_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z,
 		table.concat({
-			"size[9,8.75]",
+			"formspec_version[4]",
-			"label[0,0;"..F(C("#313131", name)).."]",
+			"size[11.75,10.425]",
-			"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]",
+
-			mcl_formspec.get_itemslot_bg(0, 0.5, 9, 3),
+			"label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]",
-			"label[0,4.0;"..F(C("#313131", S("Inventory"))).."]",
+			mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3),
-			"list[current_player;main;0,4.5;9,3;9]",
+			"list[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main;0.375,0.75;9,3;]",
-			mcl_formspec.get_itemslot_bg(0, 4.5, 9, 3),
+			"label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]",
-			"list[current_player;main;0,7.74;9,1;]",
+			mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3),
-			mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1),
+			"list[current_player;main;0.375,5.1;9,3;9]",
+
+			mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1),
+			"list[current_player;main;0.375,9.05;9,1;]",
 			"listring[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main]",
 			"listring[current_player;main]",
 		})
@@ -66,6 +70,7 @@ local function barrel_open(pos, node, clicker)
 	minetest.sound_play({ name = "mcl_barrels_default_barrel_open", pos = pos, gain = 0.5, max_hear_distance = 16 }, true)
 end
 
+---@param pos Vector
 local function close_forms(pos)
 	local players = minetest.get_connected_players()
 	local formname = "mcl_barrels:barrel_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z
@@ -76,15 +81,18 @@ local function close_forms(pos)
 	end
 end
 
+---@param pos Vector
 local function update_after_close(pos)
 	local node = minetest.get_node_or_nil(pos)
 	if not node then return end
 	if node.name == "mcl_barrels:barrel_open" then
 		minetest.swap_node(pos, { name = "mcl_barrels:barrel_closed", param2 = node.param2 })
-		minetest.sound_play({name="mcl_barrels_default_barrel_close", pos=pos, gain=0.5, max_hear_distance=16}, true)
+		minetest.sound_play({ name = "mcl_barrels_default_barrel_close", pos = pos, gain = 0.5, max_hear_distance = 16 },
+			true)
 	end
 end
 
+---@param player ObjectRef
 local function close_barrel(player)
 	local name = player:get_player_name()
 	local open = open_barrels[name]
@@ -106,7 +114,9 @@ minetest.register_node("mcl_barrels:barrel_closed", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	on_place = function(itemstack, placer, pointed_thing)
-		minetest.rotate_and_place(itemstack, placer, pointed_thing, minetest.is_creative_enabled(placer:get_player_name()), {}, false)
+		minetest.rotate_and_place(itemstack, placer, pointed_thing,
+			minetest.is_creative_enabled(placer:get_player_name()), {}
+			, false)
 		return itemstack
 	end,
 	stack_max = 64,
@@ -155,7 +165,15 @@ minetest.register_node("mcl_barrels:barrel_open", {
 	drop = "mcl_barrels:barrel_closed",
 	stack_max = 64,
 	sounds = mcl_sounds.node_sound_wood_defaults(),
-	groups = {handy = 1, axey = 1, container = 2, material_wood = 1, flammable = -1, deco_block = 1, not_in_creative_inventory = 1},
+	groups = {
+		handy = 1,
+		axey = 1,
+		container = 2,
+		material_wood = 1,
+		flammable = -1,
+		deco_block = 1,
+		not_in_creative_inventory = 1
+	},
 	allow_metadata_inventory_move = protection_check_move,
 	allow_metadata_inventory_take = protection_check_put_take,
 	allow_metadata_inventory_put = protection_check_put_take,
@@ -196,7 +214,7 @@ minetest.register_craft({
 		{ "group:wood", "group:wood_slab", "group:wood" },
 		{ "group:wood", "",                "group:wood" },
 		{ "group:wood", "group:wood_slab", "group:wood" },
-	}
+	},
 })
 
 minetest.register_craft({