From 78355c5c578a89fac2b1fc2b455fd9395f276a7b Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Fri, 23 Apr 2021 13:40:51 +0200
Subject: [PATCH] Integrate totems

---
 mods/ENTITIES/mobs_mc/1_items_default.lua | 62 +----------------------
 mods/ITEMS/mcl_totems/init.lua            | 61 ++++++++++++++++++++--
 mods/ITEMS/mcl_totems/mod.conf            |  2 +-
 3 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/1_items_default.lua b/mods/ENTITIES/mobs_mc/1_items_default.lua
index b4abd4f9c..bdadbfdc5 100644
--- a/mods/ENTITIES/mobs_mc/1_items_default.lua
+++ b/mods/ENTITIES/mobs_mc/1_items_default.lua
@@ -516,8 +516,6 @@ end
 
 -- Evoker
 if c("totem") then
-	local hud_totem = {}
-
 	-- Totem of Undying
 	minetest.register_craftitem("mobs_mc:totem", {
 		description = S("Totem of Undying"),
@@ -527,66 +525,8 @@ if c("totem") then
 		inventory_image = "mcl_totems_totem.png",
 		wield_image = "mcl_totems_totem.png",
 		stack_max = 1,
+		groups = {combat_item=1},
 	})
-
-	minetest.register_on_leaveplayer(function(player)
-		hud_totem[player:get_player_name()] = nil
-	end)
-
-	-- Save the player from death when holding totem of undying in hand
-	minetest.register_on_player_hpchange(function(player, hp_change)
-		local hp = player:get_hp()
-		-- Fatal damage?
-		if hp + hp_change <= 0 then
-			local wield = player:get_wielded_item()
-			if wield:get_name() == "mobs_mc:totem" then
-				local ppos = player:get_pos()
-				local pnname = minetest.get_node(ppos).name
-				-- Some exceptions when _not_ to save the player
-				for n=1, #mobs_mc.misc.totem_fail_nodes do
-					if pnname == mobs_mc.misc.totem_fail_nodes[n] then
-						return hp_change
-					end
-				end
-				-- Reset breath as well
-				if player:get_breath() < 11 then
-					player:set_breath(10)
-				end
-				if not minetest.is_creative_enabled(player:get_player_name()) then
-					wield:take_item()
-					player:set_wielded_item(wield)
-				end
-				-- Effects
-				minetest.sound_play({name = "mcl_totems_totem", gain=1}, {pos=ppos, max_hear_distance=16}, true)
-
-				-- Big totem overlay
-				if not hud_totem[player:get_player_name()] then
-					hud_totem[player:get_player_name()] = player:hud_add({
-						hud_elem_type = "image",
-						text = "mcl_totems_totem.png",
-						position = { x=0.5, y=1 },
-						scale = { x=17, y=17 },
-						offset = { x=0, y=-178 },
-						z_index = 100,
-					})
-					minetest.after(3, function(name)
-						local player = minetest.get_player_by_name(name)
-						if player and player:is_player() then
-							local name = player:get_player_name()
-							if hud_totem[name] then
-								player:hud_remove(hud_totem[name])
-								hud_totem[name] = nil
-							end
-						end
-					end, player:get_player_name())
-				end
-
-				-- Set HP to exactly 1
-				return -hp + 1
-			end
-		end
-		return hp_change
-	end, true)
 end
 
 -- Rotten flesh
diff --git a/mods/ITEMS/mcl_totems/init.lua b/mods/ITEMS/mcl_totems/init.lua
index b4ec3eb8d..499d7362d 100644
--- a/mods/ITEMS/mcl_totems/init.lua
+++ b/mods/ITEMS/mcl_totems/init.lua
@@ -1,5 +1,58 @@
--- Node is currently defined in mobs_mc.
--- TODO: Add full item definition here when status effects become a thing.
+local hud_totem = {}
 
--- Add group for Creative Mode.
-minetest.override_item("mobs_mc:totem", {groups = { combat_item=1}})
+minetest.register_on_leaveplayer(function(player)
+	hud_totem[player] = nil
+end)
+
+-- Save the player from death when holding totem of undying in hand
+mcl_damage.register_modifier(function(obj, damage, reason)
+	if obj:is_player() then
+		local hp = obj:get_hp()
+		if hp - damage <= 0 then
+			local wield = obj:get_wielded_item()
+			if wield:get_name() == "mobs_mc:totem" then
+				local ppos = obj:get_pos()
+				local pnname = minetest.get_node(ppos).name
+				-- Some exceptions when _not_ to save the player
+				for n=1, #mobs_mc.misc.totem_fail_nodes do
+					if pnname == mobs_mc.misc.totem_fail_nodes[n] then
+						return
+					end
+				end
+				-- Reset breath as well
+				if obj:get_breath() < 11 then
+					obj:set_breath(10)
+				end
+
+				if not minetest.is_creative_enabled(obj:get_player_name()) then
+					wield:take_item()
+					obj:set_wielded_item(wield)
+				end
+
+				-- Effects
+				minetest.sound_play({name = "mcl_totems_totem", gain=1}, {pos=ppos, max_hear_distance=16}, true)
+
+				-- Big totem overlay
+				if not hud_totem[obj] then
+					hud_totem[obj] = obj:hud_add({
+						hud_elem_type = "image",
+						text = "mcl_totems_totem.png",
+						position = { x=0.5, y=1 },
+						scale = { x=17, y=17 },
+						offset = { x=0, y=-178 },
+						z_index = 100,
+					})
+					minetest.after(3, function()
+						if obj:is_player() then
+							obj:hud_remove(hud_totem[obj])
+							hud_totem[obj] = nil
+						end
+					end)
+				end
+
+				-- Set HP to exactly 1
+				return hp - 1
+			end
+		end
+	end
+end, 1000)
diff --git a/mods/ITEMS/mcl_totems/mod.conf b/mods/ITEMS/mcl_totems/mod.conf
index 70c5844c6..4ba94defc 100644
--- a/mods/ITEMS/mcl_totems/mod.conf
+++ b/mods/ITEMS/mcl_totems/mod.conf
@@ -1,2 +1,2 @@
 name = mcl_totems
-depends = mobs_mc
+depends = mobs_mc, mcl_damage