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

This information can be used by ContentDB.

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.3] - 2020-02-15
+
+### Fixed
+
+- Fix an issue with gauges occasionally no longer appearing above a player.
+
+### Changed
+
+- Improved the reliability of the Minetest version check (for compatibility with 0.4.17).
+
 ## [1.0.2] - 2020-01-16
 
 ### Fixed
@@ -27,5 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/gauges/compare/v1.0.1...HEAD
+[Unreleased]: https://github.com/minetest-mods/gauges/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/minetest-mods/gauges/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/minetest-mods/gauges/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/minetest-mods/gauges/compare/v1.0.0...v1.0.1

README.md

@@ -60,9 +60,8 @@ on that line.
 
 ## Version compatibility
 
-Gauges is currently primarily tested with Minetest 5.1.0 and 0.4.17. It may or may not work
-with newer or older versions. Issues arising in versions older than 5.0.0
-will generally not be fixed.
+Gauges currently supports Minetest 5.0 and later, as well as 0.4.17.
+Issues arising in versions older than 5.0 will generally not be fixed.
 
 ## License
 

init.lua

@@ -7,14 +7,30 @@ if minetest.settings:get_bool("health_bars") == false or
 		not minetest.settings:get_bool("enable_damage")
 then return end
 
--- Localize the vector distance function for better performance, as it's called
--- on every step
+-- Localize the vector distance function for better performance,
+-- as it's called on every step
 local vector_distance = vector.distance
 
+local function add_gauge(player)
+	if player and player:is_player() then
+		local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
+		local height = 19
+
+		-- Check for Minetest 0.4.17 and adjust the entity height if needed
+		-- (The entity height offset was changed in Minetest 5.0.0.)
+		local version = tonumber(minetest.get_version().string:sub(1, 1))
+		if version and version < 5 then
+			height = 9
+		end
+
+		entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0})
+		entity:get_luaentity().wielder = player
+	end
+end
+
 minetest.register_entity("gauges:hp_bar", {
 	visual = "sprite",
 	visual_size = {x=1, y=1/16, z=1},
-	-- The texture is changed later in the code
 	textures = {"blank.png"},
 	collisionbox = {0},
 	physical = false,
@@ -23,12 +39,13 @@ minetest.register_entity("gauges:hp_bar", {
 		local player = self.wielder
 		local gauge = self.object
 
-		if not player or
-				not minetest.is_player(player) or
-				vector_distance(player:get_pos(), gauge:get_pos()) > 3
-		then
+		if not player or not player:is_player() then
 			gauge:remove()
 			return
+		elseif vector_distance(player:get_pos(), gauge:get_pos()) > 3 then
+			gauge:remove()
+			add_gauge(player)
+			return
 		end
 
 		local hp = player:get_hp() <= 20 and player:get_hp() or 20
@@ -37,8 +54,8 @@ minetest.register_entity("gauges:hp_bar", {
 		if self.hp ~= hp or self.breath ~= breath then
 			gauge:set_properties({
 				textures = {
-					"health_"..tostring(hp)..".png^"..
-					"breath_"..tostring(breath)..".png"
+					"health_"..hp..".png^"..
+					"breath_"..breath..".png"
 				}
 			})
 			self.hp = hp
@@ -47,17 +64,8 @@ minetest.register_entity("gauges:hp_bar", {
 	end
 })
 
-local function add_gauge(player)
-	if player and minetest.is_player(player) then
-		local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
-		-- check for minetest_game 0.4.*
-		local height = minetest.get_modpath("player_api") and 19 or 9
-
-		entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0})
-		entity:get_luaentity().wielder = player
-	end
-end
-
 minetest.register_on_joinplayer(function(player)
 	minetest.after(1, add_gauge, player)
 end)
+
+minetest.log("action", "[gauges] loaded.")

mod.conf

@@ -1,2 +1,3 @@
 name = gauges
 description = Adds health and breath gauges above players.
+min_minetest_version = 0.4.17