Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

README.md

@@ -11,8 +11,7 @@ this mod will place them accordingly.
 position should be displayed correctly on every screen size.
 
 ## Current version
-The current version is 2.3.1.
-It works for Minetest 5.3.0.
+The current version is 2.2.2.
 
 This software uses [semantic versioning](http://semver.org), as defined by version 2.0.0 of the SemVer
 standard.

init.lua

@@ -213,8 +213,22 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 					z_index = 1,
 				})
 			end
+		elseif hb.settings.bar_type == "statbar_modern" then
+			if textures.bgicon ~= nil then
+				ids.bg = player:hud_add({
+					hud_elem_type = "statbar",
+					position = pos,
+					text = textures.bgicon,
+					number = bgiconnumber,
+					alignment = {x=-1,y=-1},
+					offset = { x = offset.x, y = offset.y },
+					direction = 0,
+					size = {x=24, y=24},
+					z_index = 0,
+				})
 			end
-		local bar_image, bgicon, bar_size
+		end
+		local bar_image, bar_size
 		if hb.settings.bar_type == "progress_bar" then
 			bar_image = textures.bar
 			-- NOTE: Intentionally set to nil. For some reason, on some systems,
@@ -226,16 +240,13 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 			bar_size = nil
 		elseif hb.settings.bar_type == "statbar_classic" or hb.settings.bar_type == "statbar_modern" then
 			bar_image = textures.icon
-			bgicon = textures.bgicon
 			bar_size = {x=24, y=24}
 		end
 		ids.bar = player:hud_add({
 			hud_elem_type = "statbar",
 			position = pos,
 			text = bar_image,
-			text2 = bgicon,
 			number = barnumber,
-			item = bgiconnumber,
 			alignment = {x=-1,y=-1},
 			offset = offset,
 			direction = 0,
@@ -410,9 +421,10 @@ function hb.hide_hudbar(player, identifier)
 		end
 		player:hud_change(hudtable.hudids[name].bg, "scale", {x=0,y=0})
 		player:hud_change(hudtable.hudids[name].text, "text", "")
+	elseif hb.settings.bar_type == "statbar_modern" then
+		player:hud_change(hudtable.hudids[name].bg, "number", 0)
 	end
 	player:hud_change(hudtable.hudids[name].bar, "number", 0)
-	player:hud_change(hudtable.hudids[name].bar, "item", 0)
 	hudtable.hudstate[name].hidden = true
 	return true
 end
@@ -433,10 +445,9 @@ function hb.unhide_hudbar(player, identifier)
 		end
 		player:hud_change(hudtable.hudids[name].text, "text", make_label(hudtable.format_string, hudtable.format_string_config, hudtable.label, value, max))
 	elseif hb.settings.bar_type == "statbar_modern" then
-		player:hud_change(hudtable.hudids[name].bar, "scale", {x=1,y=1})
+		player:hud_change(hudtable.hudids[name].bg, "number", hb.settings.statbar_length)
 	end
 	player:hud_change(hudtable.hudids[name].bar, "number", hb.value_to_barlength(value, max))
-	player:hud_change(hudtable.hudids[name].bar, "item", hb.value_to_barlength(max, max))
 	hudtable.hudstate[name].hidden = false
 	return true
 end
@@ -492,7 +503,7 @@ local function custom_hud(player)
 		local breath_max = player:get_properties().breath_max
 		local hide_breath
 		if breath >= breath_max and hb.settings.autohide_breath == true then hide_breath = true else hide_breath = false end
-		hb.init_hudbar(player, "breath", math.min(breath, breath_max), breath_max, hide_breath or hide)
+		hb.init_hudbar(player, "breath", math.min(breath, breath_max-1), breath_max-1, hide_breath or hide)
 	end
 end
 
@@ -516,7 +527,7 @@ local function update_hud(player)
 			hb.hide_hudbar(player, "breath")
 		else
 			hb.unhide_hudbar(player, "breath")
-			hb.change_hudbar(player, "breath", math.min(breath, breath_max), breath_max)
+			hb.change_hudbar(player, "breath", math.min(breath, breath_max-1), breath_max-1)
 		end
 		--health
 		update_health(player)
@@ -564,3 +575,5 @@ minetest.register_globalstep(function(dtime)
 	end
 	if timer > 4 then timer = 0 end
 end)
+
+minetest.log("action", "[hudbars] loaded.")