Use node groups to determine swimming & burning

changelog.txt

@@ -2,6 +2,7 @@
 v1.2-cmer
 ---------
 - fixed nil error when clearing entity's nametag on death
+- uses node groups to determine swimming & burning instead of depending on `default`
 
 v1.1-cmer
 ---------

functions.lua

@@ -23,7 +23,7 @@
 -- Localizations
 local rnd = math.random
 
-local translate_name = dofile(cmer.modpath .. "/misc_functions.lua")
+local translate_name, is_water_node, is_burning_node = dofile(cmer.modpath .. "/misc_functions.lua")
 
 
 local function knockback(selfOrObject, dir, old_dir, strengh)
@@ -703,31 +703,28 @@ cmer.on_step = function(self, dtime)
 	--swim
 	if self.can_swim and self.swimtimer > 0.8 and self.last_node then
 		self.swimtimer = 0
-		local name = self.last_node.name
-		if name then
-			if name == "default:water_source" then
-				self.air_cnt = 0
-				local vel = me:get_velocity()
-				update_velocity(me, {x=vel.x, y=0.9, z=vel.z}, 1)
-				me:set_acceleration({x=0, y=-1.2, z=0})
-				self.in_water = true
-				-- play swimming sounds
-				if def.sounds and def.sounds.swim then
-					local swim_snd = def.sounds.swim
-					core.sound_play(swim_snd.name, {
-						pos = current_pos,
-						gain = swim_snd.gain or 1,
-						max_hear_distance = swim_snd.distance or 10,
-						})
-				end
-				spawnParticles(current_pos, vel, "bubble.png")
-			else
-				self.air_cnt = self.air_cnt + 1
-				if self.in_water == true and self.air_cnt > 5 then
-					self.in_water = false
-					if not self.can_fly then
-						me:set_acceleration({x=0, y=-15, z=0})
-					end
+		if is_water_node(self.last_node) then
+			self.air_cnt = 0
+			local vel = me:get_velocity()
+			update_velocity(me, {x=vel.x, y=0.9, z=vel.z}, 1)
+			me:set_acceleration({x=0, y=-1.2, z=0})
+			self.in_water = true
+			-- play swimming sounds
+			if def.sounds and def.sounds.swim then
+				local swim_snd = def.sounds.swim
+				core.sound_play(swim_snd.name, {
+					pos = current_pos,
+					gain = swim_snd.gain or 1,
+					max_hear_distance = swim_snd.distance or 10,
+					})
+			end
+			spawnParticles(current_pos, vel, "bubble.png")
+		else
+			self.air_cnt = self.air_cnt + 1
+			if self.in_water == true and self.air_cnt > 5 then
+				self.in_water = false
+				if not self.can_fly then
+					me:set_acceleration({x=0, y=-15, z=0})
 				end
 			end
 		end
@@ -736,13 +733,10 @@ cmer.on_step = function(self, dtime)
 	-- Add damage when drowning or in lava
 	if self.env_damage and self.envtimer > 1 and self.last_node then
 		self.envtimer = 0
-		local name = self.last_node.name
-		if not self.can_swim and name == "default:water_source" then
+		if not self.can_swim and is_water_node(self.last_node) then
 			changeHP(self, -1)
-		elseif self.can_burn then
-			if name == "fire:basic_flame" or name == "default:lava_source" then
-				changeHP(self, -4)
-			end
+		elseif self.can_burn and is_burning_node(self.last_node) then
+			changeHP(self, -4)
 		end
 
 		-- add damage when light is too bright or too dark

misc_functions.lua

@@ -8,4 +8,18 @@ local function translate_name(name)
 	return name
 end
 
-return translate_name
+local function is_water_node(node)
+	if type(node) == "table" and node.groups ~= nil and (node.groups.liquid or node.groups.water) then
+		return true
+	end
+	return false
+end
+
+local function is_burning_node(node)
+	if type(node) == "table" and node.groups ~= nil and (node.groups.igniter or node.groups.fire or node.groups.lava) then
+		return true
+	end
+	return false
+end
+
+return translate_name, is_water_node, is_burning_node

mod.conf

@@ -2,5 +2,4 @@ name = cmer
 title = Creatures Revived
 description = An API for creating mobs.
 version = 1.1
-depends = default
 optional_depends = creatures, asm_spawneggs