From f350fa6272a341d7ba28aab0aa75e7ba9bbd5b43 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Tue, 6 Apr 2021 14:50:34 +0200
Subject: [PATCH 1/2] Add bossbars

---
 mods/CORE/mcl_util/init.lua                   |   2 +-
 mods/ENTITIES/mcl_mobs/api.lua                |  16 +--
 mods/ENTITIES/mobs_mc/ender_dragon.lua        |   3 +
 mods/ENTITIES/mobs_mc/wither.lua              |   3 +-
 mods/HUD/mcl_bossbars/init.lua                | 124 ++++++++++++++++++
 mods/HUD/mcl_bossbars/mod.conf                |   4 +
 .../mcl_bossbars/textures/mcl_bossbars.png    | Bin 0 -> 3689 bytes
 .../textures/mcl_bossbars_empty.png           | Bin 0 -> 3369 bytes
 8 files changed, 142 insertions(+), 10 deletions(-)
 create mode 100644 mods/HUD/mcl_bossbars/init.lua
 create mode 100644 mods/HUD/mcl_bossbars/mod.conf
 create mode 100644 mods/HUD/mcl_bossbars/textures/mcl_bossbars.png
 create mode 100644 mods/HUD/mcl_bossbars/textures/mcl_bossbars_empty.png

diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index a43c3d5d0..ac913de39 100644
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@@ -410,7 +410,7 @@ function mcl_util.get_color(colorstr)
 	local mc_color = mcl_colors[colorstr:upper()]
 	if mc_color then
 		colorstr = mc_color
-	elseif #colorstr ~= 7 or colorstr:sub(1, 1) ~= "#"then
+	elseif #colorstr ~= 7 or colorstr:sub(1, 1) ~= "#" then
 		return
 	end
 	local hex = tonumber(colorstr:sub(2, 7), 16)
diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index 6e932ed5e..e599f2127 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -3526,14 +3526,6 @@ local mob_step = function(self, dtime)
 
 	-- end rotation
 
-	-- knockback timer
-	if self.pause_timer > 0 then
-
-		self.pause_timer = self.pause_timer - dtime
-
-		return
-	end
-
 	-- run custom function (defined in mob lua file)
 	if self.do_custom then
 
@@ -3543,6 +3535,14 @@ local mob_step = function(self, dtime)
 		end
 	end
 
+	-- knockback timer
+	if self.pause_timer > 0 then
+
+		self.pause_timer = self.pause_timer - dtime
+
+		return
+	end
+
 	-- attack timer
 	self.timer = self.timer + dtime
 
diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua
index ddaea360f..509409a2e 100644
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@@ -59,6 +59,9 @@ mobs:register_mob("mobs_mc:enderdragon", {
 		run_start = 0,		run_end = 20,
 	},
 	ignores_nametag = true,
+	do_custom = function(self)
+		mcl_bossbars.update_boss(self, "Ender Dragon", "light_purple")
+	end,
 	on_die = function(self, pos)
 		if not self._respawned then
 			mcl_experience.throw_experience(pos, 11500) -- 500 + 11500 = 12000
diff --git a/mods/ENTITIES/mobs_mc/wither.lua b/mods/ENTITIES/mobs_mc/wither.lua
index caf5a248d..8e7f7eb95 100644
--- a/mods/ENTITIES/mobs_mc/wither.lua
+++ b/mods/ENTITIES/mobs_mc/wither.lua
@@ -73,6 +73,7 @@ mobs:register_mob("mobs_mc:wither", {
 			self.object:set_properties({textures={self.base_texture}})
 			self.armor = {undead = 80, fleshy = 80}
 		end
+		mcl_bossbars.update_boss(self, "Wither", "dark_purple")
 	end,
 	on_spawn = function(self)
 		minetest.sound_play("mobs_mc_wither_spawn", {object=self.object, gain=1.0, max_hear_distance=64})
@@ -115,4 +116,4 @@ mobs:register_arrow("mobs_mc:wither_skull", {
 --Spawn egg
 mobs:register_egg("mobs_mc:wither", S("Wither"), "mobs_mc_spawn_icon_wither.png", 0, true)
 
-mcl_wip.register_wip_item("mobs_mc:wither")
\ No newline at end of file
+mcl_wip.register_wip_item("mobs_mc:wither")
diff --git a/mods/HUD/mcl_bossbars/init.lua b/mods/HUD/mcl_bossbars/init.lua
new file mode 100644
index 000000000..38dbbe376
--- /dev/null
+++ b/mods/HUD/mcl_bossbars/init.lua
@@ -0,0 +1,124 @@
+mcl_bossbars = {
+	bars = {},
+	huds = {},
+	colors = {"light_purple", "blue", "red", "green", "yellow", "dark_purple", "white"},
+}
+
+function mcl_bossbars.recalculate_colors()
+	local sorted = {}
+	local colors = mcl_bossbars.colors
+	local color_count = #colors
+	local frame_count = color_count * 2
+	for i, color in ipairs(colors) do
+		local idx = i * 2 - 1
+		local image = "mcl_bossbars.png"
+			.. "^[transformR270"
+			.. "^[verticalframe:" .. frame_count .. ":" .. (idx - 1)
+			.. "^(mcl_bossbars_empty.png"
+			.. "^[lowpart:%d:mcl_bossbars.png"
+			.. "^[transformR270"
+			.. "^[verticalframe:" .. frame_count .. ":" .. idx .. ")"
+		local _, hex = mcl_util.get_color(color)
+		sorted[color] = {
+			image = image,
+			hex = hex,
+		}
+	end
+	mcl_bossbars.colors_sorted = sorted
+end
+
+function mcl_bossbars.update_bar(player, text, color, percentage)
+	local cdef = mcl_bossbars.colors_sorted[color]
+	table.insert(mcl_bossbars.bars[player:get_player_name()], {color = cdef.hex, text = text, image = string.format(cdef.image, percentage)})
+end
+
+function mcl_bossbars.update_boss(luaentity, name, color)
+	local object = luaentity.object
+	local text = luaentity.nametag
+	if not text or text == "" then
+		text = name
+	end
+	local percentage = math.floor(luaentity.health / luaentity.hp_max * 100)
+	for _, obj in pairs(minetest.get_objects_inside_radius(object:get_pos(), 128)) do
+		if obj:is_player() then
+			mcl_bossbars.update_bar(obj, text, color, percentage)
+		end
+	end
+end
+
+minetest.register_on_joinplayer(function(player)
+	local name = player:get_player_name()
+	mcl_bossbars.huds[name] = {}
+	mcl_bossbars.bars[name] = {}
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	mcl_bossbars.huds[name] = nil
+	mcl_bossbars.bars[name] = nil
+end)
+
+minetest.register_globalstep(function()
+	for _, player in pairs(minetest.get_connected_players()) do
+		local name = player:get_player_name()
+		local bars = mcl_bossbars.bars[name]
+		local huds = mcl_bossbars.huds[name]
+		local huds_new = {}
+		local i = 0
+
+		while #huds > 0 or #bars > 0 do
+			local bar = table.remove(bars, 1)
+			local hud = table.remove(huds, 1)
+
+			if bar and not hud then
+				hud = {
+					color = bar.color,
+					image = bar.image,
+					text = bar.text,
+					text_id = player:hud_add({
+						hud_elem_type = "text",
+						text = bar.text,
+						number = bar.color,
+						position = {x = 0.5, y = 0},
+						alignment = {x = 0, y = 1},
+						offset = {x = 0, y = i * 40},
+					}),
+					image_id = player:hud_add({
+						hud_elem_type = "image",
+						text = bar.image,
+						position = {x = 0.5, y = 0},
+						alignment = {x = 0, y = 1},
+						offset = {x = 0, y = i * 40 + 25},
+						scale = {x = 3, y = 3},
+					}),
+				}
+			elseif hud and not bar then
+				player:hud_remove(hud.text_id)
+				player:hud_remove(hud.image_id)
+				hud = nil
+			else
+				if bar.text ~= hud.text then
+					player:hud_change(hud.text_id, "text", bar.text)
+					hud.text = bar.text
+				end
+
+				if bar.color ~= hud.color then
+					player:hud_change(hud.text_id, "number", bar.color)
+					hud.color = bar.color
+				end
+
+				if bar.image ~= hud.image then
+					player:hud_change(hud.image_id, "text", bar.image)
+					hud.image = bar.image
+				end
+			end
+
+			table.insert(huds_new, hud)
+			i = i + 1
+		end
+
+		mcl_bossbars.huds[name] = huds_new
+	end
+end)
+
+mcl_bossbars.recalculate_colors()
diff --git a/mods/HUD/mcl_bossbars/mod.conf b/mods/HUD/mcl_bossbars/mod.conf
new file mode 100644
index 000000000..64cbd4c9f
--- /dev/null
+++ b/mods/HUD/mcl_bossbars/mod.conf
@@ -0,0 +1,4 @@
+name = mcl_bossbars
+author = Fleckenstein
+description = Show enderdragon & wither boss bars. Also allows custom bars.
+depends = mcl_util, mcl_colors
diff --git a/mods/HUD/mcl_bossbars/textures/mcl_bossbars.png b/mods/HUD/mcl_bossbars/textures/mcl_bossbars.png
new file mode 100644
index 0000000000000000000000000000000000000000..55bf36dc288f271d12228a67a6a39c98c6ca18e9
GIT binary patch
literal 3689
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

literal 0
HcmV?d00001

diff --git a/mods/HUD/mcl_bossbars/textures/mcl_bossbars_empty.png b/mods/HUD/mcl_bossbars/textures/mcl_bossbars_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e50b6afc2a8dddc0748ae7763a5975ef6956b24
GIT binary patch
literal 3369
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
SEo%JRzk$BCkyed{6ZSuzSwWZp

literal 0
HcmV?d00001


From 962a13847e64613e53f1a2542860d3439a9a6d4f Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Tue, 6 Apr 2021 14:57:29 +0200
Subject: [PATCH 2/2] Fix dragons summoned using commands spawning an egg on
 the exit portal

---
 mods/ENTITIES/mobs_mc/ender_dragon.lua | 4 ++--
 mods/ITEMS/mcl_end/end_crystal.lua     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua
index 509409a2e..01c346579 100644
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@@ -63,9 +63,9 @@ mobs:register_mob("mobs_mc:enderdragon", {
 		mcl_bossbars.update_boss(self, "Ender Dragon", "light_purple")
 	end,
 	on_die = function(self, pos)
-		if not self._respawned then
+		if self._portal_pos then
 			mcl_experience.throw_experience(pos, 11500) -- 500 + 11500 = 12000
-			minetest.set_node(self._portal_pos and minetest.string_to_pos(self._portal_pos) or vector.add(mcl_vars.mg_end_platform_pos, vector.new(-27, 2, 0)), {name = mobs_mc.items.dragon_egg})
+			minetest.set_node(minetest.string_to_pos(self._portal_pos), {name = mobs_mc.items.dragon_egg})
 		end
 	end,
 	fire_resistant = true,
diff --git a/mods/ITEMS/mcl_end/end_crystal.lua b/mods/ITEMS/mcl_end/end_crystal.lua
index 8fcf67a1d..9e4fa13fd 100644
--- a/mods/ITEMS/mcl_end/end_crystal.lua
+++ b/mods/ITEMS/mcl_end/end_crystal.lua
@@ -58,7 +58,7 @@ local function spawn_crystal(pos)
 	for _, crystal in pairs(crystals) do
 		crystal_explode(crystal)
 	end
-	minetest.add_entity(vector.add(portal_center, {x = 0, y = 10, z = 0}), "mobs_mc:enderdragon"):get_luaentity()._respawned = true
+	minetest.add_entity(vector.add(portal_center, {x = 0, y = 10, z = 0}), "mobs_mc:enderdragon")
 end
 
 minetest.register_entity("mcl_end:crystal", {